fpm.patch   [plain text]


diff -Naur php-5.3.23-patch1/Makefile.global php-5.3.23-patch2/Makefile.global
--- php-5.3.23-patch1/Makefile.global	2013-04-04 21:27:15.000000000 -0700
+++ php-5.3.23-patch2/Makefile.global	2013-04-04 21:36:54.000000000 -0700
@@ -13,6 +13,8 @@
 	
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
+build-binaries: $(PHP_BINARIES)
+
 libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
@@ -35,6 +37,8 @@
 	fi
 	@$(INSTALL_IT)
 
+install-binaries: build-binaries $(install_binary_targets)
+
 install-modules: build-modules
 	@test -d modules && \
 	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
diff -Naur php-5.3.23-patch1/acconfig.h php-5.3.23-patch2/acconfig.h
--- php-5.3.23-patch1/acconfig.h	2013-04-04 21:28:22.000000000 -0700
+++ php-5.3.23-patch2/acconfig.h	2013-04-04 21:36:54.000000000 -0700
@@ -20,8 +20,6 @@
 
 /* $Id$ */
 
-#ifndef ZEND_API
-
 #if defined(__GNUC__) && __GNUC__ >= 4
 # define ZEND_API __attribute__ ((visibility("default")))
 # define ZEND_DLEXPORT __attribute__ ((visibility("default")))
@@ -122,29 +120,6 @@
 #endif
 
 /*
- * Darwin's GCC can generate multiple architectures in a single pass so the size and
- * byte order will only be accurate for the one architecture that happened to invoke
- * configure.
- */
-#ifdef __DARWIN_BYTE_ORDER
-#/* This symbol must be allowed to be cleared. */ undef WORDS_BIGENDIAN
-# if (__DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN)
-#  define WORDS_BIGENDIAN 1
-# endif
-#/* This symbol must be allowed to be cleared. */ undef SIZEOF_LONG
-#/* This symbol must be allowed to be cleared. */ undef SIZEOF_SIZE_T
-# ifdef __LP64__
-#/* This symbol should not be modified by configure. */  define SIZEOF_LONG 8
-#/* This symbol should not be modified by configure. */  define SIZEOF_SIZE_T 8
-# else
-#/* This symbol should not be modified by configure. */  define SIZEOF_LONG 4
-#/* This symbol should not be modified by configure. */  define SIZEOF_SIZE_T 4
-# endif
-#endif
-
-#endif	/* ZEND_API */
-
-/*
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
diff -Naur php-5.3.23-patch1/acinclude.m4 php-5.3.23-patch2/acinclude.m4
--- php-5.3.23-patch1/acinclude.m4	2013-04-04 21:26:53.000000000 -0700
+++ php-5.3.23-patch2/acinclude.m4	2013-04-04 21:36:54.000000000 -0700
@@ -194,7 +194,7 @@
 dnl
 dnl which array to append to?
 AC_DEFUN([PHP_ADD_SOURCES],[
-  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
+  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))
 ])
 
 dnl
@@ -772,7 +772,7 @@
 AC_DEFUN([PHP_BUILD_SHARED],[
   PHP_BUILD_PROGRAM
   OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
-  php_build_target=shared
+  php_sapi_module=shared
   
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
@@ -789,7 +789,7 @@
 AC_DEFUN([PHP_BUILD_STATIC],[
   PHP_BUILD_PROGRAM
   OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
-  php_build_target=static
+  php_sapi_module=static
 ])
 
 dnl
@@ -798,14 +798,13 @@
 AC_DEFUN([PHP_BUILD_BUNDLE],[
   PHP_BUILD_PROGRAM
   OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle]
-  php_build_target=static
+  php_sapi_module=static
 ])
 
 dnl
 dnl PHP_BUILD_PROGRAM
 dnl
 AC_DEFUN([PHP_BUILD_PROGRAM],[
-  OVERALL_TARGET=[]ifelse($1,,php,$1)
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -826,8 +825,6 @@
   shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
   shared_cxx_post=
   shared_lo=lo
-
-  php_build_target=program
 ])
 
 dnl
@@ -873,32 +870,45 @@
 dnl
 dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]])
 dnl
-dnl Selects the SAPI name and type (static, shared, programm)
+dnl Selects the SAPI name and type (static, shared, bundle, program)
 dnl and optionally also the source-files for the SAPI-specific
 dnl objects.
 dnl
 AC_DEFUN([PHP_SELECT_SAPI],[
-  if test "$PHP_SAPI" != "default"; then
-AC_MSG_ERROR([
+  if test "$2" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES $1"
+  elif test "$PHP_SAPI" != "none"; then
+    AC_MSG_ERROR([
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
 ])
-  fi
+  else
+    PHP_SAPI=$1
+  fi  
 
-  PHP_SAPI=$1
-  
-  case "$2" in
-  static[)] PHP_BUILD_STATIC;;
-  shared[)] PHP_BUILD_SHARED;;
-  bundle[)] PHP_BUILD_BUNDLE;;
-  program[)] PHP_BUILD_PROGRAM($5);;
-  esac
-    
-  ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+  PHP_ADD_BUILD_DIR([sapi/$1])
+
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS $1"
+
+  ifelse($2,program,[
+    PHP_BUILD_PROGRAM
+    install_binaries="install-binaries"
+    install_binary_targets="$install_binary_targets install-$1"
+    PHP_SUBST(PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)
+    ifelse($3,,,[PHP_ADD_SOURCES_X([sapi/$1],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)])
+  ],[
+    case "$2" in
+    static[)] PHP_BUILD_STATIC;;
+    shared[)] PHP_BUILD_SHARED;;
+    bundle[)] PHP_BUILD_BUNDLE;;
+    esac
+    install_sapi="install-sapi"
+    ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+  ])
 ])
 
 dnl deprecated
diff -Naur php-5.3.23-patch1/aclocal.m4 php-5.3.23-patch2/aclocal.m4
--- php-5.3.23-patch1/aclocal.m4	2013-04-04 21:26:53.000000000 -0700
+++ php-5.3.23-patch2/aclocal.m4	2013-04-04 21:36:54.000000000 -0700
@@ -194,7 +194,7 @@
 dnl
 dnl which array to append to?
 AC_DEFUN([PHP_ADD_SOURCES],[
-  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
+  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))
 ])
 
 dnl
@@ -772,7 +772,7 @@
 AC_DEFUN([PHP_BUILD_SHARED],[
   PHP_BUILD_PROGRAM
   OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
-  php_build_target=shared
+  php_sapi_module=shared
   
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
@@ -789,7 +789,7 @@
 AC_DEFUN([PHP_BUILD_STATIC],[
   PHP_BUILD_PROGRAM
   OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
-  php_build_target=static
+  php_sapi_module=static
 ])
 
 dnl
@@ -798,14 +798,13 @@
 AC_DEFUN([PHP_BUILD_BUNDLE],[
   PHP_BUILD_PROGRAM
   OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle]
-  php_build_target=static
+  php_sapi_module=static
 ])
 
 dnl
 dnl PHP_BUILD_PROGRAM
 dnl
 AC_DEFUN([PHP_BUILD_PROGRAM],[
-  OVERALL_TARGET=[]ifelse($1,,php,$1)
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -826,8 +825,6 @@
   shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
   shared_cxx_post=
   shared_lo=lo
-
-  php_build_target=program
 ])
 
 dnl
@@ -873,32 +870,45 @@
 dnl
 dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]])
 dnl
-dnl Selects the SAPI name and type (static, shared, programm)
+dnl Selects the SAPI name and type (static, shared, bundle, program)
 dnl and optionally also the source-files for the SAPI-specific
 dnl objects.
 dnl
 AC_DEFUN([PHP_SELECT_SAPI],[
-  if test "$PHP_SAPI" != "default"; then
-AC_MSG_ERROR([
+  if test "$2" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES $1"
+  elif test "$PHP_SAPI" != "none"; then
+    AC_MSG_ERROR([
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
 ])
-  fi
+  else
+    PHP_SAPI=$1
+  fi  
 
-  PHP_SAPI=$1
-  
-  case "$2" in
-  static[)] PHP_BUILD_STATIC;;
-  shared[)] PHP_BUILD_SHARED;;
-  bundle[)] PHP_BUILD_BUNDLE;;
-  program[)] PHP_BUILD_PROGRAM($5);;
-  esac
-    
-  ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+  PHP_ADD_BUILD_DIR([sapi/$1])
+
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS $1"
+
+  ifelse($2,program,[
+    PHP_BUILD_PROGRAM
+    install_binaries="install-binaries"
+    install_binary_targets="$install_binary_targets install-$1"
+    PHP_SUBST(PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)
+    ifelse($3,,,[PHP_ADD_SOURCES_X([sapi/$1],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)])
+  ],[
+    case "$2" in
+    static[)] PHP_BUILD_STATIC;;
+    shared[)] PHP_BUILD_SHARED;;
+    bundle[)] PHP_BUILD_BUNDLE;;
+    esac
+    install_sapi="install-sapi"
+    ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+  ])
 ])
 
 dnl deprecated
diff -Naur php-5.3.23-patch1/configure php-5.3.23-patch2/configure
--- php-5.3.23-patch1/configure	2013-04-04 21:27:40.000000000 -0700
+++ php-5.3.23-patch2/configure	2013-04-04 21:38:08.000000000 -0700
@@ -22,273 +22,1202 @@
 
 
 
-# Forbidden tokens and exceptions.
 
 
 
-# Actually reserved by M4sh.
 
-# All the M4sugar macros start with `m4_', except `dnl' kept as is
-# for sake of simplicity.
 
 
 
-# Check the divert push/pop perfect balance.
 
 
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
 
 
 
 
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
 
 
 
 
 
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
 
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
 
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
 
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
 
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
 
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
+## 2008  Free Software Foundation, Inc.
+## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+##
+## This file is free software; the Free Software Foundation gives
+## unlimited permission to copy and/or distribute it, with or without
+## modifications, as long as this notice is preserved.
+
+# serial 52 AC_PROG_LIBTOOL
+
+
+# autoconf 2.13 compatibility
+# Set PATH_SEPARATOR variable
+# ---------------------------------
+# Find the correct PATH separator.  Usually this is :', but
+# DJGPP uses ;' like DOS.
+if test "X${PATH_SEPARATOR+set}" != Xset; then
+  UNAME=${UNAME-`uname 2>/dev/null`}
+  case X$UNAME in
+    *-DOS) lt_cv_sys_path_separator=';' ;;
+    *)     lt_cv_sys_path_separator=':' ;;
+  esac
+  PATH_SEPARATOR=$lt_cv_sys_path_separator
 fi
 
-as_executable_p="test -f"
 
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+# _LT_AC_SYS_COMPILER
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+# _LT_LINKER_BOILERPLATE
+
+
 
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
 
-# CDPATH.
-$as_unset CDPATH
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# _LT_AC_SYS_LIBPATH_AIX
 
 
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+# _LT_AC_SHELL_INIT
 
 
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# ------------------
+# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
+# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# ----------------------
+# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+# _LT_AC_TAGCONFIG
+# ----------------
+# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+# AC_LIBTOOL_DLOPEN
+
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 DLLs
+# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+# set the default shared flag to --disable-shared
+# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognize shared library
+# AC_PATH_TOOL_PREFIX
+
+
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognize a shared library
+# AC_PATH_MAGIC
+
+
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+# AC_PROG_LD
+
+
+# AC_PROG_LD_GNU
+# --------------
+# AC_PROG_LD_GNU
+
+
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+# AC_PROG_LD_RELOAD_FLAG
+
+
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+# AC_DEPLIBS_CHECK_METHOD
+
+
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
+# AC_PROG_NM
+
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+# AC_CHECK_LIBM
+
+
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
+# AC_LIBLTDL_CONVENIENCE
+
+
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+# AC_LIBLTDL_INSTALLABLE
+
+
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+# AC_LIBTOOL_CXX
+
+
+# _LT_AC_LANG_CXX
+# ---------------
+# _LT_AC_LANG_CXX
+
+# _LT_AC_PROG_CXXCPP
+# ------------------
+# _LT_AC_PROG_CXXCPP
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+
+# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+# AC_LIBTOOL_CONFIG
+
+
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+ # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+
+
+
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+# AC_LIBTOOL_PROG_LD_SHLIBS
+
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+
+
+
+# old names
+
+
+
+
+
+
+
+
+# This is just to silence aclocal about the macro not being used
+
+
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.13 
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+ac_help="$ac_help
+  --with-libdir=NAME      Look for libraries in .../NAME rather than .../lib"
+ac_help="$ac_help
+  --disable-rpath         Disable passing additional runtime library
+                          search paths"
+ac_help="$ac_help
+  --enable-re2c-cgoto     Enable -g flag to re2c to use computed goto gcc extension"
+ac_help="$ac_help
+
+SAPI modules:
+"
+ac_help="$ac_help
+  --with-aolserver=DIR    Specify path to the installed AOLserver"
+ac_help="$ac_help
+  --with-apxs[=FILE]      Build shared Apache 1.x module. FILE is the optional
+                          pathname to the Apache apxs tool [apxs]"
+ac_help="$ac_help
+  --with-apache[=DIR]     Build Apache 1.x module. DIR is the top-level Apache
+                          build directory [/usr/local/apache]"
+ac_help="$ac_help
+  --enable-mod-charset      APACHE: Enable transfer tables for mod_charset (Rus Apache)"
+ac_help="$ac_help
+  --with-apxs2filter[=FILE]   
+                          EXPERIMENTAL: Build shared Apache 2.0 Filter module. FILE is the optional
+                          pathname to the Apache apxs tool [apxs]"
+ac_help="$ac_help
+  --with-apxs2[=FILE]     Build shared Apache 2.0 Handler module. FILE is the optional
+                          pathname to the Apache apxs tool [apxs]"
+ac_help="$ac_help
+  --with-apache-hooks[=FILE]      
+                          EXPERIMENTAL: Build shared Apache 1.x module. FILE is the optional
+                          pathname to the Apache apxs tool [apxs]"
+ac_help="$ac_help
+  --with-apache-hooks-static[=DIR]
+                          EXPERIMENTAL: Build Apache 1.x module. DIR is the top-level Apache
+                          build directory [/usr/local/apache]"
+ac_help="$ac_help
+  --enable-mod-charset      APACHE (hooks): Enable transfer tables for mod_charset (Rus Apache)"
+ac_help="$ac_help
+  --with-caudium[=DIR]    Build PHP as a Pike module for use with Caudium.
+                          DIR is the Caudium server dir [/usr/local/caudium/server]"
+ac_help="$ac_help
+  --disable-cli           Disable building CLI version of PHP
+                          (this forces --without-pear)"
+ac_help="$ac_help
+  --with-continuity=DIR   Build PHP as Continuity Server module. 
+                          DIR is path to the installed Continuity Server root"
+ac_help="$ac_help
+  --enable-embed[=TYPE]   EXPERIMENTAL: Enable building of embedded SAPI library
+                          TYPE is either 'shared' or 'static'. [TYPE=shared]"
+ac_help="$ac_help
+  --enable-fpm              EXPERIMENTAL: Enable building of the fpm SAPI executable"
+ac_help="$ac_help
+  --with-fpm-user[=USER]  Set the user for php-fpm to run as. (default: nobody)"
+ac_help="$ac_help
+  --with-fpm-group[=GRP]  Set the group for php-fpm to run as. For a system user, this 
+                  should usually be set to match the fpm username (default: nobody)"
+ac_help="$ac_help
+  --with-isapi[=DIR]      Build PHP as an ISAPI module for use with Zeus"
+ac_help="$ac_help
+  --with-litespeed        Build PHP as litespeed module"
+ac_help="$ac_help
+  --with-milter[=DIR]     Build PHP as Milter application"
+ac_help="$ac_help
+  --with-nsapi=DIR        Build PHP as NSAPI module for Netscape/iPlanet/Sun Webserver"
+ac_help="$ac_help
+  --with-phttpd=DIR       Build PHP as phttpd module"
+ac_help="$ac_help
+  --with-pi3web[=DIR]     Build PHP as Pi3Web module"
+ac_help="$ac_help
+  --with-roxen=DIR        Build PHP as a Pike module. DIR is the base Roxen
+                          directory, normally /usr/local/roxen/server"
+ac_help="$ac_help
+  --enable-roxen-zts        ROXEN: Build the Roxen module using Zend Thread Safety"
+ac_help="$ac_help
+  --with-thttpd=SRCDIR    Build PHP as thttpd module"
+ac_help="$ac_help
+  --with-tux=MODULEDIR    Build PHP as a TUX module (Linux only)"
+ac_help="$ac_help
+  --with-webjames=SRCDIR  Build PHP as a WebJames module (RISC OS only)"
+ac_help="$ac_help
+  --disable-cgi           Disable building CGI version of PHP"
+ac_help="$ac_help
+
+General settings:
+"
+ac_help="$ac_help
+  --enable-gcov           Enable GCOV code coverage (requires LTP) - FOR DEVELOPERS ONLY!!"
+ac_help="$ac_help
+  --enable-debug          Compile with debugging symbols"
+ac_help="$ac_help
+  --with-layout=TYPE      Set how installed files will be laid out.  Type can
+                          be either PHP or GNU [PHP]"
+ac_help="$ac_help
+  --with-config-file-path=PATH
+                          Set the path in which to look for php.ini [PREFIX/lib]"
+ac_help="$ac_help
+  --with-config-file-scan-dir=PATH
+                          Set the path where to scan for configuration files"
+ac_help="$ac_help
+  --enable-safe-mode      Enable safe mode by default"
+ac_help="$ac_help
+  --with-exec-dir[=DIR]   Only allow executables in DIR under safe-mode
+                          [/usr/local/php/bin]"
+ac_help="$ac_help
+  --enable-sigchild       Enable PHP's own SIGCHLD handler"
+ac_help="$ac_help
+  --enable-magic-quotes   Enable magic quotes by default."
+ac_help="$ac_help
+  --enable-libgcc         Enable explicitly linking against libgcc"
+ac_help="$ac_help
+  --disable-short-tags    Disable the short-form <? start tag by default"
+ac_help="$ac_help
+  --enable-dmalloc        Enable dmalloc"
+ac_help="$ac_help
+  --disable-ipv6          Disable IPv6 support"
+ac_help="$ac_help
+  --enable-fd-setsize     Set size of descriptor sets"
+ac_help="$ac_help
+
+Extensions:
+
+  --with-EXTENSION=[shared[,PATH]]
+  
+    NOTE: Not all extensions can be build as 'shared'.
+
+    Example: --with-foobar=shared,/usr/local/foobar/
+
+      o Builds the foobar extension as shared extension.
+      o foobar package install prefix is /usr/local/foobar/
+
+"
+ac_help="$ac_help
+ --disable-all   Disable all extensions which are enabled by default
+"
+ac_help="$ac_help
+  --with-regex=TYPE       regex library type: system, php. [TYPE=php]
+                          WARNING: Do NOT use unless you know what you are doing!"
+ac_help="$ac_help
+  --disable-libxml        Disable LIBXML support"
+ac_help="$ac_help
+  --with-libxml-dir[=DIR]   LIBXML: libxml2 install prefix"
+ac_help="$ac_help
+  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.6)"
+ac_help="$ac_help
+  --with-kerberos[=DIR]     OPENSSL: Include Kerberos support"
+ac_help="$ac_help
+  --with-pcre-regex=DIR   Include Perl Compatible Regular Expressions support.
+                          DIR is the PCRE install prefix [BUNDLED]"
+ac_help="$ac_help
+  --without-sqlite3[=DIR] Do not include SQLite3 support. DIR is the prefix to
+                          SQLite3 installation directory."
+ac_help="$ac_help
+  --with-zlib[=DIR]       Include ZLIB support (requires zlib >= 1.0.9)"
+ac_help="$ac_help
+  --with-zlib-dir=<DIR>   Define the location of zlib install directory"
+ac_help="$ac_help
+  --enable-bcmath         Enable bc style precision math functions"
+ac_help="$ac_help
+  --with-bz2[=DIR]        Include BZip2 support"
+ac_help="$ac_help
+  --enable-calendar       Enable support for calendar conversion"
+ac_help="$ac_help
+  --disable-ctype         Disable ctype functions"
+ac_help="$ac_help
+  --with-curl[=DIR]       Include cURL support"
+ac_help="$ac_help
+  --with-curlwrappers     EXPERIMENTAL: Use cURL for url streams"
+ac_help="$ac_help
+  --enable-dba            Build DBA with bundled modules. To build shared DBA
+                          extension use --enable-dba=shared"
+ac_help="$ac_help
+  --with-qdbm[=DIR]         DBA: QDBM support"
+ac_help="$ac_help
+  --with-gdbm[=DIR]         DBA: GDBM support"
+ac_help="$ac_help
+  --with-ndbm[=DIR]         DBA: NDBM support"
+ac_help="$ac_help
+  --with-db4[=DIR]          DBA: Oracle Berkeley DB 4.x or 5.x support"
+ac_help="$ac_help
+  --with-db3[=DIR]          DBA: Oracle Berkeley DB 3.x support"
+ac_help="$ac_help
+  --with-db2[=DIR]          DBA: Oracle Berkeley DB 2.x support"
+ac_help="$ac_help
+  --with-db1[=DIR]          DBA: Oracle Berkeley DB 1.x support/emulation"
+ac_help="$ac_help
+  --with-dbm[=DIR]          DBA: DBM support"
+ac_help="$ac_help
+  --without-cdb[=DIR]       DBA: CDB support (bundled)"
+ac_help="$ac_help
+  --disable-inifile         DBA: INI support (bundled)"
+ac_help="$ac_help
+  --disable-flatfile        DBA: FlatFile support (bundled)"
+ac_help="$ac_help
+  --disable-dom           Disable DOM support"
+ac_help="$ac_help
+  --with-libxml-dir[=DIR]   DOM: libxml2 install prefix"
+ac_help="$ac_help
+  --with-enchant[=DIR]     Include enchant support.
+                          GNU Aspell version 1.1.3 or higher required."
+ac_help="$ac_help
+  --enable-exif           Enable EXIF (metadata from images) support"
+ac_help="$ac_help
+  --disable-fileinfo      Disable fileinfo support"
+ac_help="$ac_help
+  --disable-filter        Disable input filter support"
+ac_help="$ac_help
+  --with-pcre-dir           FILTER: pcre install prefix"
+ac_help="$ac_help
+  --enable-ftp            Enable FTP support"
+ac_help="$ac_help
+  --with-openssl-dir[=DIR]  FTP: openssl install prefix"
+ac_help="$ac_help
+  --with-gd[=DIR]         Include GD support.  DIR is the GD library base
+                          install directory [BUNDLED]"
+ac_help="$ac_help
+  --with-jpeg-dir[=DIR]     GD: Set the path to libjpeg install prefix"
+ac_help="$ac_help
+  --with-png-dir[=DIR]      GD: Set the path to libpng install prefix"
+ac_help="$ac_help
+  --with-zlib-dir[=DIR]     GD: Set the path to libz install prefix"
+ac_help="$ac_help
+  --with-xpm-dir[=DIR]      GD: Set the path to libXpm install prefix"
+ac_help="$ac_help
+  --with-freetype-dir[=DIR] GD: Set the path to FreeType 2 install prefix"
+ac_help="$ac_help
+  --with-t1lib[=DIR]        GD: Include T1lib support. T1lib version >= 5.0.0 required"
+ac_help="$ac_help
+  --enable-gd-native-ttf    GD: Enable TrueType string function"
+ac_help="$ac_help
+  --enable-gd-jis-conv      GD: Enable JIS-mapped Japanese font support"
+ac_help="$ac_help
+  --with-gettext[=DIR]    Include GNU gettext support"
+ac_help="$ac_help
+  --with-gmp[=DIR]        Include GNU MP support"
+ac_help="$ac_help
+  --with-mhash[=DIR]      Include mhash support"
+ac_help="$ac_help
+  --disable-hash          Disable hash support"
+ac_help="$ac_help
+  --without-iconv[=DIR]   Exclude iconv support"
+ac_help="$ac_help
+  --with-imap[=DIR]       Include IMAP support. DIR is the c-client install prefix"
+ac_help="$ac_help
+  --with-kerberos[=DIR]     IMAP: Include Kerberos support. DIR is the Kerberos install prefix"
+ac_help="$ac_help
+  --with-imap-ssl[=DIR]     IMAP: Include SSL support. DIR is the OpenSSL install prefix"
+ac_help="$ac_help
+  --with-interbase[=DIR]  Include InterBase support.  DIR is the InterBase base
+                          install directory [/usr/interbase]"
+ac_help="$ac_help
+  --enable-intl           Enable internationalization support"
+ac_help="$ac_help
+  --with-icu-dir=DIR      Specify where ICU libraries and headers can be found"
+ac_help="$ac_help
+  --disable-json          Disable JavaScript Object Serialization support"
+ac_help="$ac_help
+  --with-ldap[=DIR]       Include LDAP support"
+ac_help="$ac_help
+  --with-ldap-sasl[=DIR]    LDAP: Include Cyrus SASL support"
+ac_help="$ac_help
+  --enable-mbstring       Enable multibyte string support"
+ac_help="$ac_help
+  --disable-mbregex         MBSTRING: Disable multibyte regex support"
+ac_help="$ac_help
+  --disable-mbregex-backtrack
+                            MBSTRING: Disable multibyte regex backtrack check"
+ac_help="$ac_help
+  --with-libmbfl[=DIR]      MBSTRING: Use external libmbfl.  DIR is the libmbfl base
+                            install directory [BUNDLED]"
+ac_help="$ac_help
+  --with-onig[=DIR]         MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
+                            If DIR is not set, the bundled oniguruma will be used"
+ac_help="$ac_help
+  --with-mcrypt[=DIR]     Include mcrypt support"
+ac_help="$ac_help
+  --with-mssql[=DIR]      Include MSSQL-DB support.  DIR is the FreeTDS home
+                          directory [/usr/local/freetds]"
+ac_help="$ac_help
+  --with-mysql[=DIR]      Include MySQL support.  DIR is the MySQL base
+                          directory.  If mysqlnd is passed as DIR, 
+                          the MySQL native driver will be used [/usr/local]"
+ac_help="$ac_help
+  --with-mysql-sock[=DIR]   MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
+                            If unspecified, the default locations are searched"
+ac_help="$ac_help
+  --with-zlib-dir[=DIR]     MySQL: Set the path to libz install prefix"
+ac_help="$ac_help
+  --with-mysqli[=FILE]    Include MySQLi support.  FILE is the path
+                          to mysql_config.  If mysqlnd is passed as FILE,
+                          the MySQL native driver will be used [mysql_config]"
+ac_help="$ac_help
+  --enable-embedded-mysqli  MYSQLi: Enable embedded support
+                            Note: Does not work with MySQL native driver!"
+ac_help="$ac_help
+  --with-oci8[=DIR]       Include Oracle Database OCI8 support. DIR defaults to \$ORACLE_HOME.
+                          Use --with-oci8=instantclient,/path/to/instant/client/lib 
+                          to use an Oracle Instant Client installation"
+ac_help="$ac_help
+  --with-adabas[=DIR]     Include Adabas D support [/usr/local]"
+ac_help="$ac_help
+  --with-sapdb[=DIR]      Include SAP DB support [/usr/local]"
+ac_help="$ac_help
+  --with-solid[=DIR]      Include Solid support [/usr/local/solid]"
+ac_help="$ac_help
+  --with-ibm-db2[=DIR]    Include IBM DB2 support [/home/db2inst1/sqllib]"
+ac_help="$ac_help
+  --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]"
+ac_help="$ac_help
+  --with-empress[=DIR]    Include Empress support [\$EMPRESSPATH]
+                          (Empress Version >= 8.60 required)"
+ac_help="$ac_help
+  --with-empress-bcs[=DIR]
+                          Include Empress Local Access support [\$EMPRESSPATH]
+                          (Empress Version >= 8.60 required)"
+ac_help="$ac_help
+  --with-birdstep[=DIR]   Include Birdstep support [/usr/local/birdstep]"
+ac_help="$ac_help
+  --with-custom-odbc[=DIR]
+                          Include user defined ODBC support. DIR is ODBC install base
+                          directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and
+                          have some odbc.h in your include dirs. f.e. you should define 
+                          following for Sybase SQL Anywhere 5.5.00 on QNX, prior to
+                          running this configure script:
+                              CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
+                              LDFLAGS=-lunix
+                              CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\""
+ac_help="$ac_help
+  --with-iodbc[=DIR]      Include iODBC support [/usr/local]"
+ac_help="$ac_help
+  --with-esoob[=DIR]      Include Easysoft OOB support [/usr/local/easysoft/oob/client]"
+ac_help="$ac_help
+  --with-unixODBC[=DIR]   Include unixODBC support [/usr/local]"
+ac_help="$ac_help
+  --with-dbmaker[=DIR]    Include DBMaker support"
+ac_help="$ac_help
+  --enable-pcntl          Enable pcntl support (CLI/CGI only)"
+ac_help="$ac_help
+  --disable-pdo           Disable PHP Data Objects support"
+ac_help="$ac_help
+  --with-pdo-dblib[=DIR]    PDO: DBLIB-DB support.  DIR is the FreeTDS home directory"
+ac_help="$ac_help
+  --with-pdo-firebird[=DIR] PDO: Firebird support.  DIR is the Firebird base
+                            install directory [/opt/firebird]"
+ac_help="$ac_help
+  --with-pdo-mysql[=DIR]    PDO: MySQL support. DIR is the MySQL base directory
+                                 If mysqlnd is passed as DIR, the MySQL native
+                                 native driver will be used [/usr/local]"
+ac_help="$ac_help
+  --with-zlib-dir[=DIR]       PDO_MySQL: Set the path to libz install prefix"
+ac_help="$ac_help
+  --with-pdo-oci[=DIR]      PDO: Oracle OCI support. DIR defaults to \$ORACLE_HOME.
+                            Use --with-pdo-oci=instantclient,prefix,version 
+                            for an Oracle Instant Client SDK. 
+                            For example on Linux with 11.2 RPMs use:
+                            --with-pdo-oci=instantclient,/usr,11.2
+                            With 10.2 RPMs use:
+                            --with-pdo-oci=instantclient,/usr,10.2.0.4"
+ac_help="$ac_help
+  --with-pdo-odbc=flavour,dir
+                            PDO: Support for 'flavour' ODBC driver.
+                            include and lib dirs are looked for under 'dir'.
+                            
+                            'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
+                            If ',dir' part is omitted, default for the flavour 
+                            you have selected will used. e.g.:
+                            
+                              --with-pdo-odbc=unixODBC
+                              
+                            will check for unixODBC under /usr/local. You may attempt 
+                            to use an otherwise unsupported driver using the \"generic\" 
+                            flavour.  The syntax for generic ODBC support is:
+                            
+                              --with-pdo-odbc=generic,dir,libname,ldflags,cflags
+
+                            When build as shared the extension filename is always pdo_odbc.so"
+ac_help="$ac_help
+  --with-pdo-pgsql[=DIR]    PDO: PostgreSQL support.  DIR is the PostgreSQL base
+                            install directory or the path to pg_config"
+ac_help="$ac_help
+  --without-pdo-sqlite[=DIR]
+                            PDO: sqlite 3 support.  DIR is the sqlite base
+                            install directory [BUNDLED]"
+ac_help="$ac_help
+  --with-pgsql[=DIR]      Include PostgreSQL support.  DIR is the PostgreSQL
+                          base install directory or the path to pg_config"
+ac_help="$ac_help
+  --disable-phar          Disable phar support"
+ac_help="$ac_help
+  --disable-posix         Disable POSIX-like functions"
+ac_help="$ac_help
+  --with-pspell[=DIR]     Include PSPELL support.
+                          GNU Aspell version 0.50.0 or higher required"
+ac_help="$ac_help
+  --with-libedit[=DIR]    Include libedit readline replacement (CLI/CGI only)"
+ac_help="$ac_help
+  --with-readline[=DIR]   Include readline support (CLI/CGI only)"
+ac_help="$ac_help
+  --with-recode[=DIR]     Include recode support"
+ac_help="$ac_help
+  --disable-session       Disable session support"
+ac_help="$ac_help
+  --with-mm[=DIR]           SESSION: Include mm support for session storage"
+ac_help="$ac_help
+  --enable-shmop          Enable shmop support"
+ac_help="$ac_help
+  --disable-simplexml     Disable SimpleXML support"
+ac_help="$ac_help
+  --with-libxml-dir=DIR     SimpleXML: libxml2 install prefix"
+ac_help="$ac_help
+  --with-snmp[=DIR]       Include SNMP support"
+ac_help="$ac_help
+  --with-openssl-dir[=DIR]  SNMP: openssl install prefix"
+ac_help="$ac_help
+  --enable-ucd-snmp-hack    SNMP: Enable UCD SNMP hack"
+ac_help="$ac_help
+  --enable-soap           Enable SOAP support"
+ac_help="$ac_help
+  --with-libxml-dir=DIR     SOAP: libxml2 install prefix"
+ac_help="$ac_help
+  --enable-sockets        Enable sockets support"
+ac_help="$ac_help
+  --without-sqlite=DIR    Do not include sqlite support.  DIR is the sqlite base
+                          install directory [BUNDLED]"
+ac_help="$ac_help
+  --enable-sqlite-utf8      SQLite: Enable UTF-8 support for SQLite"
+ac_help="$ac_help
+  --with-sybase-ct[=DIR]  Include Sybase-CT support.  DIR is the Sybase home
+                          directory [/home/sybase]"
+ac_help="$ac_help
+  --enable-sysvmsg        Enable sysvmsg support"
+ac_help="$ac_help
+  --enable-sysvsem        Enable System V semaphore support"
+ac_help="$ac_help
+  --enable-sysvshm        Enable the System V shared memory support"
+ac_help="$ac_help
+  --with-tidy[=DIR]       Include TIDY support"
+ac_help="$ac_help
+  --disable-tokenizer     Disable tokenizer support"
+ac_help="$ac_help
+  --enable-wddx           Enable WDDX support"
+ac_help="$ac_help
+  --with-libxml-dir=DIR     WDDX: libxml2 install prefix"
+ac_help="$ac_help
+  --with-libexpat-dir=DIR   WDDX: libexpat dir for XMLRPC-EPI (deprecated)"
+ac_help="$ac_help
+  --disable-xml           Disable XML support"
+ac_help="$ac_help
+  --with-libxml-dir=DIR     XML: libxml2 install prefix"
+ac_help="$ac_help
+  --with-libexpat-dir=DIR   XML: libexpat install prefix (deprecated)"
+ac_help="$ac_help
+  --disable-xmlreader     Disable XMLReader support"
+ac_help="$ac_help
+  --with-libxml-dir=DIR     XMLReader: libxml2 install prefix"
+ac_help="$ac_help
+  --with-xmlrpc[=DIR]     Include XMLRPC-EPI support"
+ac_help="$ac_help
+  --with-libxml-dir=DIR     XMLRPC-EPI: libxml2 install prefix"
+ac_help="$ac_help
+  --with-libexpat-dir=DIR   XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)"
+ac_help="$ac_help
+  --with-iconv-dir=DIR      XMLRPC-EPI: iconv dir for XMLRPC-EPI"
+ac_help="$ac_help
+  --disable-xmlwriter     Disable XMLWriter support"
+ac_help="$ac_help
+  --with-libxml-dir=DIR     XMLWriter: libxml2 install prefix"
+ac_help="$ac_help
+  --with-xsl[=DIR]        Include XSL support.  DIR is the libxslt base
+                          install directory (libxslt >= 1.1.0 required)"
+ac_help="$ac_help
+  --enable-zip            Include Zip read/write support"
+ac_help="$ac_help
+  --with-zlib-dir[=DIR]     ZIP: Set the path to libz install prefix"
+ac_help="$ac_help
+  --with-pcre-dir           ZIP: pcre install prefix"
+ac_help="$ac_help
+  --enable-mysqlnd        Enable mysqlnd explicitly, will be done implicitly
+                          when required by other extensions"
+ac_help="$ac_help
+  --disable-mysqlnd-compression-support
+                            Disable support for the MySQL compressed protocol in mysqlnd"
+ac_help="$ac_help
+  --with-zlib-dir[=DIR]       mysqlnd: Set the path to libz install prefix"
+ac_help="$ac_help
+
+PEAR:
+"
+ac_help="$ac_help
+  --with-pear=DIR         Install PEAR in DIR [PREFIX/lib/php]
+  --without-pear          Do not install PEAR"
+ac_help="$ac_help
+
+Zend:
+"
+ac_help="$ac_help
+  --with-zend-vm=TYPE     Set virtual machine dispatch method. Type is
+                          one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]"
+ac_help="$ac_help
+  --enable-maintainer-zts Enable thread safety - for code maintainers only!!"
+ac_help="$ac_help
+  --disable-inline-optimization 
+                          If building zend_execute.lo fails, try this switch"
+ac_help="$ac_help
+  --enable-zend-multibyte Compile with zend multibyte support"
+ac_help="$ac_help
+
+TSRM:
+"
+ac_help="$ac_help
+  --with-tsrm-pth[=pth-config]
+                          Use GNU Pth"
+ac_help="$ac_help
+  --with-tsrm-st          Use SGI's State Threads"
+ac_help="$ac_help
+  --with-tsrm-pthreads    Use POSIX threads (default)"
+ac_help="$ac_help
+
+Libtool:
+"
+ac_help="$ac_help
+  --enable-shared[=PKGS]  build shared libraries [default=yes]"
+ac_help="$ac_help
+  --enable-static[=PKGS]  build static libraries [default=yes]"
+ac_help="$ac_help
+  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
+ac_help="$ac_help
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 
 
 # Check that we are running under the correct shell.
@@ -439,93 +1368,27 @@
 
 
 
+ac_help="$ac_help
+  --disable-libtool-lock  avoid locking (might break parallel builds)"
+ac_help="$ac_help
+  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
+ac_help="$ac_help
+  --with-tags[=TAGS]      include additional configurations [automatic]
+"
+ac_help="$ac_help
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 
 tagnames=${tagnames+${tagnames},}CXX
 
-
-
-
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="README.GIT-RULES"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP SED CONFIGURE_COMMAND CONFIGURE_OPTIONS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP LN_S AWK YACC RE2C SHLIB_SUFFIX_NAME SHLIB_DL_SUFFIX_NAME php_fpm_user php_fpm_group php_fpm_sysconfdir php_fpm_localstatedir php_fpm_prefix PROG_SENDMAIL LIBOBJS ALLOCA LTP LTP_GENHTML KRB5_CONFIG PKG_CONFIG OPENSSL_INCDIR_OPT ICU_CONFIG CXX CXXFLAGS ac_ct_CXX CXXCPP MYSQL_MODULE_TYPE MYSQL_LIBS MYSQL_INCLUDE OCI8_SHARED_LIBADD OCI8_DIR OCI8_ORACLE_VERSION ODBC_INCLUDE ODBC_LIBS ODBC_LFLAGS ODBC_TYPE PDO_MYSQL_MODULE_TYPE PDO_OCI_SHARED_LIBADD PDO_OCI_DIR PDO_OCI_VERSION SNMP_CONFIG LEMON RANLIB ac_ct_RANLIB INLINE_CFLAGS INCLUDE_PATH EXPANDED_PEAR_INSTALLDIR EXPANDED_EXTENSION_DIR EXPANDED_BINDIR EXPANDED_SBINDIR EXPANDED_MANDIR EXPANDED_LIBDIR EXPANDED_DATADIR EXPANDED_SYSCONFDIR EXPANDED_LOCALSTATEDIR EXPANDED_PHP_CONFIG_FILE_PATH EXPANDED_PHP_CONFIG_FILE_SCAN_DIR PHP_INSTALLED_SAPIS abs_builddir abs_srcdir php_abs_top_builddir php_abs_top_srcdir program_prefix program_suffix DEBUG_CFLAGS EXTENSION_DIR EXTRA_LDFLAGS EXTRA_LDFLAGS_PROGRAM EXTRA_LIBS ZEND_EXTRA_LIBS INCLUDES EXTRA_INCLUDES INSTALL_IT NATIVE_RPATHS PEAR_INSTALLDIR PHP_LDFLAGS PHP_LIBS PHP_VERSION PHP_VERSION_ID ECHO AR ac_ct_AR STRIP ac_ct_STRIP DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIBTOOL LTLIBOBJS'
-ac_subst_files=''
-
 # Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-cache_file=/dev/null
+build=NONE
+cache_file=./config.cache
 exec_prefix=NONE
+host=NONE
 no_create=
+nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -534,15 +1397,10 @@
 silent=
 site=
 srcdir=
+target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -556,9 +1414,17 @@
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
+
 ac_prev=
 for ac_option
 do
+
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=\$ac_option"
@@ -566,59 +1432,59 @@
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case "$ac_option" in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
+    bindir="$ac_optarg" ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
+    ac_prev=build ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
+    build="$ac_optarg" ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
+    cache_file="$ac_optarg" ;;
 
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
   | --da=*)
-    datadir=$ac_optarg ;;
+    datadir="$ac_optarg" ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
       *) ac_optarg=yes ;;
     esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -627,47 +1493,95 @@
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
+    exec_prefix="$ac_optarg" ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [same as prefix]
+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+  --datadir=DIR           read-only architecture-independent data in DIR
+                          [PREFIX/share]
+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                          [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --includedir=DIR        C header files in DIR [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+  --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+EOF
+    cat << EOF
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+EOF
+    if test -n "$ac_help"; then
+      echo "--enable and --with options recognized:$ac_help"
+    fi
+    exit 0 ;;
 
   -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
+    ac_prev=host ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
+    host="$ac_optarg" ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
+    includedir="$ac_optarg" ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
+    infodir="$ac_optarg" ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
+    libdir="$ac_optarg" ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
+    libexecdir="$ac_optarg" ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -676,19 +1590,19 @@
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
+    localstatedir="$ac_optarg" ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
+    mandir="$ac_optarg" ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
     with_fp=no ;;
 
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
+  | --no-cr | --no-c)
     no_create=yes ;;
 
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
@@ -702,26 +1616,26 @@
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
+    oldincludedir="$ac_optarg" ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
+    prefix="$ac_optarg" ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
+    program_prefix="$ac_optarg" ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
+    program_suffix="$ac_optarg" ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -738,7 +1652,7 @@
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
+    program_transform_name="$ac_optarg" ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -748,7 +1662,7 @@
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
+    sbindir="$ac_optarg" ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -759,57 +1673,58 @@
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
+    sharedstatedir="$ac_optarg" ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
+    site="$ac_optarg" ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
+    srcdir="$ac_optarg" ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
+    sysconfdir="$ac_optarg" ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
+    ac_prev=target ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
+    target="$ac_optarg" ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.13"
+    exit 0 ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
     ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+    case "$ac_option" in
+      *=*) ;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    eval "with_${ac_package}='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -820,110 +1735,99 @@
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
+    x_includes="$ac_optarg" ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
+    x_libraries="$ac_optarg" ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
     ;;
 
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
   *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
 fi
+exec 5>./config.log
 
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
 
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=README.GIT-RULES
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
@@ -933,807 +1837,13 @@
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
   else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
   fi
 fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-rpath         Disable passing additional runtime library
-                          search paths
-  --enable-re2c-cgoto     Enable -g flag to re2c to use computed goto gcc extension
-
-SAPI modules:
-
-  --enable-mod-charset      APACHE: Enable transfer tables for mod_charset (Rus Apache)
-  --enable-mod-charset      APACHE (hooks): Enable transfer tables for mod_charset (Rus Apache)
-  --disable-cli           Disable building CLI version of PHP
-                          (this forces --without-pear)
-  --enable-embed=TYPE   EXPERIMENTAL: Enable building of embedded SAPI library
-                          TYPE is either 'shared' or 'static'. TYPE=shared
-  --enable-fpm              EXPERIMENTAL: Enable building of the fpm SAPI executable
-  --enable-roxen-zts        ROXEN: Build the Roxen module using Zend Thread Safety
-  --disable-cgi           Disable building CGI version of PHP
-
-General settings:
-
-  --enable-gcov           Enable GCOV code coverage (requires LTP) - FOR DEVELOPERS ONLY!!
-  --enable-debug          Compile with debugging symbols
-  --enable-safe-mode      Enable safe mode by default
-  --enable-sigchild       Enable PHP's own SIGCHLD handler
-  --enable-magic-quotes   Enable magic quotes by default.
-  --enable-libgcc         Enable explicitly linking against libgcc
-  --disable-short-tags    Disable the short-form <? start tag by default
-  --enable-dmalloc        Enable dmalloc
-  --disable-ipv6          Disable IPv6 support
-  --enable-fd-setsize     Set size of descriptor sets
-
-Extensions:
-
-  --with-EXTENSION=shared[,PATH]
-
-    NOTE: Not all extensions can be build as 'shared'.
-
-    Example: --with-foobar=shared,/usr/local/foobar/
-
-      o Builds the foobar extension as shared extension.
-      o foobar package install prefix is /usr/local/foobar/
-
-
- --disable-all   Disable all extensions which are enabled by default
-
-  --disable-libxml        Disable LIBXML support
-  --enable-bcmath         Enable bc style precision math functions
-  --enable-calendar       Enable support for calendar conversion
-  --disable-ctype         Disable ctype functions
-  --enable-dba            Build DBA with bundled modules. To build shared DBA
-                          extension use --enable-dba=shared
-  --disable-inifile         DBA: INI support (bundled)
-  --disable-flatfile        DBA: FlatFile support (bundled)
-  --disable-dom           Disable DOM support
-  --enable-exif           Enable EXIF (metadata from images) support
-  --disable-fileinfo      Disable fileinfo support
-  --disable-filter        Disable input filter support
-  --enable-ftp            Enable FTP support
-  --enable-gd-native-ttf    GD: Enable TrueType string function
-  --enable-gd-jis-conv      GD: Enable JIS-mapped Japanese font support
-  --disable-hash          Disable hash support
-  --enable-intl           Enable internationalization support
-  --disable-json          Disable JavaScript Object Serialization support
-  --enable-mbstring       Enable multibyte string support
-  --disable-mbregex         MBSTRING: Disable multibyte regex support
-  --disable-mbregex-backtrack
-                            MBSTRING: Disable multibyte regex backtrack check
-  --enable-embedded-mysqli  MYSQLi: Enable embedded support
-                            Note: Does not work with MySQL native driver!
-  --enable-pcntl          Enable pcntl support (CLI/CGI only)
-  --disable-pdo           Disable PHP Data Objects support
-  --disable-phar          Disable phar support
-  --disable-posix         Disable POSIX-like functions
-  --disable-session       Disable session support
-  --enable-shmop          Enable shmop support
-  --disable-simplexml     Disable SimpleXML support
-  --enable-ucd-snmp-hack    SNMP: Enable UCD SNMP hack
-  --enable-soap           Enable SOAP support
-  --enable-sockets        Enable sockets support
-  --enable-sqlite-utf8      SQLite: Enable UTF-8 support for SQLite
-  --enable-sysvmsg        Enable sysvmsg support
-  --enable-sysvsem        Enable System V semaphore support
-  --enable-sysvshm        Enable the System V shared memory support
-  --disable-tokenizer     Disable tokenizer support
-  --enable-wddx           Enable WDDX support
-  --disable-xml           Disable XML support
-  --disable-xmlreader     Disable XMLReader support
-  --disable-xmlwriter     Disable XMLWriter support
-  --enable-zip            Include Zip read/write support
-  --enable-mysqlnd        Enable mysqlnd explicitly, will be done implicitly
-                          when required by other extensions
-  --disable-mysqlnd-compression-support
-                            Disable support for the MySQL compressed protocol in mysqlnd
-
-PEAR:
-
-
-Zend:
-
-  --enable-maintainer-zts Enable thread safety - for code maintainers only!!
-  --disable-inline-optimization
-                          If building zend_execute.lo fails, try this switch
-  --enable-zend-multibyte Compile with zend multibyte support
-
-TSRM:
-
-
-Libtool:
-
-  --enable-shared=PKGS  build shared libraries default=yes
-  --enable-static=PKGS  build static libraries default=yes
-  --enable-fast-install=PKGS  optimize for fast installation default=yes
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-libdir=NAME      Look for libraries in .../NAME rather than .../lib
-  --with-aolserver=DIR    Specify path to the installed AOLserver
-  --with-apxs=FILE      Build shared Apache 1.x module. FILE is the optional
-                          pathname to the Apache apxs tool apxs
-  --with-apache=DIR     Build Apache 1.x module. DIR is the top-level Apache
-                          build directory /usr/local/apache
-  --with-apxs2filter=FILE
-                          EXPERIMENTAL: Build shared Apache 2.0 Filter module. FILE is the optional
-                          pathname to the Apache apxs tool apxs
-  --with-apxs2=FILE     Build shared Apache 2.0 Handler module. FILE is the optional
-                          pathname to the Apache apxs tool apxs
-  --with-apache-hooks=FILE
-                          EXPERIMENTAL: Build shared Apache 1.x module. FILE is the optional
-                          pathname to the Apache apxs tool apxs
-  --with-apache-hooks-static=DIR
-                          EXPERIMENTAL: Build Apache 1.x module. DIR is the top-level Apache
-                          build directory /usr/local/apache
-  --with-caudium=DIR    Build PHP as a Pike module for use with Caudium.
-                          DIR is the Caudium server dir /usr/local/caudium/server
-  --with-continuity=DIR   Build PHP as Continuity Server module.
-                          DIR is path to the installed Continuity Server root
-  --with-fpm-user=USER  Set the user for php-fpm to run as. (default: nobody)
-  --with-fpm-group=GRP  Set the group for php-fpm to run as. For a system user, this
-                  should usually be set to match the fpm username (default: nobody)
-  --with-isapi=DIR      Build PHP as an ISAPI module for use with Zeus
-  --with-litespeed        Build PHP as litespeed module
-  --with-milter=DIR     Build PHP as Milter application
-  --with-nsapi=DIR        Build PHP as NSAPI module for Netscape/iPlanet/Sun Webserver
-  --with-phttpd=DIR       Build PHP as phttpd module
-  --with-pi3web=DIR     Build PHP as Pi3Web module
-  --with-roxen=DIR        Build PHP as a Pike module. DIR is the base Roxen
-                          directory, normally /usr/local/roxen/server
-  --with-thttpd=SRCDIR    Build PHP as thttpd module
-  --with-tux=MODULEDIR    Build PHP as a TUX module (Linux only)
-  --with-webjames=SRCDIR  Build PHP as a WebJames module (RISC OS only)
-  --with-layout=TYPE      Set how installed files will be laid out.  Type can
-                          be either PHP or GNU PHP
-  --with-config-file-path=PATH
-                          Set the path in which to look for php.ini PREFIX/lib
-  --with-config-file-scan-dir=PATH
-                          Set the path where to scan for configuration files
-  --with-exec-dir=DIR   Only allow executables in DIR under safe-mode
-                          /usr/local/php/bin
-  --with-regex=TYPE       regex library type: system, php. TYPE=php
-                          WARNING: Do NOT use unless you know what you are doing!
-  --with-libxml-dir=DIR   LIBXML: libxml2 install prefix
-  --with-openssl=DIR    Include OpenSSL support (requires OpenSSL >= 0.9.6)
-  --with-kerberos=DIR     OPENSSL: Include Kerberos support
-  --with-pcre-regex=DIR   Include Perl Compatible Regular Expressions support.
-                          DIR is the PCRE install prefix BUNDLED
-  --without-sqlite3=DIR Do not include SQLite3 support. DIR is the prefix to
-                          SQLite3 installation directory.
-  --with-zlib=DIR       Include ZLIB support (requires zlib >= 1.0.9)
-  --with-zlib-dir=<DIR>   Define the location of zlib install directory
-  --with-bz2=DIR        Include BZip2 support
-  --with-curl=DIR       Include cURL support
-  --with-curlwrappers     EXPERIMENTAL: Use cURL for url streams
-  --with-qdbm=DIR         DBA: QDBM support
-  --with-gdbm=DIR         DBA: GDBM support
-  --with-ndbm=DIR         DBA: NDBM support
-  --with-db4=DIR          DBA: Oracle Berkeley DB 4.x or 5.x support
-  --with-db3=DIR          DBA: Oracle Berkeley DB 3.x support
-  --with-db2=DIR          DBA: Oracle Berkeley DB 2.x support
-  --with-db1=DIR          DBA: Oracle Berkeley DB 1.x support/emulation
-  --with-dbm=DIR          DBA: DBM support
-  --without-cdb=DIR       DBA: CDB support (bundled)
-  --with-libxml-dir=DIR   DOM: libxml2 install prefix
-  --with-enchant=DIR     Include enchant support.
-                          GNU Aspell version 1.1.3 or higher required.
-  --with-pcre-dir           FILTER: pcre install prefix
-  --with-openssl-dir=DIR  FTP: openssl install prefix
-  --with-gd=DIR         Include GD support.  DIR is the GD library base
-                          install directory BUNDLED
-  --with-jpeg-dir=DIR     GD: Set the path to libjpeg install prefix
-  --with-png-dir=DIR      GD: Set the path to libpng install prefix
-  --with-zlib-dir=DIR     GD: Set the path to libz install prefix
-  --with-xpm-dir=DIR      GD: Set the path to libXpm install prefix
-  --with-freetype-dir=DIR GD: Set the path to FreeType 2 install prefix
-  --with-t1lib=DIR        GD: Include T1lib support. T1lib version >= 5.0.0 required
-  --with-gettext=DIR    Include GNU gettext support
-  --with-gmp=DIR        Include GNU MP support
-  --with-mhash=DIR      Include mhash support
-  --without-iconv=DIR   Exclude iconv support
-  --with-imap=DIR       Include IMAP support. DIR is the c-client install prefix
-  --with-kerberos=DIR     IMAP: Include Kerberos support. DIR is the Kerberos install prefix
-  --with-imap-ssl=DIR     IMAP: Include SSL support. DIR is the OpenSSL install prefix
-  --with-interbase=DIR  Include InterBase support.  DIR is the InterBase base
-                          install directory /usr/interbase
-  --with-icu-dir=DIR      Specify where ICU libraries and headers can be found
-  --with-ldap=DIR       Include LDAP support
-  --with-ldap-sasl=DIR    LDAP: Include Cyrus SASL support
-  --with-libmbfl=DIR      MBSTRING: Use external libmbfl.  DIR is the libmbfl base
-                            install directory BUNDLED
-  --with-onig=DIR         MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
-                            If DIR is not set, the bundled oniguruma will be used
-  --with-mcrypt=DIR     Include mcrypt support
-  --with-mssql=DIR      Include MSSQL-DB support.  DIR is the FreeTDS home
-                          directory /usr/local/freetds
-  --with-mysql=DIR      Include MySQL support.  DIR is the MySQL base
-                          directory.  If mysqlnd is passed as DIR,
-                          the MySQL native driver will be used /usr/local
-  --with-mysql-sock=DIR   MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
-                            If unspecified, the default locations are searched
-  --with-zlib-dir=DIR     MySQL: Set the path to libz install prefix
-  --with-mysqli=FILE    Include MySQLi support.  FILE is the path
-                          to mysql_config.  If mysqlnd is passed as FILE,
-                          the MySQL native driver will be used mysql_config
-  --with-oci8=DIR       Include Oracle Database OCI8 support. DIR defaults to \$ORACLE_HOME.
-                          Use --with-oci8=instantclient,/path/to/instant/client/lib
-                          to use an Oracle Instant Client installation
-  --with-adabas=DIR     Include Adabas D support /usr/local
-  --with-sapdb=DIR      Include SAP DB support /usr/local
-  --with-solid=DIR      Include Solid support /usr/local/solid
-  --with-ibm-db2=DIR    Include IBM DB2 support /home/db2inst1/sqllib
-  --with-ODBCRouter=DIR Include ODBCRouter.com support /usr
-  --with-empress=DIR    Include Empress support \$EMPRESSPATH
-                          (Empress Version >= 8.60 required)
-  --with-empress-bcs=DIR
-                          Include Empress Local Access support \$EMPRESSPATH
-                          (Empress Version >= 8.60 required)
-  --with-birdstep=DIR   Include Birdstep support /usr/local/birdstep
-  --with-custom-odbc=DIR
-                          Include user defined ODBC support. DIR is ODBC install base
-                          directory /usr/local. Make sure to define CUSTOM_ODBC_LIBS and
-                          have some odbc.h in your include dirs. f.e. you should define
-                          following for Sybase SQL Anywhere 5.5.00 on QNX, prior to
-                          running this configure script:
-                              CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
-                              LDFLAGS=-lunix
-                              CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"
-  --with-iodbc=DIR      Include iODBC support /usr/local
-  --with-esoob=DIR      Include Easysoft OOB support /usr/local/easysoft/oob/client
-  --with-unixODBC=DIR   Include unixODBC support /usr/local
-  --with-dbmaker=DIR    Include DBMaker support
-  --with-pdo-dblib=DIR    PDO: DBLIB-DB support.  DIR is the FreeTDS home directory
-  --with-pdo-firebird=DIR PDO: Firebird support.  DIR is the Firebird base
-                            install directory /opt/firebird
-  --with-pdo-mysql=DIR    PDO: MySQL support. DIR is the MySQL base directory
-                                 If mysqlnd is passed as DIR, the MySQL native
-                                 native driver will be used /usr/local
-  --with-zlib-dir=DIR       PDO_MySQL: Set the path to libz install prefix
-  --with-pdo-oci=DIR      PDO: Oracle OCI support. DIR defaults to \$ORACLE_HOME.
-                            Use --with-pdo-oci=instantclient,prefix,version
-                            for an Oracle Instant Client SDK.
-                            For example on Linux with 11.2 RPMs use:
-                            --with-pdo-oci=instantclient,/usr,11.2
-                            With 10.2 RPMs use:
-                            --with-pdo-oci=instantclient,/usr,10.2.0.4
-  --with-pdo-odbc=flavour,dir
-                            PDO: Support for 'flavour' ODBC driver.
-                            include and lib dirs are looked for under 'dir'.
-
-                            'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
-                            If ',dir' part is omitted, default for the flavour
-                            you have selected will used. e.g.:
-
-                              --with-pdo-odbc=unixODBC
-
-                            will check for unixODBC under /usr/local. You may attempt
-                            to use an otherwise unsupported driver using the \"generic\"
-                            flavour.  The syntax for generic ODBC support is:
-
-                              --with-pdo-odbc=generic,dir,libname,ldflags,cflags
-
-                            When build as shared the extension filename is always pdo_odbc.so
-  --with-pdo-pgsql=DIR    PDO: PostgreSQL support.  DIR is the PostgreSQL base
-                            install directory or the path to pg_config
-  --without-pdo-sqlite=DIR
-                            PDO: sqlite 3 support.  DIR is the sqlite base
-                            install directory BUNDLED
-  --with-pgsql=DIR      Include PostgreSQL support.  DIR is the PostgreSQL
-                          base install directory or the path to pg_config
-  --with-pspell=DIR     Include PSPELL support.
-                          GNU Aspell version 0.50.0 or higher required
-  --with-libedit=DIR    Include libedit readline replacement (CLI/CGI only)
-  --with-readline=DIR   Include readline support (CLI/CGI only)
-  --with-recode=DIR     Include recode support
-  --with-mm=DIR           SESSION: Include mm support for session storage
-  --with-libxml-dir=DIR     SimpleXML: libxml2 install prefix
-  --with-snmp=DIR       Include SNMP support
-  --with-openssl-dir=DIR  SNMP: openssl install prefix
-  --with-libxml-dir=DIR     SOAP: libxml2 install prefix
-  --without-sqlite=DIR    Do not include sqlite support.  DIR is the sqlite base
-                          install directory BUNDLED
-  --with-sybase-ct=DIR  Include Sybase-CT support.  DIR is the Sybase home
-                          directory /home/sybase
-  --with-tidy=DIR       Include TIDY support
-  --with-libxml-dir=DIR     WDDX: libxml2 install prefix
-  --with-libexpat-dir=DIR   WDDX: libexpat dir for XMLRPC-EPI (deprecated)
-  --with-libxml-dir=DIR     XML: libxml2 install prefix
-  --with-libexpat-dir=DIR   XML: libexpat install prefix (deprecated)
-  --with-libxml-dir=DIR     XMLReader: libxml2 install prefix
-  --with-xmlrpc=DIR     Include XMLRPC-EPI support
-  --with-libxml-dir=DIR     XMLRPC-EPI: libxml2 install prefix
-  --with-libexpat-dir=DIR   XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)
-  --with-iconv-dir=DIR      XMLRPC-EPI: iconv dir for XMLRPC-EPI
-  --with-libxml-dir=DIR     XMLWriter: libxml2 install prefix
-  --with-xsl=DIR        Include XSL support.  DIR is the libxslt base
-                          install directory (libxslt >= 1.1.0 required)
-  --with-zlib-dir=DIR     ZIP: Set the path to libz install prefix
-  --with-pcre-dir           ZIP: pcre install prefix
-  --with-zlib-dir=DIR       mysqlnd: Set the path to libz install prefix
-  --with-pear=DIR         Install PEAR in DIR PREFIX/lib/php
-  --without-pear          Do not install PEAR
-  --with-zend-vm=TYPE     Set virtual machine dispatch method. Type is
-                          one of "CALL", "SWITCH" or "GOTO" TYPE=CALL
-  --with-tsrm-pth=pth-config
-                          Use GNU Pth
-  --with-tsrm-st          Use SGI's State Threads
-  --with-tsrm-pthreads    Use POSIX threads (default)
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
-  --with-pic              try to use only PIC/non-PIC objects default=use both
-  --with-tags=TAGS      include additional configurations automatic
-
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -1744,125 +1854,127 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
+    echo "loading site script $ac_site_file"
     . "$ac_site_file"
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
+  echo "loading cache $cache_file"
+  . $cache_file
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  echo "creating cache $cache_file"
+  > $cache_file
 fi
 
 ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
 
 
 
 
 
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:1897: 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 1902 "configure"
+#include "confdefs.h"
 
+int main() {
 
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_cygwin=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
 
+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:1930: 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 1935 "configure"
+#include "confdefs.h"
 
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:1942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_mingw32=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
 
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
 
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for egrep""... $ac_c" 1>&6
+echo "configure:1961: checking for egrep" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   if echo a | (grep -E '(a|b)') >/dev/null 2>&1
     then ac_cv_prog_egrep='grep -E'
     else ac_cv_prog_egrep='egrep'
     fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
 
+echo "$ac_t""$ac_cv_prog_egrep" 1>&6
+ EGREP=$ac_cv_prog_egrep
+ 
 
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
+echo "configure:1976: 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
   # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
@@ -1913,23 +2025,22 @@
 fi
 
 SED=$lt_cv_path_SED
-echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
-
-
-
-
+echo "$ac_t""$SED" 1>&6
 
 
+  
+  
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST EGREP"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST SED"
 
-
+  
 
   test -f config.nice && mv config.nice config.nice.old
   rm -f config.nice.old
@@ -1950,7 +2061,7 @@
   echo "'$0' \\" >> config.nice
   if test `expr -- $0 : "'.*"` = 0; then
     CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$0'"
-  else
+  else 
     CONFIGURE_COMMAND="$CONFIGURE_COMMAND $0"
   fi
   for arg in $ac_configure_args; do
@@ -1971,17 +2082,17 @@
   echo '"$@"' >> config.nice
   chmod +x config.nice
   CONFIGURE_COMMAND="$CONFIGURE_COMMAND $CONFIGURE_OPTIONS"
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST CONFIGURE_COMMAND"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST CONFIGURE_OPTIONS"
 
-
+  
 
 
 
@@ -1995,115 +2106,69 @@
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
 
 # Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:2126: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:2147: checking target system type" >&5
+
+target_alias=$target
+case "$target_alias" in
+NONE)
+  case $nonopt in
+  NONE) target_alias=$host_alias ;;
+  *) target_alias=$nonopt ;;
+  esac ;;
+esac
+
+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$target" 1>&6
+
 
         if test -z "$host_alias" && test -n "$host"; then
     host_alias=$host
   fi
   if test -z "$host_alias"; then
-    { { echo "$as_me:$LINENO: error: host_alias is not set!" >&5
-echo "$as_me: error: host_alias is not set!" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: host_alias is not set!" 1>&2; exit 1; }
   fi
 
 
-          ac_config_headers="$ac_config_headers main/php_config.h"
 
 
 PHP_MAJOR_VERSION=5
@@ -2147,24 +2212,18 @@
 
 
 if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
-  { { echo "$as_me:$LINENO: error: --with-shared-apache is not supported. Please refer to the documentation for using APXS" >&5
-echo "$as_me: error: --with-shared-apache is not supported. Please refer to the documentation for using APXS" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "configure: error: --with-shared-apache is not supported. Please refer to the documentation for using APXS" 1>&2; exit 1; }
 fi
 
 if test -n "$with_apache" && test -n "$with_apxs"; then
-  { { echo "$as_me:$LINENO: error: --with-apache and --with-apxs cannot be used together" >&5
-echo "$as_me: error: --with-apache and --with-apxs cannot be used together" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "configure: error: --with-apache and --with-apxs cannot be used together" 1>&2; exit 1; }
 fi
 
 if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then
-  { { echo "$as_me:$LINENO: error: --with-apxs2filter and --with-apxs2 cannot be used together" >&5
-echo "$as_me: error: --with-apxs2filter and --with-apxs2 cannot be used together" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "configure: error: --with-apxs2filter and --with-apxs2 cannot be used together" 1>&2; exit 1; }
 fi
 
-
+  
 
 cwd=`pwd`
 
@@ -2193,442 +2252,214 @@
 rm -f libs/*
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in cc gcc
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+# 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:2259: 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
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-CC=$ac_cv_prog_CC
+CC="$ac_cv_prog_CC"
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  echo "$ac_t""$CC" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-    test -n "$CC" && break
-  done
-fi
 if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cc gcc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  # 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:2289: 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
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_prog_rejected=no
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" "$@"
+    shift
+    ac_cv_prog_CC="$@"
   fi
-done
-done
-
 fi
 fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # 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:2340: 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
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:2372: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
-int
-main ()
-{
+cat > conftest.$ac_ext << EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+#line 2383 "configure"
+#include "confdefs.h"
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
+main(){return(0);}
+EOF
+if { (eval echo configure:2388: \"$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
+    ac_cv_prog_cc_cross=no
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
 fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+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:2414: 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:2419: 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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2428: \"$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
 fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 
-int
-main ()
-{
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+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:2447: 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
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
+  ac_cv_prog_cc_g=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
+  CFLAGS="$ac_save_CFLAGS"
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -2642,630 +2473,170 @@
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   '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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:2479: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
   # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 2494 "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:2500: \"$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
   :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 2511 "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:2517: \"$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
+  :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 2528 "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:2534: \"$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
+  :
 else
-  ac_cv_prog_CPP=$CPP
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
+rm -f conftest*
 fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
+rm -f conftest*
 fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
 fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+  CPP="$ac_cv_prog_CPP"
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  ac_cv_prog_CPP="$CPP"
 fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+echo "$ac_t""$CPP" 1>&6
 
 
   ICC="no"
-  echo "$as_me:$LINENO: checking for icc" >&5
-echo $ECHO_N "checking for icc... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for icc""... $ac_c" 1>&6
+echo "configure:2561: checking for icc" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 2563 "configure"
+#include "confdefs.h"
 __INTEL_COMPILER
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^__INTEL_COMPILER" >/dev/null 2>&1; then
+  egrep "^__INTEL_COMPILER" >/dev/null 2>&1; then
+  rm -rf conftest*
   ICC="no"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
 else
+  rm -rf conftest*
   ICC="yes"
     GCC="no"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+    echo "$ac_t""yes" 1>&6
+  
 fi
 rm -f conftest*
 
 
 
   SUNCC="no"
-  echo "$as_me:$LINENO: checking for suncc" >&5
-echo $ECHO_N "checking for suncc... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for suncc""... $ac_c" 1>&6
+echo "configure:2585: checking for suncc" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 2587 "configure"
+#include "confdefs.h"
 __SUNPRO_C
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^__SUNPRO_C" >/dev/null 2>&1; then
+  egrep "^__SUNPRO_C" >/dev/null 2>&1; then
+  rm -rf conftest*
   SUNCC="no"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
 else
+  rm -rf conftest*
   SUNCC="yes"
     GCC="no"
     test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload"
     GCC=""
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+    echo "$ac_t""yes" 1>&6
+  
 fi
 rm -f conftest*
 
 
 if test "x$CC" != xcc; then
-  echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6
+  echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
+echo "configure:2610: checking whether $CC and cc understand -c and -o together" >&5
 else
-  echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6
+  echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
+echo "configure:2613: checking whether cc understands -c and -o together" >&5
 fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
+set dummy $CC; ac_cc="`echo $2 |
+		       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
+if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'foo(){}' > conftest.c
 # Make sure it works both with $CC and with simple cc.
 # 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 -c conftest.$ac_ext -o conftest.$ac_objext >&5'
-if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
+ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
+if { (eval echo configure:2625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+   test -f conftest.o && { (eval echo configure:2626: \"$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.$ac_ext >&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest.$ac_objext >&5'
-      if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
+    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2631: \"$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:2633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+	 test -f conftest.o && { (eval echo configure:2634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
       then
-	# cc works too.
-	:
+        # cc works too.
+        :
       else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+        # cc exists but doesn't like -o.
+        eval ac_cv_prog_cc_${ac_cc}_c_o=no
       fi
     fi
   fi
@@ -3276,313 +2647,160 @@
 
 fi
 if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-cat >>confdefs.h <<\_ACEOF
+  echo "$ac_t""no" 1>&6
+  cat >> confdefs.h <<\EOF
 #define NO_MINUS_C_MINUS_O 1
-_ACEOF
+EOF
 
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:2661: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
   # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 2676 "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:2682: \"$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
   :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 2693 "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:2699: \"$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
+  :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 2710 "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:2716: \"$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
+  :
 else
-  ac_cv_prog_CPP=$CPP
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
+rm -f conftest*
 fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
+rm -f conftest*
 fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
 fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+  CPP="$ac_cv_prog_CPP"
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  ac_cv_prog_CPP="$CPP"
 fi
+echo "$ac_t""$CPP" 1>&6
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for AIX" >&5
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for AIX""... $ac_c" 1>&6
+echo "configure:2741: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2743 "configure"
+#include "confdefs.h"
 #ifdef _AIX
   yes
 #endif
 
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-cat >>confdefs.h <<\_ACEOF
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
 #define _ALL_SOURCE 1
-_ACEOF
+EOF
 
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 
 
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:2765: 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
+  rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+  rm -f conftestdata
+  ac_cv_prog_LN_S="ln -s"
+else
+  ac_cv_prog_LN_S=ln
+fi
+fi
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+  echo "$ac_t""yes" 1>&6
 else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
 
 php_with_libdir=lib
 
-echo "$as_me:$LINENO: checking for system library directory" >&5
-echo $ECHO_N "checking for system library directory... $ECHO_C" >&6
-
+echo $ac_n "checking for system library directory""... $ac_c" 1>&6
+echo "configure:2790: 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"
   PHP_LIBDIR=$withval
 else
-
+  
   PHP_LIBDIR=lib
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBDIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -3590,148 +2808,90 @@
 
 php_enable_rpath=yes
 
-echo "$as_me:$LINENO: checking whether to enable runpaths" >&5
-echo $ECHO_N "checking whether to enable runpaths... $ECHO_C" >&6
+echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6
+echo "configure:2813: 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"
   PHP_RPATH=$enableval
 else
-
+  
   PHP_RPATH=yes
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_RPATH
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 
-echo "$as_me:$LINENO: checking if compiler supports -R" >&5
-echo $ECHO_N "checking if compiler supports -R... $ECHO_C" >&6
-if test "${php_cv_cc_dashr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6
+echo "configure:2834: 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
-
+  
   SAVE_LIBS=$LIBS
   LIBS="-R /usr/$PHP_LIBDIR $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 2842 "configure"
+#include "confdefs.h"
 
-int
-main ()
-{
+int main() {
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
   php_cv_cc_dashr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-php_cv_cc_dashr=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  php_cv_cc_dashr=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
   LIBS=$SAVE_LIBS
 fi
 
-echo "$as_me:$LINENO: result: $php_cv_cc_dashr" >&5
-echo "${ECHO_T}$php_cv_cc_dashr" >&6
+echo "$ac_t""$php_cv_cc_dashr" 1>&6
 if test $php_cv_cc_dashr = "yes"; then
   ld_runpath_switch=-R
 else
-  echo "$as_me:$LINENO: checking if compiler supports -Wl,-rpath," >&5
-echo $ECHO_N "checking if compiler supports -Wl,-rpath,... $ECHO_C" >&6
-  if test "${php_cv_cc_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
+echo "configure:2867: 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
-
+  
     SAVE_LIBS=$LIBS
     LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    cat > conftest.$ac_ext <<EOF
+#line 2875 "configure"
+#include "confdefs.h"
 
-int
-main ()
-{
+int main() {
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
   php_cv_cc_rpath=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-php_cv_cc_rpath=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  php_cv_cc_rpath=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
     LIBS=$SAVE_LIBS
 fi
 
-  echo "$as_me:$LINENO: result: $php_cv_cc_rpath" >&5
-echo "${ECHO_T}$php_cv_cc_rpath" >&6
+  echo "$ac_t""$php_cv_cc_rpath" 1>&6
   if test $php_cv_cc_rpath = "yes"; then
     ld_runpath_switch=-Wl,-rpath,
   else
@@ -3746,120 +2906,100 @@
 
   for ac_prog in gawk nawk awk mawk
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2913: 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
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="/usr/xpg4/bin/:$PATH"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="/usr/xpg4/bin/:$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AWK="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-AWK=$ac_cv_prog_AWK
+AWK="$ac_cv_prog_AWK"
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  echo "$ac_t""$AWK" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-  test -n "$AWK" && break
+test -n "$AWK" && break
 done
 test -n "$AWK" || AWK="bork"
 
   case "$AWK" in
     *mawk)
-      { echo "$as_me:$LINENO: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5
-echo "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;}
+      echo "configure: warning: mawk is known to have problems on some systems. You should install GNU awk" 1>&2
       ;;
-    *gawk)
+    *gawk)  
       ;;
-    bork)
-      { { echo "$as_me:$LINENO: error: Could not find awk; Install GNU awk" >&5
-echo "$as_me: error: Could not find awk; Install GNU awk" >&2;}
-   { (exit 1); exit 1; }; }
+    bork)   
+      { echo "configure: error: Could not find awk; Install GNU awk" 1>&2; exit 1; }
       ;;
     *)
-      echo "$as_me:$LINENO: checking if $AWK is broken" >&5
-echo $ECHO_N "checking if $AWK is broken... $ECHO_C" >&6
+      echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6
+echo "configure:2954: checking if $AWK is broken" >&5
       if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-        { { echo "$as_me:$LINENO: error: You should install GNU awk" >&5
-echo "$as_me: error: You should install GNU awk" >&2;}
-   { (exit 1); exit 1; }; }
+        echo "$ac_t""yes" 1>&6
+        { echo "configure: error: You should install GNU awk" 1>&2; exit 1; }
       else
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        echo "$ac_t""no" 1>&6
       fi
       ;;
   esac
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST AWK"
 
 
 
   for ac_prog in 'bison -y' byacc
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+# Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_YACC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2973: 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
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_YACC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_YACC="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-YACC=$ac_cv_prog_YACC
+YACC="$ac_cv_prog_YACC"
 if test -n "$YACC"; then
-  echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6
+  echo "$ac_t""$YACC" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-  test -n "$YACC" && break
+test -n "$YACC" && break
 done
 test -n "$YACC" || YACC="yacc"
 
-
+  
   # we only support certain bison versions
   bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2"
 
@@ -3868,12 +3008,12 @@
 
   bison_version=none
   if test "$YACC"; then
-    echo "$as_me:$LINENO: checking for bison version" >&5
-echo $ECHO_N "checking for bison version... $ECHO_C" >&6
-if test "${php_cv_bison_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for bison version""... $ac_c" 1>&6
+echo "configure:3013: 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
-
+  
       bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
       php_cv_bison_version=invalid
       if test -n "$bison_version_vars"; then
@@ -3886,86 +3026,78 @@
           fi
         done
       fi
-
+    
 fi
-echo "$as_me:$LINENO: result: $php_cv_bison_version" >&5
-echo "${ECHO_T}$php_cv_bison_version" >&6
+
+echo "$ac_t""$php_cv_bison_version" 1>&6
   fi
   case $php_cv_bison_version in
     ""|invalid)
       bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)."
-      { echo "$as_me:$LINENO: WARNING: $bison_msg" >&5
-echo "$as_me: WARNING: $bison_msg" >&2;}
+      echo "configure: warning: $bison_msg" 1>&2
       YACC="exit 0;"
       ;;
   esac
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST YACC"
 
 
 
   # Extract the first word of "re2c", so it can be a program name with args.
 set dummy re2c; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RE2C+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:3051: 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
   if test -n "$RE2C"; then
   ac_cv_prog_RE2C="$RE2C" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RE2C="re2c"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RE2C="re2c"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-RE2C=$ac_cv_prog_RE2C
+RE2C="$ac_cv_prog_RE2C"
 if test -n "$RE2C"; then
-  echo "$as_me:$LINENO: result: $RE2C" >&5
-echo "${ECHO_T}$RE2C" >&6
+  echo "$ac_t""$RE2C" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   if test -n "$RE2C"; then
-    echo "$as_me:$LINENO: checking for re2c version" >&5
-echo $ECHO_N "checking for re2c version... $ECHO_C" >&6
-if test "${php_cv_re2c_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for re2c version""... $ac_c" 1>&6
+echo "configure:3079: 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
-
+  
       re2c_vernum=`$RE2C --vernum 2>/dev/null`
       if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "1304"; then
         php_cv_re2c_version=invalid
       else
         php_cv_re2c_version="`$RE2C --version | cut -d ' ' -f 2  2>/dev/null` (ok)"
-      fi
-
+      fi 
+    
 fi
-echo "$as_me:$LINENO: result: $php_cv_re2c_version" >&5
-echo "${ECHO_T}$php_cv_re2c_version" >&6
+
+echo "$ac_t""$php_cv_re2c_version" 1>&6
   fi
   case $php_cv_re2c_version in
     ""|invalid)
-      { echo "$as_me:$LINENO: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&5
-echo "$as_me: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&2;}
+      echo "configure: warning: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." 1>&2
       RE2C="exit 0;"
       ;;
   esac
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C"
 
 
@@ -3973,9 +3105,7 @@
 case $php_cv_bison_version in
   ""|invalid)
     if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then
-      { { echo "$as_me:$LINENO: error: bison is required to build PHP/Zend when building a GIT checkout!" >&5
-echo "$as_me: error: bison is required to build PHP/Zend when building a GIT checkout!" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: bison is required to build PHP/Zend when building a GIT checkout!" 1>&2; exit 1; }
     fi
     ;;
 esac
@@ -3983,22 +3113,22 @@
 
 php_enable_re2c_cgoto=no
 
-echo "$as_me:$LINENO: checking whether to enable computed goto gcc extension with re2c" >&5
-echo $ECHO_N "checking whether to enable computed goto gcc extension with re2c... $ECHO_C" >&6
+echo $ac_n "checking whether to enable computed goto gcc extension with re2c""... $ac_c" 1>&6
+echo "configure:3118: 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"
   PHP_RE2C_CGOTO=$enableval
 else
-
+  
   PHP_RE2C_CGOTO=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_RE2C_CGOTO
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -4006,18 +3136,13 @@
 if test "$PHP_RE2C_CGOTO" = "no"; then
   RE2C_FLAGS=""
 else
-  echo "$as_me:$LINENO: checking whether re2c -g works" >&5
-echo $ECHO_N "checking whether re2c -g works... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking whether re2c -g works""... $ac_c" 1>&6
+echo "configure:3141: checking whether re2c -g works" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 3143 "configure"
+#include "confdefs.h"
 
-int
-main ()
-{
+int main() {
 
 int main(int argc, const char **argv)
 {
@@ -4029,49 +3154,25 @@
   goto *adr[0];
   return 0;
 }
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+; return 0; }
+EOF
+if { (eval echo configure:3161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     RE2C_FLAGS=""
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+    echo "$ac_t""no" 1>&6
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
     RE2C_FLAGS="-g"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+    echo "$ac_t""yes" 1>&6
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C_FLAGS"
@@ -4119,14 +3220,14 @@
     ;;
   *darwin*|*rhapsody*)
     if test -n "$GCC"; then
-
+      
   gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp
-  echo "$as_me:$LINENO: checking whether $CC supports -no-cpp-precomp" >&5
-echo $ECHO_N "checking whether $CC supports -no-cpp-precomp... $ECHO_C" >&6
-if test "${ac_cv_gcc_arg_no_cpp_precomp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether $CC supports -no-cpp-precomp""... $ac_c" 1>&6
+echo "configure:3227: 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
-
+  
   echo 'void somefunc() { };' > conftest.c
   cmd='$CC -no-cpp-precomp -c conftest.c'
   if eval $cmd 2>&1 | $EGREP -e -no-cpp-precomp >/dev/null ; then
@@ -4136,15 +3237,15 @@
   fi
   eval $gcc_arg_name=$ac_result
   rm -f conftest.*
-
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_no_cpp_precomp" >&5
-echo "${ECHO_T}$ac_cv_gcc_arg_no_cpp_precomp" >&6
+
+echo "$ac_t""$ac_cv_gcc_arg_no_cpp_precomp" 1>&6
   if eval test "\$$gcc_arg_name" = "yes"; then
     gcc_no_cpp_precomp=yes
   else
     :
-
+    
   fi
 
       if test "$gcc_no_cpp_precomp" = "yes"; then
@@ -4166,8 +3267,7 @@
     fi
     ;;
   *netware*)
-
-  OVERALL_TARGET=php
+    
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -4189,17 +3289,15 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
-
-
+    
+  
   case /main in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "/main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir//main/"; ac_bdir="/main/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -4212,12 +3310,12 @@
 
   old_IFS=$IFS
   for ac_src in internal_functions.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
@@ -4234,15 +3332,15 @@
   done
 
 
-
-
+    
+  
   case win32 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "win32"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/win32/"; ac_bdir="win32/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -4255,12 +3353,12 @@
 
   old_IFS=$IFS
   for ac_src in sendmail.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
@@ -4279,10 +3377,10 @@
 
     PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\)
     EXTENSION_DIR=sys:/php$PHP_MAJOR_VERSION/ext
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP5LIB_SHARED_LIBADD"
 
-
+    
   install_modules="install-modules"
 
   case $host_alias in
@@ -4305,7 +3403,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/php5lib.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_GLOBAL_OBJS"
 
   cat >>Makefile.objects<<EOF
@@ -4322,22 +3420,19 @@
 
 # Disable PIC mode by default where it is known to be safe to do so,
 # to avoid the performance hit from the lost register
-echo "$as_me:$LINENO: checking whether to force non-PIC code in shared modules" >&5
-echo $ECHO_N "checking whether to force non-PIC code in shared modules... $ECHO_C" >&6
+echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6
+echo "configure:3425: 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
       with_pic=no
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      echo "$ac_t""yes" 1>&6
     else
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+      echo "$ac_t""no" 1>&6
     fi
     ;;
   *)
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
     ;;
 esac
 
@@ -4355,20 +3450,20 @@
 
 
 
-echo "$as_me:$LINENO: checking whether /dev/urandom exists" >&5
-echo $ECHO_N "checking whether /dev/urandom exists... $ECHO_C" >&6
-if test -r "/dev/urandom" && test -c "/dev/urandom"; then
-
-cat >>confdefs.h <<\_ACEOF
+echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6
+echo "configure:3455: 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
-_ACEOF
+EOF
+
+  echo "$ac_t""yes" 1>&6 
+else 
+  echo "$ac_t""no" 1>&6 
+fi 
+
+
 
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
 
 
 
@@ -4388,6 +3483,10 @@
 
 
 
+cat >> confdefs.h <<\EOF
+#define SUHOSIN_PATCH 1
+EOF
+
 
 
 
@@ -4399,7 +3498,7 @@
 else
   save_CFLAGS=$CFLAGS
   save_LIBS=$LIBS
-
+  
 if test -n "$ac_cv_pthreads_lib"; then
   LIBS="$LIBS -l$ac_cv_pthreads_lib"
 fi
@@ -4408,9 +3507,9 @@
   CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
 fi
 
-
+  
 if test "$cross_compiling" = yes; then
-
+  
     pthreads_working=no
   case $host_alias in
   *netware*)
@@ -4419,12 +3518,9 @@
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 3523 "configure"
+#include "confdefs.h"
 
 #include <pthread.h>
 #include <stddef.h>
@@ -4439,51 +3535,41 @@
     int data = 1;
     pthread_mutexattr_init(&mattr);
     return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+} 
+EOF
+if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
   pthreads_working=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   pthreads_working=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+  
   LIBS=$save_LIBS
   CFLAGS=$save_CFLAGS
 
-  echo "$as_me:$LINENO: checking for pthreads_cflags" >&5
-echo $ECHO_N "checking for pthreads_cflags... $ECHO_C" >&6
-if test "${ac_cv_pthreads_cflags+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
+echo "configure:3561: 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
-
+  
   ac_cv_pthreads_cflags=
   if test "$pthreads_working" != "yes"; then
-    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
+    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
       ac_save=$CFLAGS
       CFLAGS="$CFLAGS $flag"
-
+      
 if test "$cross_compiling" = yes; then
-
+  
     pthreads_working=no
   case $host_alias in
   *netware*)
@@ -4492,12 +3578,9 @@
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 3583 "configure"
+#include "confdefs.h"
 
 #include <pthread.h>
 #include <stddef.h>
@@ -4512,34 +3595,24 @@
     int data = 1;
     pthread_mutexattr_init(&mattr);
     return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+} 
+EOF
+if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
   pthreads_working=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   pthreads_working=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+  
       CFLAGS=$ac_save
       if test "$pthreads_working" = "yes"; then
         ac_cv_pthreads_cflags=$flag
@@ -4550,23 +3623,23 @@
 fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_pthreads_cflags" >&5
-echo "${ECHO_T}$ac_cv_pthreads_cflags" >&6
 
-echo "$as_me:$LINENO: checking for pthreads_lib" >&5
-echo $ECHO_N "checking for pthreads_lib... $ECHO_C" >&6
-if test "${ac_cv_pthreads_lib+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
 
+echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
+echo "configure:3631: 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
+  
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
   for lib in pthread pthreads c_r; do
     ac_save=$LIBS
     LIBS="$LIBS -l$lib"
-
+    
 if test "$cross_compiling" = yes; then
-
+  
     pthreads_working=no
   case $host_alias in
   *netware*)
@@ -4575,12 +3648,9 @@
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 3653 "configure"
+#include "confdefs.h"
 
 #include <pthread.h>
 #include <stddef.h>
@@ -4595,34 +3665,24 @@
     int data = 1;
     pthread_mutexattr_init(&mattr);
     return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+} 
+EOF
+if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
   pthreads_working=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   pthreads_working=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+  
     LIBS=$ac_save
     if test "$pthreads_working" = "yes"; then
       ac_cv_pthreads_lib=$lib
@@ -4632,8 +3692,8 @@
 fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_pthreads_lib" >&5
-echo "${ECHO_T}$ac_cv_pthreads_lib" >&6
+
+echo "$ac_t""$ac_cv_pthreads_lib" 1>&6
 
 if test "$pthreads_working" = "yes"; then
   threads_result="POSIX-Threads found"
@@ -4645,21 +3705,22 @@
 # Check whether --enable- or --disable- was given.
 if test "${enable_+set}" = set; then
   enableval="$enable_"
-
-fi;
-
+  :
+fi
 
 
 
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST SHLIB_SUFFIX_NAME"
 
+  
 
-
-
-
+ 
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST SHLIB_DL_SUFFIX_NAME"
 
-
+  
 
  SHLIB_SUFFIX_NAME=so
  SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME
@@ -4674,9 +3735,7 @@
    ;;
  esac
 
-PHP_SAPI=default
 
-  OVERALL_TARGET=php
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -4698,8 +3757,7 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
+PHP_SAPI=none
 
 
 
@@ -4708,10 +3766,8 @@
 SAPI_LIBTOOL=libphp$PHP_MAJOR_VERSION.la
 
 
-  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  echo "$as_me:$LINENO: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring SAPI modules${T_ME}" >&6
+  echo "$ac_t""" 1>&6
+  echo "$ac_t""${T_MD}Configuring SAPI modules${T_ME}" 1>&6
 
 
 
@@ -4720,17 +3776,17 @@
 php_with_aolserver=no
 
 
-
 # Check whether --with-aolserver or --without-aolserver was given.
 if test "${with_aolserver+set}" = set; then
   withval="$with_aolserver"
   PHP_AOLSERVER=$withval
 else
-
+  
   PHP_AOLSERVER=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_AOLSERVER
 
@@ -4738,94 +3794,88 @@
 
 
 
-echo "$as_me:$LINENO: checking for AOLserver support" >&5
-echo $ECHO_N "checking for AOLserver support... $ECHO_C" >&6
+echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6
+echo "configure:3799: checking for AOLserver support" >&5
 
 if test "$PHP_AOLSERVER" != "no"; then
   if test -d "$PHP_AOLSERVER/include"; then
     PHP_AOLSERVER_SRC=$PHP_AOLSERVER
   fi
   if test -z "$PHP_AOLSERVER_SRC" || test ! -d $PHP_AOLSERVER_SRC/include; then
-    { { echo "$as_me:$LINENO: error: Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" >&5
-echo "$as_me: error: Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" 1>&2; exit 1; }
   fi
   if test ! -d $PHP_AOLSERVER/bin ; then
-    { { echo "$as_me:$LINENO: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" >&5
-echo "$as_me: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" 1>&2; exit 1; }
   fi
-
+  
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
-
+  
   if test "$PHP_AOLSERVER_SRC/include" != "/usr/include"; then
-
+    
   if test -z "$PHP_AOLSERVER_SRC/include" || echo "$PHP_AOLSERVER_SRC/include" | grep '^/' >/dev/null ; then
     ai_p=$PHP_AOLSERVER_SRC/include
   else
-
+    
     ep_dir="`echo $PHP_AOLSERVER_SRC/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_AOLSERVER_SRC/include\"`"
   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
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_AOLSERVER 1
-_ACEOF
-
+EOF
 
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES aolserver"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=aolserver
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/aolserver"
+  
 
-  PHP_SAPI=aolserver
 
-  case "shared" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS aolserver"
 
-  OVERALL_TARGET=php
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -4847,14 +3897,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -4876,11 +3923,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -4889,9 +3934,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -4913,47 +3957,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/aolserver in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/aolserver"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/aolserver/"; ac_bdir="sapi/aolserver/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -4966,12 +3983,12 @@
 
   old_IFS=$IFS
   for ac_src in aolserver.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -4988,12 +4005,12 @@
   done
 
 
+  
 
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_AOLSERVER/bin/"
 fi
 
-echo "$as_me:$LINENO: result: $PHP_AOLSERVER" >&5
-echo "${ECHO_T}$PHP_AOLSERVER" >&6
+echo "$ac_t""$PHP_AOLSERVER" 1>&6
 
 
 
@@ -5002,17 +4019,17 @@
 php_with_apxs=no
 
 
-
 # Check whether --with-apxs or --without-apxs was given.
 if test "${with_apxs+set}" = set; then
   withval="$with_apxs"
   PHP_APXS=$withval
 else
-
+  
   PHP_APXS=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_APXS
 
@@ -5020,24 +4037,24 @@
 
 
 
-echo "$as_me:$LINENO: checking for Apache 1.x module support via DSO through APXS" >&5
-echo $ECHO_N "checking for Apache 1.x module support via DSO through APXS... $ECHO_C" >&6
+echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6
+echo "configure:4042: checking for Apache 1.x module support via DSO through APXS" >&5
 
 if test "$PHP_APXS" != "no"; then
   if test "$PHP_APXS" = "yes"; then
     APXS=apxs
     $APXS -q CFLAGS >/dev/null 2>&1
-    if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x
+    if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x 
       APXS=/usr/sbin/apxs
     fi
   else
-
+    
   if test -z "$PHP_APXS" || echo "$PHP_APXS" | grep '^/' >/dev/null ; then
     APXS=$PHP_APXS
   else
-
+    
     ep_dir="`echo $PHP_APXS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     APXS="$ep_realdir/`basename \"$PHP_APXS\"`"
   fi
@@ -5046,27 +4063,17 @@
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: Sorry, I was not able to successfully run APXS.  Possible reasons:" >&5
-echo "${ECHO_T}Sorry, I was not able to successfully run APXS.  Possible reasons:" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: 1.  Perl is not installed;" >&5
-echo "${ECHO_T}1.  Perl is not installed;" >&6
-    echo "$as_me:$LINENO: result: 2.  Apache was not compiled with DSO support (--enable-module=so);" >&5
-echo "${ECHO_T}2.  Apache was not compiled with DSO support (--enable-module=so);" >&6
-    echo "$as_me:$LINENO: result: 3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&5
-echo "${ECHO_T}3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&6
-    echo "$as_me:$LINENO: result: The output of $APXS follows" >&5
-echo "${ECHO_T}The output of $APXS follows" >&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""Sorry, I was not able to successfully run APXS.  Possible reasons:" 1>&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""1.  Perl is not installed;" 1>&6
+    echo "$ac_t""2.  Apache was not compiled with DSO support (--enable-module=so);" 1>&6
+    echo "$ac_t""3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" 1>&6
+    echo "$ac_t""The output of $APXS follows" 1>&6
     $APXS -q CFLAGS
-    { { echo "$as_me:$LINENO: error: Aborting" >&5
-echo "$as_me: error: Aborting" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+    { echo "configure: error: Aborting" 1>&2; exit 1; } 
+  fi 
 
   APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
@@ -5075,7 +4082,7 @@
   APACHE_INCLUDE=-I$APXS_INCLUDEDIR
 
   # Test that we're trying to configure with apache 1.x
-
+  
   ac_output=`$APXS_HTTPD -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
   ac_IFS=$IFS
 IFS="- /.
@@ -5086,9 +4093,7 @@
   APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6`
 
   if test "$APACHE_VERSION" -ge 2000000; then
-    { { echo "$as_me:$LINENO: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" >&5
-echo "$as_me: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" 1>&2; exit 1; } 
   fi
 
   for flag in $APXS_CFLAGS; do
@@ -5106,7 +4111,7 @@
     ;;
   *darwin*)
     MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS"
 
     SAPI_SHARED=libs/libphp5.so
@@ -5117,33 +4122,34 @@
     ;;
   esac
 
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "$build_type" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache
+  fi  
 
-  PHP_SAPI=apache
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache"
+  
 
-  case "$build_type" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
+
+  
+    case "$build_type" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5165,14 +4171,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5194,11 +4197,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -5207,9 +4208,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5231,47 +4231,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -5284,12 +4257,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -5306,6 +4279,7 @@
   done
 
 
+  
 
 
   # Test whether apxs support -S option
@@ -5313,7 +4287,7 @@
 
   if test "$?" != "0"; then
     APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-  else
+  else 
     APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
     if test -z `$APXS -q SYSCONFDIR`; then
       APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
@@ -5333,43 +4307,38 @@
     PHP_APXS_BROKEN=yes
   fi
   STRONGHOLD=
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_AP_COMPAT_H 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_APACHE 1
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
 php_with_apache=no
 
 
-
 # Check whether --with-apache or --without-apache was given.
 if test "${with_apache+set}" = set; then
   withval="$with_apache"
   PHP_APACHE=$withval
 else
-
+  
   PHP_APACHE=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_APACHE
 
@@ -5377,11 +4346,11 @@
 
 
 
-echo "$as_me:$LINENO: checking for Apache 1.x module support" >&5
-echo $ECHO_N "checking for Apache 1.x module support... $ECHO_C" >&6
+echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6
+echo "configure:4351: checking for Apache 1.x module support" >&5
 
 if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
-
+  
   if test "$PHP_APACHE" = "yes"; then
     # Apache's default directory
     PHP_APACHE=/usr/local/apache
@@ -5389,54 +4358,54 @@
 
   APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module"
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_APACHE 1
-_ACEOF
+EOF
 
   APACHE_MODULE=yes
-
+  
   if test -z "$PHP_APACHE" || echo "$PHP_APACHE" | grep '^/' >/dev/null ; then
     PHP_APACHE=$PHP_APACHE
   else
-
+    
     ep_dir="`echo $PHP_APACHE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     PHP_APACHE="$ep_realdir/`basename \"$PHP_APACHE\"`"
   fi
 
   # For Apache 1.2.x
-  if test -f $PHP_APACHE/src/httpd.h; then
+  if test -f $PHP_APACHE/src/httpd.h; then 
     APACHE_INCLUDE=-I$PHP_APACHE/src
     APACHE_TARGET=$PHP_APACHE/src
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache
+  fi  
 
-  PHP_SAPI=apache
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache"
+  
 
-  case "static" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
+
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5458,14 +4427,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5487,11 +4453,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -5500,9 +4464,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5524,47 +4487,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -5577,12 +4513,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -5599,24 +4535,21 @@
   done
 
 
+  
 
     APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
     PHP_LIBS="-L. -lphp3"
-    echo "$as_me:$LINENO: result: yes - Apache 1.2.x" >&5
-echo "${ECHO_T}yes - Apache 1.2.x" >&6
+    echo "$ac_t""yes - Apache 1.2.x" 1>&6
     STRONGHOLD=
     if test -f $PHP_APACHE/src/ap_config.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
+EOF
 
     fi
   # For Apache 2.0.x
   elif test -f $PHP_APACHE/include/httpd.h && test -f $PHP_APACHE/srclib/apr/include/apr_general.h ; then
-    { { echo "$as_me:$LINENO: error: Use --with-apxs2 with Apache 2.x!" >&5
-echo "$as_me: error: Use --with-apxs2 with Apache 2.x!" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Use --with-apxs2 with Apache 2.x!" 1>&2; exit 1; }
   # For Apache 1.3.x
   elif test -f $PHP_APACHE/src/main/httpd.h; then
     APACHE_HAS_REGEX=1
@@ -5625,33 +4558,34 @@
     if test ! -d $APACHE_TARGET; then
       mkdir $APACHE_TARGET
     fi
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache"
+  
 
-  PHP_SAPI=apache
 
-  case "static" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
 
-  OVERALL_TARGET=php
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5673,14 +4607,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5702,11 +4633,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -5715,9 +4644,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5739,47 +4667,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -5792,12 +4693,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -5814,35 +4715,30 @@
   done
 
 
+  
 
     APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
-    echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5
-echo "${ECHO_T}yes - Apache 1.3.x" >&6
+    echo "$ac_t""yes - Apache 1.3.x" 1>&6
     STRONGHOLD=
     if test -f $PHP_APACHE/src/include/ap_config.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
+EOF
 
     fi
     if test -f $PHP_APACHE/src/include/ap_compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_COMPAT_H 1
-_ACEOF
+EOF
 
       if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; }
       fi
     elif test -f $PHP_APACHE/src/include/compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_OLD_COMPAT_H 1
-_ACEOF
+EOF
 
     fi
   # Also for Apache 1.3.x
@@ -5853,33 +4749,34 @@
     if test ! -d $APACHE_TARGET; then
       mkdir $APACHE_TARGET
     fi
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache
+  fi  
 
-  PHP_SAPI=apache
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache"
+  
 
-  case "static" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
+
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5901,14 +4798,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5930,11 +4824,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -5943,9 +4835,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -5967,47 +4858,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -6020,12 +4884,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -6042,68 +4906,64 @@
   done
 
 
+  
 
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
     APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-    echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5
-echo "${ECHO_T}yes - Apache 1.3.x" >&6
+    echo "$ac_t""yes - Apache 1.3.x" 1>&6
     STRONGHOLD=
     if test -f $PHP_APACHE/src/include/ap_config.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
+EOF
 
     fi
     if test -f $PHP_APACHE/src/include/ap_compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_COMPAT_H 1
-_ACEOF
+EOF
 
       if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; }
       fi
     elif test -f $PHP_APACHE/src/include/compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_OLD_COMPAT_H 1
-_ACEOF
+EOF
 
     fi
   # For StrongHold 2.2
   elif test -f $PHP_APACHE/apache/httpd.h; then
     APACHE_INCLUDE="-I$PHP_APACHE/apache -I$PHP_APACHE/ssl/include"
     APACHE_TARGET=$PHP_APACHE/apache
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache"
+  
 
-  PHP_SAPI=apache
 
-  case "static" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
 
-  OVERALL_TARGET=php
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -6125,14 +4985,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -6154,11 +5011,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -6167,9 +5022,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -6191,47 +5045,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -6244,12 +5071,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -6266,96 +5093,86 @@
   done
 
 
+  
 
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
     APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
     STRONGHOLD=-DSTRONGHOLD=1
-    echo "$as_me:$LINENO: result: yes - StrongHold" >&5
-echo "${ECHO_T}yes - StrongHold" >&6
+    echo "$ac_t""yes - StrongHold" 1>&6
     if test -f $PHP_APACHE/apache/ap_config.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
+EOF
 
     fi
     if test -f $PHP_APACHE/src/ap_compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_COMPAT_H 1
-_ACEOF
+EOF
 
       if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; }
       fi
     elif test -f $PHP_APACHE/src/compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_OLD_COMPAT_H 1
-_ACEOF
+EOF
 
     fi
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    { { echo "$as_me:$LINENO: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" >&5
-echo "$as_me: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" 1>&2; exit 1; }
   fi
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 # compatibility
 if test -z "$enable_mod_charset" && test "$with_mod_charset"; then
   enable_mod_charset=$with_mod_charset
 fi
-
+  
 
 php_enable_mod_charset=no
 
-echo "$as_me:$LINENO: checking whether to enable Apache charset compatibility option" >&5
-echo $ECHO_N "checking whether to enable Apache charset compatibility option... $ECHO_C" >&6
+echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
+echo "configure:5140: 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"
   PHP_MOD_CHARSET=$enableval
 else
-
+  
   PHP_MOD_CHARSET=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_MOD_CHARSET
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_MOD_CHARSET" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define USE_TRANSFER_TABLES 1
-_ACEOF
+EOF
 
 fi
 
 if test "$APACHE_MODULE" = "yes"; then
-
+  
   if test -n "$GCC"; then
-
+        
   gcc_arg_name=ac_cv_gcc_arg_rdynamic
-  echo "$as_me:$LINENO: checking whether $CC supports -rdynamic" >&5
-echo $ECHO_N "checking whether $CC supports -rdynamic... $ECHO_C" >&6
-if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
+echo "configure:5172: 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
-
+  
   echo 'void somefunc() { };' > conftest.c
   cmd='$CC -rdynamic -c conftest.c'
   if eval $cmd 2>&1 | $EGREP -e -rdynamic >/dev/null ; then
@@ -6365,15 +5182,15 @@
   fi
   eval $gcc_arg_name=$ac_result
   rm -f conftest.*
-
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_rdynamic" >&5
-echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6
+
+echo "$ac_t""$ac_cv_gcc_arg_rdynamic" 1>&6
   if eval test "\$$gcc_arg_name" = "yes"; then
     gcc_rdynamic=yes
   else
     :
-
+    
   fi
 
     if test "$gcc_rdynamic" = "yes"; then
@@ -6382,7 +5199,7 @@
   fi
 
   $php_shtool mkdir -p sapi/apache
-
+  
   PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/apache/libphp5.module"
 
 fi
@@ -6392,99 +5209,71 @@
     APXS_EXP=-bE:sapi/apache/mod_php5.exp
   fi
 
-
-echo "$as_me:$LINENO: checking for member fd in BUFF *" >&5
-echo $ECHO_N "checking for member fd in BUFF *... $ECHO_C" >&6
-if test "${ac_cv_php_fd_in_buff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
+echo "configure:5215: 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
-
+  
   save=$CPPFLAGS
   if test -n "$APXS_INCLUDEDIR"; then
     CPPFLAGS="$CPPFLAGS -I$APXS_INCLUDEDIR"
   else
     CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
   fi
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 5227 "configure"
+#include "confdefs.h"
 #include <httpd.h>
-int
-main ()
-{
+int main() {
 conn_rec *c; int fd = c->client->fd;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:5234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     ac_cv_php_fd_in_buff=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_php_fd_in_buff=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_php_fd_in_buff=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
   CPPFLAGS=$save
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_fd_in_buff" >&5
-echo "${ECHO_T}$ac_cv_php_fd_in_buff" >&6
-if test "$ac_cv_php_fd_in_buff" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_php_fd_in_buff" 1>&6
+if test "$ac_cv_php_fd_in_buff" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define PHP_APACHE_HAVE_CLIENT_FD 1
-_ACEOF
+EOF
 
 fi
 
   INSTALL_IT=$APACHE_INSTALL
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_EXP"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_INCLUDE"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_TARGET"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_LDFLAGS"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_INSTALL"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST STRONGHOLD"
 
 fi
@@ -6495,17 +5284,17 @@
 php_with_apxs2filter=no
 
 
-
 # Check whether --with-apxs2filter or --without-apxs2filter was given.
 if test "${with_apxs2filter+set}" = set; then
   withval="$with_apxs2filter"
   PHP_APXS2FILTER=$withval
 else
-
+  
   PHP_APXS2FILTER=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_APXS2FILTER
 
@@ -6513,8 +5302,8 @@
 
 
 
-echo "$as_me:$LINENO: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
-echo $ECHO_N "checking for Apache 2.0 filter-module support via DSO through APXS... $ECHO_C" >&6
+echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6
+echo "configure:5307: 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
@@ -6524,13 +5313,13 @@
       APXS=/usr/sbin/apxs
     fi
   else
-
+    
   if test -z "$PHP_APXS2FILTER" || echo "$PHP_APXS2FILTER" | grep '^/' >/dev/null ; then
     APXS=$PHP_APXS2FILTER
   else
-
+    
     ep_dir="`echo $PHP_APXS2FILTER|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     APXS="$ep_realdir/`basename \"$PHP_APXS2FILTER\"`"
   fi
@@ -6539,29 +5328,18 @@
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
-echo "${ECHO_T}Sorry, I cannot run apxs.  Possible reasons follow:" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: 1. Perl is not installed" >&5
-echo "${ECHO_T}1. Perl is not installed" >&6
-    echo "$as_me:$LINENO: result: 2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&5
-echo "${ECHO_T}2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&6
-    echo "$as_me:$LINENO: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
-echo "${ECHO_T}3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: The output of $APXS follows:" >&5
-echo "${ECHO_T}The output of $APXS follows:" >&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""Sorry, I cannot run apxs.  Possible reasons follow:" 1>&6 
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""1. Perl is not installed" 1>&6
+    echo "$ac_t""2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" 1>&6
+    echo "$ac_t""3. Apache was not built using --enable-so (the apxs usage page is displayed)" 1>&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""The output of $APXS follows:" 1>&6
     $APXS -q CFLAGS
-    { { echo "$as_me:$LINENO: error: Aborting" >&5
-echo "$as_me: error: Aborting" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+    { echo "configure: error: Aborting" 1>&2; exit 1; }
+  fi 
 
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
   APXS_BINDIR=`$APXS -q BINDIR`
@@ -6588,7 +5366,7 @@
   APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
 
   # Test that we're trying to configure with apache 2.x
-
+  
   ac_output=`$APXS_HTTPD -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
   ac_IFS=$IFS
 IFS="- /.
@@ -6599,13 +5377,9 @@
   APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6`
 
   if test "$APACHE_VERSION" -le 2000000; then
-    { { echo "$as_me:$LINENO: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" >&5
-echo "$as_me: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" 1>&2; exit 1; }
   elif test "$APACHE_VERSION" -lt 2000040; then
-    { { echo "$as_me:$LINENO: error: Please note that Apache version >= 2.0.40 is required" >&5
-echo "$as_me: error: Please note that Apache version >= 2.0.40 is required" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Please note that Apache version >= 2.0.40 is required" 1>&2; exit 1; }
   fi
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
@@ -6625,33 +5399,34 @@
   case $host_alias in
   *aix*)
     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache2filter"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache2filter
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache2filter"
+  
 
-  PHP_SAPI=apache2filter
 
-  case "shared" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter"
 
-  OVERALL_TARGET=php
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -6673,14 +5448,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -6702,11 +5474,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -6715,9 +5485,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -6739,47 +5508,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache2filter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -6792,12 +5534,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache2.c apache_config.c php_functions.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -6814,8 +5556,9 @@
   done
 
 
+  
 
-    INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
+    INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 
     ;;
   *darwin*)
                     if test -x "$APR_CONFIG"; then
@@ -6825,36 +5568,37 @@
         MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS"
     fi
     MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS"
 
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "bundle" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache2filter"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache2filter
+  fi  
 
-  PHP_SAPI=apache2filter
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache2filter"
+  
 
-  case "bundle" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter"
+
+  
+    case "bundle" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -6876,14 +5620,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -6905,11 +5646,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -6918,9 +5657,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -6942,47 +5680,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache2filter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -6995,12 +5706,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache2.c apache_config.c php_functions.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -7017,6 +5728,7 @@
   done
 
 
+  
 
     SAPI_SHARED=libs/libphp5.so
     INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
@@ -7025,33 +5737,34 @@
     if test -f _APP_; then `rm _APP_`; fi
     `ln -s $APXS_BINDIR/httpd _APP_`
     EXTRA_LIBS="$EXTRA_LIBS _APP_"
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache2filter"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache2filter
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache2filter"
+  
 
-  PHP_SAPI=apache2filter
 
-  case "shared" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter"
 
-  OVERALL_TARGET=php
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7073,14 +5786,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7102,11 +5812,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -7115,9 +5823,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7139,47 +5846,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache2filter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -7192,12 +5872,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache2.c apache_config.c php_functions.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -7214,37 +5894,39 @@
   done
 
 
+  
 
     INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
     ;;
   *)
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache2filter"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache2filter
+  fi  
 
-  PHP_SAPI=apache2filter
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache2filter"
+  
 
-  case "shared" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7266,14 +5948,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7295,11 +5974,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -7308,9 +5985,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7332,47 +6008,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache2filter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -7385,12 +6034,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache2.c apache_config.c php_functions.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -7407,7 +6056,8 @@
   done
 
 
-
+  
+ 
     INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
     ;;
   esac
@@ -7415,36 +6065,30 @@
   if test "$APACHE_VERSION" -lt 2004001; then
     APXS_MPM=`$APXS -q MPM_NAME`
     if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
-
+      
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
     fi
   else
     APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
     if test -n "$APACHE_THREADED_MPM"; then
-
+      
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
     fi
   fi
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+  echo "$ac_t""yes" 1>&6
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
 
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
@@ -7453,17 +6097,17 @@
 php_with_apxs2=no
 
 
-
 # Check whether --with-apxs2 or --without-apxs2 was given.
 if test "${with_apxs2+set}" = set; then
   withval="$with_apxs2"
   PHP_APXS2=$withval
 else
-
+  
   PHP_APXS2=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_APXS2
 
@@ -7471,8 +6115,8 @@
 
 
 
-echo "$as_me:$LINENO: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
-echo $ECHO_N "checking for Apache 2.0 handler-module support via DSO through APXS... $ECHO_C" >&6
+echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6
+echo "configure:6120: 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
@@ -7482,13 +6126,13 @@
       APXS=/usr/sbin/apxs
     fi
   else
-
+    
   if test -z "$PHP_APXS2" || echo "$PHP_APXS2" | grep '^/' >/dev/null ; then
     APXS=$PHP_APXS2
   else
-
+    
     ep_dir="`echo $PHP_APXS2|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     APXS="$ep_realdir/`basename \"$PHP_APXS2\"`"
   fi
@@ -7497,29 +6141,18 @@
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
-echo "${ECHO_T}Sorry, I cannot run apxs.  Possible reasons follow:" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: 1. Perl is not installed" >&5
-echo "${ECHO_T}1. Perl is not installed" >&6
-    echo "$as_me:$LINENO: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5
-echo "${ECHO_T}2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6
-    echo "$as_me:$LINENO: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
-echo "${ECHO_T}3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: The output of $APXS follows:" >&5
-echo "${ECHO_T}The output of $APXS follows:" >&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""Sorry, I cannot run apxs.  Possible reasons follow:" 1>&6 
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""1. Perl is not installed" 1>&6
+    echo "$ac_t""2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" 1>&6
+    echo "$ac_t""3. Apache was not built using --enable-so (the apxs usage page is displayed)" 1>&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""The output of $APXS follows:" 1>&6
     $APXS -q CFLAGS
-    { { echo "$as_me:$LINENO: error: Aborting" >&5
-echo "$as_me: error: Aborting" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+    { echo "configure: error: Aborting" 1>&2; exit 1; }
+  fi 
 
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
   APXS_BINDIR=`$APXS -q BINDIR`
@@ -7546,7 +6179,7 @@
   APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
 
   # Test that we're trying to configure with apache 2.x
-
+  
   ac_output=`$APXS_HTTPD -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
   ac_IFS=$IFS
 IFS="- /.
@@ -7557,13 +6190,9 @@
   APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6`
 
   if test "$APACHE_VERSION" -le 2000000; then
-    { { echo "$as_me:$LINENO: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" >&5
-echo "$as_me: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" 1>&2; exit 1; }
   elif test "$APACHE_VERSION" -lt 2000044; then
-    { { echo "$as_me:$LINENO: error: Please note that Apache version >= 2.0.44 is required" >&5
-echo "$as_me: error: Please note that Apache version >= 2.0.44 is required" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Please note that Apache version >= 2.0.44 is required" 1>&2; exit 1; }
   fi
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
@@ -7583,33 +6212,34 @@
   case $host_alias in
   *aix*)
     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache2handler"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache2handler
+  fi  
 
-  PHP_SAPI=apache2handler
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache2handler"
+  
 
-  case "shared" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7631,14 +6261,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7660,11 +6287,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -7673,9 +6298,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7697,47 +6321,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache2handler in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -7750,12 +6347,12 @@
 
   old_IFS=$IFS
   for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -7772,8 +6369,9 @@
   done
 
 
+  
 
-    INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
+    INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 
     ;;
   *darwin*)
                     if test -x "$APR_CONFIG"; then
@@ -7783,36 +6381,37 @@
         MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS"
     fi
     MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS"
 
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
+    
+  if test "bundle" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache2handler"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache2handler
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache2handler"
+  
 
-  PHP_SAPI=apache2handler
 
-  case "bundle" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler"
 
-  OVERALL_TARGET=php
+  
+    case "bundle" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7834,14 +6433,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7863,11 +6459,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -7876,9 +6470,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -7900,47 +6493,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache2handler in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -7953,12 +6519,12 @@
 
   old_IFS=$IFS
   for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -7975,6 +6541,7 @@
   done
 
 
+  
 
     SAPI_SHARED=libs/libphp5.so
     INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
@@ -7983,33 +6550,34 @@
     if test -f _APP_; then `rm _APP_`; fi
     `ln -s $APXS_BINDIR/httpd _APP_`
     EXTRA_LIBS="$EXTRA_LIBS _APP_"
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache2handler"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache2handler
+  fi  
 
-  PHP_SAPI=apache2handler
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache2handler"
+  
 
-  case "shared" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8031,14 +6599,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8060,11 +6625,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -8073,9 +6636,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8097,47 +6659,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache2handler in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -8150,12 +6685,12 @@
 
   old_IFS=$IFS
   for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -8172,37 +6707,39 @@
   done
 
 
+  
 
     INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
     ;;
   *)
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
+    
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache2handler"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache2handler
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache2handler"
+  
 
-  PHP_SAPI=apache2handler
 
-  case "shared" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler"
 
-  OVERALL_TARGET=php
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8224,14 +6761,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8253,11 +6787,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -8266,9 +6798,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8290,47 +6821,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache2handler in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -8343,12 +6847,12 @@
 
   old_IFS=$IFS
   for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -8365,7 +6869,8 @@
   done
 
 
-
+  
+ 
     INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
     ;;
   esac
@@ -8373,36 +6878,30 @@
   if test "$APACHE_VERSION" -lt 2004001; then
     APXS_MPM=`$APXS -q MPM_NAME`
     if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
-
+      
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
     fi
   else
     APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
     if test -n "$APACHE_THREADED_MPM"; then
-
+      
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
     fi
   fi
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+  echo "$ac_t""yes" 1>&6
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
 
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
@@ -8412,17 +6911,17 @@
 php_with_apache_hooks=no
 
 
-
 # Check whether --with-apache-hooks or --without-apache-hooks was given.
 if test "${with_apache_hooks+set}" = set; then
   withval="$with_apache_hooks"
   PHP_APACHE_HOOKS=$withval
 else
-
+  
   PHP_APACHE_HOOKS=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_APACHE_HOOKS
 
@@ -8430,24 +6929,24 @@
 
 
 
-echo "$as_me:$LINENO: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
-echo $ECHO_N "checking for Apache 1.x (hooks) module support via DSO through APXS... $ECHO_C" >&6
+echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6
+echo "configure:6934: 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
     APXS=apxs
     $APXS -q CFLAGS >/dev/null 2>&1
-    if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x
+    if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x 
       APXS=/usr/sbin/apxs
     fi
   else
-
+    
   if test -z "$PHP_APACHE_HOOKS" || echo "$PHP_APACHE_HOOKS" | grep '^/' >/dev/null ; then
     APXS=$PHP_APACHE_HOOKS
   else
-
+    
     ep_dir="`echo $PHP_APACHE_HOOKS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     APXS="$ep_realdir/`basename \"$PHP_APACHE_HOOKS\"`"
   fi
@@ -8456,27 +6955,17 @@
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: Sorry, I was not able to successfully run APXS.  Possible reasons:" >&5
-echo "${ECHO_T}Sorry, I was not able to successfully run APXS.  Possible reasons:" >&6
-    echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-    echo "$as_me:$LINENO: result: 1.  Perl is not installed;" >&5
-echo "${ECHO_T}1.  Perl is not installed;" >&6
-    echo "$as_me:$LINENO: result: 2.  Apache was not compiled with DSO support (--enable-module=so);" >&5
-echo "${ECHO_T}2.  Apache was not compiled with DSO support (--enable-module=so);" >&6
-    echo "$as_me:$LINENO: result: 3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&5
-echo "${ECHO_T}3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&6
-    echo "$as_me:$LINENO: result: The output of $APXS follows" >&5
-echo "${ECHO_T}The output of $APXS follows" >&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""Sorry, I was not able to successfully run APXS.  Possible reasons:" 1>&6
+    echo "$ac_t""" 1>&6
+    echo "$ac_t""1.  Perl is not installed;" 1>&6
+    echo "$ac_t""2.  Apache was not compiled with DSO support (--enable-module=so);" 1>&6
+    echo "$ac_t""3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" 1>&6
+    echo "$ac_t""The output of $APXS follows" 1>&6
     $APXS -q CFLAGS
-    { { echo "$as_me:$LINENO: error: Aborting" >&5
-echo "$as_me: error: Aborting" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+    { echo "configure: error: Aborting" 1>&2; exit 1; } 
+  fi 
 
   APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
@@ -8485,7 +6974,7 @@
   APACHE_INCLUDE=-I$APXS_INCLUDEDIR
 
   # Test that we're trying to configure with apache 1.x
-
+  
   ac_output=`$APXS_HTTPD -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
   ac_IFS=$IFS
 IFS="- /.
@@ -8496,9 +6985,7 @@
   APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6`
 
   if test "$APACHE_VERSION" -ge 2000000; then
-    { { echo "$as_me:$LINENO: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" >&5
-echo "$as_me: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" 1>&2; exit 1; } 
   fi
 
   for flag in $APXS_CFLAGS; do
@@ -8516,7 +7003,7 @@
     ;;
   *darwin*)
     MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS"
 
     SAPI_SHARED=libs/libphp5.so
@@ -8527,33 +7014,34 @@
     ;;
   esac
 
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "$build_type" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache_hooks"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache_hooks
+  fi  
 
-  PHP_SAPI=apache_hooks
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+  
 
-  case "$build_type" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
+
+  
+    case "$build_type" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8575,14 +7063,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8604,11 +7089,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -8617,9 +7100,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8641,47 +7123,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache_hooks in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -8694,12 +7149,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -8716,6 +7171,7 @@
   done
 
 
+  
 
 
   # Test whether apxs support -S option
@@ -8723,7 +7179,7 @@
 
   if test "$?" != "0"; then
     APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-  else
+  else 
     APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
     if test -z `$APXS -q SYSCONFDIR`; then
       APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
@@ -8743,43 +7199,38 @@
     PHP_APXS_BROKEN=yes
   fi
   STRONGHOLD=
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_AP_COMPAT_H 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_APACHE_HOOKS 1
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
 php_with_apache_hooks_static=no
 
 
-
 # Check whether --with-apache-hooks-static or --without-apache-hooks-static was given.
 if test "${with_apache_hooks_static+set}" = set; then
   withval="$with_apache_hooks_static"
   PHP_APACHE_HOOKS_STATIC=$withval
 else
-
+  
   PHP_APACHE_HOOKS_STATIC=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_APACHE_HOOKS_STATIC
 
@@ -8787,8 +7238,8 @@
 
 
 
-echo "$as_me:$LINENO: checking for Apache 1.x (hooks) module support" >&5
-echo $ECHO_N "checking for Apache 1.x (hooks) module support... $ECHO_C" >&6
+echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6
+echo "configure:7243: 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
 
@@ -8799,54 +7250,54 @@
 
   APACHE_HOOKS_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php5.* sapi/apache_hooks/libphp5.module"
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_APACHE 1
-_ACEOF
+EOF
 
   APACHE_HOOKS_MODULE=yes
-
+  
   if test -z "$PHP_APACHE_HOOKS_STATIC" || echo "$PHP_APACHE_HOOKS_STATIC" | grep '^/' >/dev/null ; then
     PHP_APACHE_HOOKS_STATIC=$PHP_APACHE_HOOKS_STATIC
   else
-
+    
     ep_dir="`echo $PHP_APACHE_HOOKS_STATIC|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     PHP_APACHE_HOOKS_STATIC="$ep_realdir/`basename \"$PHP_APACHE_HOOKS_STATIC\"`"
   fi
 
   # For Apache 1.2.x
-  if test -f $PHP_APACHE_HOOKS_STATIC/src/httpd.h; then
+  if test -f $PHP_APACHE_HOOKS_STATIC/src/httpd.h; then 
     APACHE_INCLUDE=-I$PHP_APACHE_HOOKS_STATIC/src
     APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache_hooks"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache_hooks
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+  
 
-  PHP_SAPI=apache_hooks
 
-  case "static" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
 
-  OVERALL_TARGET=php
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8868,14 +7319,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8897,11 +7345,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -8910,9 +7356,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -8934,47 +7379,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache_hooks in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -8987,12 +7405,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -9009,24 +7427,21 @@
   done
 
 
+  
 
     APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET"
     PHP_LIBS="-L. -lphp3"
-    echo "$as_me:$LINENO: result: yes - Apache 1.2.x" >&5
-echo "${ECHO_T}yes - Apache 1.2.x" >&6
+    echo "$ac_t""yes - Apache 1.2.x" 1>&6
     STRONGHOLD=
     if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_config.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
+EOF
 
     fi
   # For Apache 2.0.x
   elif test -f $PHP_APACHE_HOOKS_STATIC/include/httpd.h && test -f $PHP_APACHE_HOOKS_STATIC/srclib/apr/include/apr_general.h ; then
-    { { echo "$as_me:$LINENO: error: Use --with-apxs2 with Apache 2.x!" >&5
-echo "$as_me: error: Use --with-apxs2 with Apache 2.x!" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Use --with-apxs2 with Apache 2.x!" 1>&2; exit 1; }
   # For Apache 1.3.x
   elif test -f $PHP_APACHE_HOOKS_STATIC/src/main/httpd.h; then
     APACHE_HAS_REGEX=1
@@ -9035,33 +7450,34 @@
     if test ! -d $APACHE_TARGET; then
       mkdir $APACHE_TARGET
     fi
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache_hooks"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache_hooks
+  fi  
 
-  PHP_SAPI=apache_hooks
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+  
 
-  case "static" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
+
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -9083,14 +7499,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -9112,11 +7525,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -9125,9 +7536,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -9149,47 +7559,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache_hooks in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -9202,12 +7585,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -9224,35 +7607,30 @@
   done
 
 
+  
 
     APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
-    echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5
-echo "${ECHO_T}yes - Apache 1.3.x" >&6
+    echo "$ac_t""yes - Apache 1.3.x" 1>&6
     STRONGHOLD=
     if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
+EOF
 
     fi
     if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_COMPAT_H 1
-_ACEOF
+EOF
 
       if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; }
       fi
     elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_OLD_COMPAT_H 1
-_ACEOF
+EOF
 
     fi
   # Also for Apache 1.3.x
@@ -9263,33 +7641,34 @@
     if test ! -d $APACHE_TARGET; then
       mkdir $APACHE_TARGET
     fi
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
+    
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache_hooks"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache_hooks
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+  
 
-  PHP_SAPI=apache_hooks
 
-  case "static" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
 
-  OVERALL_TARGET=php
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -9311,14 +7690,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -9340,11 +7716,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -9353,9 +7727,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -9377,47 +7750,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache_hooks in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -9430,12 +7776,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -9452,68 +7798,64 @@
   done
 
 
+  
 
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
     APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-    echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5
-echo "${ECHO_T}yes - Apache 1.3.x" >&6
+    echo "$ac_t""yes - Apache 1.3.x" 1>&6
     STRONGHOLD=
     if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
+EOF
 
     fi
     if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_COMPAT_H 1
-_ACEOF
+EOF
 
       if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; }
       fi
     elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_OLD_COMPAT_H 1
-_ACEOF
+EOF
 
     fi
   # For StrongHold 2.2
   elif test -f $PHP_APACHE_HOOKS_STATIC/apache/httpd.h; then
     APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/apache -I$PHP_APACHE_HOOKS_STATIC/ssl/include"
     APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/apache
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES apache_hooks"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=apache_hooks
+  fi  
 
-  PHP_SAPI=apache_hooks
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+  
 
-  case "static" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
+
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -9535,14 +7877,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -9564,11 +7903,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -9577,9 +7914,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -9601,47 +7937,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/apache_hooks in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -9654,12 +7963,12 @@
 
   old_IFS=$IFS
   for ac_src in sapi_apache.c mod_php5.c php_apache.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -9676,47 +7985,38 @@
   done
 
 
+  
 
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
     APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET"
     STRONGHOLD=-DSTRONGHOLD=1
-    echo "$as_me:$LINENO: result: yes - StrongHold" >&5
-echo "${ECHO_T}yes - StrongHold" >&6
+    echo "$ac_t""yes - StrongHold" 1>&6
     if test -f $PHP_APACHE_HOOKS_STATIC/apache/ap_config.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_CONFIG_H 1
-_ACEOF
+EOF
 
     fi
     if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_AP_COMPAT_H 1
-_ACEOF
+EOF
 
       if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; }
       fi
     elif test -f $PHP_APACHE_HOOKS_STATIC/src/compat.h; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_OLD_COMPAT_H 1
-_ACEOF
+EOF
 
     fi
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    { { echo "$as_me:$LINENO: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" >&5
-echo "$as_me: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" 1>&2; exit 1; }
   fi
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 # compatibility
@@ -9727,45 +8027,44 @@
 
 php_enable_mod_charset=no
 
-echo "$as_me:$LINENO: checking whether to enable Apache charset compatibility option" >&5
-echo $ECHO_N "checking whether to enable Apache charset compatibility option... $ECHO_C" >&6
+echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
+echo "configure:8032: 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"
   PHP_MOD_CHARSET=$enableval
 else
-
+  
   PHP_MOD_CHARSET=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_MOD_CHARSET
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_MOD_CHARSET" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define USE_TRANSFER_TABLES 1
-_ACEOF
+EOF
 
 fi
 
 if test "$APACHE_HOOKS_MODULE" = "yes"; then
-
+  
   if test -n "$GCC"; then
-
+        
   gcc_arg_name=ac_cv_gcc_arg_rdynamic
-  echo "$as_me:$LINENO: checking whether $CC supports -rdynamic" >&5
-echo $ECHO_N "checking whether $CC supports -rdynamic... $ECHO_C" >&6
-if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
+echo "configure:8064: 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
-
+  
   echo 'void somefunc() { };' > conftest.c
   cmd='$CC -rdynamic -c conftest.c'
   if eval $cmd 2>&1 | $EGREP -e -rdynamic >/dev/null ; then
@@ -9775,15 +8074,15 @@
   fi
   eval $gcc_arg_name=$ac_result
   rm -f conftest.*
-
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_rdynamic" >&5
-echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6
+
+echo "$ac_t""$ac_cv_gcc_arg_rdynamic" 1>&6
   if eval test "\$$gcc_arg_name" = "yes"; then
     gcc_rdynamic=yes
   else
     :
-
+    
   fi
 
     if test "$gcc_rdynamic" = "yes"; then
@@ -9792,7 +8091,7 @@
   fi
 
   $php_shtool mkdir -p sapi/apache_hooks
-
+  
   PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/apache_hooks/libphp5.module"
 
 fi
@@ -9802,99 +8101,71 @@
     APXS_EXP=-bE:sapi/apache_hooks/mod_php5.exp
   fi
 
-
-echo "$as_me:$LINENO: checking for member fd in BUFF *" >&5
-echo $ECHO_N "checking for member fd in BUFF *... $ECHO_C" >&6
-if test "${ac_cv_php_fd_in_buff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
+echo "configure:8107: 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
-
+  
   save=$CPPFLAGS
   if test -n "$APXS_INCLUDEDIR"; then
     CPPFLAGS="$CPPFLAGS -I$APXS_INCLUDEDIR"
   else
     CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
   fi
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 8119 "configure"
+#include "confdefs.h"
 #include <httpd.h>
-int
-main ()
-{
+int main() {
 conn_rec *c; int fd = c->client->fd;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:8126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     ac_cv_php_fd_in_buff=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_php_fd_in_buff=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_php_fd_in_buff=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
   CPPFLAGS=$save
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_fd_in_buff" >&5
-echo "${ECHO_T}$ac_cv_php_fd_in_buff" >&6
-if test "$ac_cv_php_fd_in_buff" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_php_fd_in_buff" 1>&6
+if test "$ac_cv_php_fd_in_buff" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define PHP_APACHE_HAVE_CLIENT_FD 1
-_ACEOF
+EOF
 
 fi
 
   INSTALL_IT=$APACHE_HOOKS_INSTALL
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_EXP"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_INCLUDE"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_TARGET"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_LDFLAGS"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_HOOKS_INSTALL"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST STRONGHOLD"
 
 fi
@@ -9906,17 +8177,17 @@
 php_with_caudium=no
 
 
-
 # Check whether --with-caudium or --without-caudium was given.
 if test "${with_caudium+set}" = set; then
   withval="$with_caudium"
   PHP_CAUDIUM=$withval
 else
-
+  
   PHP_CAUDIUM=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_CAUDIUM
 
@@ -9924,8 +8195,8 @@
 
 
 
-echo "$as_me:$LINENO: checking for Caudium support" >&5
-echo $ECHO_N "checking for Caudium support... $ECHO_C" >&6
+echo $ac_n "checking for Caudium support""... $ac_c" 1>&6
+echo "configure:8200: checking for Caudium support" >&5
 
 if test "$PHP_CAUDIUM" != "no"; then
   if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi
@@ -9941,20 +8212,15 @@
   elif test -f $PHP_CAUDIUM/bin/pike; then
     PIKE=$PHP_CAUDIUM/bin/pike
   else
-    { { echo "$as_me:$LINENO: error: Could not find a pike in $PHP_CAUDIUM/bin/" >&5
-echo "$as_me: error: Could not find a pike in $PHP_CAUDIUM/bin/" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Could not find a pike in $PHP_CAUDIUM/bin/" 1>&2; exit 1; }
   fi
   if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then
     PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`
     PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' `
     if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then
-      { { echo "$as_me:$LINENO: error: Failed to figure out Pike module and include directories" >&5
-echo "$as_me: error: Failed to figure out Pike module and include directories" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Failed to figure out Pike module and include directories" 1>&2; exit 1; }
     fi
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
     PIKE=`echo $PIKE | pike -e 'int tries=100;
        string orig,pike=Stdio.File("stdin")->read()-"\n";
        orig=pike;
@@ -9963,33 +8229,33 @@
        while(!catch(pike=readlink(pike)) && tries--)
          ;
        write(combine_path(dirname(orig), pike)); '`
-
+    
   if test "$PIKE_INCLUDE_DIR" != "/usr/include"; then
-
+    
   if test -z "$PIKE_INCLUDE_DIR" || echo "$PIKE_INCLUDE_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PIKE_INCLUDE_DIR
   else
-
+    
     ep_dir="`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PIKE_INCLUDE_DIR\"`"
   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
@@ -9999,8 +8265,8 @@
     else
       PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE`
     fi
-    echo "$as_me:$LINENO: checking for C includes in $PIKE_C_INCLUDE" >&5
-echo $ECHO_N "checking for C includes in $PIKE_C_INCLUDE... $ECHO_C" >&6
+    echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6
+echo "configure:8270: 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 #######
@@ -10023,86 +8289,81 @@
       fi
 
       if test "$PIKE_TEST_VER" = "${PIKE_CMAJOR_VERSION}.${PIKE_CMINOR_VERSION}.${PIKE_CBUILD_VERSION}"; then
-
+        
   if test "$PIKE_C_INCLUDE" != "/usr/include"; then
-
+    
   if test -z "$PIKE_C_INCLUDE" || echo "$PIKE_C_INCLUDE" | grep '^/' >/dev/null ; then
     ai_p=$PIKE_C_INCLUDE
   else
-
+    
     ep_dir="`echo $PIKE_C_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PIKE_C_INCLUDE\"`"
   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
 
         PIKE_INCLUDE_DIR="$PIKE_INCLUDE_DIR, $PIKE_C_INCLUDE"
-        echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+        echo "$ac_t""found" 1>&6
       else
-        echo "$as_me:$LINENO: result: version mismatch" >&5
-echo "${ECHO_T}version mismatch" >&6
+        echo "$ac_t""version mismatch" 1>&6
       fi
     else
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+      echo "$ac_t""not found" 1>&6
     fi
   else
-    { { echo "$as_me:$LINENO: error: Caudium PHP5 requires Pike 7.0 or newer" >&5
-echo "$as_me: error: Caudium PHP5 requires Pike 7.0 or newer" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Caudium PHP5 requires Pike 7.0 or newer" 1>&2; exit 1; }
   fi
-  PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
-
-cat >>confdefs.h <<\_ACEOF
+  PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`   
+  cat >> confdefs.h <<\EOF
 #define HAVE_CAUDIUM 1
-_ACEOF
-
+EOF
 
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES caudium"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=caudium
+  fi  
 
-  PHP_SAPI=caudium
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/caudium"
+  
 
-  case "shared" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS caudium"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10124,14 +8385,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10153,11 +8411,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -10166,9 +8422,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10190,47 +8445,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/caudium in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/caudium"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/caudium/"; ac_bdir="sapi/caudium/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -10243,12 +8471,12 @@
 
   old_IFS=$IFS
   for ac_src in caudium.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -10265,22 +8493,20 @@
   done
 
 
+  
 
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so"
   RESULT="  *** Pike binary used:         $PIKE
   *** Pike include dir(s) used: $PIKE_INCLUDE_DIR
   *** Pike version:             $PIKE_VERSION"
-
+    
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
 fi
-echo "$as_me:$LINENO: result: $RESULT" >&5
-echo "${ECHO_T}$RESULT" >&6
+echo "$ac_t""$RESULT" 1>&6
 
 
 
@@ -10293,11 +8519,12 @@
   enableval="$enable_cli"
   PHP_CLI=$enableval
 else
-
+  
   PHP_CLI=yes
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_CLI
 
@@ -10305,123 +8532,44 @@
 
 
 
-echo "$as_me:$LINENO: checking for CLI build" >&5
-echo $ECHO_N "checking for CLI build... $ECHO_C" >&6
+echo $ac_n "checking for CLI build""... $ac_c" 1>&6
+echo "configure:8537: checking for CLI build" >&5
 if test "$PHP_CLI" != "no"; then
-
+  
   src=$abs_srcdir/sapi/cli/Makefile.frag
-  ac_srcdir=$abs_srcdir/sapi/cli
-  ac_builddir=sapi/cli
+  ac_srcdir=$ext_srcdir
+  ac_builddir=$ext_builddir
   test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 
-  SAPI_CLI_PATH=sapi/cli/php
-
-  PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CLI_PATH"
-
-
-  case $host_alias in
-  *aix*)
-    if test "$php_build_target" = "shared"; then
-      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-    else
-      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-    fi
-    ;;
-  *darwin*)
-    BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-    ;;
-  *netware*)
-    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
-    ;;
-  *)
-    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-    ;;
-  esac
-  INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
-
-
-  PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CLI"
-
-
-  PHP_VAR_SUBST="$PHP_VAR_SUBST INSTALL_CLI"
-
-
-  PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cli/php.1"
-
-fi
-echo "$as_me:$LINENO: result: $PHP_CLI" >&5
-echo "${ECHO_T}$PHP_CLI" >&6
-
-
-
-php_with_continuity=no
-
-echo "$as_me:$LINENO: checking for Continuity support" >&5
-echo $ECHO_N "checking for Continuity support... $ECHO_C" >&6
-
-# Check whether --with-continuity or --without-continuity was given.
-if test "${with_continuity+set}" = set; then
-  withval="$with_continuity"
-  PHP_CONTINUITY=$withval
-else
-
-  PHP_CONTINUITY=no
-
-
-fi;
-
-ext_output=$PHP_CONTINUITY
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
-
-
-
-
-if test "$PHP_CONTINUITY" != "no"; then
-  if test ! -d $PHP_CONTINUITY; then
-    { { echo "$as_me:$LINENO: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" >&5
-echo "$as_me: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  echo "$as_me:$LINENO: checking for Continuity include files" >&5
-echo $ECHO_N "checking for Continuity include files... $ECHO_C" >&6
-  if test -d $PHP_CONTINUITY/include ; then
-    CAPI_INCLUDE=$PHP_CONTINUITY/include
-    echo "$as_me:$LINENO: result: Continuity Binary Distribution" >&5
-echo "${ECHO_T}Continuity Binary Distribution" >&6
-  else
-    { { echo "$as_me:$LINENO: error: Cannot find your CAPI include files in either DIR/src or DIR/include" >&5
-echo "$as_me: error: Cannot find your CAPI include files in either DIR/src or DIR/include" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
 
+    SAPI_CLI_PATH=sapi/cli/php
 
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "program" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES cli"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=cli
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/cli"
+  
 
-  PHP_SAPI=continuity
 
-  case "shared" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS cli"
 
-  OVERALL_TARGET=php
+  
+    
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10443,14 +8591,157 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
+    install_binaries="install-binaries"
+    install_binary_targets="$install_binary_targets install-cli"
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CLI_OBJS"
 
-  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
-;;
-  shared)
+    
+  case sapi/cli in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "sapi/cli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/sapi/cli/"; ac_bdir="sapi/cli/"; 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 php_cli.c php_cli_readline.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_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_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_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_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
+  *aix*)
+    if test "$php_sapi_module" = "shared"; then
+      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    else
+      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    fi
+    ;;
+  *darwin*)
+    BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    ;;
+  *netware*)
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+    ;;
+  *)
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    ;;
+  esac
+
+    PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
+  
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_EXECUTABLE"
+
+
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CLI_PATH"
+
+  
+  PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CLI"
+
+
+  
+  PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cli/php.1"
+
+fi
+echo "$ac_t""$PHP_CLI" 1>&6
 
-  OVERALL_TARGET=php
+
+
+php_with_continuity=no
+
+echo $ac_n "checking for Continuity support""... $ac_c" 1>&6
+echo "configure:8686: checking for Continuity support" >&5
+# Check whether --with-continuity or --without-continuity was given.
+if test "${with_continuity+set}" = set; then
+  withval="$with_continuity"
+  PHP_CONTINUITY=$withval
+else
+  
+  PHP_CONTINUITY=no
+  
+
+fi
+
+
+ext_output=$PHP_CONTINUITY
+echo "$ac_t""$ext_output" 1>&6
+
+
+
+
+if test "$PHP_CONTINUITY" != "no"; then
+  if test ! -d $PHP_CONTINUITY; 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:8710: 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
+  else
+    { echo "configure: error: Cannot find your CAPI include files in either DIR/src or DIR/include" 1>&2; exit 1; }
+  fi
+
+  
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES continuity"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
++--------------------------------------------------------------------+
+|                        *** ATTENTION ***                           |
+|                                                                    |
+| You've configured multiple SAPIs to be build. You can build only   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
++--------------------------------------------------------------------+
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=continuity
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/continuity"
+  
+
+
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS continuity"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10472,22 +8763,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
-  php_c_pre=$shared_c_pre
-  php_c_meta=$shared_c_meta
-  php_c_post=$shared_c_post
-  php_cxx_pre=$shared_cxx_pre
-  php_cxx_meta=$shared_cxx_meta
-  php_cxx_post=$shared_cxx_post
-  php_lo=$shared_lo
+  php_sapi_module=static
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10509,13 +8789,19 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
-  OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
+  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
+  php_sapi_module=shared
+  
+  php_c_pre=$shared_c_pre
+  php_c_meta=$shared_c_meta
+  php_c_post=$shared_c_post
+  php_cxx_pre=$shared_cxx_pre
+  php_cxx_meta=$shared_cxx_meta
+  php_cxx_post=$shared_cxx_post
+  php_lo=$shared_lo
 ;;
-  program)
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10537,19 +8823,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
+  OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/continuity in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/continuity"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/continuity/"; ac_bdir="sapi/continuity/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -10562,12 +8849,12 @@
 
   old_IFS=$IFS
   for ac_src in capi.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -10584,50 +8871,48 @@
   done
 
 
+  
 
-
+  
   if test "$CAPI_INCLUDE" != "/usr/include"; then
-
+    
   if test -z "$CAPI_INCLUDE" || echo "$CAPI_INCLUDE" | grep '^/' >/dev/null ; then
     ai_p=$CAPI_INCLUDE
   else
-
+    
     ep_dir="`echo $CAPI_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$CAPI_INCLUDE\"`"
   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
 
-
+  
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_CONTINUITY 1
-_ACEOF
+EOF
 
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_CONTINUITY/lib/"
 fi
@@ -10643,11 +8928,12 @@
   enableval="$enable_embed"
   PHP_EMBED=$enableval
 else
-
+  
   PHP_EMBED=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_EMBED
 
@@ -10655,8 +8941,8 @@
 
 
 
-echo "$as_me:$LINENO: checking for embedded SAPI library support" >&5
-echo $ECHO_N "checking for embedded SAPI library support... $ECHO_C" >&6
+echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6
+echo "configure:8946: checking for embedded SAPI library support" >&5
 
 if test "$PHP_EMBED" != "no"; then
   case "$PHP_EMBED" in
@@ -10673,33 +8959,34 @@
       ;;
   esac
   if test "$PHP_EMBED_TYPE" != "no"; then
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    
+  if test "$PHP_EMBED_TYPE" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES embed"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=embed
+  fi  
 
-  PHP_SAPI=embed
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/embed"
+  
 
-  case "$PHP_EMBED_TYPE" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS embed"
+
+  
+    case "$PHP_EMBED_TYPE" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10721,14 +9008,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10750,11 +9034,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -10763,9 +9045,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -10787,47 +9068,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/embed in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/embed"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/embed/"; ac_bdir="sapi/embed/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -10840,12 +9094,12 @@
 
   old_IFS=$IFS
   for ac_src in php_embed.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -10862,31 +9116,30 @@
   done
 
 
+  
 
-
-
+    
+  
     for header_file in sapi/embed/php_embed.h; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
+    done 
+  
 
   fi
-  echo "$as_me:$LINENO: result: $PHP_EMBED_TYPE" >&5
-echo "${ECHO_T}$PHP_EMBED_TYPE" >&6
+  echo "$ac_t""$PHP_EMBED_TYPE" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
@@ -10900,11 +9153,12 @@
   enableval="$enable_fpm"
   PHP_FPM=$enableval
 else
-
+  
   PHP_FPM=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_FPM
 
@@ -10941,1429 +9195,467 @@
 
 
 
-echo "$as_me:$LINENO: checking for FPM build" >&5
-echo $ECHO_N "checking for FPM build... $ECHO_C" >&6
+echo $ac_n "checking for FPM build""... $ac_c" 1>&6
+echo "configure:9200: checking for FPM build" >&5
 if test "$PHP_FPM" != "no"; then
-  echo "$as_me:$LINENO: result: $PHP_FPM" >&5
-echo "${ECHO_T}$PHP_FPM" >&6
-
-  echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
+  echo "$ac_t""$PHP_FPM" 1>&6
 
-
-
-
-
-for ac_func in setenv clearenv setproctitle
+  
+  for ac_func in setenv clearenv setproctitle
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:9208: 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 9213 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:9236: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
 
-  echo "$as_me:$LINENO: checking for library containing socket" >&5
-echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6
-if test "${ac_cv_search_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_socket=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  
+echo $ac_n "checking for library containing socket""... $ac_c" 1>&6
+echo "configure:9263: 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
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_socket="no"
+cat > conftest.$ac_ext <<EOF
+#line 9270 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char socket ();
-int
-main ()
-{
-socket ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+    builtin and then its argument prototype would still apply.  */
+char socket();
+
+int main() {
+socket()
+; return 0; }
+EOF
+if { (eval echo configure:9281: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_socket" = no; then
-  for ac_lib in socket; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+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 9292 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char socket ();
-int
-main ()
-{
-socket ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_socket="-l$ac_lib"
+    builtin and then its argument prototype would still apply.  */
+char socket();
+
+int main() {
+socket()
+; return 0; }
+EOF
+if { (eval echo configure:9303: \"$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
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
-echo "${ECHO_T}$ac_cv_search_socket" >&6
-if test "$ac_cv_search_socket" != no; then
-  test "$ac_cv_search_socket" = "none required" || LIBS="$ac_cv_search_socket $LIBS"
-
+rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"
 fi
 
-  echo "$as_me:$LINENO: checking for library containing inet_addr" >&5
-echo $ECHO_N "checking for library containing inet_addr... $ECHO_C" >&6
-if test "${ac_cv_search_inet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_inet_addr=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+echo "$ac_t""$ac_cv_search_socket" 1>&6
+if test "$ac_cv_search_socket" != "no"; then
+  test "$ac_cv_search_socket" = "none required" || LIBS="$ac_cv_search_socket $LIBS"
+  
+else :
+  
+fi
+  
+echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6
+echo "configure:9325: 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
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_inet_addr="no"
+cat > conftest.$ac_ext <<EOF
+#line 9332 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char inet_addr ();
-int
-main ()
-{
-inet_addr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+    builtin and then its argument prototype would still apply.  */
+char inet_addr();
+
+int main() {
+inet_addr()
+; return 0; }
+EOF
+if { (eval echo configure:9343: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_inet_addr" = no; then
-  for ac_lib in nsl; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+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 9354 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char inet_addr ();
-int
-main ()
-{
-inet_addr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_inet_addr="-l$ac_lib"
+    builtin and then its argument prototype would still apply.  */
+char inet_addr();
+
+int main() {
+inet_addr()
+; return 0; }
+EOF
+if { (eval echo configure:9365: \"$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
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-LIBS=$ac_func_search_save_LIBS
+rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_inet_addr" >&5
-echo "${ECHO_T}$ac_cv_search_inet_addr" >&6
-if test "$ac_cv_search_inet_addr" != no; then
-  test "$ac_cv_search_inet_addr" = "none required" || LIBS="$ac_cv_search_inet_addr $LIBS"
 
+echo "$ac_t""$ac_cv_search_inet_addr" 1>&6
+if test "$ac_cv_search_inet_addr" != "no"; then
+  test "$ac_cv_search_inet_addr" = "none required" || LIBS="$ac_cv_search_inet_addr $LIBS"
+  
+else :
+  
 fi
 
-
-
-
-
-
-
-
-for ac_header in errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h
+  for ac_hdr in errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9390: 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
-  eval "$as_ac_Header=\$ac_header_preproc"
+  cat > conftest.$ac_ext <<EOF
+#line 9395 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9400: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
-
-
-
-for ac_header in sys/select.h sys/socket.h sys/time.h
+  for ac_hdr in sys/select.h sys/socket.h sys/time.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9430: 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 9435 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9440: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
-
-
-for ac_header in arpa/inet.h netinet/in.h
+  for ac_hdr in arpa/inet.h netinet/in.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9470: 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 9475 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9480: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
-
-for ac_header in sysexits.h
+  for ac_hdr in sysexits.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9510: 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 9515 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9520: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 
+  
+  echo $ac_n "checking for prctl""... $ac_c" 1>&6
+echo "configure:9549: checking for prctl" >&5
 
-  echo "$as_me:$LINENO: checking for prctl" >&5
-echo $ECHO_N "checking for prctl... $ECHO_C" >&6
-
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- #include <sys/prctl.h>
-int
-main ()
-{
+  cat > conftest.$ac_ext <<EOF
+#line 9552 "configure"
+#include "confdefs.h"
+ #include <sys/prctl.h> 
+int main() {
 prctl(0, 0, 0, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:9559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+    cat >> confdefs.h <<\EOF
 #define HAVE_PRCTL 1
-_ACEOF
-
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+EOF
 
+    echo "$ac_t""yes" 1>&6
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    echo "$ac_t""no" 1>&6
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
 
+  
   have_clock_gettime=no
 
-  echo "$as_me:$LINENO: checking for clock_gettime" >&5
-echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+  echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6
+echo "configure:9582: checking for clock_gettime" >&5
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- #include <time.h>
-int
-main ()
-{
+  cat > conftest.$ac_ext <<EOF
+#line 9585 "configure"
+#include "confdefs.h"
+ #include <time.h> 
+int main() {
 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
     have_clock_gettime=yes
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+    echo "$ac_t""yes" 1>&6
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    echo "$ac_t""no" 1>&6
+  
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 
   if test "$have_clock_gettime" = "no"; then
-    echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
-echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+    echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6
+echo "configure:9610: checking for clock_gettime in -lrt" >&5
 
     SAVED_LIBS="$LIBS"
     LIBS="$LIBS -lrt"
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- #include <time.h>
-int
-main ()
-{
+    cat > conftest.$ac_ext <<EOF
+#line 9616 "configure"
+#include "confdefs.h"
+ #include <time.h> 
+int main() {
 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:9623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
       have_clock_gettime=yes
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+      echo "$ac_t""yes" 1>&6
+    
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
       LIBS="$SAVED_LIBS"
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
   fi
 
   if test "$have_clock_gettime" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_CLOCK_GETTIME 1
-_ACEOF
+EOF
 
   fi
 
   have_clock_get_time=no
 
   if test "$have_clock_gettime" = "no"; then
-    echo "$as_me:$LINENO: checking for clock_get_time" >&5
-echo $ECHO_N "checking for clock_get_time... $ECHO_C" >&6
+    echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6
+echo "configure:9652: checking for clock_get_time" >&5
 
     if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9658 "configure"
+#include "confdefs.h"
  #include <mach/mach.h>
       #include <mach/clock.h>
       #include <mach/mach_error.h>
@@ -12384,126 +9676,77 @@
 
         return 0;
       }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+    
+EOF
+if { (eval echo configure:9682: \"$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
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+      echo "$ac_t""yes" 1>&6
+    
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
   fi
 
   if test "$have_clock_get_time" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_CLOCK_GET_TIME 1
-_ACEOF
+EOF
 
   fi
 
-
+  
   have_ptrace=no
   have_broken_ptrace=no
 
-  echo "$as_me:$LINENO: checking for ptrace" >&5
-echo $ECHO_N "checking for ptrace... $ECHO_C" >&6
+  echo $ac_n "checking for ptrace""... $ac_c" 1>&6
+echo "configure:9713: checking for ptrace" >&5
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 9716 "configure"
+#include "confdefs.h"
 
     #include <sys/types.h>
-    #include <sys/ptrace.h>
-int
-main ()
-{
+    #include <sys/ptrace.h> 
+int main() {
 ptrace(0, 0, (void *) 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:9725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     have_ptrace=yes
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+    echo "$ac_t""yes" 1>&6
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    echo "$ac_t""no" 1>&6
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
   if test "$have_ptrace" = "yes"; then
-    echo "$as_me:$LINENO: checking whether ptrace works" >&5
-echo $ECHO_N "checking whether ptrace works... $ECHO_C" >&6
+    echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6
+echo "configure:9743: checking whether ptrace works" >&5
 
     if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9749 "configure"
+#include "confdefs.h"
 
       #include <unistd.h>
       #include <signal.h>
@@ -12571,117 +9814,74 @@
           return 0;
         }
       }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+    
+EOF
+if { (eval echo configure:9820: \"$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
+    
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
       have_ptrace=no
       have_broken_ptrace=yes
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
   fi
 
   if test "$have_ptrace" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_PTRACE 1
-_ACEOF
+EOF
 
   fi
 
   have_mach_vm_read=no
 
   if test "$have_broken_ptrace" = "yes"; then
-    echo "$as_me:$LINENO: checking for mach_vm_read" >&5
-echo $ECHO_N "checking for mach_vm_read... $ECHO_C" >&6
+    echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6
+echo "configure:9851: checking for mach_vm_read" >&5
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    cat > conftest.$ac_ext <<EOF
+#line 9854 "configure"
+#include "confdefs.h"
  #include <mach/mach.h>
       #include <mach/mach_vm.h>
-
-int
-main ()
-{
+    
+int main() {
 
       mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+    
+; return 0; }
+EOF
+if { (eval echo configure:9865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
       have_mach_vm_read=yes
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+      echo "$ac_t""yes" 1>&6
+    
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
   fi
 
   if test "$have_mach_vm_read" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_MACH_VM_READ 1
-_ACEOF
+EOF
 
   fi
 
@@ -12696,22 +9896,15 @@
   fi
 
   if test -n "$proc_mem_file" ; then
-    echo "$as_me:$LINENO: checking for proc mem file" >&5
-echo $ECHO_N "checking for proc mem file... $ECHO_C" >&6
-
+    echo $ac_n "checking for proc mem file""... $ac_c" 1>&6
+echo "configure:9901: checking for proc mem file" >&5
+  
     if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9907 "configure"
+#include "confdefs.h"
 
       #define _GNU_SOURCE
       #define _FILE_OFFSET_BITS 64
@@ -12738,471 +9931,271 @@
         close(fd);
         return v1 != v2;
       }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      echo "$as_me:$LINENO: result: $proc_mem_file" >&5
-echo "${ECHO_T}$proc_mem_file" >&6
-
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+    
+EOF
+if { (eval echo configure:9937: \"$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
+    
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
       proc_mem_file=""
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
-  fi
 
+  fi
+  
   if test -n "$proc_mem_file"; then
-
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define PROC_MEM_FILE "$proc_mem_file"
-_ACEOF
+EOF
 
   fi
-
+  
   fpm_trace_type=""
 
   if test "$have_ptrace" = "yes"; then
     fpm_trace_type=ptrace
-
+    
   elif test -n "$proc_mem_file"; then
     fpm_trace_type=pread
-
+    
   elif test "$have_mach_vm_read" = "yes" ; then
     fpm_trace_type=mach
-
+    
   else
-    { echo "$as_me:$LINENO: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5
-echo "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;}
+    echo "configure: warning: FPM Trace - ptrace, pread, or mach: could not be found" 1>&2    
   fi
+  
 
+  
+  echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6
+echo "configure:9981: checking if gcc supports __sync_bool_compare_and_swap" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 9983 "configure"
+#include "confdefs.h"
 
-
-  echo "$as_me:$LINENO: checking if gcc supports __sync_bool_compare_and_swap" >&5
-echo $ECHO_N "checking if gcc supports __sync_bool_compare_and_swap... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
+int main() {
 
     int variable = 1;
     return (__sync_bool_compare_and_swap(&variable, 1, 2)
            && __sync_add_and_fetch(&variable, 1)) ? 1 : 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+  
+; return 0; }
+EOF
+if { (eval echo configure:9994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+    echo "$ac_t""yes" 1>&6
+    cat >> confdefs.h <<\EOF
 #define HAVE_BUILTIN_ATOMIC 1
-_ACEOF
-
+EOF
 
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    echo "$ac_t""no" 1>&6
+  
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
+rm -f conftest*
 
+  
   have_lq=no
 
-  echo "$as_me:$LINENO: checking for TCP_INFO" >&5
-echo $ECHO_N "checking for TCP_INFO... $ECHO_C" >&6
+  echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6
+echo "configure:10017: checking for TCP_INFO" >&5
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- #include <netinet/tcp.h>
-int
-main ()
-{
+  cat > conftest.$ac_ext <<EOF
+#line 10020 "configure"
+#include "confdefs.h"
+ #include <netinet/tcp.h> 
+int main() {
 struct tcp_info ti; int x = TCP_INFO;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:10027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     have_lq=tcp_info
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+    echo "$ac_t""yes" 1>&6
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    echo "$ac_t""no" 1>&6
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
   if test "$have_lq" = "tcp_info"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LQ_TCP_INFO 1
-_ACEOF
+EOF
 
   fi
 
   if test "$have_lq" = "no" ; then
-    echo "$as_me:$LINENO: checking for SO_LISTENQLEN" >&5
-echo $ECHO_N "checking for SO_LISTENQLEN... $ECHO_C" >&6
+    echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6
+echo "configure:10052: checking for SO_LISTENQLEN" >&5
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- #include <sys/socket.h>
-int
-main ()
-{
+    cat > conftest.$ac_ext <<EOF
+#line 10055 "configure"
+#include "confdefs.h"
+ #include <sys/socket.h> 
+int main() {
 int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:10062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
       have_lq=so_listenq
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+      echo "$ac_t""yes" 1>&6
+    
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
     if test "$have_lq" = "tcp_info"; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_LQ_SO_LISTENQ 1
-_ACEOF
+EOF
 
     fi
   fi
 
+	
+	echo $ac_n "checking for sysconf""... $ac_c" 1>&6
+echo "configure:10088: checking for sysconf" >&5
 
-	echo "$as_me:$LINENO: checking for sysconf" >&5
-echo $ECHO_N "checking for sysconf... $ECHO_C" >&6
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- #include <unistd.h>
-int
-main ()
-{
+	cat > conftest.$ac_ext <<EOF
+#line 10091 "configure"
+#include "confdefs.h"
+ #include <unistd.h> 
+int main() {
 sysconf(_SC_CLK_TCK);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:10098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+		cat >> confdefs.h <<\EOF
 #define HAVE_SYSCONF 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+EOF
 
+		echo "$ac_t""yes" 1>&6
+	
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		echo "$ac_t""no" 1>&6
+	
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
 
-	echo "$as_me:$LINENO: checking for times" >&5
-echo $ECHO_N "checking for times... $ECHO_C" >&6
+	
+	echo $ac_n "checking for times""... $ac_c" 1>&6
+echo "configure:10119: checking for times" >&5
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- #include <sys/times.h>
-int
-main ()
-{
+	cat > conftest.$ac_ext <<EOF
+#line 10122 "configure"
+#include "confdefs.h"
+ #include <sys/times.h> 
+int main() {
 struct tms t; times(&t);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:10129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+		cat >> confdefs.h <<\EOF
 #define HAVE_TIMES 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+EOF
 
+		echo "$ac_t""yes" 1>&6
+	
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		echo "$ac_t""no" 1>&6
+	
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-	echo "$as_me:$LINENO: checking for kqueue" >&5
-echo $ECHO_N "checking for kqueue... $ECHO_C" >&6
+rm -f conftest*
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+	
+	echo $ac_n "checking for kqueue""... $ac_c" 1>&6
+echo "configure:10150: checking for kqueue" >&5
 
+	cat > conftest.$ac_ext <<EOF
+#line 10153 "configure"
+#include "confdefs.h"
+ 
 		#include <sys/types.h>
 		#include <sys/event.h>
 		#include <sys/time.h>
-
-int
-main ()
-{
+	
+int main() {
 
 		int kfd;
 		struct kevent k;
 		kfd = kqueue();
 		/* 0 -> STDIN_FILENO */
 		EV_SET(&k, 0, EVFILT_READ , EV_ADD | EV_CLEAR, 0, 0, NULL);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+	
+; return 0; }
+EOF
+if { (eval echo configure:10170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+		cat >> confdefs.h <<\EOF
 #define HAVE_KQUEUE 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+EOF
 
+		echo "$ac_t""yes" 1>&6
+	
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		echo "$ac_t""no" 1>&6
+	
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-	echo "$as_me:$LINENO: checking for port framework" >&5
-echo $ECHO_N "checking for port framework... $ECHO_C" >&6
+rm -f conftest*
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+	
+	echo $ac_n "checking for port framework""... $ac_c" 1>&6
+echo "configure:10191: checking for port framework" >&5
 
+	cat > conftest.$ac_ext <<EOF
+#line 10194 "configure"
+#include "confdefs.h"
+ 
 		#include <port.h>
-
-int
-main ()
-{
+	
+int main() {
 
 		int port;
 
@@ -13210,70 +10203,40 @@
 		if (port < 0) {
 			return 1;
 		}
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+	
+; return 0; }
+EOF
+if { (eval echo configure:10210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+		cat >> confdefs.h <<\EOF
 #define HAVE_PORT 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+EOF
 
+		echo "$ac_t""yes" 1>&6
+	
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		echo "$ac_t""no" 1>&6
+	
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-	echo "$as_me:$LINENO: checking for /dev/poll" >&5
-echo $ECHO_N "checking for /dev/poll... $ECHO_C" >&6
+rm -f conftest*
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+	
+	echo $ac_n "checking for /dev/poll""... $ac_c" 1>&6
+echo "configure:10231: checking for /dev/poll" >&5
 
+	cat > conftest.$ac_ext <<EOF
+#line 10234 "configure"
+#include "confdefs.h"
+ 
 		#include <stdio.h>
 		#include <sys/devpoll.h>
-
-int
-main ()
-{
+	
+int main() {
 
 		int n, dp;
 		struct dvpoll dvp;
@@ -13282,69 +10245,39 @@
 		dvp.dp_nfds = 0;
 		dvp.dp_timeout = 0;
 		n = ioctl(dp, DP_POLL, &dvp)
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+	
+; return 0; }
+EOF
+if { (eval echo configure:10252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+		cat >> confdefs.h <<\EOF
 #define HAVE_DEVPOLL 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+EOF
 
+		echo "$ac_t""yes" 1>&6
+	
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		echo "$ac_t""no" 1>&6
+	
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-	echo "$as_me:$LINENO: checking for epoll" >&5
-echo $ECHO_N "checking for epoll... $ECHO_C" >&6
+rm -f conftest*
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+	
+	echo $ac_n "checking for epoll""... $ac_c" 1>&6
+echo "configure:10273: checking for epoll" >&5
 
+	cat > conftest.$ac_ext <<EOF
+#line 10276 "configure"
+#include "confdefs.h"
+ 
 		#include <sys/epoll.h>
-
-int
-main ()
-{
+	
+int main() {
 
 		int epollfd;
 		struct epoll_event e;
@@ -13365,69 +10298,39 @@
 		if (epoll_wait(epollfd, &e, 1, 1) < 0) {
 			return 1;
 		}
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+	
+; return 0; }
+EOF
+if { (eval echo configure:10305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+		cat >> confdefs.h <<\EOF
 #define HAVE_EPOLL 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+EOF
 
+		echo "$ac_t""yes" 1>&6
+	
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		echo "$ac_t""no" 1>&6
+	
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-	echo "$as_me:$LINENO: checking for poll" >&5
-echo $ECHO_N "checking for poll... $ECHO_C" >&6
+rm -f conftest*
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+	
+	echo $ac_n "checking for poll""... $ac_c" 1>&6
+echo "configure:10326: checking for poll" >&5
 
+	cat > conftest.$ac_ext <<EOF
+#line 10329 "configure"
+#include "confdefs.h"
+ 
 		#include <poll.h>
-
-int
-main ()
-{
+	
+int main() {
 
 		struct pollfd fds[2];
 
@@ -13438,64 +10341,36 @@
 		fds[1].events = POLLIN;
 
 		 poll(fds, 2, 1);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+	
+; return 0; }
+EOF
+if { (eval echo configure:10348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+		cat >> confdefs.h <<\EOF
 #define HAVE_POLL 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+EOF
 
+		echo "$ac_t""yes" 1>&6
+	
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		echo "$ac_t""no" 1>&6
+	
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-	echo "$as_me:$LINENO: checking for select" >&5
-echo $ECHO_N "checking for select... $ECHO_C" >&6
+rm -f conftest*
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+	
+	echo $ac_n "checking for select""... $ac_c" 1>&6
+echo "configure:10369: checking for select" >&5
 
+	cat > conftest.$ac_ext <<EOF
+#line 10372 "configure"
+#include "confdefs.h"
+ 
 		/* According to POSIX.1-2001 */
 		#include <sys/select.h>
 
@@ -13503,10 +10378,8 @@
 		#include <sys/time.h>
 		#include <sys/types.h>
 		#include <unistd.h>
-
-int
-main ()
-{
+	
+int main() {
 
 		fd_set fds;
 		struct timeval t;
@@ -13516,69 +10389,44 @@
 		/* 0 -> STDIN_FILENO */
 		FD_SET(0, &fds);
 		select(FD_SETSIZE, &fds, NULL, NULL, &t);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+	
+; return 0; }
+EOF
+if { (eval echo configure:10396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+		cat >> confdefs.h <<\EOF
 #define HAVE_SELECT 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+EOF
 
+		echo "$ac_t""yes" 1>&6
+	
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		echo "$ac_t""no" 1>&6
+	
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
 
 
+  
 php_with_fpm_user=nobody
 
 
-
 # Check whether --with-fpm-user or --without-fpm-user was given.
 if test "${with_fpm_user+set}" = set; then
   withval="$with_fpm_user"
   PHP_FPM_USER=$withval
 else
-
+  
   PHP_FPM_USER=nobody
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_FPM_USER
 
@@ -13586,21 +10434,21 @@
 
 
 
-
+  
 php_with_fpm_group=nobody
 
 
-
 # Check whether --with-fpm-group or --without-fpm-group was given.
 if test "${with_fpm_group+set}" = set; then
   withval="$with_fpm_group"
   PHP_FPM_GROUP=$withval
 else
-
+  
   PHP_FPM_GROUP=nobody
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_FPM_GROUP
 
@@ -13620,73 +10468,77 @@
     php_fpm_group="$PHP_FPM_GROUP"
   fi
 
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_user"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_group"
 
-
+  
 
   php_fpm_sysconfdir=`eval echo $sysconfdir`
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_sysconfdir"
 
-
+  
 
   php_fpm_localstatedir=`eval echo $localstatedir`
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_localstatedir"
 
-
+  
 
   php_fpm_prefix=`eval echo $prefix`
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_prefix"
 
+  
 
 
-
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_FPM_USER "$php_fpm_user"
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_FPM_GROUP "$php_fpm_group"
-_ACEOF
+EOF
 
 
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/fpm/fpm"
+  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/fpm/fpm/events"
+  
 
+  
   PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html"
 
-
+  
   src=$abs_srcdir/sapi/fpm/Makefile.frag
-  ac_srcdir=$abs_srcdir/sapi/fpm
-  ac_builddir=sapi/fpm
+  ac_srcdir=$ext_srcdir
+  ac_builddir=$ext_builddir
   test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 
 
   SAPI_FPM_PATH=sapi/fpm/php-fpm
-
-  PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_FPM_PATH"
-
-
+  
   if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then
     PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"
   fi
-
+  
   PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
-
-  INSTALL_IT=":"
+ 
   PHP_FPM_FILES="fpm/fastcgi.c \
     fpm/fpm.c \
     fpm/fpm_children.c \
@@ -13718,127 +10570,32 @@
 		fpm/events/port.c \
   "
 
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "program" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES fpm"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-  PHP_SAPI=fpm
-
-  case "program" in
-  static)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
-
-  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
-;;
-  shared)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
-
-  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
-  php_c_pre=$shared_c_pre
-  php_c_meta=$shared_c_meta
-  php_c_post=$shared_c_post
-  php_cxx_pre=$shared_cxx_pre
-  php_cxx_meta=$shared_cxx_meta
-  php_cxx_post=$shared_cxx_post
-  php_lo=$shared_lo
-;;
-  bundle)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=fpm
+  fi  
 
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/fpm"
+  
 
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
 
-  php_build_target=program
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS fpm"
 
-  OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET='$(SAPI_FPM_PATH)'
+  
+    
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -13860,19 +10617,19 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-;;
-  esac
-
-
+    install_binaries="install-binaries"
+    install_binary_targets="$install_binary_targets install-fpm"
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_FPM_OBJS"
 
+    
   case sapi/fpm in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/fpm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/fpm/"; ac_bdir="sapi/fpm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -13885,13 +10642,13 @@
 
   old_IFS=$IFS
   for ac_src in $PHP_FPM_FILES $PHP_FPM_TRACE_FILES; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
+      
+      PHP_FPM_OBJS="$PHP_FPM_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
         *.c) ac_comp="$b_c_pre $PHP_FPM_CFLAGS $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -13906,50 +10663,52 @@
 EOF
   done
 
-
+  
 
 
   case $host_alias in
       *aix*)
-        BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+        BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
         ;;
       *darwin*)
-        BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+        BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
       ;;
       *)
-        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
       ;;
   esac
 
+  
+  PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_FPM_PATH"
 
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_FPM"
 
+
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
 
 php_with_isapi=no
 
-echo "$as_me:$LINENO: checking for Zeus ISAPI support" >&5
-echo $ECHO_N "checking for Zeus ISAPI support... $ECHO_C" >&6
-
+echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6
+echo "configure:10698: 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"
   PHP_ISAPI=$withval
 else
-
+  
   PHP_ISAPI=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ISAPI
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -13960,80 +10719,76 @@
   else
     ZEUSPATH=$PHP_ISAPI
   fi
-  test -f "$ZEUSPATH/web/include/httpext.h" || { { echo "$as_me:$LINENO: error: Unable to find httpext.h in $ZEUSPATH/web/include" >&5
-echo "$as_me: error: Unable to find httpext.h in $ZEUSPATH/web/include" >&2;}
-   { (exit 1); exit 1; }; }
-
+  test -f "$ZEUSPATH/web/include/httpext.h" || { echo "configure: error: Unable to find httpext.h in $ZEUSPATH/web/include" 1>&2; exit 1; }
+  
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define WITH_ZEUS 1
-_ACEOF
-
+EOF
 
+  
   if test "$ZEUSPATH/web/include" != "/usr/include"; then
-
+    
   if test -z "$ZEUSPATH/web/include" || echo "$ZEUSPATH/web/include" | grep '^/' >/dev/null ; then
     ai_p=$ZEUSPATH/web/include
   else
-
+    
     ep_dir="`echo $ZEUSPATH/web/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ZEUSPATH/web/include\"`"
   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 "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES isapi"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=isapi
+  fi  
 
-  PHP_SAPI=isapi
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/isapi"
+  
 
-  case "shared" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS isapi"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -14055,14 +10810,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -14084,11 +10836,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -14097,9 +10847,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -14121,47 +10870,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/isapi in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/isapi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/isapi/"; ac_bdir="sapi/isapi/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -14174,12 +10896,12 @@
 
   old_IFS=$IFS
   for ac_src in php5isapi.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -14196,30 +10918,31 @@
   done
 
 
+  
 
   INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/"
 fi
 
 
 
-echo "$as_me:$LINENO: checking for LiteSpeed support" >&5
-echo $ECHO_N "checking for LiteSpeed support... $ECHO_C" >&6
+echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6
+echo "configure:10930: checking for LiteSpeed support" >&5
 
 
 php_with_litespeed=no
 
 
-
 # Check whether --with-litespeed or --without-litespeed was given.
 if test "${with_litespeed+set}" = set; then
   withval="$with_litespeed"
   PHP_LITESPEED=$withval
 else
-
+  
   PHP_LITESPEED=no
   test "$PHP_ENABLE_ALL" && PHP_LITESPEED=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -14249,137 +10972,39 @@
 
 
 if test "$PHP_LITESPEED" != "no"; then
-
+  
   src=$abs_srcdir/sapi/litespeed/Makefile.frag
   ac_srcdir=$abs_srcdir/sapi/litespeed
   ac_builddir=sapi/litespeed
   test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 
   SAPI_LITESPEED_PATH=sapi/litespeed/php
-
-  PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_LITESPEED_PATH"
-
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "program" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES litespeed"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-  PHP_SAPI=litespeed
-
-  case "program" in
-  static)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
-
-  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
-;;
-  shared)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
-
-  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
-  php_c_pre=$shared_c_pre
-  php_c_meta=$shared_c_meta
-  php_c_post=$shared_c_post
-  php_cxx_pre=$shared_cxx_pre
-  php_cxx_meta=$shared_cxx_meta
-  php_cxx_post=$shared_cxx_post
-  php_lo=$shared_lo
-;;
-  bundle)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=litespeed
+  fi  
 
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/litespeed"
+  
 
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
 
-  php_build_target=program
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS litespeed"
 
-  OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET='$(SAPI_LITESPEED_PATH)'
+  
+    
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -14401,19 +11026,19 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-;;
-  esac
-
-
+    install_binaries="install-binaries"
+    install_binary_targets="$install_binary_targets install-litespeed"
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_LITESPEED_OBJS"
 
+    
   case sapi/litespeed in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/litespeed"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/litespeed/"; ac_bdir="sapi/litespeed/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -14426,13 +11051,13 @@
 
   old_IFS=$IFS
   for ac_src in lsapi_main.c lsapilib.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
+      
+      PHP_LITESPEED_OBJS="$PHP_LITESPEED_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
         *.c) ac_comp="$b_c_pre "" $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -14447,51 +11072,52 @@
 EOF
   done
 
-
-
+  
+ 
   INSTALL_IT="@echo \"Installing PHP LiteSpeed into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_LITESPEED_PATH) \$(INSTALL_ROOT)\$(bindir)/lsphp"
   case $host_alias in
   *darwin*)
-    BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+    BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
     ;;
   *cygwin*)
     SAPI_LITESPEED_PATH=sapi/litespeed/php.exe
-    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
     ;;
   *)
-    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
     ;;
   esac
 
+  
+  PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_LITESPEED_PATH"
 
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_LITESPEED"
 
 fi
 
-echo "$as_me:$LINENO: result: $PHP_LITESPEED" >&5
-echo "${ECHO_T}$PHP_LITESPEED" >&6
+echo "$ac_t""$PHP_LITESPEED" 1>&6
 
 
 
 php_with_milter=no
 
-echo "$as_me:$LINENO: checking for Milter support" >&5
-echo $ECHO_N "checking for Milter support... $ECHO_C" >&6
-
+echo $ac_n "checking for Milter support""... $ac_c" 1>&6
+echo "configure:11107: checking for Milter support" >&5
 # Check whether --with-milter or --without-milter was given.
 if test "${with_milter+set}" = set; then
   withval="$with_milter"
   PHP_MILTER=$withval
 else
-
+  
   PHP_MILTER=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_MILTER
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -14504,151 +11130,52 @@
       if test -f /usr/lib/libmilter/libmilter.a ; then
         MILTERPATH=/usr/lib/libmilter
       else
-        { { echo "$as_me:$LINENO: error: Unable to find libmilter.a" >&5
-echo "$as_me: error: Unable to find libmilter.a" >&2;}
-   { (exit 1); exit 1; }; }
+        { echo "configure: error: Unable to find libmilter.a" 1>&2; exit 1; }
       fi
     fi
   else
     MILTERPATH=$PHP_MILTER
   fi
-
+  
   SAPI_MILTER_PATH=sapi/milter/php-milter
-
+  
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
-
+  
   src=$abs_srcdir/sapi/milter/Makefile.frag
   ac_srcdir=$ext_srcdir
   ac_builddir=$ext_builddir
   test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "program" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES milter"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-  PHP_SAPI=milter
-
-  case "program" in
-  static)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
-
-  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
-;;
-  shared)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
-
-  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
-  php_c_pre=$shared_c_pre
-  php_c_meta=$shared_c_meta
-  php_c_post=$shared_c_post
-  php_cxx_pre=$shared_cxx_pre
-  php_cxx_meta=$shared_cxx_meta
-  php_cxx_post=$shared_cxx_post
-  php_lo=$shared_lo
-;;
-  bundle)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=milter
+  fi  
 
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/milter"
+  
 
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
 
-  php_build_target=program
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS milter"
 
-  OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET='$(SAPI_MILTER_PATH)'
+  
+    
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -14670,19 +11197,19 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-;;
-  esac
-
-
+    install_binaries="install-binaries"
+    install_binary_targets="$install_binary_targets install-milter"
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MILTER_OBJS"
 
+    
   case sapi/milter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/milter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/milter/"; ac_bdir="sapi/milter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -14695,13 +11222,13 @@
 
   old_IFS=$IFS
   for ac_src in php_milter.c getopt.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
+      
+      PHP_MILTER_OBJS="$PHP_MILTER_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
         *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -14716,63 +11243,62 @@
 EOF
   done
 
-
-
-
+  
+ 
+  
 
   if test -n "$MILTERPATH"; then
-
+    
   if test "$MILTERPATH" != "/usr/$PHP_LIBDIR" && test "$MILTERPATH" != "/usr/lib"; then
-
+    
   if test -z "$MILTERPATH" || echo "$MILTERPATH" | grep '^/' >/dev/null ; then
     ai_p=$MILTERPATH
   else
-
+    
     ep_dir="`echo $MILTERPATH|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MILTERPATH\"`"
   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 milter in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lmilter $LIBS"
+  *) 
+      LIBS="-lmilter $LIBS" 
    ;;
   esac
 
 
 
 
-  BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
-  INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_MILTER_PATH) \$(bindir)/php-milter"
-
+  BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_MILTER_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_MILTER_PATH"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_MILTER"
 
 fi
@@ -14781,385 +11307,158 @@
 
 php_with_nsapi=no
 
-echo "$as_me:$LINENO: checking for NSAPI support" >&5
-echo $ECHO_N "checking for NSAPI support... $ECHO_C" >&6
-
+echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6
+echo "configure:11312: checking for NSAPI support" >&5
 # Check whether --with-nsapi or --without-nsapi was given.
 if test "${with_nsapi+set}" = set; then
   withval="$with_nsapi"
   PHP_NSAPI=$withval
 else
-
+  
   PHP_NSAPI=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_NSAPI
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_NSAPI" != "no"; then
   if test ! -d $PHP_NSAPI/bin ; then
-    { { echo "$as_me:$LINENO: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" >&5
-echo "$as_me: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: checking for NSAPI include files" >&5
-echo $ECHO_N "checking for NSAPI include files... $ECHO_C" >&6
+  echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6
+echo "configure:11336: checking for NSAPI include files" >&5
   if test -d $PHP_NSAPI/include ; then
     NSAPI_INC_DIR="$PHP_NSAPI/include"
-    echo "$as_me:$LINENO: result: Netscape 3.x / Sun 7.x style" >&5
-echo "${ECHO_T}Netscape 3.x / Sun 7.x style" >&6
-
-for ac_header in $NSAPI_INC_DIR/nsapi.h
+    echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6
+    for ac_hdr in $NSAPI_INC_DIR/nsapi.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11344: 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 11349 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11354: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
     NSAPI_INCLUDE="-I$NSAPI_INC_DIR"
   fi
   if test -d $PHP_NSAPI/plugins/include ; then
     NSAPI_INC_DIR="$PHP_NSAPI/plugins/include"
-    echo "$as_me:$LINENO: result: iPlanet 4.x / Sun 6.x style" >&5
-echo "${ECHO_T}iPlanet 4.x / Sun 6.x style" >&6
-
-for ac_header in $NSAPI_INC_DIR/nsapi.h
+    echo "$ac_t""iPlanet 4.x / Sun 6.x style" 1>&6
+    for ac_hdr in $NSAPI_INC_DIR/nsapi.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11389: 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 11394 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11399: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
     NSAPI_INCLUDE="$NSAPI_INCLUDE -I$NSAPI_INC_DIR"
   fi
   if test -z "$NSAPI_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" >&5
-echo "$as_me: error: Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" 1>&2; exit 1; }
   fi
 
-
+  
   for ac_i in $NSAPI_INCLUDE; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -15168,46 +11467,44 @@
     esac
   done
 
-
+  
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_NSAPI 1
-_ACEOF
-
+EOF
 
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
+  
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES nsapi"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=nsapi
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/nsapi"
+  
 
-  PHP_SAPI=nsapi
 
-  case "shared" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS nsapi"
 
-  OVERALL_TARGET=php
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -15229,14 +11526,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -15258,11 +11552,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -15271,9 +11563,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -15295,47 +11586,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/nsapi in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/nsapi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/nsapi/"; ac_bdir="sapi/nsapi/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -15348,12 +11612,12 @@
 
   old_IFS=$IFS
   for ac_src in nsapi.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -15370,6 +11634,7 @@
   done
 
 
+  
 
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/"
 fi
@@ -15380,104 +11645,99 @@
 
 php_with_phttpd=no
 
-echo "$as_me:$LINENO: checking for PHTTPD support" >&5
-echo $ECHO_N "checking for PHTTPD support... $ECHO_C" >&6
-
+echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6
+echo "configure:11650: checking for PHTTPD support" >&5
 # Check whether --with-phttpd or --without-phttpd was given.
 if test "${with_phttpd+set}" = set; then
   withval="$with_phttpd"
   PHP_PHTTPD=$withval
 else
-
+  
   PHP_PHTTPD=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_PHTTPD
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_PHTTPD" != "no"; then
   if test ! -d $PHP_PHTTPD ; then
-    { { echo "$as_me:$LINENO: error: You did not specify a directory" >&5
-echo "$as_me: error: You did not specify a directory" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You did not specify a directory" 1>&2; exit 1; }
   fi
-
+  
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
-
+  
   if test "$PHP_PHTTPD/include" != "/usr/include"; then
-
+    
   if test -z "$PHP_PHTTPD/include" || echo "$PHP_PHTTPD/include" | grep '^/' >/dev/null ; then
     ai_p=$PHP_PHTTPD/include
   else
-
+    
     ep_dir="`echo $PHP_PHTTPD/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_PHTTPD/include\"`"
   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
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_PHTTPD 1
-_ACEOF
-
+EOF
 
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES phttpd"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=phttpd
+  fi  
 
-  PHP_SAPI=phttpd
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/phttpd"
+  
 
-  case "shared" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS phttpd"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -15499,14 +11759,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -15528,11 +11785,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -15541,9 +11796,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -15565,47 +11819,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/phttpd in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/phttpd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/phttpd/"; ac_bdir="sapi/phttpd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -15618,12 +11845,12 @@
 
   old_IFS=$IFS
   for ac_src in phttpd.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -15640,6 +11867,7 @@
   done
 
 
+  
 
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_PHTTPD/modules/"
 fi
@@ -15649,23 +11877,22 @@
 
 php_with_pi3web=no
 
-echo "$as_me:$LINENO: checking for Pi3Web support" >&5
-echo $ECHO_N "checking for Pi3Web support... $ECHO_C" >&6
-
+echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6
+echo "configure:11882: checking for Pi3Web support" >&5
 # Check whether --with-pi3web or --without-pi3web was given.
 if test "${with_pi3web+set}" = set; then
   withval="$with_pi3web"
   PHP_PI3WEB=$withval
 else
-
+  
   PHP_PI3WEB=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_PI3WEB
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -15676,173 +11903,169 @@
   else
     PI3PATH=$PHP_PI3WEB
   fi
-  test -f "$PI3PATH/PiAPI/PiAPI.h" || { { echo "$as_me:$LINENO: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" >&5
-echo "$as_me: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" >&2;}
-   { (exit 1); exit 1; }; }
-
+  test -f "$PI3PATH/PiAPI/PiAPI.h" || { echo "configure: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" 1>&2; exit 1; }
+  
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define WITH_PI3WEB 1
-_ACEOF
-
+EOF
 
+  
   if test "$PI3PATH/PiAPI" != "/usr/include"; then
-
+    
   if test -z "$PI3PATH/PiAPI" || echo "$PI3PATH/PiAPI" | grep '^/' >/dev/null ; then
     ai_p=$PI3PATH/PiAPI
   else
-
+    
     ep_dir="`echo $PI3PATH/PiAPI|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PI3PATH/PiAPI\"`"
   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 "$PI3PATH/Pi2API" != "/usr/include"; then
-
+    
   if test -z "$PI3PATH/Pi2API" || echo "$PI3PATH/Pi2API" | grep '^/' >/dev/null ; then
     ai_p=$PI3PATH/Pi2API
   else
-
+    
     ep_dir="`echo $PI3PATH/Pi2API|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PI3PATH/Pi2API\"`"
   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 "$PI3PATH/Pi3API" != "/usr/include"; then
-
+    
   if test -z "$PI3PATH/Pi3API" || echo "$PI3PATH/Pi3API" | grep '^/' >/dev/null ; then
     ai_p=$PI3PATH/Pi3API
   else
-
+    
     ep_dir="`echo $PI3PATH/Pi3API|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PI3PATH/Pi3API\"`"
   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 "$PI3PATH/PHP5" != "/usr/include"; then
-
+    
   if test -z "$PI3PATH/PHP5" || echo "$PI3PATH/PHP5" | grep '^/' >/dev/null ; then
     ai_p=$PI3PATH/PHP5
   else
-
+    
     ep_dir="`echo $PI3PATH/PHP5|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PI3PATH/PHP5\"`"
   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 "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES pi3web"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=pi3web
+  fi  
 
-  PHP_SAPI=pi3web
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/pi3web"
+  
 
-  case "shared" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS pi3web"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -15864,14 +12087,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -15893,11 +12113,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -15906,9 +12124,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -15930,47 +12147,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
-;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/pi3web in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/pi3web"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/pi3web/"; ac_bdir="sapi/pi3web/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -15983,12 +12173,12 @@
 
   old_IFS=$IFS
   for ac_src in pi3web_sapi.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -16005,6 +12195,7 @@
   done
 
 
+  
 
   INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/"
 fi
@@ -16015,17 +12206,17 @@
 php_with_roxen=no
 
 
-
 # Check whether --with-roxen or --without-roxen was given.
 if test "${with_roxen+set}" = set; then
   withval="$with_roxen"
   PHP_ROXEN=$withval
 else
-
+  
   PHP_ROXEN=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ROXEN
 
@@ -16036,122 +12227,114 @@
 
 php_enable_roxen_zts=no
 
-echo "$as_me:$LINENO: checking whether Roxen module is build using ZTS" >&5
-echo $ECHO_N "checking whether Roxen module is build using ZTS... $ECHO_C" >&6
+echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6
+echo "configure:12232: 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"
   PHP_ROXEN_ZTS=$enableval
 else
-
+  
   PHP_ROXEN_ZTS=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ROXEN_ZTS
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 RESULT=
-echo "$as_me:$LINENO: checking for Roxen/Pike support" >&5
-echo $ECHO_N "checking for Roxen/Pike support... $ECHO_C" >&6
+echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6
+echo "configure:12253: checking for Roxen/Pike support" >&5
 if test "$PHP_ROXEN" != "no"; then
   if test ! -d $PHP_ROXEN ; then
-    { { echo "$as_me:$LINENO: error: You did not specify a directory" >&5
-echo "$as_me: error: You did not specify a directory" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You did not specify a directory" 1>&2; exit 1; }
   fi
   if test -f $PHP_ROXEN/bin/roxen; then
     PIKE=$PHP_ROXEN/bin/roxen
   elif test -f $PHP_ROXEN/bin/pike; then
     PIKE=$PHP_ROXEN/bin/pike
   else
-    { { echo "$as_me:$LINENO: error: Could not find a pike in $PHP_ROXEN/bin/" >&5
-echo "$as_me: error: Could not find a pike in $PHP_ROXEN/bin/" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Could not find a pike in $PHP_ROXEN/bin/" 1>&2; exit 1; }
   fi
 
   if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then
     PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`
     PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'`
     if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then
-      { { echo "$as_me:$LINENO: error: Failed to figure out Pike module and include directories" >&5
-echo "$as_me: error: Failed to figure out Pike module and include directories" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Failed to figure out Pike module and include directories" 1>&2; exit 1; }
     fi
   else
-    { { echo "$as_me:$LINENO: error: Roxen/PHP requires Pike 0.7.79 or newer" >&5
-echo "$as_me: error: Roxen/PHP requires Pike 0.7.79 or newer" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Roxen/PHP requires Pike 0.7.79 or newer" 1>&2; exit 1; }
   fi
-
-
+   
+  
   if test "$PIKE_INCLUDE_DIR" != "/usr/include"; then
-
+    
   if test -z "$PIKE_INCLUDE_DIR" || echo "$PIKE_INCLUDE_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PIKE_INCLUDE_DIR
   else
-
+    
     ep_dir="`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PIKE_INCLUDE_DIR\"`"
   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
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_ROXEN 1
-_ACEOF
-
+EOF
 
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES roxen"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=roxen
+  fi  
 
-  PHP_SAPI=roxen
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/roxen"
+  
 
-  case "shared" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS roxen"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -16173,14 +12356,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -16202,11 +12382,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -16215,9 +12393,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -16239,47 +12416,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/roxen in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/roxen"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/roxen/"; ac_bdir="sapi/roxen/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -16292,12 +12442,12 @@
 
   old_IFS=$IFS
   for ac_src in roxen.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -16314,6 +12464,7 @@
   done
 
 
+  
 
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP5.so"
   RESULT="yes
@@ -16323,23 +12474,19 @@
   PIKE_INCLUDE_DIR=" -I$PIKE_INCLUDE_DIR "
 
   if test "$PHP_ROXEN_ZTS" != "no"; then
-
+    
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define ROXEN_USE_ZTS 1
-_ACEOF
+EOF
 
   fi
 fi
-echo "$as_me:$LINENO: result: $RESULT" >&5
-echo "${ECHO_T}$RESULT" >&6
+echo "$ac_t""$RESULT" 1>&6
 
 
 
@@ -16347,17 +12494,17 @@
 php_with_thttpd=no
 
 
-
 # Check whether --with-thttpd or --without-thttpd was given.
 if test "${with_thttpd+set}" = set; then
   withval="$with_thttpd"
   PHP_THTTPD=$withval
 else
-
+  
   PHP_THTTPD=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_THTTPD
 
@@ -16365,27 +12512,26 @@
 
 
 
-echo "$as_me:$LINENO: checking for thttpd" >&5
-echo $ECHO_N "checking for thttpd... $ECHO_C" >&6
+echo $ac_n "checking for thttpd""... $ac_c" 1>&6
+echo "configure:12517: checking for thttpd" >&5
 
 if test "$PHP_THTTPD" != "no"; then
   if test ! -d $PHP_THTTPD; then
-    echo "$as_me:$LINENO: result: thttpd directory does not exist ($PHP_THTTPD)" >&5
-echo "${ECHO_T}thttpd directory does not exist ($PHP_THTTPD)" >&6
+    echo "$ac_t""thttpd directory does not exist ($PHP_THTTPD)" 1>&6
   fi
 
-
+  
   if test -z "$PHP_THTTPD" || echo "$PHP_THTTPD" | grep '^/' >/dev/null ; then
     THTTPD=$PHP_THTTPD
   else
-
+    
     ep_dir="`echo $PHP_THTTPD|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     THTTPD="$ep_realdir/`basename \"$PHP_THTTPD\"`"
   fi
 
-
+  
   if grep thttpd.2.21b $PHP_THTTPD/version.h >/dev/null; then
     patch="test -f $THTTPD/php_patched || \
     (cd $THTTPD && patch -p1 < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)"
@@ -16393,20 +12539,18 @@
   elif grep Premium $PHP_THTTPD/version.h >/dev/null; then
     patch=
   else
-    { { echo "$as_me:$LINENO: error: This version only supports thttpd-2.21b and Premium thttpd" >&5
-echo "$as_me: error: This version only supports thttpd-2.21b and Premium thttpd" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: This version only supports thttpd-2.21b and Premium thttpd" 1>&2; exit 1; }
   fi
-
+  
   if test -n "$GCC"; then
-
+        
   gcc_arg_name=ac_cv_gcc_arg_rdynamic
-  echo "$as_me:$LINENO: checking whether $CC supports -rdynamic" >&5
-echo $ECHO_N "checking whether $CC supports -rdynamic... $ECHO_C" >&6
-if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
+echo "configure:12550: 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
-
+  
   echo 'void somefunc() { };' > conftest.c
   cmd='$CC -rdynamic -c conftest.c'
   if eval $cmd 2>&1 | $EGREP -e -rdynamic >/dev/null ; then
@@ -16416,15 +12560,15 @@
   fi
   eval $gcc_arg_name=$ac_result
   rm -f conftest.*
-
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_rdynamic" >&5
-echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6
+
+echo "$ac_t""$ac_cv_gcc_arg_rdynamic" 1>&6
   if eval test "\$$gcc_arg_name" = "yes"; then
     gcc_rdynamic=yes
   else
     :
-
+    
   fi
 
     if test "$gcc_rdynamic" = "yes"; then
@@ -16441,64 +12585,65 @@
     \$(LN_S) $abs_srcdir/sapi/thttpd/php_thttpd.h $abs_builddir/$SAPI_STATIC $THTTPD/;\
     $patch"
   PHP_THTTPD="yes, using $THTTPD"
-
+  
   if test "$THTTPD" != "/usr/include"; then
-
+    
   if test -z "$THTTPD" || echo "$THTTPD" | grep '^/' >/dev/null ; then
     ai_p=$THTTPD
   else
-
+    
     ep_dir="`echo $THTTPD|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THTTPD\"`"
   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 "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES thttpd"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=thttpd
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/thttpd"
+  
 
-  PHP_SAPI=thttpd
 
-  case "static" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS thttpd"
 
-  OVERALL_TARGET=php
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -16520,14 +12665,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -16549,11 +12691,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -16562,9 +12702,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -16586,60 +12725,33 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
 
 fi
-echo "$as_me:$LINENO: result: $PHP_THTTPD" >&5
-echo "${ECHO_T}$PHP_THTTPD" >&6
+echo "$ac_t""$PHP_THTTPD" 1>&6
 
 
 
 php_with_tux=no
 
 
-
 # Check whether --with-tux or --without-tux was given.
 if test "${with_tux+set}" = set; then
   withval="$with_tux"
   PHP_TUX=$withval
 else
-
+  
   PHP_TUX=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_TUX
 
@@ -16647,191 +12759,79 @@
 
 
 
-echo "$as_me:$LINENO: checking for TUX" >&5
-echo $ECHO_N "checking for TUX... $ECHO_C" >&6
+echo $ac_n "checking for TUX""... $ac_c" 1>&6
+echo "configure:12764: checking for TUX" >&5
 if test "$PHP_TUX" != "no"; then
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so"
-
-for ac_header in tuxmodule.h
+  for ac_hdr in tuxmodule.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12771: 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 12776 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12781: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
  :
 else
-  { { echo "$as_me:$LINENO: error: Cannot find tuxmodule.h" >&5
-echo "$as_me: error: Cannot find tuxmodule.h" >&2;}
-   { (exit 1); exit 1; }; }
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Cannot find tuxmodule.h" 1>&2; exit 1; }
 fi
-
 done
 
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+  
+  if test "shared" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES tux"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=tux
+  fi  
 
-  PHP_SAPI=tux
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/tux"
+  
 
-  case "shared" in
-  static)
 
-  OVERALL_TARGET=php
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS tux"
+
+  
+    case "shared" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -16853,14 +12853,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -16882,11 +12879,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -16895,9 +12890,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -16919,47 +12913,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/tux in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/tux"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/tux/"; ac_bdir="sapi/tux/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -16972,12 +12939,12 @@
 
   old_IFS=$IFS
   for ac_src in php_tux.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -16994,12 +12961,11 @@
   done
 
 
+  
 
-  echo "$as_me:$LINENO: result: $PHP_TUX" >&5
-echo "${ECHO_T}$PHP_TUX" >&6
+  echo "$ac_t""$PHP_TUX" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
@@ -17007,17 +12973,17 @@
 php_with_webjames=no
 
 
-
 # Check whether --with-webjames or --without-webjames was given.
 if test "${with_webjames+set}" = set; then
   withval="$with_webjames"
   PHP_WEBJAMES=$withval
 else
-
+  
   PHP_WEBJAMES=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_WEBJAMES
 
@@ -17025,17 +12991,17 @@
 
 
 
-echo "$as_me:$LINENO: checking for webjames" >&5
-echo $ECHO_N "checking for webjames... $ECHO_C" >&6
+echo $ac_n "checking for webjames""... $ac_c" 1>&6
+echo "configure:12996: checking for webjames" >&5
 
 if test "$PHP_WEBJAMES" != "no"; then
-
+  
   if test -z "$PHP_WEBJAMES" || echo "$PHP_WEBJAMES" | grep '^/' >/dev/null ; then
     PHP_WEBJAMES=$PHP_WEBJAMES
   else
-
+    
     ep_dir="`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     PHP_WEBJAMES="$ep_realdir/`basename \"$PHP_WEBJAMES\"`"
   fi
@@ -17044,64 +13010,65 @@
     echo 'PHP_LIBS = -l$abs_srcdir/$SAPI_STATIC \$(PHP_LIBS) \$(EXTRA_LIBS)' > $PHP_WEBJAMES/build/php; \
     echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $PHP_WEBJAMES/build/php; \
     echo 'PHP_CFLAGS = -DPHP \$(COMMON_FLAGS) \$(EXTRA_CFLAGS) -I$abs_srcdir/sapi/webjames' >> $PHP_WEBJAMES/build/php;"
-
+  
   if test "$PHP_WEBJAMES" != "/usr/include"; then
-
+    
   if test -z "$PHP_WEBJAMES" || echo "$PHP_WEBJAMES" | grep '^/' >/dev/null ; then
     ai_p=$PHP_WEBJAMES
   else
-
+    
     ep_dir="`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_WEBJAMES\"`"
   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 "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
+  
+  if test "static" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES webjames"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=webjames
+  fi  
+
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/webjames"
+  
 
-  PHP_SAPI=webjames
 
-  case "static" in
-  static)
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS webjames"
 
-  OVERALL_TARGET=php
+  
+    case "static" in
+    static) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -17123,14 +13090,11 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
+  php_sapi_module=static
 ;;
-  shared)
-
-  OVERALL_TARGET=php
+    shared) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -17152,11 +13116,9 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
+  php_sapi_module=shared
+  
   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
   php_c_post=$shared_c_post
@@ -17165,9 +13127,8 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
-  bundle)
-
-  OVERALL_TARGET=php
+    bundle) 
+  
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -17189,47 +13150,20 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-
   OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
+  php_sapi_module=static
 ;;
-  esac
-
-
-
+    esac
+    install_sapi="install-sapi"
+    
+  
   case sapi/webjames in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/webjames"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/webjames/"; ac_bdir="sapi/webjames/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -17242,12 +13176,12 @@
 
   old_IFS=$IFS
   for ac_src in webjames.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -17264,12 +13198,11 @@
   done
 
 
+  
 
-  echo "$as_me:$LINENO: result: yes, using $PHP_WEBJAMES" >&5
-echo "${ECHO_T}yes, using $PHP_WEBJAMES" >&6
+  echo "$ac_t""yes, using $PHP_WEBJAMES" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
@@ -17282,11 +13215,12 @@
   enableval="$enable_cgi"
   PHP_CGI=$enableval
 else
-
+  
   PHP_CGI=yes
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_CGI
 
@@ -17294,86 +13228,70 @@
 
 
 
-if test "$PHP_SAPI" = "default"; then
-  echo "$as_me:$LINENO: checking whether to build CGI binary" >&5
-echo $ECHO_N "checking whether to build CGI binary... $ECHO_C" >&6
-  if test "$PHP_CGI" != "no"; then
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-    echo "$as_me:$LINENO: checking for socklen_t in sys/socket.h" >&5
-echo $ECHO_N "checking for socklen_t in sys/socket.h... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for CGI build""... $ac_c" 1>&6
+echo "configure:13233: checking for CGI build" >&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:13237: checking for socklen_t in sys/socket.h" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 13239 "configure"
+#include "confdefs.h"
 #include <sys/socket.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "socklen_t" >/dev/null 2>&1; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+  egrep "socklen_t" >/dev/null 2>&1; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+       cat >> confdefs.h <<\EOF
 #define HAVE_SOCKLEN_T 1
-_ACEOF
+EOF
 
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 
 
-    echo "$as_me:$LINENO: checking for sun_len in sys/un.h" >&5
-echo $ECHO_N "checking for sun_len in sys/un.h... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6
+echo "configure:13259: checking for sun_len in sys/un.h" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 13261 "configure"
+#include "confdefs.h"
 #include <sys/un.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sun_len" >/dev/null 2>&1; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+  egrep "sun_len" >/dev/null 2>&1; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+       cat >> confdefs.h <<\EOF
 #define HAVE_SOCKADDR_UN_SUN_LEN 1
-_ACEOF
+EOF
 
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 
 
-    echo "$as_me:$LINENO: checking whether cross-process locking is required by accept()" >&5
-echo $ECHO_N "checking whether cross-process locking is required by accept()... $ECHO_C" >&6
+    echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6
+echo "configure:13281: checking whether cross-process locking is required by accept()" >&5
     case "`uname -sr`" in
-      IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+      IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)	
+        echo "$ac_t""yes" 1>&6
+        cat >> confdefs.h <<\EOF
 #define USE_LOCKING 1
-_ACEOF
+EOF
 
       ;;
       *)
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        echo "$ac_t""no" 1>&6
       ;;
     esac
 
-
+    
   src=$abs_srcdir/sapi/cgi/Makefile.frag
   ac_srcdir=$ext_srcdir
   ac_builddir=$ext_builddir
@@ -17389,131 +13307,32 @@
         ;;
     esac
 
-  PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
-
-
-        INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
-
-  if test "$PHP_SAPI" != "default"; then
-{ { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+        
+  if test "program" = "program"; then
+    PHP_BINARIES="$PHP_BINARIES cgi"
+  elif test "$PHP_SAPI" != "none"; then
+    { echo "configure: error: 
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module and CLI binary at the same time.                   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-  PHP_SAPI=cgi
-
-  case "program" in
-  static)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
-
-  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=static
-;;
-  shared)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
-
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
-
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
-
-  php_build_target=program
-
-  OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
-  php_build_target=shared
-
-  php_c_pre=$shared_c_pre
-  php_c_meta=$shared_c_meta
-  php_c_post=$shared_c_post
-  php_cxx_pre=$shared_cxx_pre
-  php_cxx_meta=$shared_cxx_meta
-  php_cxx_post=$shared_cxx_post
-  php_lo=$shared_lo
-;;
-  bundle)
-
-  OVERALL_TARGET=php
-  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post=
-  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post=
-  php_lo=lo
+" 1>&2; exit 1; }
+  else
+    PHP_SAPI=cgi
+  fi  
 
-  case $with_pic in
-    yes) pic_setting='-prefer-pic';;
-    no)  pic_setting='-prefer-non-pic';;
-  esac
+  
+  
+    BUILD_DIR="$BUILD_DIR sapi/cgi"
+  
 
-  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
-  shared_c_post=
-  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
-  shared_cxx_post=
-  shared_lo=lo
 
-  php_build_target=program
+  PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS cgi"
 
-  OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
-  php_build_target=static
-;;
-  program)
-  OVERALL_TARGET='$(SAPI_CGI_PATH)'
+  
+    
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -17535,19 +13354,19 @@
   shared_cxx_post=
   shared_lo=lo
 
-  php_build_target=program
-;;
-  esac
-
-
+    install_binaries="install-binaries"
+    install_binary_targets="$install_binary_targets install-cgi"
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CGI_OBJS"
 
+    
   case sapi/cgi in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "sapi/cgi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/sapi/cgi/"; ac_bdir="sapi/cgi/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -17560,13 +13379,13 @@
 
   old_IFS=$IFS
   for ac_src in cgi_main.c fastcgi.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
+      
+      PHP_CGI_OBJS="$PHP_CGI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
         *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -17581,46 +13400,55 @@
 EOF
   done
 
-
+  
 
 
     case $host_alias in
       *aix*)
-        BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        if test "$php_sapi_module" = "shared"; then
+          BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        else
+          BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        fi
         ;;
       *darwin*)
-        BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
       ;;
       *)
-        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
       ;;
     esac
 
+        
+  PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
 
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CGI"
 
-
-  elif test "$PHP_CLI" != "no"; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    OVERALL_TARGET=
-    PHP_SAPI=cli
-  else
-    { { echo "$as_me:$LINENO: error: No SAPIs selected." >&5
-echo "$as_me: error: No SAPIs selected." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+else
+  echo "$ac_t""yes" 1>&6
 fi
 
 
 
-echo "$as_me:$LINENO: checking for chosen SAPI module" >&5
-echo $ECHO_N "checking for chosen SAPI module... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $PHP_SAPI" >&5
-echo "${ECHO_T}$PHP_SAPI" >&6
+echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6
+echo "configure:13436: checking for chosen SAPI module" >&5
+echo "$ac_t""$PHP_SAPI" 1>&6
 
-if test "$enable_maintainer_zts" = "yes"; then
+echo $ac_n "checking for executable SAPI binaries""... $ac_c" 1>&6
+echo "configure:13440: checking for executable SAPI binaries" >&5
+if test "$PHP_BINARIES"; then
+  echo "$ac_t""$PHP_BINARIES" 1>&6
+else
+  echo "$ac_t""none" 1>&6
+fi
 
+if test -z "$PHP_INSTALLED_SAPIS"; then
+  { echo "configure: error: Nothing to build." 1>&2; exit 1; }
+fi
+
+if test "$enable_maintainer_zts" = "yes"; then
+  
 if test -n "$ac_cv_pthreads_lib"; then
   LIBS="$LIBS -l$ac_cv_pthreads_lib"
 fi
@@ -17629,14 +13457,12 @@
   CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
 fi
 
-
+  
   if test -z "$host_alias" && test -n "$host"; then
     host_alias=$host
   fi
   if test -z "$host_alias"; then
-    { { echo "$as_me:$LINENO: error: host_alias is not set. Make sure to run config.guess" >&5
-echo "$as_me: error: host_alias is not set. Make sure to run config.guess" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: host_alias is not set. Make sure to run config.guess" 1>&2; exit 1; }
   fi
   case $host_alias in
   *solaris*)
@@ -17662,137 +13488,117 @@
 fi
 
 
-  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  echo "$as_me:$LINENO: result: ${T_MD}Running system checks${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Running system checks${T_ME}" >&6
+
+
+
+
+  echo "$ac_t""" 1>&6
+  echo "$ac_t""${T_MD}Running system checks${T_ME}" 1>&6
 
 
 
   PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
   # Extract the first word of "sendmail", so it can be a program name with args.
 set dummy sendmail; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PROG_SENDMAIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:13505: 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
-  case $PROG_SENDMAIL in
-  [\\/]* | ?:[\\/]*)
+  case "$PROG_SENDMAIL" in
+  /*)
   ac_cv_path_PROG_SENDMAIL="$PROG_SENDMAIL" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_PROG_SENDMAIL="$PROG_SENDMAIL" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$PHP_ALT_PATH"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PROG_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH:$PHP_ALT_PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PROG_SENDMAIL="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   ;;
 esac
 fi
-PROG_SENDMAIL=$ac_cv_path_PROG_SENDMAIL
-
+PROG_SENDMAIL="$ac_cv_path_PROG_SENDMAIL"
 if test -n "$PROG_SENDMAIL"; then
-  echo "$as_me:$LINENO: result: $PROG_SENDMAIL" >&5
-echo "${ECHO_T}$PROG_SENDMAIL" >&6
+  echo "$ac_t""$PROG_SENDMAIL" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PROG_SENDMAIL"
 
 
 
 
-  echo "$as_me:$LINENO: checking whether system uses EBCDIC" >&5
-echo $ECHO_N "checking whether system uses EBCDIC... $ECHO_C" >&6
-if test "${ac_cv_ebcdic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6
+echo "configure:13544: 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
-
+  
   if test "$cross_compiling" = yes; then
-
+  
   ac_cv_ebcdic=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int main(void) {
-  return (unsigned char)'A' != (unsigned char)0xC1;
-}
+  cat > conftest.$ac_ext <<EOF
+#line 13555 "configure"
+#include "confdefs.h"
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main(void) { 
+  return (unsigned char)'A' != (unsigned char)0xC1; 
+} 
 
+EOF
+if { (eval echo configure:13563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
   ac_cv_ebcdic=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_ebcdic=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_ebcdic" >&5
-echo "${ECHO_T}$ac_cv_ebcdic" >&6
-  if test "$ac_cv_ebcdic" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_ebcdic" 1>&6
+  if test "$ac_cv_ebcdic" = "yes"; then
+    cat >> confdefs.h <<\EOF
 #define CHARSET_EBCDIC 1
-_ACEOF
+EOF
 
   fi
 
 
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian_php+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:13591: 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
-
+  
   ac_cv_c_bigendian_php=unknown
   if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian_php=unknown
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 13601 "configure"
+#include "confdefs.h"
 
 int main(void)
 {
@@ -17805,61 +13611,47 @@
     return(1);
   }
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  
+EOF
+if { (eval echo configure:13617: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian_php=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_bigendian_php=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+ 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian_php" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian_php" >&6
- if test $ac_cv_c_bigendian_php = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN
-_ACEOF
+echo "$ac_t""$ac_cv_c_bigendian_php" 1>&6
+ if test $ac_cv_c_bigendian_php = yes; then
+   cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 
+EOF
 
  fi
 
 
 
-  echo "$as_me:$LINENO: checking whether writing to stdout works" >&5
-echo $ECHO_N "checking whether writing to stdout works... $ECHO_C" >&6
-if test "${ac_cv_write_stdout+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6
+echo "configure:13643: 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
-
+  
     if test "$cross_compiling" = yes; then
-
+  
       ac_cv_write_stdout=no
-
+    
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 13654 "configure"
+#include "confdefs.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -17874,43 +13666,32 @@
   n = write(1, TEXT, sizeof(TEXT)-1);
   return (!(n == sizeof(TEXT)-1));
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+    
+EOF
+if { (eval echo configure:13672: \"$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
-
+    
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
       ac_cv_write_stdout=no
-
+    
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_write_stdout" >&5
-echo "${ECHO_T}$ac_cv_write_stdout" >&6
-  if test "$ac_cv_write_stdout" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_write_stdout" 1>&6
+  if test "$ac_cv_write_stdout" = "yes"; then
+    cat >> confdefs.h <<\EOF
 #define PHP_WRITE_STDOUT 1
-_ACEOF
+EOF
 
   fi
 
@@ -17919,37 +13700,37 @@
    CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
    LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 fi
-test -d /usr/ucblib &&
+test -d /usr/ucblib && 
   if test "/usr/ucblib" != "/usr/$PHP_LIBDIR" && test "/usr/ucblib" != "/usr/lib"; then
-
+    
   if test -z "/usr/ucblib" || echo "/usr/ucblib" | grep '^/' >/dev/null ; then
     ai_p=/usr/ucblib
   else
-
+    
     ep_dir="`echo /usr/ucblib|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"/usr/ucblib\"`"
   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
 
 
@@ -17960,353 +13741,200 @@
   unset ac_cv_func_socket
   unset ac_cv_func___socket
   unset found
-
-  echo "$as_me:$LINENO: checking for socket" >&5
-echo $ECHO_N "checking for socket... $ECHO_C" >&6
-if test "${ac_cv_func_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define socket to an innocuous variant, in case <limits.h> declares socket.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define socket innocuous_socket
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char socket (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef socket
-
+  
+  echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "configure:13747: 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 13752 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char socket(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char socket ();
+    builtin and then its argument prototype would still apply.  */
+char socket();
+
+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_socket) || defined (__stub___socket)
 choke me
 #else
-char (*f) () = socket;
-#endif
-#ifdef __cplusplus
-}
+socket();
 #endif
 
-int
-main ()
-{
-return f != socket;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_socket=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
-echo "${ECHO_T}$ac_cv_func_socket" >&6
-if test $ac_cv_func_socket = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:13775: \"$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
-   echo "$as_me:$LINENO: checking for __socket" >&5
-echo $ECHO_N "checking for __socket... $ECHO_C" >&6
-if test "${ac_cv_func___socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __socket to an innocuous variant, in case <limits.h> declares __socket.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __socket innocuous___socket
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_socket=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __socket""... $ac_c" 1>&6
+echo "configure:13793: 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 13798 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __socket (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __socket
-
+    which can conflict with char __socket(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __socket ();
+    builtin and then its argument prototype would still apply.  */
+char __socket();
+
+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___socket) || defined (__stub_____socket)
 choke me
 #else
-char (*f) () = __socket;
-#endif
-#ifdef __cplusplus
-}
+__socket();
 #endif
 
-int
-main ()
-{
-return f != __socket;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___socket=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___socket" >&5
-echo "${ECHO_T}$ac_cv_func___socket" >&6
-if test $ac_cv_func___socket = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:13821: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___socket=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__socket`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_SOCKET 1
-_ACEOF
+EOF
 
     ac_cv_func_socket=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_socket_socket
   unset ac_cv_lib_socket___socket
   unset found
-  echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:13859: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 13867 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char socket ();
-int
-main ()
-{
-socket ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_socket=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
-if test $ac_cv_lib_socket_socket = yes; then
+    builtin and then its argument prototype would still apply.  */
+char socket();
+
+int main() {
+socket()
+; return 0; }
+EOF
+if { (eval echo configure:13878: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __socket in -lsocket" >&5
-echo $ECHO_N "checking for __socket in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket___socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6
+echo "configure:13898: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 13906 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __socket ();
-int
-main ()
-{
-__socket ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket___socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket___socket=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___socket" >&6
-if test $ac_cv_lib_socket___socket = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __socket();
+
+int main() {
+__socket()
+; return 0; }
+EOF
+if { (eval echo configure:13917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -18316,422 +13944,254 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 13949 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:13953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case socket in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsocket $LIBS"
+  *) 
+      LIBS="-lsocket $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_SOCKET 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBSOCKET 1
-_ACEOF
+EOF
 
     ac_cv_func_socket=yes
   else
-
+    
   :
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
   unset ac_cv_func_socketpair
   unset ac_cv_func___socketpair
   unset found
-
-  echo "$as_me:$LINENO: checking for socketpair" >&5
-echo $ECHO_N "checking for socketpair... $ECHO_C" >&6
-if test "${ac_cv_func_socketpair+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define socketpair to an innocuous variant, in case <limits.h> declares socketpair.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define socketpair innocuous_socketpair
-
+  
+  echo $ac_n "checking for socketpair""... $ac_c" 1>&6
+echo "configure:14004: 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 14009 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char socketpair (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef socketpair
-
+    which can conflict with char socketpair(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char socketpair ();
+    builtin and then its argument prototype would still apply.  */
+char socketpair();
+
+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_socketpair) || defined (__stub___socketpair)
 choke me
 #else
-char (*f) () = socketpair;
-#endif
-#ifdef __cplusplus
-}
+socketpair();
 #endif
 
-int
-main ()
-{
-return f != socketpair;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_socketpair=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_socketpair=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_socketpair" >&5
-echo "${ECHO_T}$ac_cv_func_socketpair" >&6
-if test $ac_cv_func_socketpair = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:14032: \"$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
-   echo "$as_me:$LINENO: checking for __socketpair" >&5
-echo $ECHO_N "checking for __socketpair... $ECHO_C" >&6
-if test "${ac_cv_func___socketpair+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __socketpair to an innocuous variant, in case <limits.h> declares __socketpair.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __socketpair innocuous___socketpair
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_socketpair=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'socketpair`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __socketpair""... $ac_c" 1>&6
+echo "configure:14050: 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 14055 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __socketpair (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __socketpair
-
+    which can conflict with char __socketpair(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __socketpair ();
+    builtin and then its argument prototype would still apply.  */
+char __socketpair();
+
+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___socketpair) || defined (__stub_____socketpair)
 choke me
 #else
-char (*f) () = __socketpair;
-#endif
-#ifdef __cplusplus
-}
+__socketpair();
 #endif
 
-int
-main ()
-{
-return f != __socketpair;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___socketpair=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___socketpair=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___socketpair" >&5
-echo "${ECHO_T}$ac_cv_func___socketpair" >&6
-if test $ac_cv_func___socketpair = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:14078: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___socketpair=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__socketpair`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_SOCKETPAIR 1
-_ACEOF
+EOF
 
     ac_cv_func_socketpair=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_socket_socketpair
   unset ac_cv_lib_socket___socketpair
   unset found
-  echo "$as_me:$LINENO: checking for socketpair in -lsocket" >&5
-echo $ECHO_N "checking for socketpair in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_socketpair+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6
+echo "configure:14116: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 14124 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char socketpair ();
-int
-main ()
-{
-socketpair ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_socketpair=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_socketpair=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socketpair" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socketpair" >&6
-if test $ac_cv_lib_socket_socketpair = yes; then
+    builtin and then its argument prototype would still apply.  */
+char socketpair();
+
+int main() {
+socketpair()
+; return 0; }
+EOF
+if { (eval echo configure:14135: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __socketpair in -lsocket" >&5
-echo $ECHO_N "checking for __socketpair in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket___socketpair+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6
+echo "configure:14155: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 14163 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __socketpair ();
-int
-main ()
-{
-__socketpair ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket___socketpair=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket___socketpair=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___socketpair" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___socketpair" >&6
-if test $ac_cv_lib_socket___socketpair = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __socketpair();
+
+int main() {
+__socketpair()
+; return 0; }
+EOF
+if { (eval echo configure:14174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -18741,422 +14201,254 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 14206 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:14210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case socket in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsocket $LIBS"
+  *) 
+      LIBS="-lsocket $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_SOCKETPAIR 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBSOCKET 1
-_ACEOF
+EOF
 
     ac_cv_func_socketpair=yes
   else
-
+    
   :
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
   unset ac_cv_func_htonl
   unset ac_cv_func___htonl
   unset found
-
-  echo "$as_me:$LINENO: checking for htonl" >&5
-echo $ECHO_N "checking for htonl... $ECHO_C" >&6
-if test "${ac_cv_func_htonl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define htonl to an innocuous variant, in case <limits.h> declares htonl.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define htonl innocuous_htonl
-
+  
+  echo $ac_n "checking for htonl""... $ac_c" 1>&6
+echo "configure:14261: 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 14266 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char htonl (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef htonl
-
+    which can conflict with char htonl(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char htonl ();
+    builtin and then its argument prototype would still apply.  */
+char htonl();
+
+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_htonl) || defined (__stub___htonl)
 choke me
 #else
-char (*f) () = htonl;
-#endif
-#ifdef __cplusplus
-}
+htonl();
 #endif
 
-int
-main ()
-{
-return f != htonl;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_htonl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_htonl=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_htonl" >&5
-echo "${ECHO_T}$ac_cv_func_htonl" >&6
-if test $ac_cv_func_htonl = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:14289: \"$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
-   echo "$as_me:$LINENO: checking for __htonl" >&5
-echo $ECHO_N "checking for __htonl... $ECHO_C" >&6
-if test "${ac_cv_func___htonl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __htonl to an innocuous variant, in case <limits.h> declares __htonl.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __htonl innocuous___htonl
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_htonl=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'htonl`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __htonl""... $ac_c" 1>&6
+echo "configure:14307: 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 14312 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __htonl (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __htonl
-
+    which can conflict with char __htonl(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __htonl ();
+    builtin and then its argument prototype would still apply.  */
+char __htonl();
+
+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___htonl) || defined (__stub_____htonl)
 choke me
 #else
-char (*f) () = __htonl;
-#endif
-#ifdef __cplusplus
-}
+__htonl();
 #endif
 
-int
-main ()
-{
-return f != __htonl;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___htonl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___htonl=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___htonl" >&5
-echo "${ECHO_T}$ac_cv_func___htonl" >&6
-if test $ac_cv_func___htonl = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:14335: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___htonl=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__htonl`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_HTONL 1
-_ACEOF
+EOF
 
     ac_cv_func_htonl=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_socket_htonl
   unset ac_cv_lib_socket___htonl
   unset found
-  echo "$as_me:$LINENO: checking for htonl in -lsocket" >&5
-echo $ECHO_N "checking for htonl in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_htonl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6
+echo "configure:14373: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 14381 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char htonl ();
-int
-main ()
-{
-htonl ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_htonl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_htonl=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_htonl" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_htonl" >&6
-if test $ac_cv_lib_socket_htonl = yes; then
+    builtin and then its argument prototype would still apply.  */
+char htonl();
+
+int main() {
+htonl()
+; return 0; }
+EOF
+if { (eval echo configure:14392: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __htonl in -lsocket" >&5
-echo $ECHO_N "checking for __htonl in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket___htonl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6
+echo "configure:14412: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 14420 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __htonl ();
-int
-main ()
-{
-__htonl ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket___htonl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket___htonl=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___htonl" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___htonl" >&6
-if test $ac_cv_lib_socket___htonl = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __htonl();
+
+int main() {
+__htonl()
+; return 0; }
+EOF
+if { (eval echo configure:14431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -19166,425 +14458,254 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 14463 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:14467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case socket in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsocket $LIBS"
+  *) 
+      LIBS="-lsocket $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_HTONL 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBSOCKET 1
-_ACEOF
+EOF
 
     ac_cv_func_htonl=yes
   else
-
+    
   :
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
   unset ac_cv_func_gethostname
   unset ac_cv_func___gethostname
   unset found
-
-  echo "$as_me:$LINENO: checking for gethostname" >&5
-echo $ECHO_N "checking for gethostname... $ECHO_C" >&6
-if test "${ac_cv_func_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gethostname to an innocuous variant, in case <limits.h> declares gethostname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostname innocuous_gethostname
-
+  
+  echo $ac_n "checking for gethostname""... $ac_c" 1>&6
+echo "configure:14518: 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 14523 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef gethostname
-
+    which can conflict with char gethostname(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostname ();
+    builtin and then its argument prototype would still apply.  */
+char gethostname();
+
+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_gethostname) || defined (__stub___gethostname)
 choke me
 #else
-char (*f) () = gethostname;
-#endif
-#ifdef __cplusplus
-}
+gethostname();
 #endif
 
-int
-main ()
-{
-return f != gethostname;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_gethostname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_gethostname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostname" >&6
-if test $ac_cv_func_gethostname = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:14546: \"$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
-   echo "$as_me:$LINENO: checking for __gethostname" >&5
-echo $ECHO_N "checking for __gethostname... $ECHO_C" >&6
-if test "${ac_cv_func___gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __gethostname to an innocuous variant, in case <limits.h> declares __gethostname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __gethostname innocuous___gethostname
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_gethostname=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
+echo "configure:14564: 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 14569 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __gethostname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __gethostname
-
+    which can conflict with char __gethostname(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __gethostname ();
+    builtin and then its argument prototype would still apply.  */
+char __gethostname();
+
+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___gethostname) || defined (__stub_____gethostname)
 choke me
 #else
-char (*f) () = __gethostname;
-#endif
-#ifdef __cplusplus
-}
+__gethostname();
 #endif
 
-int
-main ()
-{
-return f != __gethostname;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___gethostname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___gethostname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___gethostname" >&5
-echo "${ECHO_T}$ac_cv_func___gethostname" >&6
-if test $ac_cv_func___gethostname = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:14592: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___gethostname=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__gethostname`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
-cat >> confdefs.h <<\EOF
-#define SUHOSIN_PATCH 1
-EOF
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_GETHOSTNAME 1
-_ACEOF
+EOF
 
     ac_cv_func_gethostname=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_nsl_gethostname
   unset ac_cv_lib_nsl___gethostname
   unset found
-  echo "$as_me:$LINENO: checking for gethostname in -lnsl" >&5
-echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
+echo "configure:14630: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 14638 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostname ();
-int
-main ()
-{
-gethostname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_gethostname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_gethostname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
-if test $ac_cv_lib_nsl_gethostname = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gethostname();
+
+int main() {
+gethostname()
+; return 0; }
+EOF
+if { (eval echo configure:14649: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __gethostname in -lnsl" >&5
-echo $ECHO_N "checking for __gethostname in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl___gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
+echo "configure:14669: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 14677 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __gethostname ();
-int
-main ()
-{
-__gethostname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl___gethostname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl___gethostname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl___gethostname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl___gethostname" >&6
-if test $ac_cv_lib_nsl___gethostname = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __gethostname();
+
+int main() {
+__gethostname()
+; return 0; }
+EOF
+if { (eval echo configure:14688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -19594,422 +14715,254 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 14720 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:14724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case nsl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lnsl $LIBS"
+  *) 
+      LIBS="-lnsl $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GETHOSTNAME 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBNSL 1
-_ACEOF
+EOF
 
     ac_cv_func_gethostname=yes
   else
-
+    
   :
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
   unset ac_cv_func_gethostbyaddr
   unset ac_cv_func___gethostbyaddr
   unset found
-
-  echo "$as_me:$LINENO: checking for gethostbyaddr" >&5
-echo $ECHO_N "checking for gethostbyaddr... $ECHO_C" >&6
-if test "${ac_cv_func_gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gethostbyaddr to an innocuous variant, in case <limits.h> declares gethostbyaddr.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostbyaddr innocuous_gethostbyaddr
-
+  
+  echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
+echo "configure:14775: 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 14780 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyaddr (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef gethostbyaddr
-
+    which can conflict with char gethostbyaddr(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostbyaddr ();
+    builtin and then its argument prototype would still apply.  */
+char gethostbyaddr();
+
+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_gethostbyaddr) || defined (__stub___gethostbyaddr)
 choke me
 #else
-char (*f) () = gethostbyaddr;
-#endif
-#ifdef __cplusplus
-}
+gethostbyaddr();
 #endif
 
-int
-main ()
-{
-return f != gethostbyaddr;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_gethostbyaddr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_gethostbyaddr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyaddr" >&6
-if test $ac_cv_func_gethostbyaddr = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:14803: \"$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
-   echo "$as_me:$LINENO: checking for __gethostbyaddr" >&5
-echo $ECHO_N "checking for __gethostbyaddr... $ECHO_C" >&6
-if test "${ac_cv_func___gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __gethostbyaddr to an innocuous variant, in case <limits.h> declares __gethostbyaddr.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __gethostbyaddr innocuous___gethostbyaddr
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_gethostbyaddr=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'gethostbyaddr`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6
+echo "configure:14821: 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 14826 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __gethostbyaddr (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __gethostbyaddr
-
+    which can conflict with char __gethostbyaddr(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __gethostbyaddr ();
+    builtin and then its argument prototype would still apply.  */
+char __gethostbyaddr();
+
+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___gethostbyaddr) || defined (__stub_____gethostbyaddr)
 choke me
 #else
-char (*f) () = __gethostbyaddr;
-#endif
-#ifdef __cplusplus
-}
+__gethostbyaddr();
 #endif
 
-int
-main ()
-{
-return f != __gethostbyaddr;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___gethostbyaddr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___gethostbyaddr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_func___gethostbyaddr" >&6
-if test $ac_cv_func___gethostbyaddr = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:14849: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___gethostbyaddr=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__gethostbyaddr`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_GETHOSTBYADDR 1
-_ACEOF
+EOF
 
     ac_cv_func_gethostbyaddr=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_nsl_gethostbyaddr
   unset ac_cv_lib_nsl___gethostbyaddr
   unset found
-  echo "$as_me:$LINENO: checking for gethostbyaddr in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyaddr in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
+echo "configure:14887: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 14895 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostbyaddr ();
-int
-main ()
-{
-gethostbyaddr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_gethostbyaddr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_gethostbyaddr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyaddr" >&6
-if test $ac_cv_lib_nsl_gethostbyaddr = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gethostbyaddr();
+
+int main() {
+gethostbyaddr()
+; return 0; }
+EOF
+if { (eval echo configure:14906: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __gethostbyaddr in -lnsl" >&5
-echo $ECHO_N "checking for __gethostbyaddr in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl___gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6
+echo "configure:14926: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 14934 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __gethostbyaddr ();
-int
-main ()
-{
-__gethostbyaddr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl___gethostbyaddr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl___gethostbyaddr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl___gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl___gethostbyaddr" >&6
-if test $ac_cv_lib_nsl___gethostbyaddr = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __gethostbyaddr();
+
+int main() {
+__gethostbyaddr()
+; return 0; }
+EOF
+if { (eval echo configure:14945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -20019,422 +14972,254 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 14977 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:14981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case nsl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lnsl $LIBS"
+  *) 
+      LIBS="-lnsl $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GETHOSTBYADDR 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBNSL 1
-_ACEOF
+EOF
 
     ac_cv_func_gethostbyaddr=yes
   else
-
+    
   :
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
   unset ac_cv_func_yp_get_default_domain
   unset ac_cv_func___yp_get_default_domain
   unset found
-
-  echo "$as_me:$LINENO: checking for yp_get_default_domain" >&5
-echo $ECHO_N "checking for yp_get_default_domain... $ECHO_C" >&6
-if test "${ac_cv_func_yp_get_default_domain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define yp_get_default_domain to an innocuous variant, in case <limits.h> declares yp_get_default_domain.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define yp_get_default_domain innocuous_yp_get_default_domain
-
+  
+  echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6
+echo "configure:15032: 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 15037 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char yp_get_default_domain (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef yp_get_default_domain
-
+    which can conflict with char yp_get_default_domain(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char yp_get_default_domain ();
+    builtin and then its argument prototype would still apply.  */
+char yp_get_default_domain();
+
+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_yp_get_default_domain) || defined (__stub___yp_get_default_domain)
 choke me
 #else
-char (*f) () = yp_get_default_domain;
-#endif
-#ifdef __cplusplus
-}
+yp_get_default_domain();
 #endif
 
-int
-main ()
-{
-return f != yp_get_default_domain;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_yp_get_default_domain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_yp_get_default_domain=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_yp_get_default_domain" >&5
-echo "${ECHO_T}$ac_cv_func_yp_get_default_domain" >&6
-if test $ac_cv_func_yp_get_default_domain = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:15060: \"$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
-   echo "$as_me:$LINENO: checking for __yp_get_default_domain" >&5
-echo $ECHO_N "checking for __yp_get_default_domain... $ECHO_C" >&6
-if test "${ac_cv_func___yp_get_default_domain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __yp_get_default_domain to an innocuous variant, in case <limits.h> declares __yp_get_default_domain.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __yp_get_default_domain innocuous___yp_get_default_domain
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_yp_get_default_domain=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'yp_get_default_domain`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6
+echo "configure:15078: 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 15083 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __yp_get_default_domain (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __yp_get_default_domain
-
+    which can conflict with char __yp_get_default_domain(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __yp_get_default_domain ();
+    builtin and then its argument prototype would still apply.  */
+char __yp_get_default_domain();
+
+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___yp_get_default_domain) || defined (__stub_____yp_get_default_domain)
 choke me
 #else
-char (*f) () = __yp_get_default_domain;
-#endif
-#ifdef __cplusplus
-}
+__yp_get_default_domain();
 #endif
 
-int
-main ()
-{
-return f != __yp_get_default_domain;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___yp_get_default_domain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___yp_get_default_domain=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___yp_get_default_domain" >&5
-echo "${ECHO_T}$ac_cv_func___yp_get_default_domain" >&6
-if test $ac_cv_func___yp_get_default_domain = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:15106: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___yp_get_default_domain=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__yp_get_default_domain`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_YP_GET_DEFAULT_DOMAIN 1
-_ACEOF
+EOF
 
     ac_cv_func_yp_get_default_domain=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_nsl_yp_get_default_domain
   unset ac_cv_lib_nsl___yp_get_default_domain
   unset found
-  echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
-echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
+echo "configure:15144: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 15152 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char yp_get_default_domain ();
-int
-main ()
-{
-yp_get_default_domain ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_yp_get_default_domain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_yp_get_default_domain=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6
-if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
+    builtin and then its argument prototype would still apply.  */
+char yp_get_default_domain();
+
+int main() {
+yp_get_default_domain()
+; return 0; }
+EOF
+if { (eval echo configure:15163: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __yp_get_default_domain in -lnsl" >&5
-echo $ECHO_N "checking for __yp_get_default_domain in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl___yp_get_default_domain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6
+echo "configure:15183: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 15191 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __yp_get_default_domain ();
-int
-main ()
-{
-__yp_get_default_domain ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl___yp_get_default_domain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl___yp_get_default_domain=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl___yp_get_default_domain" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl___yp_get_default_domain" >&6
-if test $ac_cv_lib_nsl___yp_get_default_domain = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __yp_get_default_domain();
+
+int main() {
+__yp_get_default_domain()
+; return 0; }
+EOF
+if { (eval echo configure:15202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -20444,69 +15229,54 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 15234 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:15238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case nsl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lnsl $LIBS"
+  *) 
+      LIBS="-lnsl $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_YP_GET_DEFAULT_DOMAIN 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBNSL 1
-_ACEOF
+EOF
 
     ac_cv_func_yp_get_default_domain=yes
   else
-
+    
   :
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
@@ -20514,353 +15284,200 @@
   unset ac_cv_func_dlopen
   unset ac_cv_func___dlopen
   unset found
-
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
+  
+  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+echo "configure:15290: 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 15295 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
+    which can conflict with char dlopen(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+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_dlopen) || defined (__stub___dlopen)
 choke me
 #else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
+dlopen();
 #endif
 
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:15318: \"$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
-   echo "$as_me:$LINENO: checking for __dlopen" >&5
-echo $ECHO_N "checking for __dlopen... $ECHO_C" >&6
-if test "${ac_cv_func___dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __dlopen to an innocuous variant, in case <limits.h> declares __dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __dlopen innocuous___dlopen
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dlopen=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __dlopen""... $ac_c" 1>&6
+echo "configure:15336: 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 15341 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __dlopen
-
+    which can conflict with char __dlopen(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dlopen ();
+    builtin and then its argument prototype would still apply.  */
+char __dlopen();
+
+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___dlopen) || defined (__stub_____dlopen)
 choke me
 #else
-char (*f) () = __dlopen;
-#endif
-#ifdef __cplusplus
-}
+__dlopen();
 #endif
 
-int
-main ()
-{
-return f != __dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___dlopen" >&5
-echo "${ECHO_T}$ac_cv_func___dlopen" >&6
-if test $ac_cv_func___dlopen = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:15364: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___dlopen=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__dlopen`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_DLOPEN 1
-_ACEOF
+EOF
 
     ac_cv_func_dlopen=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_dl_dlopen
   unset ac_cv_lib_dl___dlopen
   unset found
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:15402: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 15410 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:15421: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dlopen in -ldl" >&5
-echo $ECHO_N "checking for __dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl___dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:15441: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 15449 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dlopen ();
-int
-main ()
-{
-__dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl___dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl___dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl___dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl___dlopen" >&6
-if test $ac_cv_lib_dl___dlopen = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dlopen();
+
+int main() {
+__dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:15460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -20870,150 +15487,107 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 15492 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:15496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case dl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ldl $LIBS"
+  *) 
+      LIBS="-ldl $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DLOPEN 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBDL 1
-_ACEOF
+EOF
 
     ac_cv_func_dlopen=yes
   else
-
+    
   :
 
   fi
-
+  
  ;;
-
+  
   esac
 
 if test "$ac_cv_func_dlopen" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBDL 1
-_ACEOF
+EOF
 
 fi
-
-echo "$as_me:$LINENO: checking for sin in -lm" >&5
-echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6
-if test "${ac_cv_lib_m_sin+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
+echo "configure:15548: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 15556 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char sin ();
-int
-main ()
-{
-sin ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_m_sin=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_m_sin=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5
-echo "${ECHO_T}$ac_cv_lib_m_sin" >&6
-if test $ac_cv_lib_m_sin = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+    builtin and then its argument prototype would still apply.  */
+char sin();
+
+int main() {
+sin()
+; return 0; }
+EOF
+if { (eval echo configure:15567: \"$ac_link\") 1>&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
+    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
 
   LIBS="-lm $LIBS"
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
 
@@ -21021,353 +15595,200 @@
   unset ac_cv_func_inet_aton
   unset ac_cv_func___inet_aton
   unset found
-
-  echo "$as_me:$LINENO: checking for inet_aton" >&5
-echo $ECHO_N "checking for inet_aton... $ECHO_C" >&6
-if test "${ac_cv_func_inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define inet_aton to an innocuous variant, in case <limits.h> declares inet_aton.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define inet_aton innocuous_inet_aton
-
+  
+  echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
+echo "configure:15601: 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 15606 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char inet_aton (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef inet_aton
-
+    which can conflict with char inet_aton(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char inet_aton ();
+    builtin and then its argument prototype would still apply.  */
+char inet_aton();
+
+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_inet_aton) || defined (__stub___inet_aton)
 choke me
 #else
-char (*f) () = inet_aton;
-#endif
-#ifdef __cplusplus
-}
+inet_aton();
 #endif
 
-int
-main ()
-{
-return f != inet_aton;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_inet_aton=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_inet_aton=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton" >&5
-echo "${ECHO_T}$ac_cv_func_inet_aton" >&6
-if test $ac_cv_func_inet_aton = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:15629: \"$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
-   echo "$as_me:$LINENO: checking for __inet_aton" >&5
-echo $ECHO_N "checking for __inet_aton... $ECHO_C" >&6
-if test "${ac_cv_func___inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __inet_aton to an innocuous variant, in case <limits.h> declares __inet_aton.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __inet_aton innocuous___inet_aton
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __inet_aton (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __inet_aton
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_inet_aton=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6
+echo "configure:15647: 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 15652 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char __inet_aton(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __inet_aton ();
+    builtin and then its argument prototype would still apply.  */
+char __inet_aton();
+
+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___inet_aton) || defined (__stub_____inet_aton)
 choke me
 #else
-char (*f) () = __inet_aton;
-#endif
-#ifdef __cplusplus
-}
+__inet_aton();
 #endif
 
-int
-main ()
-{
-return f != __inet_aton;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___inet_aton=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___inet_aton=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___inet_aton" >&5
-echo "${ECHO_T}$ac_cv_func___inet_aton" >&6
-if test $ac_cv_func___inet_aton = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:15675: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___inet_aton=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__inet_aton`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_INET_ATON 1
-_ACEOF
+EOF
 
     ac_cv_func_inet_aton=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_resolv_inet_aton
   unset ac_cv_lib_resolv___inet_aton
   unset found
-  echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5
-echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
+echo "configure:15713: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 15721 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char inet_aton ();
-int
-main ()
-{
-inet_aton ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv_inet_aton=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv_inet_aton=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_inet_aton" >&6
-if test $ac_cv_lib_resolv_inet_aton = yes; then
+    builtin and then its argument prototype would still apply.  */
+char inet_aton();
+
+int main() {
+inet_aton()
+; return 0; }
+EOF
+if { (eval echo configure:15732: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __inet_aton in -lresolv" >&5
-echo $ECHO_N "checking for __inet_aton in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv___inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6
+echo "configure:15752: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 15760 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __inet_aton ();
-int
-main ()
-{
-__inet_aton ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv___inet_aton=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv___inet_aton=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___inet_aton" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___inet_aton" >&6
-if test $ac_cv_lib_resolv___inet_aton = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __inet_aton();
+
+int main() {
+__inet_aton()
+; return 0; }
+EOF
+if { (eval echo configure:15771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -21377,206 +15798,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 15803 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:15807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case resolv in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lresolv $LIBS"
+  *) 
+      LIBS="-lresolv $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_INET_ATON 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBRESOLV 1
-_ACEOF
+EOF
 
     ac_cv_func_inet_aton=yes
   else
-
-
+    
+  
   unset ac_cv_lib_bind_inet_aton
   unset ac_cv_lib_bind___inet_aton
   unset found
-  echo "$as_me:$LINENO: checking for inet_aton in -lbind" >&5
-echo $ECHO_N "checking for inet_aton in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
+echo "configure:15849: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 15857 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char inet_aton ();
-int
-main ()
-{
-inet_aton ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind_inet_aton=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_inet_aton=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_inet_aton" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_inet_aton" >&6
-if test $ac_cv_lib_bind_inet_aton = yes; then
+    builtin and then its argument prototype would still apply.  */
+char inet_aton();
+
+int main() {
+inet_aton()
+; return 0; }
+EOF
+if { (eval echo configure:15868: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __inet_aton in -lbind" >&5
-echo $ECHO_N "checking for __inet_aton in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind___inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
+echo "configure:15888: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 15896 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __inet_aton ();
-int
-main ()
-{
-__inet_aton ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind___inet_aton=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind___inet_aton=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___inet_aton" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___inet_aton" >&6
-if test $ac_cv_lib_bind___inet_aton = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __inet_aton();
+
+int main() {
+__inet_aton()
+; return 0; }
+EOF
+if { (eval echo configure:15907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -21586,146 +15934,101 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 15939 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:15943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case bind in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lbind $LIBS"
+  *) 
+      LIBS="-lbind $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_INET_ATON 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBBIND 1
-_ACEOF
+EOF
 
     ac_cv_func_inet_aton=yes
   else
-
+    
   :
 
   fi
-
+  
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:15994: 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 15999 "configure"
+#include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:16007: \"$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_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+cat > conftest.$ac_ext <<EOF
+#line 16024 "configure"
+#include "confdefs.h"
 #include <string.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
+  egrep "memchr" >/dev/null 2>&1; then
   :
 else
+  rm -rf conftest*
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
@@ -21734,19 +16037,16 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+cat > conftest.$ac_ext <<EOF
+#line 16042 "configure"
+#include "confdefs.h"
 #include <stdlib.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
+  egrep "free" >/dev/null 2>&1; then
   :
 else
+  rm -rf conftest*
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
@@ -21755,459 +16055,171 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 16063 "configure"
+#include "confdefs.h"
 #include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:16074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  cat >> confdefs.h <<\EOF
 #define STDC_HEADERS 1
-_ACEOF
+EOF
 
 fi
 
-
-
-
-
-
 ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+echo "configure:16102: 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 16107 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
-
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-
-ac_header_dirent=$ac_hdr; break
+int main() {
+DIR *dirp = 0;
+; return 0; }
+EOF
+if { (eval echo configure:16115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_header_dirent_$ac_safe=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_dirent_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ ac_header_dirent=$ac_hdr; break
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+echo "configure:16140: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldir  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 16148 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
-  for ac_lib in dir; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    builtin and then its argument prototype would still apply.  */
+char opendir();
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="-l$ac_lib"
-break
+int main() {
+opendir()
+; return 0; }
+EOF
+if { (eval echo configure:16159: \"$ac_link\") 1>&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 "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+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
+  LIBS="$LIBS -ldir"
+else
+  echo "$ac_t""no" 1>&6
+fi
 
 else
-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+echo "configure:16181: 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
 else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  ac_save_LIBS="$LIBS"
+LIBS="-lx  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 16189 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
-  for ac_lib in x; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    builtin and then its argument prototype would still apply.  */
+char opendir();
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="-l$ac_lib"
-break
+int main() {
+opendir()
+; return 0; }
+EOF
+if { (eval echo configure:16200: \"$ac_link\") 1>&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 "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+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
+  LIBS="$LIBS -lx"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
+fi
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in  \
+for ac_hdr in  \
 inttypes.h \
 stdint.h \
 dirent.h \
@@ -22264,241 +16276,128 @@
 assert.h
 
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:16282: 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 16287 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:16292: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 
 
-  echo "$as_me:$LINENO: checking for fopencookie" >&5
-echo $ECHO_N "checking for fopencookie... $ECHO_C" >&6
-if test "${ac_cv_func_fopencookie+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define fopencookie to an innocuous variant, in case <limits.h> declares fopencookie.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define fopencookie innocuous_fopencookie
-
+  echo $ac_n "checking for fopencookie""... $ac_c" 1>&6
+echo "configure:16321: 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 16326 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char fopencookie (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef fopencookie
-
+    which can conflict with char fopencookie(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char fopencookie ();
+    builtin and then its argument prototype would still apply.  */
+char fopencookie();
+
+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_fopencookie) || defined (__stub___fopencookie)
 choke me
 #else
-char (*f) () = fopencookie;
-#endif
-#ifdef __cplusplus
-}
+fopencookie();
 #endif
 
-int
-main ()
-{
-return f != fopencookie;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_fopencookie=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_fopencookie=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fopencookie" >&5
-echo "${ECHO_T}$ac_cv_func_fopencookie" >&6
-if test $ac_cv_func_fopencookie = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:16349: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_fopencookie=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'fopencookie`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   have_glibc_fopencookie=yes
+else
+  echo "$ac_t""no" 1>&6
 fi
 
 
   if test "$have_glibc_fopencookie" = "yes"; then
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+cat > conftest.$ac_ext <<EOF
+#line 16371 "configure"
+#include "confdefs.h"
 
 #define _GNU_SOURCE
 #include <stdio.h>
 
-int
-main ()
-{
+int main() {
 cookie_io_functions_t cookie;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:16381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   have_cookie_io_functions_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
     if test "$have_cookie_io_functions_t" = "yes"; then
       cookie_io_functions_t=cookie_io_functions_t
       have_fopen_cookie=yes
 
 if test "$cross_compiling" = yes; then
-
+  
   cookie_io_functions_use_off64_t=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 16400 "configure"
+#include "confdefs.h"
 
 #define _GNU_SOURCE
 #include <stdio.h>
@@ -22528,83 +16427,45 @@
 }
 
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:16432: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   cookie_io_functions_use_off64_t=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+    
     else
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+cat > conftest.$ac_ext <<EOF
+#line 16452 "configure"
+#include "confdefs.h"
 
 #define _GNU_SOURCE
 #include <stdio.h>
 
-int
-main ()
-{
- _IO_cookie_io_functions_t cookie;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+ _IO_cookie_io_functions_t cookie; 
+; return 0; }
+EOF
+if { (eval echo configure:16462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   have_IO_cookie_io_functions_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
       if test "$have_cookie_io_functions_t" = "yes" ; then
         cookie_io_functions_t=_IO_cookie_io_functions_t
         have_fopen_cookie=yes
@@ -22612,111 +16473,75 @@
     fi
 
     if test "$have_fopen_cookie" = "yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_FOPENCOOKIE 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COOKIE_IO_FUNCTIONS_T $cookie_io_functions_t
-_ACEOF
+EOF
 
       if test "$cookie_io_functions_use_off64_t" = "yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define COOKIE_SEEKER_USES_OFF64_T 1
-_ACEOF
+EOF
 
       fi
     fi
   fi
 
 
-  echo "$as_me:$LINENO: checking for broken getcwd" >&5
-echo $ECHO_N "checking for broken getcwd... $ECHO_C" >&6
+  echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6
+echo "configure:16496: checking for broken getcwd" >&5
   os=`uname -sr 2>/dev/null`
   case $os in
     SunOS*)
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_BROKEN_GETCWD 1
-_ACEOF
+EOF
 
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6;;
+      echo "$ac_t""yes" 1>&6;;
     *)
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6;;
+      echo "$ac_t""no" 1>&6;;
   esac
 
 
-  echo "$as_me:$LINENO: checking for broken libc stdio" >&5
-echo $ECHO_N "checking for broken libc stdio... $ECHO_C" >&6
-  if test "${_cv_have_broken_glibc_fopen_append+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6
+echo "configure:16511: 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
-
+  
   if test "$cross_compiling" = yes; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 16518 "configure"
+#include "confdefs.h"
 
 #include <features.h>
 
-int
-main ()
-{
+int main() {
 
 #if !__GLIBC_PREREQ(2,2)
 choke me
 #endif
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:16531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   _cv_have_broken_glibc_fopen_append=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-_cv_have_broken_glibc_fopen_append=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  _cv_have_broken_glibc_fopen_append=no 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 16544 "configure"
+#include "confdefs.h"
 
 #include <stdio.h>
 int main(int argc, char *argv[])
@@ -22724,7 +16549,7 @@
   FILE *fp;
   long position;
   char *filename = "/tmp/phpglibccheck";
-
+  
   fp = fopen(filename, "w");
   if (fp == NULL) {
     perror("fopen");
@@ -22742,2939 +16567,643 @@
   return 0;
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:16572: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-_cv_have_broken_glibc_fopen_append=yes
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  _cv_have_broken_glibc_fopen_append=yes 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
 
 
   if test "$_cv_have_broken_glibc_fopen_append" = "yes"; then
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+    echo "$ac_t""yes" 1>&6
+    cat >> confdefs.h <<\EOF
 #define HAVE_BROKEN_GLIBC_FOPEN_APPEND 1
-_ACEOF
+EOF
 
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
 
 
-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+echo "configure:16600: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 16605 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
-
-int
-main ()
-{
+int main() {
 struct tm *tp; tp->tm_sec;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:16613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_struct_tm=sys/time.h
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_tm=sys/time.h
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
-if test $ac_cv_struct_tm = sys/time.h; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_struct_tm" 1>&6
+if test $ac_cv_struct_tm = sys/time.h; then
+  cat >> confdefs.h <<\EOF
 #define TM_IN_SYS_TIME 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
-if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
+echo "configure:16634: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <$ac_cv_struct_tm>
-
-
-int
-main ()
-{
-static struct tm ac_aggr;
-if (ac_aggr.tm_zone)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_tm_tm_zone=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 16639 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
-
-
-int
-main ()
-{
-static struct tm ac_aggr;
-if (sizeof ac_aggr.tm_zone)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_tm_tm_zone=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_tm_tm_zone=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
-if test $ac_cv_member_struct_tm_tm_zone = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_TM_TM_ZONE 1
-_ACEOF
-
-
+int main() {
+struct tm tm; tm.tm_zone;
+; return 0; }
+EOF
+if { (eval echo configure:16647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_tm_zone=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_tm_zone=no
+fi
+rm -f conftest*
 fi
 
-if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6
+if test "$ac_cv_struct_tm_zone" = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_TM_ZONE 1
-_ACEOF
+EOF
 
 else
-  echo "$as_me:$LINENO: checking for tzname" >&5
-echo $ECHO_N "checking for tzname... $ECHO_C" >&6
-if test "${ac_cv_var_tzname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for tzname""... $ac_c" 1>&6
+echo "configure:16667: 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 16672 "configure"
+#include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
 extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
 #endif
-
-int
-main ()
-{
+int main() {
 atoi(*tzname);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:16682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
   ac_cv_var_tzname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_var_tzname=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_var_tzname=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
-echo "${ECHO_T}$ac_cv_var_tzname" >&6
-  if test $ac_cv_var_tzname = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_var_tzname" 1>&6
+  if test $ac_cv_var_tzname = yes; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_TZNAME 1
-_ACEOF
+EOF
 
   fi
 fi
 
 
 
-  echo "$as_me:$LINENO: checking for missing declarations of reentrant functions" >&5
-echo $ECHO_N "checking for missing declarations of reentrant functions... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6
+echo "configure:16706: checking for missing declarations of reentrant functions" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 16708 "configure"
+#include "confdefs.h"
 #include <time.h>
-int
-main ()
-{
+int main() {
 struct tm *(*func)() = localtime_r
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:16715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     :
-
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
-cat >>confdefs.h <<\_ACEOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    cat >> confdefs.h <<\EOF
 #define MISSING_LOCALTIME_R_DECL 1
-_ACEOF
-
+EOF
 
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 16733 "configure"
+#include "confdefs.h"
 #include <time.h>
-int
-main ()
-{
+int main() {
 struct tm *(*func)() = gmtime_r
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:16740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     :
-
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
-cat >>confdefs.h <<\_ACEOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    cat >> confdefs.h <<\EOF
 #define MISSING_GMTIME_R_DECL 1
-_ACEOF
-
+EOF
 
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 16758 "configure"
+#include "confdefs.h"
 #include <time.h>
-int
-main ()
-{
+int main() {
 char *(*func)() = asctime_r
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:16765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     :
-
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
-cat >>confdefs.h <<\_ACEOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    cat >> confdefs.h <<\EOF
 #define MISSING_ASCTIME_R_DECL 1
-_ACEOF
-
+EOF
 
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 16783 "configure"
+#include "confdefs.h"
 #include <time.h>
-int
-main ()
-{
+int main() {
 char *(*func)() = ctime_r
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:16790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     :
-
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
-cat >>confdefs.h <<\_ACEOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    cat >> confdefs.h <<\EOF
 #define MISSING_CTIME_R_DECL 1
-_ACEOF
-
+EOF
 
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 16808 "configure"
+#include "confdefs.h"
 #include <string.h>
-int
-main ()
-{
+int main() {
 char *(*func)() = strtok_r
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:16815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     :
-
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
-cat >>confdefs.h <<\_ACEOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    cat >> confdefs.h <<\EOF
 #define MISSING_STRTOK_R_DECL 1
-_ACEOF
-
+EOF
 
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  echo "$as_me:$LINENO: result: done" >&5
-echo "${ECHO_T}done" >&6
+rm -f conftest*
+  echo "$ac_t""done" 1>&6
 
 
-  echo "$as_me:$LINENO: checking for fclose declaration" >&5
-echo $ECHO_N "checking for fclose declaration... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6
+echo "configure:16836: checking for fclose declaration" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 16838 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-int
-main ()
-{
+int main() {
 int (*func)() = fclose
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:16845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+    cat >> confdefs.h <<\EOF
 #define MISSING_FCLOSE_DECL 0
-_ACEOF
-
-    echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+EOF
 
+    echo "$ac_t""ok" 1>&6
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
-cat >>confdefs.h <<\_ACEOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+    cat >> confdefs.h <<\EOF
 #define MISSING_FCLOSE_DECL 1
-_ACEOF
-
-    echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
+EOF
 
+    echo "$ac_t""missing" 1>&6
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
 
 
-echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
-echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
-if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
+echo "configure:16871: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 16876 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
-int
-main ()
-{
+int main() {
 struct tm tm; tm.tm_gmtoff;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:16884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_struct_tm_gmtoff=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_struct_tm_gmtoff=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_tm_gmtoff=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
-echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6
 
-if test "$ac_cv_struct_tm_gmtoff" = yes; then
+echo "$ac_t""$ac_cv_struct_tm_gmtoff" 1>&6
 
-cat >>confdefs.h <<\_ACEOF
+if test "$ac_cv_struct_tm_gmtoff" = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_TM_GMTOFF 1
-_ACEOF
+EOF
 
 fi
 
 
-echo "$as_me:$LINENO: checking for struct flock" >&5
-echo $ECHO_N "checking for struct flock... $ECHO_C" >&6
-if test "${ac_cv_struct_flock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for struct flock""... $ac_c" 1>&6
+echo "configure:16907: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 16912 "configure"
+#include "confdefs.h"
 
 #include <unistd.h>
 #include <fcntl.h>
-
-int
-main ()
-{
+        
+int main() {
 struct flock x;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:16922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
           ac_cv_struct_flock=yes
-
+        
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
           ac_cv_struct_flock=no
-
+        
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_flock" >&5
-echo "${ECHO_T}$ac_cv_struct_flock" >&6
-if test "$ac_cv_struct_flock" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_struct_flock" 1>&6
+if test "$ac_cv_struct_flock" = "yes" ; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_STRUCT_FLOCK 1
-_ACEOF
+EOF
 
 fi
 
 
-echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-if test "${ac_cv_socklen_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
+echo "configure:16949: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 16954 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
-int
-main ()
-{
+int main() {
 
 socklen_t x;
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:16966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
   ac_cv_socklen_t=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
   ac_cv_socklen_t=no
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
-echo "${ECHO_T}$ac_cv_socklen_t" >&6
-if test "$ac_cv_socklen_t" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_socklen_t" 1>&6
+if test "$ac_cv_socklen_t" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_SOCKLEN_T 1
-_ACEOF
+EOF
 
 fi
 
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking size of size_t""... $ac_c" 1>&6
+echo "configure:16992: 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-
-echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
-if test "${ac_cv_sizeof_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_size_t" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+  ac_cv_sizeof_size_t=8
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_size_t=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (size_t)); }
-unsigned long ulongval () { return (long) (sizeof (size_t)); }
+  cat > conftest.$ac_ext <<EOF
+#line 17000 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (size_t))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (size_t))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (size_t))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(size_t));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_size_t=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:17011: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_size_t=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long long *) 0)
-  return 0;
-if (sizeof (long long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
-
-echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long long)); }
-unsigned long ulongval () { return (long) (sizeof (long long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_long_long=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
 
-
-echo "$as_me:$LINENO: checking for long long int" >&5
-echo $ECHO_N "checking for long long int... $ECHO_C" >&6
-if test "${ac_cv_type_long_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long long int *) 0)
-  return 0;
-if (sizeof (long long int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_long_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
-
-echo "$as_me:$LINENO: checking size of long long int" >&5
-echo $ECHO_N "checking size of long long int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_long_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long long int)); }
-unsigned long ulongval () { return (long) (sizeof (long long int)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long long int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long long int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long long int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_long_long_int=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
+echo "$ac_t""$ac_cv_sizeof_size_t" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:17031: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
+  ac_cv_sizeof_long_long=8
+else
+  cat > conftest.$ac_ext <<EOF
+#line 17039 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:17050: \"$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
-  ac_cv_sizeof_long=0
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long_long=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
 
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+EOF
 
-echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((int *) 0)
-  return 0;
-if (sizeof (int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
+
+echo $ac_n "checking size of long long int""... $ac_c" 1>&6
+echo "configure:17070: 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
   if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
+  ac_cv_sizeof_long_long_int=8
+else
+  cat > conftest.$ac_ext <<EOF
+#line 17078 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
+EOF
+if { (eval echo configure:17089: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long_long_int=0
+fi
+rm -fr conftest*
+fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-test_array [0] = 0
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:17109: 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
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_long=8
+else
+  cat > conftest.$ac_ext <<EOF
+#line 17117 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
 }
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+EOF
+if { (eval echo configure:17128: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
+fi
+rm -fr conftest*
+fi
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:17148: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
+  ac_cv_sizeof_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 17156 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:17167: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_int=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
 
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
 
 
 
-  echo "$as_me:$LINENO: checking size of intmax_t" >&5
-echo $ECHO_N "checking size of intmax_t... $ECHO_C" >&6
 
+  echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6
+echo "configure:17189: checking size of intmax_t" >&5
+  
   php_cache_value=php_cv_sizeof_intmax_t
-  if test "${php_cv_sizeof_intmax_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-
+  
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
     if test "$cross_compiling" = yes; then
-
+  
     eval $php_cache_value=0
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 17206 "configure"
+#include "confdefs.h"
 #include <stdio.h>
 #if STDC_HEADERS
 #include <stdlib.h>
@@ -25695,34 +17224,24 @@
 	fprintf(fp, "%d\n", sizeof(intmax_t));
 	return(0);
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:17230: \"$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`
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     eval $php_cache_value=0
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -25730,47 +17249,41 @@
 
   if eval test "\$$php_cache_value" != "0"; then
 
-
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define HAVE_INTMAX_T 1
-_ACEOF
-
+EOF
 
+  
 
   fi
 
-  echo "$as_me:$LINENO: result: $php_cv_sizeof_intmax_t" >&5
-echo "${ECHO_T}$php_cv_sizeof_intmax_t" >&6
+  echo "$ac_t""$php_cv_sizeof_intmax_t" 1>&6
 
 
-  echo "$as_me:$LINENO: checking size of ssize_t" >&5
-echo $ECHO_N "checking size of ssize_t... $ECHO_C" >&6
-
+  echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6
+echo "configure:17269: checking size of ssize_t" >&5
+  
   php_cache_value=php_cv_sizeof_ssize_t
-  if test "${php_cv_sizeof_ssize_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-
+  
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
     if test "$cross_compiling" = yes; then
-
+  
     eval $php_cache_value=8
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 17286 "configure"
+#include "confdefs.h"
 #include <stdio.h>
 #if STDC_HEADERS
 #include <stdlib.h>
@@ -25791,34 +17304,24 @@
 	fprintf(fp, "%d\n", sizeof(ssize_t));
 	return(0);
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:17310: \"$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`
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     eval $php_cache_value=0
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -25826,47 +17329,41 @@
 
   if eval test "\$$php_cache_value" != "0"; then
 
-
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define HAVE_SSIZE_T 1
-_ACEOF
-
+EOF
 
+  
 
   fi
 
-  echo "$as_me:$LINENO: result: $php_cv_sizeof_ssize_t" >&5
-echo "${ECHO_T}$php_cv_sizeof_ssize_t" >&6
-
+  echo "$ac_t""$php_cv_sizeof_ssize_t" 1>&6
 
-  echo "$as_me:$LINENO: checking size of ptrdiff_t" >&5
-echo $ECHO_N "checking size of ptrdiff_t... $ECHO_C" >&6
 
+  echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6
+echo "configure:17349: checking size of ptrdiff_t" >&5
+  
   php_cache_value=php_cv_sizeof_ptrdiff_t
-  if test "${php_cv_sizeof_ptrdiff_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-
+  
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
     if test "$cross_compiling" = yes; then
-
+  
     eval $php_cache_value=8
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 17366 "configure"
+#include "confdefs.h"
 #include <stdio.h>
 #if STDC_HEADERS
 #include <stdlib.h>
@@ -25887,34 +17384,24 @@
 	fprintf(fp, "%d\n", sizeof(ptrdiff_t));
 	return(0);
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:17390: \"$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`
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     eval $php_cache_value=0
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -25922,960 +17409,405 @@
 
   if eval test "\$$php_cache_value" != "0"; then
 
-
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define HAVE_PTRDIFF_T 1
-_ACEOF
-
+EOF
 
+  
 
   fi
 
-  echo "$as_me:$LINENO: result: $php_cv_sizeof_ptrdiff_t" >&5
-echo "${ECHO_T}$php_cv_sizeof_ptrdiff_t" >&6
+  echo "$ac_t""$php_cv_sizeof_ptrdiff_t" 1>&6
 
 
-
-echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
-echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
+echo "configure:17429: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_blksize)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_blksize=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_blksize)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_blksize=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_blksize=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
-if test $ac_cv_member_struct_stat_st_blksize = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-_ACEOF
-
+  cat > conftest.$ac_ext <<EOF
+#line 17434 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+int main() {
+struct stat s; s.st_blksize;
+; return 0; }
+EOF
+if { (eval echo configure:17442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_st_blksize=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_st_blksize=no
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6
+if test $ac_cv_struct_st_blksize = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_ST_BLKSIZE 1
-_ACEOF
+EOF
 
 fi
 
-
 if test "`uname -s 2>/dev/null`" != "QNX"; then
-  echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
-echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_blocks)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_blocks=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_blocks)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_blocks=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_blocks=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6
-if test $ac_cv_member_struct_stat_st_blocks = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-_ACEOF
-
+  echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
+echo "configure:17464: 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 17469 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+int main() {
+struct stat s; s.st_blocks;
+; return 0; }
+EOF
+if { (eval echo configure:17477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_st_blocks=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_st_blocks=no
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_struct_st_blocks" 1>&6
+if test $ac_cv_struct_st_blocks = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_ST_BLOCKS 1
-_ACEOF
+EOF
 
 else
-  case $LIBOBJS in
-    "fileblocks.$ac_objext"   | \
-  *" fileblocks.$ac_objext"   | \
-    "fileblocks.$ac_objext "* | \
-  *" fileblocks.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" ;;
-esac
-
+  LIBOBJS="$LIBOBJS fileblocks.${ac_objext}"
 fi
 
-
 else
-  { echo "$as_me:$LINENO: WARNING: warnings level for cc set to 0" >&5
-echo "$as_me: WARNING: warnings level for cc set to 0" >&2;}
+  echo "configure: warning: warnings level for cc set to 0" 1>&2
   WARNING_LEVEL=0
 fi
+echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
+echo "configure:17504: 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 17509 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+int main() {
+struct stat s; s.st_rdev;
+; return 0; }
+EOF
+if { (eval echo configure:17517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_st_rdev=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_st_rdev=no
+fi
+rm -f conftest*
+fi
 
-echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
-echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_rdev)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_rdev=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_rdev)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_rdev=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_rdev=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6
-if test $ac_cv_member_struct_stat_st_rdev = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6
+if test $ac_cv_struct_st_rdev = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_ST_RDEV 1
-_ACEOF
+EOF
 
 fi
 
 
-
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:17539: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  cat > conftest.$ac_ext <<EOF
+#line 17544 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_type_size_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  rm -rf conftest*
+  ac_cv_type_size_t=no
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
-  :
-else
+rm -f conftest*
 
-cat >>confdefs.h <<_ACEOF
+fi
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+  cat >> confdefs.h <<\EOF
 #define size_t unsigned
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+echo "configure:17572: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 17577 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
+  egrep "uid_t" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_type_uid_t=yes
 else
+  rm -rf conftest*
   ac_cv_type_uid_t=no
 fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
-if test $ac_cv_type_uid_t = no; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
+if test $ac_cv_type_uid_t = no; then
+  cat >> confdefs.h <<\EOF
 #define uid_t int
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define gid_t int
-_ACEOF
+EOF
 
 fi
 
 
 
-    echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
-echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
-if test "${ac_cv_sockaddr_storage+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
+echo "configure:17608: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 17613 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
-int
-main ()
-{
+int main() {
 struct sockaddr_storage s; s
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:17621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_sockaddr_storage=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_sockaddr_storage=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_sockaddr_storage=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sockaddr_storage" >&5
-echo "${ECHO_T}$ac_cv_sockaddr_storage" >&6
-  if test "$ac_cv_sockaddr_storage" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_sockaddr_storage" 1>&6
+  if test "$ac_cv_sockaddr_storage" = "yes"; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_SOCKADDR_STORAGE 1
-_ACEOF
+EOF
 
   fi
-    echo "$as_me:$LINENO: checking for field sa_len in struct sockaddr" >&5
-echo $ECHO_N "checking for field sa_len in struct sockaddr... $ECHO_C" >&6
-if test "${ac_cv_sockaddr_sa_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6
+echo "configure:17642: 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 17648 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
-int
-main ()
-{
+int main() {
 static struct sockaddr sa; int n = (int) sa.sa_len; return n;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:17656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_sockaddr_sa_len=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_sockaddr_sa_len=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_sockaddr_sa_len=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sockaddr_sa_len" >&5
-echo "${ECHO_T}$ac_cv_sockaddr_sa_len" >&6
-  if test "$ac_cv_sockaddr_sa_len" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_sockaddr_sa_len" 1>&6
+  if test "$ac_cv_sockaddr_sa_len" = "yes"; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_SOCKADDR_SA_LEN 1
-_ACEOF
+EOF
 
   fi
 
 
-echo "$as_me:$LINENO: checking for IPv6 support" >&5
-echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6
-if test "${ac_cv_ipv6_support+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6
+echo "configure:17679: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 17684 "configure"
+#include "confdefs.h"
  #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-int
-main ()
-{
+int main() {
 struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:17693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
   ac_cv_ipv6_support=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_ipv6_support=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_ipv6_support=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_ipv6_support" >&5
-echo "${ECHO_T}$ac_cv_ipv6_support" >&6
-
 
+echo "$ac_t""$ac_cv_ipv6_support" 1>&6
 
-for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
 
+echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+echo "configure:17709: 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 17714 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char vprintf(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char vprintf();
+
+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_$ac_func) || defined (__stub___$ac_func)
+#if defined (__stub_vprintf) || defined (__stub___vprintf)
 choke me
 #else
-char (*f) () = $ac_func;
+vprintf();
 #endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+; return 0; }
+EOF
+if { (eval echo configure:17737: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_vprintf=no"
+fi
+rm -f conftest*
+fi
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_VPRINTF 1
+EOF
 
-#undef _doprnt
+else
+  echo "$ac_t""no" 1>&6
+fi
 
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+echo "configure:17761: 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 17766 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char _doprnt(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char _doprnt ();
+    builtin and then its argument prototype would still apply.  */
+char _doprnt();
+
+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__doprnt) || defined (__stub____doprnt)
 choke me
 #else
-char (*f) () = _doprnt;
-#endif
-#ifdef __cplusplus
-}
+_doprnt();
 #endif
 
-int
-main ()
-{
-return f != _doprnt;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func__doprnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func__doprnt=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-if test $ac_cv_func__doprnt = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:17789: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=no"
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_DOPRNT 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
 fi
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 for ac_func in alphasort \
 asctime_r \
@@ -26961,250 +17893,146 @@
 nanosleep \
 
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17898: 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 17903 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:17926: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
 
 
-
+  
   unset ac_cv_lib_rt_nanosleep
   unset ac_cv_lib_rt___nanosleep
   unset found
-  echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
-echo $ECHO_N "checking for nanosleep in -lrt... $ECHO_C" >&6
-if test "${ac_cv_lib_rt_nanosleep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
+echo "configure:17957: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 17965 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char nanosleep ();
-int
-main ()
-{
-nanosleep ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_rt_nanosleep=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_rt_nanosleep=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5
-echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6
-if test $ac_cv_lib_rt_nanosleep = yes; then
+    builtin and then its argument prototype would still apply.  */
+char nanosleep();
+
+int main() {
+nanosleep()
+; return 0; }
+EOF
+if { (eval echo configure:17976: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __nanosleep in -lrt" >&5
-echo $ECHO_N "checking for __nanosleep in -lrt... $ECHO_C" >&6
-if test "${ac_cv_lib_rt___nanosleep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6
+echo "configure:17996: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 18004 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __nanosleep ();
-int
-main ()
-{
-__nanosleep ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_rt___nanosleep=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_rt___nanosleep=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_rt___nanosleep" >&5
-echo "${ECHO_T}$ac_cv_lib_rt___nanosleep" >&6
-if test $ac_cv_lib_rt___nanosleep = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __nanosleep();
+
+int main() {
+__nanosleep()
+; return 0; }
+EOF
+if { (eval echo configure:18015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -27214,120 +18042,75 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 18047 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:18051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case rt in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lrt $LIBS"
+  *) 
+      LIBS="-lrt $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_NANOSLEEP 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBRT 1
-_ACEOF
+EOF
 
     ac_cv_func_nanosleep=yes
   else
-
+    
   :
 
   fi
+  
 
 
-
-echo "$as_me:$LINENO: checking for getaddrinfo" >&5
-echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
-if test "${ac_cv_func_getaddrinfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
+echo "configure:18095: 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 18100 "configure"
+#include "confdefs.h"
 #include <netdb.h>
-int
-main ()
-{
+int main() {
 struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:18107: \"$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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 18113 "configure"
+#include "confdefs.h"
 
 #include <netdb.h>
 #include <sys/types.h>
@@ -27349,7 +18132,7 @@
   }
 
   pai = ai;
-
+  
   while (pai) {
     if (pai->ai_family != AF_INET) {
       /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
@@ -27364,365 +18147,216 @@
   freeaddrinfo(ai);
   exit(0);
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  
+EOF
+if { (eval echo configure:18153: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_getaddrinfo=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_getaddrinfo=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_getaddrinfo=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_getaddrinfo=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
-echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
-if test "$ac_cv_func_getaddrinfo" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_func_getaddrinfo" 1>&6
+if test "$ac_cv_func_getaddrinfo" = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_GETADDRINFO 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking for __sync_fetch_and_add" >&5
-echo $ECHO_N "checking for __sync_fetch_and_add... $ECHO_C" >&6
-if test "${ac_cv_func_sync_fetch_and_add+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for __sync_fetch_and_add""... $ac_c" 1>&6
+echo "configure:18183: checking for __sync_fetch_and_add" >&5
+if eval "test \"`echo '$''{'ac_cv_func_sync_fetch_and_add'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 18188 "configure"
+#include "confdefs.h"
 
-int
-main ()
-{
+int main() {
 int x;__sync_fetch_and_add(&x,1);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:18195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
   ac_cv_func_sync_fetch_and_add=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_sync_fetch_and_add=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_sync_fetch_and_add=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_sync_fetch_and_add" >&5
-echo "${ECHO_T}$ac_cv_func_sync_fetch_and_add" >&6
-if test "$ac_cv_func_sync_fetch_and_add" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_func_sync_fetch_and_add" 1>&6
+if test "$ac_cv_func_sync_fetch_and_add" = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_SYNC_FETCH_AND_ADD 1
-_ACEOF
+EOF
 
 fi
 
-
-
-
 for ac_func in strlcat strlcpy getopt
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18218: 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 18223 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  case $LIBOBJS in
-    "$ac_func.$ac_objext"   | \
-  *" $ac_func.$ac_objext"   | \
-    "$ac_func.$ac_objext "* | \
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
-esac
+; return 0; }
+EOF
+if { (eval echo configure:18246: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
 fi
 done
 
 
-echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
-echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6
-if test "${ac_cv_func_utime_null+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
+echo "configure:18273: 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
-  rm -f conftest.data; >conftest.data
+  rm -f conftestdata; > conftestdata
 # Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
 if test "$cross_compiling" = yes; then
   ac_cv_func_utime_null=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
+  cat > conftest.$ac_ext <<EOF
+#line 18283 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+main() {
 struct stat s, t;
-  exit (!(stat ("conftest.data", &s) == 0
-	  && utime ("conftest.data", (long *)0) == 0
-	  && stat ("conftest.data", &t) == 0
-	  && t.st_mtime >= s.st_mtime
-	  && t.st_mtime - s.st_mtime < 120));
-  ;
-  return 0;
+exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
+&& stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime
+&& t.st_mtime - s.st_mtime < 120));
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:18294: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_utime_null=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_utime_null=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
-rm -f core *.core
+
+rm -f core core.* *.core
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5
-echo "${ECHO_T}$ac_cv_func_utime_null" >&6
-if test $ac_cv_func_utime_null = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_func_utime_null" 1>&6
+if test $ac_cv_func_utime_null = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_UTIME_NULL 1
-_ACEOF
+EOF
 
 fi
-rm -f conftest.data
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+echo "configure:18320: 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 18325 "configure"
+#include "confdefs.h"
 #include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_working_alloca_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_working_alloca_h=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-if test $ac_cv_working_alloca_h = yes; then
+int main() {
+char *p = alloca(2 * sizeof(int));
+; return 0; }
+EOF
+if { (eval echo configure:18332: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_alloca_h=no
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
+if test $ac_cv_header_alloca_h = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_ALLOCA_H 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for alloca""... $ac_c" 1>&6
+echo "configure:18353: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 18358 "configure"
+#include "confdefs.h"
+
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
@@ -27744,217 +18378,137 @@
 # endif
 #endif
 
-int
-main ()
-{
-char *p = (char *) alloca (1);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+char *p = (char *) alloca(1);
+; return 0; }
+EOF
+if { (eval echo configure:18386: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_alloca_works=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_alloca_works=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
 if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_ALLOCA 1
-_ACEOF
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
+EOF
 
-ALLOCA=alloca.$ac_objext
+fi
 
-cat >>confdefs.h <<\_ACEOF
+if test $ac_cv_func_alloca_works = no; then
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+  # that cause trouble.  Some versions do not even contain alloca or
+  # contain a buggy version.  If you still want to use their alloca,
+  # use ar to extract alloca.o from them instead of compiling alloca.c.
+  ALLOCA=alloca.${ac_objext}
+  cat >> confdefs.h <<\EOF
 #define C_ALLOCA 1
-_ACEOF
+EOF
 
 
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+echo "configure:18418: 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 18423 "configure"
+#include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 #else
 wenotbecray
 #endif
 
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  egrep "webecray" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_os_cray=yes
 else
+  rm -rf conftest*
   ac_cv_os_cray=no
 fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
 
+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:18448: 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 18453 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:18476: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<_ACEOF
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<EOF
 #define CRAY_STACKSEG_END $ac_func
-_ACEOF
+EOF
 
-    break
+  break
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  done
+done
 fi
 
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+echo "configure:18503: 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
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
+  cat > conftest.$ac_ext <<EOF
+#line 18511 "configure"
+#include "confdefs.h"
 find_stack_direction ()
 {
   static char *addr = 0;
@@ -27967,59 +18521,42 @@
   else
     return (&dummy > addr) ? 1 : -1;
 }
-
-int
 main ()
 {
-  exit (find_stack_direction () < 0);
+  exit (find_stack_direction() < 0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:18530: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
+cat >> confdefs.h <<EOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
+EOF
 
 fi
 
 
-  echo "$as_me:$LINENO: checking for declared timezone" >&5
-echo $ECHO_N "checking for declared timezone... $ECHO_C" >&6
-if test "${ac_cv_declared_timezone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
+echo "configure:18553: 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 18559 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <time.h>
@@ -28027,79 +18564,51 @@
 #include <sys/time.h>
 #endif
 
-int
-main ()
-{
+int main() {
 
     time_t foo = (time_t) timezone;
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:18574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
   ac_cv_declared_timezone=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
   ac_cv_declared_timezone=no
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_declared_timezone" >&5
-echo "${ECHO_T}$ac_cv_declared_timezone" >&6
-  if test "$ac_cv_declared_timezone" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_declared_timezone" 1>&6
+  if test "$ac_cv_declared_timezone" = "yes"; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_DECLARED_TIMEZONE 1
-_ACEOF
+EOF
 
   fi
 
 
-echo "$as_me:$LINENO: checking for type of reentrant time-related functions" >&5
-echo $ECHO_N "checking for type of reentrant time-related functions... $ECHO_C" >&6
-if test "${ac_cv_time_r_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6
+echo "configure:18600: 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
-
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_time_r_type=POSIX
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 18611 "configure"
+#include "confdefs.h"
 
 #include <time.h>
 
@@ -28115,215 +18624,140 @@
 return (1);
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:18629: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   if test "$cross_compiling" = yes; then
-
+  
     ac_cv_time_r_type=POSIX
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 18645 "configure"
+#include "confdefs.h"
 
 #include <time.h>
 main() {
   struct tm t, *s;
   time_t old = 0;
   char buf[27], *p;
-
+  
   s = gmtime_r(&old, &t);
   p = asctime_r(&t, buf, 26);
   if (p == buf && s == &t) return (0);
   return (1);
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:18661: \"$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
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     ac_cv_time_r_type=POSIX
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_time_r_type" >&5
-echo "${ECHO_T}$ac_cv_time_r_type" >&6
+
+echo "$ac_t""$ac_cv_time_r_type" 1>&6
   case $ac_cv_time_r_type in
-  hpux)
-cat >>confdefs.h <<\_ACEOF
+  hpux) cat >> confdefs.h <<\EOF
 #define PHP_HPUX_TIME_R 1
-_ACEOF
+EOF
  ;;
-  irix)
-cat >>confdefs.h <<\_ACEOF
+  irix) cat >> confdefs.h <<\EOF
 #define PHP_IRIX_TIME_R 1
-_ACEOF
+EOF
  ;;
   esac
 
 
-    echo "$as_me:$LINENO: checking for readdir_r" >&5
-echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6
-if test "${ac_cv_func_readdir_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define readdir_r to an innocuous variant, in case <limits.h> declares readdir_r.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define readdir_r innocuous_readdir_r
-
+    echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
+echo "configure:18699: 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 18704 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char readdir_r (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef readdir_r
-
+    which can conflict with char readdir_r(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char readdir_r ();
+    builtin and then its argument prototype would still apply.  */
+char readdir_r();
+
+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_readdir_r) || defined (__stub___readdir_r)
 choke me
 #else
-char (*f) () = readdir_r;
-#endif
-#ifdef __cplusplus
-}
+readdir_r();
 #endif
 
-int
-main ()
-{
-return f != readdir_r;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_readdir_r=yes
+; return 0; }
+EOF
+if { (eval echo configure:18727: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_readdir_r=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_readdir_r=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5
-echo "${ECHO_T}$ac_cv_func_readdir_r" >&6
-if test $ac_cv_func_readdir_r = yes; then
+
+if eval "test \"`echo '$ac_cv_func_'readdir_r`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   ac_cv_func_readdir_r=yes
 else
-  ac_cv_func_readdir=no
+  echo "$ac_t""no" 1>&6
+ac_cv_func_readdir=no
 fi
 
   if test "$ac_cv_func_readdir_r" = "yes"; then
-  echo "$as_me:$LINENO: checking for type of readdir_r" >&5
-echo $ECHO_N "checking for type of readdir_r... $ECHO_C" >&6
-if test "${ac_cv_what_readdir_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6
+echo "configure:18749: 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
-
+  
     if test "$cross_compiling" = yes; then
-
+  
       ac_cv_what_readdir_r=none
-
+   
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 18760 "configure"
+#include "confdefs.h"
 
 #define _REENTRANT
 #include <sys/types.h>
@@ -28339,114 +18773,84 @@
   struct dirent *pentry = (struct dirent *) &entry;
 
   dir = opendir("/");
-  if (!dir)
+  if (!dir) 
     exit(1);
   if (readdir_r(dir, (struct dirent *) entry, &pentry) == 0)
     exit(0);
   exit(1);
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+    
+EOF
+if { (eval echo configure:18785: \"$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
-
+    
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+      cat > conftest.$ac_ext <<EOF
+#line 18796 "configure"
+#include "confdefs.h"
 
 #define _REENTRANT
 #include <sys/types.h>
 #include <dirent.h>
 int readdir_r(DIR *, struct dirent *);
-
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-
+        
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:18806: \"$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_what_readdir_r=old-style
-
+        
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
           ac_cv_what_readdir_r=none
-
+      
 fi
-rm -f conftest.err conftest.$ac_ext
-
+rm -f conftest*
+    
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_what_readdir_r" >&5
-echo "${ECHO_T}$ac_cv_what_readdir_r" >&6
+
+echo "$ac_t""$ac_cv_what_readdir_r" 1>&6
     case $ac_cv_what_readdir_r in
     POSIX)
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_POSIX_READDIR_R 1
-_ACEOF
+EOF
 ;;
     old-style)
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_OLD_READDIR_R 1
-_ACEOF
+EOF
 ;;
     esac
   fi
 
 
-echo "$as_me:$LINENO: checking for in_addr_t" >&5
-echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6
-if test "${ac_cv_type_in_addr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
+echo "configure:18848: 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 18853 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
@@ -28455,365 +18859,230 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_type_in_addr_t=yes
 else
+  rm -rf conftest*
   ac_cv_type_in_addr_t=no
 fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_in_addr_t" >&5
-echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6
+echo "$ac_t""$ac_cv_type_in_addr_t" 1>&6
 if test $ac_cv_type_in_addr_t = no; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define in_addr_t u_int
-_ACEOF
+EOF
 
 fi
 
 
-
 for ac_func in crypt_r
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18887: 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 18892 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  php_crypt_r="1"
+; return 0; }
+EOF
+if { (eval echo configure:18915: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+  php_crypt_r="1" 
 else
-   php_crypt_r="0"
+  echo "$ac_t""no" 1>&6
+php_crypt_r="0" 
 fi
 done
 
 if test "x$php_crypt_r" = "x1"; then
-
-  echo "$as_me:$LINENO: checking which data struct is used by crypt_r" >&5
-echo $ECHO_N "checking which data struct is used by crypt_r... $ECHO_C" >&6
-if test "${php_cv_crypt_r_style+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+  echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6
+echo "configure:18943: 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
-
+  
     php_cv_crypt_r_style=none
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    cat > conftest.$ac_ext <<EOF
+#line 18950 "configure"
+#include "confdefs.h"
 
 #define _REENTRANT 1
 #include <crypt.h>
 
-int
-main ()
-{
+int main() {
 
 CRYPTD buffer;
 crypt_r("passwd", "hash", &buffer);
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:18963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   php_cv_crypt_r_style=cryptd
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
     if test "$php_cv_crypt_r_style" = "none"; then
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+      cat > conftest.$ac_ext <<EOF
+#line 18974 "configure"
+#include "confdefs.h"
 
 #define _REENTRANT 1
 #include <crypt.h>
 
-int
-main ()
-{
+int main() {
 
 struct crypt_data buffer;
 crypt_r("passwd", "hash", &buffer);
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:18987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   php_cv_crypt_r_style=struct_crypt_data
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
     fi
 
     if test "$php_cv_crypt_r_style" = "none"; then
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+      cat > conftest.$ac_ext <<EOF
+#line 18999 "configure"
+#include "confdefs.h"
 
 #define _REENTRANT 1
 #define _GNU_SOURCE
 #include <crypt.h>
 
-int
-main ()
-{
+int main() {
 
 struct crypt_data buffer;
 crypt_r("passwd", "hash", &buffer);
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:19013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   php_cv_crypt_r_style=struct_crypt_data_gnu_source
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
     fi
-
+    
 fi
-echo "$as_me:$LINENO: result: $php_cv_crypt_r_style" >&5
-echo "${ECHO_T}$php_cv_crypt_r_style" >&6
 
-  if test "$php_cv_crypt_r_style" = "cryptd"; then
+echo "$ac_t""$php_cv_crypt_r_style" 1>&6
 
-cat >>confdefs.h <<\_ACEOF
+  if test "$php_cv_crypt_r_style" = "cryptd"; then
+    cat >> confdefs.h <<\EOF
 #define CRYPT_R_CRYPTD 1
-_ACEOF
+EOF
 
   fi
   if test "$php_cv_crypt_r_style" = "struct_crypt_data" -o "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define CRYPT_R_STRUCT_CRYPT_DATA 1
-_ACEOF
+EOF
 
   fi
   if test "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define CRYPT_R_GNU_SOURCE 1
-_ACEOF
+EOF
 
   fi
   if test "$php_cv_crypt_r_style" = "none"; then
-    { { echo "$as_me:$LINENO: error: Unable to detect data struct used by crypt_r" >&5
-echo "$as_me: error: Unable to detect data struct used by crypt_r" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Unable to detect data struct used by crypt_r" 1>&2; exit 1; }
   fi
 
 fi
 
 
-  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  echo "$as_me:$LINENO: result: ${T_MD}General settings${T_ME}" >&5
-echo "${ECHO_T}${T_MD}General settings${T_ME}" >&6
+
+
+
+  echo "$ac_t""" 1>&6
+  echo "$ac_t""${T_MD}General settings${T_ME}" 1>&6
 
 
 
 # Check whether --enable- or --disable- was given.
 if test "${enable_+set}" = set; then
   enableval="$enable_"
+  :
+fi
 
-fi;
 
 
 
 php_enable_gcov=no
 
-echo "$as_me:$LINENO: checking whether to include gcov symbols" >&5
-echo $ECHO_N "checking whether to include gcov symbols... $ECHO_C" >&6
+echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6
+echo "configure:19072: 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"
   PHP_GCOV=$enableval
 else
-
+  
   PHP_GCOV=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_GCOV
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -28821,108 +19090,92 @@
 if test "$PHP_GCOV" = "yes"; then
 
   if test "$GCC" != "yes"; then
-    { { echo "$as_me:$LINENO: error: GCC is required for --enable-gcov" >&5
-echo "$as_me: error: GCC is required for --enable-gcov" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: GCC is required for --enable-gcov" 1>&2; exit 1; }
   fi
-
+  
     case `$php_shtool path $CC` in
     *ccache*) gcc_ccache=yes;;
     *) gcc_ccache=no;;
   esac
 
   if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
-    { { echo "$as_me:$LINENO: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." >&5
-echo "$as_me: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." 1>&2; exit 1; }
   fi
-
+  
   ltp_version_list="1.5 1.6 1.7"
 
   # Extract the first word of "lcov", so it can be a program name with args.
-set dummy lcov; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_LTP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$LTP"; then
-  ac_cv_prog_LTP="$LTP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LTP="lcov"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+set dummy lcov; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:19111: 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
+  if test -n "$LTP"; then
+  ac_cv_prog_LTP="$LTP" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_LTP="lcov"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-LTP=$ac_cv_prog_LTP
+LTP="$ac_cv_prog_LTP"
 if test -n "$LTP"; then
-  echo "$as_me:$LINENO: result: $LTP" >&5
-echo "${ECHO_T}$LTP" >&6
+  echo "$ac_t""$LTP" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   # Extract the first word of "genhtml", so it can be a program name with args.
 set dummy genhtml; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_LTP_GENHTML+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:19140: 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
   if test -n "$LTP_GENHTML"; then
   ac_cv_prog_LTP_GENHTML="$LTP_GENHTML" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LTP_GENHTML="genhtml"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_LTP_GENHTML="genhtml"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-LTP_GENHTML=$ac_cv_prog_LTP_GENHTML
+LTP_GENHTML="$ac_cv_prog_LTP_GENHTML"
 if test -n "$LTP_GENHTML"; then
-  echo "$as_me:$LINENO: result: $LTP_GENHTML" >&5
-echo "${ECHO_T}$LTP_GENHTML" >&6
+  echo "$ac_t""$LTP_GENHTML" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST LTP"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST LTP_GENHTML"
 
 
   if test "$LTP"; then
-    echo "$as_me:$LINENO: checking for ltp version" >&5
-echo $ECHO_N "checking for ltp version... $ECHO_C" >&6
-if test "${php_cv_ltp_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for ltp version""... $ac_c" 1>&6
+echo "configure:19175: 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
-
+  
       php_cv_ltp_version=invalid
       ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'`
       for ltp_check_version in $ltp_version_list; do
@@ -28930,49 +19183,42 @@
           php_cv_ltp_version="$ltp_check_version (ok)"
         fi
       done
-
+    
 fi
-echo "$as_me:$LINENO: result: $php_cv_ltp_version" >&5
-echo "${ECHO_T}$php_cv_ltp_version" >&6
+
+echo "$ac_t""$php_cv_ltp_version" 1>&6
   else
-    ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list"
-    { { echo "$as_me:$LINENO: error: $ltp_msg" >&5
-echo "$as_me: error: $ltp_msg" >&2;}
-   { (exit 1); exit 1; }; }
+    ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list"      
+    { echo "configure: error: $ltp_msg" 1>&2; exit 1; }
   fi
 
   case $php_cv_ltp_version in
     ""|invalid)
       ltp_msg="You must have one of the following versions of LTP: $ltp_version_list (found: $ltp_version)."
-      { { echo "$as_me:$LINENO: error: $ltp_msg" >&5
-echo "$as_me: error: $ltp_msg" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: $ltp_msg" 1>&2; exit 1; }
       LTP="exit 0;"
       ;;
   esac
 
   if test -z "$LTP_GENHTML"; then
-    { { echo "$as_me:$LINENO: error: Could not find genhtml from the LTP package" >&5
-echo "$as_me: error: Could not find genhtml from the LTP package" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Could not find genhtml from the LTP package" 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GCOV 1
-_ACEOF
-
+EOF
 
+  
   src=$abs_srcdir/Makefile.gcov
   ac_srcdir=$abs_srcdir
   ac_builddir=$ext_builddir
   test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 
 
-
+    
   CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
   CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
-
+  
 
     CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
   CXXFLAGS="$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage"
@@ -28981,22 +19227,22 @@
 
 php_enable_debug=no
 
-echo "$as_me:$LINENO: checking whether to include debugging symbols" >&5
-echo $ECHO_N "checking whether to include debugging symbols... $ECHO_C" >&6
+echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6
+echo "configure:19232: 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"
   PHP_DEBUG=$enableval
 else
-
+  
   PHP_DEBUG=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_DEBUG
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -29004,10 +19250,10 @@
 if test "$PHP_DEBUG" = "yes"; then
   PHP_DEBUG=1
   ZEND_DEBUG=yes
-
+  
   CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
   CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
-
+  
     if test "$GCC" = "yes" || test "$ICC" = "yes"; then
     CFLAGS="$CFLAGS -O0"
     CXXFLAGS="$CXXFLAGS -g -O0"
@@ -29029,23 +19275,22 @@
 
 php_with_layout=PHP
 
-echo "$as_me:$LINENO: checking layout of installed files" >&5
-echo $ECHO_N "checking layout of installed files... $ECHO_C" >&6
-
+echo $ac_n "checking layout of installed files""... $ac_c" 1>&6
+echo "configure:19280: 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"
   PHP_LAYOUT=$withval
 else
-
+  
   PHP_LAYOUT=PHP
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LAYOUT
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -29062,23 +19307,22 @@
 
 php_with_config_file_path=DEFAULT
 
-echo "$as_me:$LINENO: checking path to configuration file" >&5
-echo $ECHO_N "checking path to configuration file... $ECHO_C" >&6
-
+echo $ac_n "checking path to configuration file""... $ac_c" 1>&6
+echo "configure:19312: 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"
   PHP_CONFIG_FILE_PATH=$withval
 else
-
+  
   PHP_CONFIG_FILE_PATH=DEFAULT
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_CONFIG_FILE_PATH
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -29094,91 +19338,88 @@
   esac
 fi
 
-echo "$as_me:$LINENO: checking where to scan for configuration files" >&5
-echo $ECHO_N "checking where to scan for configuration files... $ECHO_C" >&6
+echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6
+echo "configure:19343: checking where to scan for configuration files" >&5
 
 php_with_config_file_scan_dir=DEFAULT
 
 
-
 # Check whether --with-config-file-scan-dir or --without-config-file-scan-dir was given.
 if test "${with_config_file_scan_dir+set}" = set; then
   withval="$with_config_file_scan_dir"
   PHP_CONFIG_FILE_SCAN_DIR=$withval
 else
-
+  
   PHP_CONFIG_FILE_SCAN_DIR=DEFAULT
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_CONFIG_FILE_SCAN_DIR
 
 
 
-
+ 
 if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then
   PHP_CONFIG_FILE_SCAN_DIR=
 fi
-echo "$as_me:$LINENO: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5
-echo "${ECHO_T}$PHP_CONFIG_FILE_SCAN_DIR" >&6
+echo "$ac_t""$PHP_CONFIG_FILE_SCAN_DIR" 1>&6
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 
 php_enable_safe_mode=no
 
-echo "$as_me:$LINENO: checking whether to enable safe mode by default" >&5
-echo $ECHO_N "checking whether to enable safe mode by default... $ECHO_C" >&6
+echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6
+echo "configure:19376: 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"
   PHP_SAFE_MODE=$enableval
 else
-
+  
   PHP_SAFE_MODE=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_SAFE_MODE
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_SAFE_MODE" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define PHP_SAFE_MODE 1
-_ACEOF
+EOF
 
 else
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define PHP_SAFE_MODE 0
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking for safe mode exec dir" >&5
-echo $ECHO_N "checking for safe mode exec dir... $ECHO_C" >&6
+echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6
+echo "configure:19408: checking for safe mode exec dir" >&5
 
 php_with_exec_dir=no
 
 
-
 # Check whether --with-exec-dir or --without-exec-dir was given.
 if test "${with_exec_dir+set}" = set; then
   withval="$with_exec_dir"
   PHP_EXEC_DIR=$withval
 else
-
+  
   PHP_EXEC_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_EXEC_DIR
 
@@ -29187,170 +19428,160 @@
 
 
 if test "$PHP_EXEC_DIR" != "no" && test "$PHP_EXEC_DIR" != "yes" ; then
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_SAFE_MODE_EXEC_DIR "$PHP_EXEC_DIR"
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: $PHP_EXEC_DIR" >&5
-echo "${ECHO_T}$PHP_EXEC_DIR" >&6
+  echo "$ac_t""$PHP_EXEC_DIR" 1>&6
 else
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define PHP_SAFE_MODE_EXEC_DIR "/usr/local/php/bin"
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: /usr/local/php/bin" >&5
-echo "${ECHO_T}/usr/local/php/bin" >&6
+  echo "$ac_t""/usr/local/php/bin" 1>&6
 fi
 
 
 php_enable_sigchild=no
 
-echo "$as_me:$LINENO: checking whether to enable PHP's own SIGCHLD handler" >&5
-echo $ECHO_N "checking whether to enable PHP's own SIGCHLD handler... $ECHO_C" >&6
+echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6
+echo "configure:19449: 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"
   PHP_SIGCHILD=$enableval
 else
-
+  
   PHP_SIGCHILD=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_SIGCHILD
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_SIGCHILD" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define PHP_SIGCHILD 1
-_ACEOF
+EOF
 
 else
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define PHP_SIGCHILD 0
-_ACEOF
+EOF
 
 fi
 
 
 php_enable_magic_quotes=no
 
-echo "$as_me:$LINENO: checking whether to enable magic quotes by default" >&5
-echo $ECHO_N "checking whether to enable magic quotes by default... $ECHO_C" >&6
+echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6
+echo "configure:19484: 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"
   PHP_MAGIC_QUOTES=$enableval
 else
-
+  
   PHP_MAGIC_QUOTES=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_MAGIC_QUOTES
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_MAGIC_QUOTES" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define MAGIC_QUOTES 1
-_ACEOF
+EOF
 
 else
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define MAGIC_QUOTES 0
-_ACEOF
+EOF
 
 fi
 
 
 php_enable_libgcc=no
 
-echo "$as_me:$LINENO: checking whether to explicitly link against libgcc" >&5
-echo $ECHO_N "checking whether to explicitly link against libgcc... $ECHO_C" >&6
+echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6
+echo "configure:19519: 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"
   PHP_LIBGCC=$enableval
 else
-
+  
   PHP_LIBGCC=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBGCC
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_LIBGCC" = "yes"; then
-
-
+  
+  
   libgcc_libpath=`gcc --print-libgcc-file-name|$SED 's%/*[^/][^/]*$%%'`
-
+  
 
   if test -z "$libgcc_libpath"; then
-    { { echo "$as_me:$LINENO: error: Cannot locate libgcc. Make sure that gcc is in your path" >&5
-echo "$as_me: error: Cannot locate libgcc. Make sure that gcc is in your path" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot locate libgcc. Make sure that gcc is in your path" 1>&2; exit 1; }
   fi
-
+  
   if test "$libgcc_libpath" != "/usr/$PHP_LIBDIR" && test "$libgcc_libpath" != "/usr/lib"; then
-
+    
   if test -z "$libgcc_libpath" || echo "$libgcc_libpath" | grep '^/' >/dev/null ; then
     ai_p=$libgcc_libpath
   else
-
+    
     ep_dir="`echo $libgcc_libpath|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$libgcc_libpath\"`"
   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
 
-
-
+  
+  
   case gcc in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lgcc"
+  *) 
+      LIBS="$LIBS -lgcc" 
    ;;
   esac
 
@@ -29360,153 +19591,119 @@
 
 php_enable_short_tags=yes
 
-echo "$as_me:$LINENO: checking whether to enable short tags by default" >&5
-echo $ECHO_N "checking whether to enable short tags by default... $ECHO_C" >&6
+echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6
+echo "configure:19596: 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"
   PHP_SHORT_TAGS=$enableval
 else
-
+  
   PHP_SHORT_TAGS=yes
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_SHORT_TAGS
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_SHORT_TAGS" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define DEFAULT_SHORT_OPEN_TAG "1"
-_ACEOF
+EOF
 
 else
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define DEFAULT_SHORT_OPEN_TAG "0"
-_ACEOF
+EOF
 
 fi
 
 
 php_enable_dmalloc=no
 
-echo "$as_me:$LINENO: checking whether to enable dmalloc" >&5
-echo $ECHO_N "checking whether to enable dmalloc... $ECHO_C" >&6
+echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6
+echo "configure:19631: 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"
   PHP_DMALLOC=$enableval
 else
-
+  
   PHP_DMALLOC=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_DMALLOC
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_DMALLOC" = "yes"; then
-  echo "$as_me:$LINENO: checking for dmalloc_error in -ldmalloc" >&5
-echo $ECHO_N "checking for dmalloc_error in -ldmalloc... $ECHO_C" >&6
-if test "${ac_cv_lib_dmalloc_dmalloc_error+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6
+echo "configure:19652: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ldmalloc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 19660 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dmalloc_error ();
-int
-main ()
-{
-dmalloc_error ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dmalloc_dmalloc_error=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dmalloc_dmalloc_error=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5
-echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_error" >&6
-if test $ac_cv_lib_dmalloc_dmalloc_error = yes; then
-
+    builtin and then its argument prototype would still apply.  */
+char dmalloc_error();
 
+int main() {
+dmalloc_error()
+; return 0; }
+EOF
+if { (eval echo configure:19671: \"$ac_link\") 1>&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
+  
+    
+  
   case dmalloc in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ldmalloc $LIBS"
+  *) 
+      LIBS="-ldmalloc $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DMALLOC 1
-_ACEOF
+EOF
 
     CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK"
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
-    { { echo "$as_me:$LINENO: error: Problem with enabling dmalloc. Please check config.log for details." >&5
-echo "$as_me: error: Problem with enabling dmalloc. Please check config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
+    { echo "configure: error: Problem with enabling dmalloc. Please check config.log for details." 1>&2; exit 1; }
+  
 fi
 
 fi
@@ -29514,36 +19711,35 @@
 
 php_enable_ipv6=yes
 
-echo "$as_me:$LINENO: checking whether to enable IPv6 support" >&5
-echo $ECHO_N "checking whether to enable IPv6 support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
+echo "configure:19716: 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"
   PHP_IPV6=$enableval
 else
-
+  
   PHP_IPV6=yes
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_IPV6
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_IPV6 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking how big to make fd sets" >&5
-echo $ECHO_N "checking how big to make fd sets... $ECHO_C" >&6
+echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6
+echo "configure:19743: checking how big to make fd sets" >&5
 
 php_enable_fd_setsize=no
 
@@ -29553,11 +19749,12 @@
   enableval="$enable_fd_setsize"
   PHP_FD_SETSIZE=$enableval
 else
-
+  
   PHP_FD_SETSIZE=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_FD_SETSIZE
 
@@ -29568,1034 +19765,223 @@
 if test "$PHP_FD_SETSIZE" != "no"; then
   if test "0$PHP_FD_SETSIZE" -gt 0 2>/dev/null; then
     CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE"
-    echo "$as_me:$LINENO: result: using $PHP_FD_SETSIZE" >&5
-echo "${ECHO_T}using $PHP_FD_SETSIZE" >&6
+    echo "$ac_t""using $PHP_FD_SETSIZE" 1>&6
   else
-    { { echo "$as_me:$LINENO: error: Invalid value passed to --enable-fd-setsize!" >&5
-echo "$as_me: error: Invalid value passed to --enable-fd-setsize!" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Invalid value passed to --enable-fd-setsize!" 1>&2; exit 1; }
   fi
 else
-  echo "$as_me:$LINENO: result: using system default" >&5
-echo "${ECHO_T}using system default" >&6
+  echo "$ac_t""using system default" 1>&6
 fi
 
 
+
+
+
+
 # Check whether --enable- or --disable- was given.
 if test "${enable_+set}" = set; then
   enableval="$enable_"
+  :
+fi
 
-fi;
 
 
 
-  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  echo "$as_me:$LINENO: result: ${T_MD}Configuring extensions${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring extensions${T_ME}" >&6
+  echo "$ac_t""" 1>&6
+  echo "$ac_t""${T_MD}Configuring extensions${T_ME}" 1>&6
 
 
 
 # Check whether --enable-all or --disable-all was given.
 if test "${enable_all+set}" = set; then
   enableval="$enable_all"
-
+  
   PHP_ENABLE_ALL=$enableval
 
-fi;
-
-# reading config stubs
-
-
-
-
-echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-test_array [0] = 0
+fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-test_array [0] = 0
+# reading config stubs
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:19811: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
+  ac_cv_sizeof_long=8
+else
+  cat > conftest.$ac_ext <<EOF
+#line 19819 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:19830: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((int *) 0)
-  return 0;
-if (sizeof (int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:19850: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
+  ac_cv_sizeof_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 19858 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:19869: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_int=0
 fi
+rm -fr conftest*
+fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+EOF
 
 
 
-echo "$as_me:$LINENO: checking for int32_t" >&5
-echo $ECHO_N "checking for int32_t... $ECHO_C" >&6
-if test "${ac_cv_int_type_int32_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for int32_t""... $ac_c" 1>&6
+echo "configure:19890: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+cat > conftest.$ac_ext <<EOF
+#line 19896 "configure"
+#include "confdefs.h"
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
-#elif HAVE_STDINT_H
-# include <stdint.h>
+#elif HAVE_STDINT_H   
+# include <stdint.h>  
 #endif
-int
-main ()
-{
+int main() {
 if ((int32_t *) 0)
-  return 0;
+  return 0;   
 if (sizeof (int32_t))
   return 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:19915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_int_type_int32_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_int_type_int32_t=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_int_type_int32_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_int_type_int32_t" >&5
-echo "${ECHO_T}$ac_cv_int_type_int32_t" >&6
-if test "$ac_cv_int_type_int32_t" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_int_type_int32_t" 1>&6
+if test "$ac_cv_int_type_int32_t" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_INT32_T 1
-_ACEOF
+EOF
 
 fi
 
 
-echo "$as_me:$LINENO: checking for uint32_t" >&5
-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
-if test "${ac_cv_int_type_uint32_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
+echo "configure:19938: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+cat > conftest.$ac_ext <<EOF
+#line 19944 "configure"
+#include "confdefs.h"
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
-#elif HAVE_STDINT_H
-# include <stdint.h>
+#elif HAVE_STDINT_H   
+# include <stdint.h>  
 #endif
-int
-main ()
-{
+int main() {
 if ((uint32_t *) 0)
-  return 0;
+  return 0;   
 if (sizeof (uint32_t))
   return 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:19963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_int_type_uint32_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_int_type_uint32_t=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_int_type_uint32_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_int_type_uint32_t" >&5
-echo "${ECHO_T}$ac_cv_int_type_uint32_t" >&6
-if test "$ac_cv_int_type_uint32_t" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_int_type_uint32_t" 1>&6
+if test "$ac_cv_int_type_uint32_t" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_UINT32_T 1
-_ACEOF
+EOF
 
 fi
 
 
-
-
-
-
-
-for ac_header in  \
+for ac_hdr in  \
 sys/types.h \
 inttypes.h \
 stdint.h \
@@ -30603,255 +19989,97 @@
 stdlib.h
 
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:19995: 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 20000 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:20005: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 
-
-
-
 for ac_func in strtoll atoll strftime
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:20035: 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 20040 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:20063: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
@@ -30859,7 +20087,7 @@
 
 
 PHP_DATE_CFLAGS="-I@ext_builddir@/lib"
-timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
+timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c 
                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
 
 
@@ -30870,15 +20098,15 @@
 
   if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
     PHP_DATE_SHARED=no
-
-
+    
+  
   case ext/date in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -30891,12 +20119,12 @@
 
   old_IFS=$IFS
   for ac_src in php_date.c $timelib_sources; 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
@@ -30920,14 +20148,14 @@
   else
     if test "no" = "shared" || test "no" = "yes"; then
       PHP_DATE_SHARED=yes
-
+      
   case ext/date in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -30940,12 +20168,12 @@
 
   old_IFS=$IFS
   for ac_src in php_date.c $timelib_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_date="$shared_objects_date $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -30963,7 +20191,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -30973,7 +20201,7 @@
       ;;
     *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_date) -L$(top_builddir)/netware -lphp5lib $(DATE_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_date) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDATE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -30986,7 +20214,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdate.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_date"
 
   cat >>Makefile.objects<<EOF
@@ -31000,7 +20228,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -31010,7 +20238,7 @@
       ;;
     *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_date) -L$(top_builddir)/netware -lphp5lib $(E_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_date) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DATE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -31023,7 +20251,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/date.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_date"
 
   cat >>Makefile.objects<<EOF
@@ -31037,10 +20265,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_DATE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -31049,15 +20276,15 @@
     PHP_DATE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/date in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -31070,12 +20297,12 @@
 
   old_IFS=$IFS
   for ac_src in php_date.c $timelib_sources; 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
@@ -31095,15 +20322,15 @@
         EXT_STATIC="$EXT_STATIC date"
         ;;
       *)
-
-
+        
+  
   case ext/date in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -31116,13 +20343,13 @@
 
   old_IFS=$IFS
   for ac_src in php_date.c $timelib_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -31142,107 +20369,107 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC date"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=date
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
 
 
-
+  
     $php_shtool mkdir -p $ext_builddir/lib
-
+  
 
 
   if test "$ext_builddir/lib" != "/usr/include"; then
-
+    
   if test -z "$ext_builddir/lib" || echo "$ext_builddir/lib" | grep '^/' >/dev/null ; then
     ai_p=$ext_builddir/lib
   else
-
+    
     ep_dir="`echo $ext_builddir/lib|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ext_builddir/lib\"`"
   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_srcdir/lib" != "/usr/include"; then
-
+    
   if test -z "$ext_srcdir/lib" || echo "$ext_srcdir/lib" | grep '^/' >/dev/null ; then
     ai_p=$ext_srcdir/lib
   else
-
+    
     ep_dir="`echo $ext_srcdir/lib|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ext_srcdir/lib\"`"
   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
 
 
 
-
+  
     header_path=ext/date
     for header_file in php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
+    done 
+  
 
 
 cat > $ext_builddir/lib/timelib_config.h <<EOF
@@ -31258,17 +20485,17 @@
 php_with_regex=php
 
 
-
 # Check whether --with-regex or --without-regex was given.
 if test "${with_regex+set}" = set; then
   withval="$with_regex"
   PHP_REGEX=$withval
 else
-
+  
   PHP_REGEX=php
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_REGEX
 
@@ -31289,15 +20516,13 @@
     ;;
   *)
     REGEX_TYPE=php
-    { echo "$as_me:$LINENO: WARNING: Invalid regex library type selected. Using default value: php" >&5
-echo "$as_me: WARNING: Invalid regex library type selected. Using default value: php" >&2;}
+    echo "configure: warning: Invalid regex library type selected. Using default value: php" 1>&2
     ;;
 esac
 
-echo "$as_me:$LINENO: checking which regex library to use" >&5
-echo $ECHO_N "checking which regex library to use... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $REGEX_TYPE" >&5
-echo "${ECHO_T}$REGEX_TYPE" >&6
+echo $ac_n "checking which regex library to use""... $ac_c" 1>&6
+echo "configure:20525: checking which regex library to use" >&5
+echo "$ac_t""$REGEX_TYPE" 1>&6
 
 if test "$REGEX_TYPE" = "php"; then
   ereg_regex_sources="regex/regcomp.c regex/regexec.c regex/regerror.c regex/regfree.c"
@@ -31313,15 +20538,15 @@
 
   if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
     PHP_EREG_SHARED=no
-
-
+    
+  
   case ext/ereg in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -31334,12 +20559,12 @@
 
   old_IFS=$IFS
   for ac_src in ereg.c $ereg_regex_sources; 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
@@ -31363,14 +20588,14 @@
   else
     if test "no" = "shared" || test "no" = "yes"; then
       PHP_EREG_SHARED=yes
-
+      
   case ext/ereg in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -31383,12 +20608,12 @@
 
   old_IFS=$IFS
   for ac_src in ereg.c $ereg_regex_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_ereg="$shared_objects_ereg $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -31406,7 +20631,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -31416,7 +20641,7 @@
       ;;
     *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_ereg) -L$(top_builddir)/netware -lphp5lib $(EREG_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_ereg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPEREG, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -31429,7 +20654,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpereg.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ereg"
 
   cat >>Makefile.objects<<EOF
@@ -31443,7 +20668,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -31453,7 +20678,7 @@
       ;;
     *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_ereg) -L$(top_builddir)/netware -lphp5lib $(G_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_ereg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(EREG, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -31466,7 +20691,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/ereg.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ereg"
 
   cat >>Makefile.objects<<EOF
@@ -31480,10 +20705,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_EREG 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -31492,15 +20716,15 @@
     PHP_EREG_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/ereg in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -31513,12 +20737,12 @@
 
   old_IFS=$IFS
   for ac_src in ereg.c $ereg_regex_sources; 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
@@ -31538,15 +20762,15 @@
         EXT_STATIC="$EXT_STATIC ereg"
         ;;
       *)
-
-
+        
+  
   case ext/ereg in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -31559,13 +20783,13 @@
 
   old_IFS=$IFS
   for ac_src in ereg.c $ereg_regex_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -31585,178 +20809,147 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC ereg"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=ereg
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
 
-
+  
     header_path=ext/ereg
     for header_file in php_ereg.h php_regex.h $ereg_regex_headers; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
+    done 
+  
 
 
 if test "$REGEX_TYPE" = "php"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_REGEX_T_RE_MAGIC 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HSREGEX 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define REGEX 1
-_ACEOF
-
-
-
+EOF
+  
+  
+  
     $php_shtool mkdir -p $ext_builddir/regex
+  
 
-
-
+  
   if test "$ext_srcdir/regex" != "/usr/include"; then
-
+    
   if test -z "$ext_srcdir/regex" || echo "$ext_srcdir/regex" | grep '^/' >/dev/null ; then
     ai_p=$ext_srcdir/regex
   else
-
+    
     ep_dir="`echo $ext_srcdir/regex|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ext_srcdir/regex\"`"
   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
 
 elif test "$REGEX_TYPE" = "system"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define REGEX 0
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: checking whether field re_magic exists in struct regex_t" >&5
-echo $ECHO_N "checking whether field re_magic exists in struct regex_t... $ECHO_C" >&6
-if test "${ac_cv_regex_t_re_magic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6
+echo "configure:20902: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+  cat > conftest.$ac_ext <<EOF
+#line 20908 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
-#include <regex.h>
-int
-main ()
-{
+#include <regex.h>
+int main() {
 regex_t rt; rt.re_magic;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:20916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_regex_t_re_magic=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_regex_t_re_magic=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_regex_t_re_magic=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_regex_t_re_magic" >&5
-echo "${ECHO_T}$ac_cv_regex_t_re_magic" >&6
-  if test "$ac_cv_regex_t_re_magic" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REGEX_T_RE_MAGIC
-_ACEOF
-
-  fi
-fi
+echo "$ac_t""$ac_cv_regex_t_re_magic" 1>&6
+  if test "$ac_cv_regex_t_re_magic" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_REGEX_T_RE_MAGIC  
+EOF
+   
+  fi 
+fi   
 
 
 
 php_enable_libxml=yes
 
-echo "$as_me:$LINENO: checking whether to enable LIBXML support" >&5
-echo $ECHO_N "checking whether to enable LIBXML support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6
+echo "configure:20942: 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"
   PHP_LIBXML=$enableval
 else
-
+  
   PHP_LIBXML=yes
   test "$PHP_ENABLE_ALL" && PHP_LIBXML=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -31780,33 +20973,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_LIBXML_DIR"; then
-
+  
 php_with_libxml_dir=no
 
-echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
+echo "configure:20987: 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"
   PHP_LIBXML_DIR=$withval
 else
-
+  
   PHP_LIBXML_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBXML_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -31816,13 +21007,13 @@
 
     ext_shared=no
 
-
-echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
+echo "configure:21013: 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
-
+  
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
     if test -x "$i/bin/xml2-config"; then
       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
@@ -31831,8 +21022,8 @@
   done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6
+
+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -31845,17 +21036,17 @@
     if test "$LIBXML_VERSION" -ge "2006011"; then
       LIBXML_LIBS=`$XML2_CONFIG --libs`
       LIBXML_INCS=`$XML2_CONFIG --cflags`
-
+      
   for ac_i in $LIBXML_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         LIBXML_SHARED_LIBADD="$LIBXML_SHARED_LIBADD -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"
@@ -31866,20 +21057,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        LIBXML_SHARED_LIBADD="$LIBXML_SHARED_LIBADD -l$ac_ii"
+        LIBXML_SHARED_LIBADD="$LIBXML_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -31892,80 +21083,80 @@
     ;;
     -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
         LIBXML_SHARED_LIBADD="-L$ai_p $LIBXML_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && LIBXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $LIBXML_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $LIBXML_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -31975,92 +21166,74 @@
   done
 
 
-            echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
+echo "configure:21171: 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
-
-
+  
+        
   old_LIBS=$LIBS
   LIBS="
           $LIBXML_SHARED_LIBADD
          $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 21187 "configure"
+#include "confdefs.h"
 
+    
     char xmlInitParser();
     int main() {
       xmlInitParser();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:21198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
+    
           php_cv_libxml_build_works=yes
-
-
+        
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
+        
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+      
 fi
-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6
-      if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_libxml_build_works" 1>&6
+      if test "$php_cv_libxml_build_works" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
+EOF
 
       fi
-
-
-cat >>confdefs.h <<\_ACEOF
+      
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
-
+EOF
 
+    
   ext_builddir=ext/libxml
   ext_srcdir=$abs_srcdir/ext/libxml
 
@@ -32068,15 +21241,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_LIBXML_SHARED=no
-
-
+    
+  
   case ext/libxml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -32089,12 +21262,12 @@
 
   old_IFS=$IFS
   for ac_src in libxml.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
@@ -32118,14 +21291,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_LIBXML_SHARED=yes
-
+      
   case ext/libxml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -32138,12 +21311,12 @@
 
   old_IFS=$IFS
   for ac_src in libxml.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_libxml="$shared_objects_libxml $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -32161,7 +21334,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -32171,7 +21344,7 @@
       ;;
     *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_libxml) -L$(top_builddir)/netware -lphp5lib $(LIBXML_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_libxml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPLIBXML, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -32184,7 +21357,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phplibxml.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libxml"
 
   cat >>Makefile.objects<<EOF
@@ -32198,7 +21371,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -32208,7 +21381,7 @@
       ;;
     *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_libxml) -L$(top_builddir)/netware -lphp5lib $(XML_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_libxml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(LIBXML, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -32221,7 +21394,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/libxml.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libxml"
 
   cat >>Makefile.objects<<EOF
@@ -32235,10 +21408,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_LIBXML 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -32247,15 +21419,15 @@
     PHP_LIBXML_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/libxml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -32268,12 +21440,12 @@
 
   old_IFS=$IFS
   for ac_src in libxml.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
@@ -32293,15 +21465,15 @@
         EXT_STATIC="$EXT_STATIC libxml"
         ;;
       *)
-
-
+        
+  
   case ext/libxml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -32314,13 +21486,13 @@
 
   old_IFS=$IFS
   for ac_src in libxml.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -32340,48 +21512,44 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC libxml"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=libxml
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+    
+  
     for header_file in ext/libxml/php_libxml.h; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
+  
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
     fi
-else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
+  
   fi
 
 fi
@@ -32390,19 +21558,19 @@
 
 php_with_openssl=no
 
-echo "$as_me:$LINENO: checking for OpenSSL support" >&5
-echo $ECHO_N "checking for OpenSSL support... $ECHO_C" >&6
-
+echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6
+echo "configure:21563: checking for OpenSSL support" >&5
 # Check whether --with-openssl or --without-openssl was given.
 if test "${with_openssl+set}" = set; then
   withval="$with_openssl"
   PHP_OPENSSL=$withval
 else
-
+  
   PHP_OPENSSL=no
   test "$PHP_ENABLE_ALL" && PHP_OPENSSL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -32426,8 +21594,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -32435,29 +21602,28 @@
 
 php_with_kerberos=no
 
-echo "$as_me:$LINENO: checking for Kerberos support" >&5
-echo $ECHO_N "checking for Kerberos support... $ECHO_C" >&6
-
+echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6
+echo "configure:21607: checking for Kerberos support" >&5
 # Check whether --with-kerberos or --without-kerberos was given.
 if test "${with_kerberos+set}" = set; then
   withval="$with_kerberos"
   PHP_KERBEROS=$withval
 else
-
+  
   PHP_KERBEROS=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_KERBEROS
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_OPENSSL" != "no"; then
-
+  
   ext_builddir=ext/openssl
   ext_srcdir=$abs_srcdir/ext/openssl
 
@@ -32465,15 +21631,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_OPENSSL_SHARED=no
-
-
+    
+  
   case ext/openssl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -32486,12 +21652,12 @@
 
   old_IFS=$IFS
   for ac_src in openssl.c xp_ssl.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
@@ -32515,14 +21681,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_OPENSSL_SHARED=yes
-
+      
   case ext/openssl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -32535,12 +21701,12 @@
 
   old_IFS=$IFS
   for ac_src in openssl.c xp_ssl.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_openssl="$shared_objects_openssl $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -32558,7 +21724,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -32568,7 +21734,7 @@
       ;;
     *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_openssl) -L$(top_builddir)/netware -lphp5lib $(OPENSSL_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_openssl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOPENSSL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -32581,7 +21747,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpopenssl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_openssl"
 
   cat >>Makefile.objects<<EOF
@@ -32595,7 +21761,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -32605,7 +21771,7 @@
       ;;
     *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_openssl) -L$(top_builddir)/netware -lphp5lib $(NSSL_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_openssl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OPENSSL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -32618,7 +21784,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/openssl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_openssl"
 
   cat >>Makefile.objects<<EOF
@@ -32632,10 +21798,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_OPENSSL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -32644,15 +21809,15 @@
     PHP_OPENSSL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/openssl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -32665,12 +21830,12 @@
 
   old_IFS=$IFS
   for ac_src in openssl.c xp_ssl.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
@@ -32690,15 +21855,15 @@
         EXT_STATIC="$EXT_STATIC openssl"
         ;;
       *)
-
-
+        
+  
   case ext/openssl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -32711,13 +21876,13 @@
 
   old_IFS=$IFS
   for ac_src in openssl.c xp_ssl.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -32737,25 +21902,25 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC openssl"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=openssl
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST OPENSSL_SHARED_LIBADD"
 
 
   if test "$PHP_KERBEROS" != "no"; then
-
+    
   found_kerberos=no
   unset KERBEROS_CFLAGS
   unset KERBEROS_LIBS
@@ -32763,43 +21928,38 @@
     if test -z "$KRB5_CONFIG"; then
     # Extract the first word of "krb5-config", so it can be a program name with args.
 set dummy krb5-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:21933: 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
-  case $KRB5_CONFIG in
-  [\\/]* | ?:[\\/]*)
+  case "$KRB5_CONFIG" in
+  /*)
   ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_KRB5_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   test -z "$ac_cv_path_KRB5_CONFIG" && ac_cv_path_KRB5_CONFIG="no"
   ;;
 esac
 fi
-KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG
-
+KRB5_CONFIG="$ac_cv_path_KRB5_CONFIG"
 if test -n "$KRB5_CONFIG"; then
-  echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5
-echo "${ECHO_T}$KRB5_CONFIG" >&6
+  echo "$ac_t""$KRB5_CONFIG" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   fi
@@ -32810,17 +21970,17 @@
 
     if test -n "$KERBEROS_LIBS"; then
       found_kerberos=yes
-
+      
   for ac_i in $KERBEROS_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -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"
@@ -32831,20 +21991,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii"
+        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -32857,80 +22017,80 @@
     ;;
     -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
         OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $KERBEROS_CFLAGS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -32957,58 +22117,58 @@
 
     if test "$PHP_KERBEROS_DIR"; then
       found_kerberos=yes
-
+      
   if test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_KERBEROS_DIR/$PHP_LIBDIR" || echo "$PHP_KERBEROS_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_KERBEROS_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_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
 
-
-
+      
+  
   case gssapi_krb5 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lgssapi_krb5"
+        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lgssapi_krb5" 
     else
-
-
+      
+  
   case gssapi_krb5 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lgssapi_krb5"
+  *) 
+      LIBS="$LIBS -lgssapi_krb5" 
    ;;
   esac
 
@@ -33018,20 +22178,20 @@
   esac
 
 
-
-
+      
+  
   case krb5 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lkrb5"
+        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lkrb5" 
     else
-
-
+      
+  
   case krb5 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lkrb5"
+  *) 
+      LIBS="$LIBS -lkrb5" 
    ;;
   esac
 
@@ -33041,20 +22201,20 @@
   esac
 
 
-
-
+      
+  
   case k5crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lk5crypto"
+        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lk5crypto" 
     else
-
-
+      
+  
   case k5crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lk5crypto"
+  *) 
+      LIBS="$LIBS -lk5crypto" 
    ;;
   esac
 
@@ -33064,20 +22224,20 @@
   esac
 
 
-
-
+      
+  
   case com_err in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lcom_err"
+        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lcom_err" 
     else
-
-
+      
+  
   case com_err in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lcom_err"
+  *) 
+      LIBS="$LIBS -lcom_err" 
    ;;
   esac
 
@@ -33087,33 +22247,33 @@
   esac
 
 
-
+      
   if test "$PHP_KERBEROS_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$PHP_KERBEROS_DIR/include" || echo "$PHP_KERBEROS_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$PHP_KERBEROS_DIR/include
   else
-
+    
     ep_dir="`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/include\"`"
   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
@@ -33128,152 +22288,94 @@
 
   fi
 
-  echo "$as_me:$LINENO: checking for DSA_get_default_method in -lssl" >&5
-echo $ECHO_N "checking for DSA_get_default_method in -lssl... $ECHO_C" >&6
-if test "${ac_cv_lib_ssl_DSA_get_default_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6
+echo "configure:22293: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 22301 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char DSA_get_default_method ();
-int
-main ()
-{
-DSA_get_default_method ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ssl_DSA_get_default_method=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ssl_DSA_get_default_method=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_DSA_get_default_method" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_DSA_get_default_method" >&6
-if test $ac_cv_lib_ssl_DSA_get_default_method = yes; then
+    builtin and then its argument prototype would still apply.  */
+char DSA_get_default_method();
+
+int main() {
+DSA_get_default_method()
+; return 0; }
+EOF
+if { (eval echo configure:22312: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_DSA_DEFAULT_METHOD 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for X509_free in -lcrypto" >&5
-echo $ECHO_N "checking for X509_free in -lcrypto... $ECHO_C" >&6
-if test "${ac_cv_lib_crypto_X509_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for X509_free in -lcrypto""... $ac_c" 1>&6
+echo "configure:22336: checking for X509_free in -lcrypto" >&5
+ac_lib_var=`echo crypto'_'X509_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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 22344 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char X509_free ();
-int
-main ()
-{
-X509_free ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypto_X509_free=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_crypto_X509_free=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_X509_free" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_X509_free" >&6
-if test $ac_cv_lib_crypto_X509_free = yes; then
+    builtin and then its argument prototype would still apply.  */
+char X509_free();
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DSA_DEFAULT_METHOD 1
-_ACEOF
+int main() {
+X509_free()
+; return 0; }
+EOF
+if { (eval echo configure:22355: \"$ac_link\") 1>&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
+  cat >> confdefs.h <<\EOF
+#define HAVE_DSA_DEFAULT_METHOD 1
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
+fi
 
 
+  
   found_openssl=no
   unset OPENSSL_INCDIR
   unset OPENSSL_LIBDIR
@@ -33290,42 +22392,38 @@
     if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:22397: 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
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
+  case "$PKG_CONFIG" in
+  /*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  echo "$ac_t""$PKG_CONFIG" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   fi
@@ -33337,23 +22435,21 @@
       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
     else
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
     fi
 
     if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
-
+      
   for ac_i in $OPENSSL_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -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"
@@ -33364,20 +22460,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii"
+        OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -33390,80 +22486,80 @@
     ;;
     -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
         OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $OPENSSL_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -33476,7 +22572,7 @@
   fi
 
     if test "$found_openssl" = "no"; then
-
+  
     if test "$PHP_OPENSSL_DIR" = "yes"; then
       PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
     fi
@@ -33492,102 +22588,94 @@
     done
 
     if test -z "$OPENSSL_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5
-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; }
     fi
 
     if test -z "$OPENSSL_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5
-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; }
     fi
 
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
-    echo "$as_me:$LINENO: checking for OpenSSL version" >&5
-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
+echo "configure:22602: checking for OpenSSL version" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 22604 "configure"
+#include "confdefs.h"
 
 #include <openssl/opensslv.h>
 #if OPENSSL_VERSION_NUMBER >= 0x0090600fL
   yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: >= 0.9.6" >&5
-echo "${ECHO_T}>= 0.9.6" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t"">= 0.9.6" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
-
+    
   if test "$OPENSSL_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$OPENSSL_INCDIR
   else
-
+    
     ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OPENSSL_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
 
-
-
+  
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$OPENSSL_LIBDIR
     "
-
+  
   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"
@@ -33598,20 +22686,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -33624,131 +22712,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6
-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
+echo "configure:22759: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 22767 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char CRYPTO_free ();
-int
-main ()
-{
-CRYPTO_free ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypto_CRYPTO_free=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_crypto_CRYPTO_free=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6
-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then
+    builtin and then its argument prototype would still apply.  */
+char CRYPTO_free();
+
+int main() {
+CRYPTO_free()
+; return 0; }
+EOF
+if { (eval echo configure:22778: \"$ac_link\") 1>&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
-
-
-
+    
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD"
+        OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD" 
     else
-
-
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcrypto $LIBS"
+  *) 
+      LIBS="-lcrypto $LIBS" 
    ;;
   esac
 
@@ -33758,43 +22816,42 @@
   esac
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypto_CRYPTO_free
-
-      { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5
-echo "$as_me: error: libcrypto not found!" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: libcrypto not found!" 1>&2; exit 1; }
+    
+  
 fi
 
 
     old_LIBS=$LIBS
     LIBS="$LIBS -lcrypto"
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$OPENSSL_LIBDIR
     "
-
+  
   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"
@@ -33805,20 +22862,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -33831,148 +22888,117 @@
     ;;
     -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 "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6
-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
+echo "configure:22935: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 22943 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char SSL_CTX_set_ssl_version ();
-int
-main ()
-{
-SSL_CTX_set_ssl_version ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6
-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then
+    builtin and then its argument prototype would still apply.  */
+char SSL_CTX_set_ssl_version();
+
+int main() {
+SSL_CTX_set_ssl_version()
+; return 0; }
+EOF
+if { (eval echo configure:22954: \"$ac_link\") 1>&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
-
+    
       found_openssl=yes
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
-
-      { { echo "$as_me:$LINENO: error: libssl not found!" >&5
-echo "$as_me: error: libssl not found!" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: libssl not found!" 1>&2; exit 1; }
+    
+  
 fi
 
     LIBS=$old_LIBS
-
-
+    
+  
   case ssl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OPENSSL_SHARED_LIBADD="-lssl $OPENSSL_SHARED_LIBADD"
+        OPENSSL_SHARED_LIBADD="-lssl $OPENSSL_SHARED_LIBADD" 
     else
-
-
+      
+  
   case ssl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lssl $LIBS"
+  *) 
+      LIBS="-lssl $LIBS" 
    ;;
   esac
 
@@ -33982,20 +23008,20 @@
   esac
 
 
-
-
+    
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD"
+        OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD" 
     else
-
-
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcrypto $LIBS"
+  *) 
+      LIBS="-lcrypto $LIBS" 
    ;;
   esac
 
@@ -34006,62 +23032,59 @@
 
 
 
-
+    
   if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$OPENSSL_LIBDIR
   else
-
+    
     ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_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
 
   if test "$found_openssl" = "yes"; then
     OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
+  
 
 
-
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_OPENSSL_EXT 1
-_ACEOF
-
-
-else
-    { { echo "$as_me:$LINENO: error: OpenSSL check failed. Please check config.log for more information." >&5
-echo "$as_me: error: OpenSSL check failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+EOF
 
+  
+else 
+    { echo "configure: error: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; }
+  
   fi
 
 fi
@@ -34072,17 +23095,17 @@
 php_with_pcre_regex=yes
 
 
-
 # Check whether --with-pcre-regex or --without-pcre-regex was given.
 if test "${with_pcre_regex+set}" = set; then
   withval="$with_pcre_regex"
   PHP_PCRE_REGEX=$withval
 else
-
+  
   PHP_PCRE_REGEX=yes
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_PCRE_REGEX
 
@@ -34091,136 +23114,127 @@
 
 
   if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
-    echo "$as_me:$LINENO: checking for PCRE headers location" >&5
-echo $ECHO_N "checking for PCRE headers location... $ECHO_C" >&6
+    echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6
+echo "configure:23119: 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
 
     if test -z "$PCRE_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: Could not find pcre.h in $PHP_PCRE_REGEX" >&5
-echo "$as_me: error: Could not find pcre.h in $PHP_PCRE_REGEX" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Could not find pcre.h in $PHP_PCRE_REGEX" 1>&2; exit 1; }
     fi
-    echo "$as_me:$LINENO: result: $PCRE_INCDIR" >&5
-echo "${ECHO_T}$PCRE_INCDIR" >&6
+    echo "$ac_t""$PCRE_INCDIR" 1>&6
 
-    echo "$as_me:$LINENO: checking for PCRE library location" >&5
-echo $ECHO_N "checking for PCRE library location... $ECHO_C" >&6
+    echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6
+echo "configure:23130: 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
-
+    
     if test -z "$PCRE_LIBDIR" ; then
-      { { echo "$as_me:$LINENO: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" >&5
-echo "$as_me: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" 1>&2; exit 1; }
     fi
-    echo "$as_me:$LINENO: result: $PCRE_LIBDIR" >&5
-echo "${ECHO_T}$PCRE_LIBDIR" >&6
-
+    echo "$ac_t""$PCRE_LIBDIR" 1>&6
 
+    
     pcre_major=`grep PCRE_MAJOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'`
     pcre_minor=`grep PCRE_MINOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'`
-
+    
     pcre_minor_length=`echo "$pcre_minor" | wc -c | sed -e 's/^0-9//g'`
     if test "$pcre_minor_length" -eq 2 ; then
       pcre_minor="$pcre_minor"0
     fi
     pcre_version=$pcre_major$pcre_minor
     if test "$pcre_version" -lt 660; then
-      { { echo "$as_me:$LINENO: error: The PCRE extension requires PCRE library version >= 6.6" >&5
-echo "$as_me: error: The PCRE extension requires PCRE library version >= 6.6" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: The PCRE extension requires PCRE library version >= 6.6" 1>&2; exit 1; }
     fi
 
-
+    
 
   if test -n "$PCRE_LIBDIR"; then
-
+    
   if test "$PCRE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PCRE_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PCRE_LIBDIR" || echo "$PCRE_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PCRE_LIBDIR
   else
-
+    
     ep_dir="`echo $PCRE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PCRE_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 pcre in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lpcre $LIBS"
+  *) 
+      LIBS="-lpcre $LIBS" 
    ;;
   esac
 
 
 
 
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_PCRE 1
-_ACEOF
-
+EOF
 
+    
   if test "$PCRE_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$PCRE_INCDIR" || echo "$PCRE_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$PCRE_INCDIR
   else
-
+    
     ep_dir="`echo $PCRE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PCRE_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
 
-
+    
   ext_builddir=ext/pcre
   ext_srcdir=$abs_srcdir/ext/pcre
 
@@ -34228,15 +23242,15 @@
 
   if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
     PHP_PCRE_SHARED=no
-
-
+    
+  
   case ext/pcre in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -34249,12 +23263,12 @@
 
   old_IFS=$IFS
   for ac_src in php_pcre.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
@@ -34278,14 +23292,14 @@
   else
     if test "no" = "shared" || test "no" = "yes"; then
       PHP_PCRE_SHARED=yes
-
+      
   case ext/pcre in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -34298,12 +23312,12 @@
 
   old_IFS=$IFS
   for ac_src in php_pcre.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pcre="$shared_objects_pcre $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -34321,7 +23335,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -34331,7 +23345,7 @@
       ;;
     *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_pcre) -L$(top_builddir)/netware -lphp5lib $(PCRE_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_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCRE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -34344,7 +23358,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcre.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre"
 
   cat >>Makefile.objects<<EOF
@@ -34358,7 +23372,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -34368,7 +23382,7 @@
       ;;
     *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_pcre) -L$(top_builddir)/netware -lphp5lib $(E_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_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCRE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -34381,7 +23395,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcre.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre"
 
   cat >>Makefile.objects<<EOF
@@ -34395,10 +23409,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PCRE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -34407,15 +23420,15 @@
     PHP_PCRE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pcre in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -34428,12 +23441,12 @@
 
   old_IFS=$IFS
   for ac_src in php_pcre.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
@@ -34453,15 +23466,15 @@
         EXT_STATIC="$EXT_STATIC pcre"
         ;;
       *)
-
-
+        
+  
   case ext/pcre in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -34474,13 +23487,13 @@
 
   old_IFS=$IFS
   for ac_src in php_pcre.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -34500,44 +23513,43 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pcre"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pcre
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+    
+  
     header_path=ext/pcre
     for header_file in php_pcre.h; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
+    done 
+  
 
   else
-    echo "$as_me:$LINENO: checking for PCRE library to use" >&5
-echo $ECHO_N "checking for PCRE library to use... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: bundled" >&5
-echo "${ECHO_T}bundled" >&6
+    echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6
+echo "configure:23552: 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 \
     				 pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c \
@@ -34545,7 +23557,7 @@
     				 pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c \
     				 pcrelib/pcre_tables.c pcrelib/pcre_valid_utf8.c \
     				 pcrelib/pcre_version.c pcrelib/pcre_xclass.c"
-
+    
   ext_builddir=ext/pcre
   ext_srcdir=$abs_srcdir/ext/pcre
 
@@ -34553,15 +23565,15 @@
 
   if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
     PHP_PCRE_SHARED=no
-
-
+    
+  
   case ext/pcre in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -34574,12 +23586,12 @@
 
   old_IFS=$IFS
   for ac_src in $pcrelib_sources php_pcre.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
@@ -34603,14 +23615,14 @@
   else
     if test "no" = "shared" || test "no" = "yes"; then
       PHP_PCRE_SHARED=yes
-
+      
   case ext/pcre in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -34623,12 +23635,12 @@
 
   old_IFS=$IFS
   for ac_src in $pcrelib_sources php_pcre.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pcre="$shared_objects_pcre $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -34646,7 +23658,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -34656,7 +23668,7 @@
       ;;
     *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_pcre) -L$(top_builddir)/netware -lphp5lib $(PCRE_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_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCRE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -34669,7 +23681,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcre.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre"
 
   cat >>Makefile.objects<<EOF
@@ -34683,7 +23695,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -34693,7 +23705,7 @@
       ;;
     *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_pcre) -L$(top_builddir)/netware -lphp5lib $(E_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_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCRE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -34706,7 +23718,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcre.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre"
 
   cat >>Makefile.objects<<EOF
@@ -34720,10 +23732,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PCRE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -34732,15 +23743,15 @@
     PHP_PCRE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pcre in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -34753,12 +23764,12 @@
 
   old_IFS=$IFS
   for ac_src in $pcrelib_sources php_pcre.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
@@ -34778,15 +23789,15 @@
         EXT_STATIC="$EXT_STATIC pcre"
         ;;
       *)
-
-
+        
+  
   case ext/pcre in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -34799,13 +23810,13 @@
 
   old_IFS=$IFS
   for ac_src in $pcrelib_sources php_pcre.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -34825,48 +23836,47 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pcre"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pcre
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+    
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir/pcrelib"
+  
 
-
-
-
+    
+  
     header_path=ext/pcre
     for header_file in php_pcre.h pcrelib/; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
+    done 
+  
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_BUNDLED_PCRE 1
-_ACEOF
+EOF
 
   fi
 
@@ -34874,19 +23884,19 @@
 
 php_with_sqlite3=yes
 
-echo "$as_me:$LINENO: checking whether to enable the SQLite3 extension" >&5
-echo $ECHO_N "checking whether to enable the SQLite3 extension... $ECHO_C" >&6
-
+echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6
+echo "configure:23889: 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"
   PHP_SQLITE3=$withval
 else
-
+  
   PHP_SQLITE3=yes
   test "$PHP_ENABLE_ALL" && PHP_SQLITE3=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -34910,8 +23920,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -34930,46 +23939,42 @@
   fi
 
   if test $PHP_SQLITE3 != "yes"; then
-    echo "$as_me:$LINENO: checking for sqlite3 files in default path" >&5
-echo $ECHO_N "checking for sqlite3 files in default path... $ECHO_C" >&6
+    echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
+echo "configure:23944: 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
-        echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6
+        echo "$ac_t""found in $i" 1>&6
         break
       fi
     done
 
     if test -z "$SQLITE3_DIR"; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-      { { echo "$as_me:$LINENO: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&5
-echo "$as_me: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&2;}
-   { (exit 1); exit 1; }; }
+      echo "$ac_t""not found" 1>&6
+      { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; }
     fi
 
-    echo "$as_me:$LINENO: checking for SQLite 3.3.9+" >&5
-echo $ECHO_N "checking for SQLite 3.3.9+... $ECHO_C" >&6
-
+    echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6
+echo "configure:23959: checking for SQLite 3.3.9+" >&5
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$SQLITE3_DIR/$PHP_LIBDIR -lm
     "
-
+  
   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"
@@ -34980,20 +23985,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -35006,207 +24011,176 @@
     ;;
     -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 "$as_me:$LINENO: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_prepare_v2 in -lsqlite3... $ECHO_C" >&6
-if test "${ac_cv_lib_sqlite3_sqlite3_prepare_v2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6
+echo "configure:24058: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsqlite3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 24066 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char sqlite3_prepare_v2 ();
-int
-main ()
-{
-sqlite3_prepare_v2 ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sqlite3_sqlite3_prepare_v2=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sqlite3_sqlite3_prepare_v2=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6
-if test $ac_cv_lib_sqlite3_sqlite3_prepare_v2 = yes; then
+    builtin and then its argument prototype would still apply.  */
+char sqlite3_prepare_v2();
 
+int main() {
+sqlite3_prepare_v2()
+; return 0; }
+EOF
+if { (eval echo configure:24077: \"$ac_link\") 1>&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
-
-      echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-
+    
+      echo "$ac_t""found" 1>&6
+      
 
   if test "$ext_shared" = "yes"; then
     SQLITE3_SHARED_LIBADD="-lsqlite3 $SQLITE3_SHARED_LIBADD"
     if test -n "$SQLITE3_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$SQLITE3_DIR/$PHP_LIBDIR" || echo "$SQLITE3_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SQLITE3_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         SQLITE3_SHARED_LIBADD="-L$ai_p $SQLITE3_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SQLITE3_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE3_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 "$SQLITE3_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$SQLITE3_DIR/$PHP_LIBDIR" || echo "$SQLITE3_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SQLITE3_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case sqlite3 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsqlite3 $LIBS"
+  *) 
+      LIBS="-lsqlite3 $LIBS" 
    ;;
   esac
 
@@ -35216,72 +24190,70 @@
   fi
 
 
-
+      
   if test "$SQLITE3_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$SQLITE3_DIR/include" || echo "$SQLITE3_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$SQLITE3_DIR/include
   else
-
+    
     ep_dir="`echo $SQLITE3_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/include\"`"
   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
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_prepare_v2
-
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-      { { echo "$as_me:$LINENO: error: Please install SQLite 3.3.9 first or check libsqlite3 is present" >&5
-echo "$as_me: error: Please install SQLite 3.3.9 first or check libsqlite3 is present" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      echo "$ac_t""not found" 1>&6
+      { echo "configure: error: Please install SQLite 3.3.9 first or check libsqlite3 is present" 1>&2; exit 1; }
+    
+  
 fi
 
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=""
-
+  
   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"
@@ -35292,20 +24264,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -35318,151 +24290,121 @@
     ;;
     -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 "$as_me:$LINENO: checking for sqlite3_key in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_key in -lsqlite3... $ECHO_C" >&6
-if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
+echo "configure:24337: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsqlite3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 24345 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char sqlite3_key ();
-int
-main ()
-{
-sqlite3_key ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sqlite3_sqlite3_key=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sqlite3_sqlite3_key=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_key" >&6
-if test $ac_cv_lib_sqlite3_sqlite3_key = yes; then
+    builtin and then its argument prototype would still apply.  */
+char sqlite3_key();
+
+int main() {
+sqlite3_key()
+; return 0; }
+EOF
+if { (eval echo configure:24356: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+      cat >> confdefs.h <<\EOF
 #define HAVE_SQLITE3_KEY 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_key
-
-
+    
+  
 fi
 
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=""
-
+  
   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"
@@ -35473,20 +24415,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -35499,138 +24441,107 @@
     ;;
     -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 "$as_me:$LINENO: checking for sqlite3_load_extension in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_load_extension in -lsqlite3... $ECHO_C" >&6
-if test "${ac_cv_lib_sqlite3_sqlite3_load_extension+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6
+echo "configure:24488: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsqlite3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 24496 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char sqlite3_load_extension ();
-int
-main ()
-{
-sqlite3_load_extension ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sqlite3_sqlite3_load_extension=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sqlite3_sqlite3_load_extension=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6
-if test $ac_cv_lib_sqlite3_sqlite3_load_extension = yes; then
+    builtin and then its argument prototype would still apply.  */
+char sqlite3_load_extension();
+
+int main() {
+sqlite3_load_extension()
+; return 0; }
+EOF
+if { (eval echo configure:24507: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_load_extension
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define SQLITE_OMIT_LOAD_EXTENSION 1
-_ACEOF
-
-
+EOF
 
+    
+  
 fi
 
 
   else
-    echo "$as_me:$LINENO: checking bundled sqlite3 library" >&5
-echo $ECHO_N "checking bundled sqlite3 library... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6
+echo "configure:24544: checking bundled sqlite3 library" >&5
+    echo "$ac_t""yes" 1>&6
 
     sqlite3_extra_sources="libsqlite/sqlite3.c"
 
@@ -35651,35 +24562,34 @@
     fi
 
     PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
-
-
+    
+  
     for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
+    done 
+  
 
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_SQLITE3 1
-_ACEOF
+EOF
 
 
   sqlite3_sources="sqlite3.c $sqlite3_extra_sources"
 
-
+  
   ext_builddir=ext/sqlite3
   ext_srcdir=$abs_srcdir/ext/sqlite3
 
@@ -35687,15 +24597,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SQLITE3_SHARED=no
-
-
+    
+  
   case ext/sqlite3 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -35708,12 +24618,12 @@
 
   old_IFS=$IFS
   for ac_src in $sqlite3_sources; 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
@@ -35737,14 +24647,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SQLITE3_SHARED=yes
-
+      
   case ext/sqlite3 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -35757,12 +24667,12 @@
 
   old_IFS=$IFS
   for ac_src in $sqlite3_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_sqlite3="$shared_objects_sqlite3 $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -35780,7 +24690,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -35790,7 +24700,7 @@
       ;;
     *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_sqlite3) -L$(top_builddir)/netware -lphp5lib $(SQLITE3_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_sqlite3) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE3, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -35803,7 +24713,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite3.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite3"
 
   cat >>Makefile.objects<<EOF
@@ -35817,7 +24727,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -35827,7 +24737,7 @@
       ;;
     *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_sqlite3) -L$(top_builddir)/netware -lphp5lib $(ITE3_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_sqlite3) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE3, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -35840,7 +24750,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite3.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite3"
 
   cat >>Makefile.objects<<EOF
@@ -35854,10 +24764,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SQLITE3 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -35866,15 +24775,15 @@
     PHP_SQLITE3_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/sqlite3 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -35887,12 +24796,12 @@
 
   old_IFS=$IFS
   for ac_src in $sqlite3_sources; 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
@@ -35912,15 +24821,15 @@
         EXT_STATIC="$EXT_STATIC sqlite3"
         ;;
       *)
-
-
+        
+  
   case ext/sqlite3 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -35933,13 +24842,13 @@
 
   old_IFS=$IFS
   for ac_src in $sqlite3_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -35959,25 +24868,25 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite3"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=sqlite3
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir/libsqlite"
+  
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE3_SHARED_LIBADD"
 
 fi
@@ -35986,19 +24895,19 @@
 
 php_with_zlib=no
 
-echo "$as_me:$LINENO: checking for ZLIB support" >&5
-echo $ECHO_N "checking for ZLIB support... $ECHO_C" >&6
-
+echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6
+echo "configure:24900: checking for ZLIB support" >&5
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
   withval="$with_zlib"
   PHP_ZLIB=$withval
 else
-
+  
   PHP_ZLIB=no
   test "$PHP_ENABLE_ALL" && PHP_ZLIB=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -36022,8 +24931,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -36031,29 +24939,28 @@
 
 php_with_zlib_dir=no
 
-echo "$as_me:$LINENO: checking if the location of ZLIB install directory is defined" >&5
-echo $ECHO_N "checking if the location of ZLIB install directory is defined... $ECHO_C" >&6
-
+echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6
+echo "configure:24944: 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"
   PHP_ZLIB_DIR=$withval
 else
-
+  
   PHP_ZLIB_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ZLIB_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
-
+  
   ext_builddir=ext/zlib
   ext_srcdir=$abs_srcdir/ext/zlib
 
@@ -36061,15 +24968,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_ZLIB_SHARED=no
-
-
+    
+  
   case ext/zlib in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -36082,12 +24989,12 @@
 
   old_IFS=$IFS
   for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.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
@@ -36111,14 +25018,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_ZLIB_SHARED=yes
-
+      
   case ext/zlib in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -36131,12 +25038,12 @@
 
   old_IFS=$IFS
   for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_zlib="$shared_objects_zlib $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -36154,7 +25061,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -36164,7 +25071,7 @@
       ;;
     *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_zlib) -L$(top_builddir)/netware -lphp5lib $(ZLIB_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_zlib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZLIB, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -36177,7 +25084,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzlib.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zlib"
 
   cat >>Makefile.objects<<EOF
@@ -36191,7 +25098,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -36201,7 +25108,7 @@
       ;;
     *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_zlib) -L$(top_builddir)/netware -lphp5lib $(B_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_zlib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ZLIB, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -36214,7 +25121,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/zlib.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zlib"
 
   cat >>Makefile.objects<<EOF
@@ -36228,10 +25135,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_ZLIB 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -36240,15 +25146,15 @@
     PHP_ZLIB_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/zlib in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -36261,12 +25167,12 @@
 
   old_IFS=$IFS
   for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.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
@@ -36286,15 +25192,15 @@
         EXT_STATIC="$EXT_STATIC zlib"
         ;;
       *)
-
-
+        
+  
   case ext/zlib in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -36307,13 +25213,13 @@
 
   old_IFS=$IFS
   for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -36333,24 +25239,24 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC zlib"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=zlib
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ZLIB_SHARED_LIBADD"
 
-
-  if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then
+  
+  if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then 
     if test -f $PHP_ZLIB/include/zlib/zlib.h; then
       ZLIB_DIR=$PHP_ZLIB
       ZLIB_INCDIR=$ZLIB_DIR/include/zlib
@@ -36358,7 +25264,7 @@
       ZLIB_DIR=$PHP_ZLIB
       ZLIB_INCDIR=$ZLIB_DIR/include
     fi
-  else
+  else 
     for i in /usr/local /usr $PHP_ZLIB_DIR; do
       if test -f $i/include/zlib/zlib.h; then
         ZLIB_DIR=$i
@@ -36369,37 +25275,35 @@
       fi
     done
   fi
-
+  
   if test -z "$ZLIB_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libz" >&5
-echo "$as_me: error: Cannot find libz" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find libz" 1>&2; exit 1; }
   fi
 
   case $ZLIB_DIR in
-  /usr) ac_extra= ;;
+  /usr) ac_extra= ;; 
   *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;;
   esac
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $ac_extra
   "
-
+  
   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"
@@ -36410,20 +25314,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -36436,192 +25340,160 @@
     ;;
     -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 "$as_me:$LINENO: checking for gzgets in -lz" >&5
-echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6
-if test "${ac_cv_lib_z_gzgets+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
+echo "configure:25387: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 25395 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gzgets ();
-int
-main ()
-{
-gzgets ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_z_gzgets=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_z_gzgets=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6
-if test $ac_cv_lib_z_gzgets = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gzgets();
+
+int main() {
+gzgets()
+; return 0; }
+EOF
+if { (eval echo configure:25406: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_ZLIB 1
-_ACEOF
-
-
-
+EOF
+ 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_z_gzgets
-
-    { { echo "$as_me:$LINENO: error: ZLIB extension requires zlib >= 1.0.9" >&5
-echo "$as_me: error: ZLIB extension requires zlib >= 1.0.9" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: ZLIB extension requires zlib >= 1.0.9" 1>&2; exit 1; }
+  
+  
 fi
 
 
-
+  
   if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ZLIB_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         ZLIB_SHARED_LIBADD="-L$ai_p $ZLIB_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && ZLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZLIB_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
 
 
   PHP_ZLIB_DIR=$ZLIB_DIR
-
-
+  
+  
   case z in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        ZLIB_SHARED_LIBADD="-lz $ZLIB_SHARED_LIBADD"
+        ZLIB_SHARED_LIBADD="-lz $ZLIB_SHARED_LIBADD" 
     else
-
-
+      
+  
   case z in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lz $LIBS"
+  *) 
+      LIBS="-lz $LIBS" 
    ;;
   esac
 
@@ -36631,33 +25503,33 @@
   esac
 
 
-
+  
   if test "$ZLIB_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$ZLIB_INCDIR" || echo "$ZLIB_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$ZLIB_INCDIR
   else
-
+    
     ep_dir="`echo $ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ZLIB_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
@@ -36669,18 +25541,19 @@
 
 php_enable_bcmath=no
 
-echo "$as_me:$LINENO: checking whether to enable bc style precision math functions" >&5
-echo $ECHO_N "checking whether to enable bc style precision math functions... $ECHO_C" >&6
+echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
+echo "configure:25546: 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;
+fi
+
 
 
 ext_output="yes, shared"
@@ -36704,14 +25577,13 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_BCMATH" != "no"; then
-
+  
   ext_builddir=ext/bcmath
   ext_srcdir=$abs_srcdir/ext/bcmath
 
@@ -36719,15 +25591,15 @@
 
   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
@@ -36744,12 +25616,12 @@
 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
@@ -36773,14 +25645,14 @@
   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
@@ -36797,12 +25669,12 @@
 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
@@ -36820,7 +25692,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -36830,7 +25702,7 @@
       ;;
     *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 $(BCMATH_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_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBCMATH, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -36843,7 +25715,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
 
   cat >>Makefile.objects<<EOF
@@ -36857,7 +25729,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -36867,7 +25739,7 @@
       ;;
     *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 $(ATH_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_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BCMATH, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -36880,7 +25752,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
 
   cat >>Makefile.objects<<EOF
@@ -36894,10 +25766,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_BCMATH 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -36906,15 +25777,15 @@
     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
@@ -36931,12 +25802,12 @@
 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
@@ -36956,15 +25827,15 @@
         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
@@ -36981,13 +25852,13 @@
 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"
+      
+      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" ;;
@@ -37007,28 +25878,27 @@
     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 <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_BCMATH 1
-_ACEOF
+EOF
 
 fi
 
@@ -37036,19 +25906,19 @@
 
 php_with_bz2=no
 
-echo "$as_me:$LINENO: checking for BZip2 support" >&5
-echo $ECHO_N "checking for BZip2 support... $ECHO_C" >&6
-
+echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
+echo "configure:25911: 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;
+fi
+
 
 
 ext_output="yes, shared"
@@ -37072,8 +25942,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -37082,45 +25951,41 @@
   if test -r $PHP_BZ2/include/bzlib.h; then
     BZIP_DIR=$PHP_BZ2
   else
-    echo "$as_me:$LINENO: checking for BZip2 in default path" >&5
-echo $ECHO_N "checking for BZip2 in default path... $ECHO_C" >&6
+    echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
+echo "configure:25956: 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
-        echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6
+        echo "$ac_t""found in $i" 1>&6
         break
       fi
     done
   fi
 
   if test -z "$BZIP_DIR"; then
-    echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-    { { echo "$as_me:$LINENO: error: Please reinstall the BZip2 distribution" >&5
-echo "$as_me: error: Please reinstall the BZip2 distribution" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "$ac_t""not found" 1>&6
+    { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; }
   fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$BZIP_DIR/$PHP_LIBDIR
   "
-
+  
   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"
@@ -37131,20 +25996,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -37157,236 +26022,206 @@
     ;;
     -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 "$as_me:$LINENO: checking for BZ2_bzerror in -lbz2" >&5
-echo $ECHO_N "checking for BZ2_bzerror in -lbz2... $ECHO_C" >&6
-if test "${ac_cv_lib_bz2_BZ2_bzerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
+echo "configure:26069: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbz2  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 26077 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char BZ2_bzerror ();
-int
-main ()
-{
-BZ2_bzerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bz2_BZ2_bzerror=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bz2_BZ2_bzerror=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5
-echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzerror" >&6
-if test $ac_cv_lib_bz2_BZ2_bzerror = yes; then
+    builtin and then its argument prototype would still apply.  */
+char BZ2_bzerror();
+
+int main() {
+BZ2_bzerror()
+; return 0; }
+EOF
+if { (eval echo configure:26088: \"$ac_link\") 1>&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 "$BZIP_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$BZIP_DIR/include" || echo "$BZIP_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$BZIP_DIR/include
   else
-
+    
     ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`"
   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
     BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD"
     if test -n "$BZIP_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$BZIP_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         BZ2_SHARED_LIBADD="-L$ai_p $BZ2_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && BZ2_SHARED_LIBADD="$ld_runpath_switch$ai_p $BZ2_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 "$BZIP_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$BZIP_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case bz2 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lbz2 $LIBS"
+  *) 
+      LIBS="-lbz2 $LIBS" 
    ;;
   esac
 
@@ -37396,28 +26231,26 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_BZ2 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_bz2_BZ2_bzerror
-
-    { { echo "$as_me:$LINENO: error: bz2 module requires libbz2 >= 1.0.0" >&5
-echo "$as_me: error: bz2 module requires libbz2 >= 1.0.0" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: bz2 module requires libbz2 >= 1.0.0" 1>&2; exit 1; }
+  
+  
 fi
 
 
-
+  
   ext_builddir=ext/bz2
   ext_srcdir=$abs_srcdir/ext/bz2
 
@@ -37425,15 +26258,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_BZ2_SHARED=no
-
-
+    
+  
   case ext/bz2 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -37446,12 +26279,12 @@
 
   old_IFS=$IFS
   for ac_src in bz2.c bz2_filter.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
@@ -37475,14 +26308,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_BZ2_SHARED=yes
-
+      
   case ext/bz2 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -37495,12 +26328,12 @@
 
   old_IFS=$IFS
   for ac_src in bz2.c bz2_filter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_bz2="$shared_objects_bz2 $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -37518,7 +26351,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -37528,7 +26361,7 @@
       ;;
     *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_bz2) -L$(top_builddir)/netware -lphp5lib $(BZ2_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_bz2) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBZ2, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -37541,7 +26374,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbz2.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
 
   cat >>Makefile.objects<<EOF
@@ -37555,7 +26388,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -37565,7 +26398,7 @@
       ;;
     *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_bz2) -L$(top_builddir)/netware -lphp5lib $(_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_bz2) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BZ2, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -37578,7 +26411,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/bz2.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
 
   cat >>Makefile.objects<<EOF
@@ -37592,10 +26425,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_BZ2 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -37604,15 +26436,15 @@
     PHP_BZ2_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/bz2 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -37625,12 +26457,12 @@
 
   old_IFS=$IFS
   for ac_src in bz2.c bz2_filter.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
@@ -37650,15 +26482,15 @@
         EXT_STATIC="$EXT_STATIC bz2"
         ;;
       *)
-
-
+        
+  
   case ext/bz2 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -37671,13 +26503,13 @@
 
   old_IFS=$IFS
   for ac_src in bz2.c bz2_filter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -37697,20 +26529,20 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=bz2
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST BZ2_SHARED_LIBADD"
 
 fi
@@ -37719,18 +26551,19 @@
 
 php_enable_calendar=no
 
-echo "$as_me:$LINENO: checking whether to enable calendar conversion support" >&5
-echo $ECHO_N "checking whether to enable calendar conversion support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
+echo "configure:26556: 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"
   PHP_CALENDAR=$enableval
 else
-
+  
   PHP_CALENDAR=no
   test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -37754,19 +26587,17 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_CALENDAR" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_CALENDAR 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/calendar
   ext_srcdir=$abs_srcdir/ext/calendar
 
@@ -37774,15 +26605,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_CALENDAR_SHARED=no
-
-
+    
+  
   case ext/calendar in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -37795,12 +26626,12 @@
 
   old_IFS=$IFS
   for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.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
@@ -37824,14 +26655,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_CALENDAR_SHARED=yes
-
+      
   case ext/calendar in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -37844,12 +26675,12 @@
 
   old_IFS=$IFS
   for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -37867,7 +26698,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -37877,7 +26708,7 @@
       ;;
     *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_calendar) -L$(top_builddir)/netware -lphp5lib $(CALENDAR_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_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCALENDAR, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -37890,7 +26721,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcalendar.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
 
   cat >>Makefile.objects<<EOF
@@ -37904,7 +26735,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -37914,7 +26745,7 @@
       ;;
     *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_calendar) -L$(top_builddir)/netware -lphp5lib $(ENDAR_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_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CALENDAR, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -37927,7 +26758,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/calendar.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
 
   cat >>Makefile.objects<<EOF
@@ -37941,10 +26772,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_CALENDAR 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -37953,15 +26783,15 @@
     PHP_CALENDAR_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/calendar in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -37974,12 +26804,12 @@
 
   old_IFS=$IFS
   for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.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
@@ -37999,15 +26829,15 @@
         EXT_STATIC="$EXT_STATIC calendar"
         ;;
       *)
-
-
+        
+  
   case ext/calendar in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -38020,13 +26850,13 @@
 
   old_IFS=$IFS
   for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -38046,15 +26876,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=calendar
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -38065,18 +26895,19 @@
 
 php_enable_ctype=yes
 
-echo "$as_me:$LINENO: checking whether to enable ctype functions" >&5
-echo $ECHO_N "checking whether to enable ctype functions... $ECHO_C" >&6
+echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
+echo "configure:26900: 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"
   PHP_CTYPE=$enableval
 else
-
+  
   PHP_CTYPE=yes
   test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -38100,19 +26931,17 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_CTYPE" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_CTYPE 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/ctype
   ext_srcdir=$abs_srcdir/ext/ctype
 
@@ -38120,15 +26949,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_CTYPE_SHARED=no
-
-
+    
+  
   case ext/ctype in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -38141,12 +26970,12 @@
 
   old_IFS=$IFS
   for ac_src in ctype.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
@@ -38170,14 +26999,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_CTYPE_SHARED=yes
-
+      
   case ext/ctype in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -38190,12 +27019,12 @@
 
   old_IFS=$IFS
   for ac_src in ctype.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_ctype="$shared_objects_ctype $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -38213,7 +27042,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -38223,7 +27052,7 @@
       ;;
     *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_ctype) -L$(top_builddir)/netware -lphp5lib $(CTYPE_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_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCTYPE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -38236,7 +27065,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpctype.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
 
   cat >>Makefile.objects<<EOF
@@ -38250,7 +27079,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -38260,7 +27089,7 @@
       ;;
     *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_ctype) -L$(top_builddir)/netware -lphp5lib $(PE_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_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CTYPE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -38273,7 +27102,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/ctype.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
 
   cat >>Makefile.objects<<EOF
@@ -38287,10 +27116,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_CTYPE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -38299,15 +27127,15 @@
     PHP_CTYPE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/ctype in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -38320,12 +27148,12 @@
 
   old_IFS=$IFS
   for ac_src in ctype.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
@@ -38345,15 +27173,15 @@
         EXT_STATIC="$EXT_STATIC ctype"
         ;;
       *)
-
-
+        
+  
   case ext/ctype in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -38366,13 +27194,13 @@
 
   old_IFS=$IFS
   for ac_src in ctype.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -38392,15 +27220,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=ctype
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -38411,19 +27239,19 @@
 
 php_with_curl=no
 
-echo "$as_me:$LINENO: checking for cURL support" >&5
-echo $ECHO_N "checking for cURL support... $ECHO_C" >&6
-
+echo $ac_n "checking for cURL support""... $ac_c" 1>&6
+echo "configure:27244: checking for cURL support" >&5
 # Check whether --with-curl or --without-curl was given.
 if test "${with_curl+set}" = set; then
   withval="$with_curl"
   PHP_CURL=$withval
 else
-
+  
   PHP_CURL=no
   test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -38447,8 +27275,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -38456,23 +27283,22 @@
 
 php_with_curlwrappers=no
 
-echo "$as_me:$LINENO: checking if we should use cURL for url streams" >&5
-echo $ECHO_N "checking if we should use cURL for url streams... $ECHO_C" >&6
-
+echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6
+echo "configure:27288: 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"
   PHP_CURLWRAPPERS=$withval
 else
-
+  
   PHP_CURLWRAPPERS=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_CURLWRAPPERS
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -38481,31 +27307,26 @@
   if test -r $PHP_CURL/include/curl/easy.h; then
     CURL_DIR=$PHP_CURL
   else
-    echo "$as_me:$LINENO: checking for cURL in default path" >&5
-echo $ECHO_N "checking for cURL in default path... $ECHO_C" >&6
+    echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6
+echo "configure:27312: 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
-        echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6
+        echo "$ac_t""found in $i" 1>&6
         break
       fi
     done
   fi
 
   if test -z "$CURL_DIR"; then
-    echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-    { { echo "$as_me:$LINENO: error: Please reinstall the libcurl distribution -
-    easy.h should be in <curl-dir>/include/curl/" >&5
-echo "$as_me: error: Please reinstall the libcurl distribution -
-    easy.h should be in <curl-dir>/include/curl/" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "$ac_t""not found" 1>&6
+    { echo "configure: error: Please reinstall the libcurl distribution -
+    easy.h should be in <curl-dir>/include/curl/" 1>&2; exit 1; }
   fi
 
   CURL_CONFIG="curl-config"
-  echo "$as_me:$LINENO: checking for cURL 7.10.5 or greater" >&5
-echo $ECHO_N "checking for cURL 7.10.5 or greater... $ECHO_C" >&6
+  echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6
+echo "configure:27330: 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
@@ -38518,57 +27339,54 @@
   curl_version_full=`$CURL_CONFIG --version`
   curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
   if test "$curl_version" -ge 7010005; then
-    echo "$as_me:$LINENO: result: $curl_version_full" >&5
-echo "${ECHO_T}$curl_version_full" >&6
+    echo "$ac_t""$curl_version_full" 1>&6
     CURL_LIBS=`$CURL_CONFIG --libs`
   else
-    { { echo "$as_me:$LINENO: error: cURL version 7.10.5 or later is required to compile php with cURL support" >&5
-echo "$as_me: error: cURL version 7.10.5 or later is required to compile php with cURL support" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; }
   fi
 
-
+  
   if test "$CURL_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$CURL_DIR/include
   else
-
+    
     ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`"
   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
 
-
+  
   for ac_i in $CURL_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -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"
@@ -38579,20 +27397,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii"
+        CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -38605,136 +27423,136 @@
     ;;
     -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
         CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_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
 
     ;;
     esac
   done
 
-
+  
 
   if test "$ext_shared" = "yes"; then
     CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD"
     if test -n "$CURL_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$CURL_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_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 "$CURL_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$CURL_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case curl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcurl $LIBS"
+  *) 
+      LIBS="-lcurl $LIBS" 
    ;;
   esac
 
@@ -38744,270 +27562,110 @@
   fi
 
 
-
-  echo "$as_me:$LINENO: checking for SSL support in libcurl" >&5
-echo $ECHO_N "checking for SSL support in libcurl... $ECHO_C" >&6
+  
+  echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
+echo "configure:27568: checking for SSL support in libcurl" >&5
   CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
   if test "$CURL_SSL" = "SSL"; then
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+    echo "$ac_t""yes" 1>&6
+    cat >> confdefs.h <<\EOF
 #define HAVE_CURL_SSL 1
-_ACEOF
-
+EOF
 
+   
     save_CFLAGS="$CFLAGS"
     CFLAGS="`$CURL_CONFIG --cflags`"
-
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+   
+    echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:27581: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
   # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 27596 "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:27602: \"$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
   :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 27613 "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:27619: \"$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
+  :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 27630 "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:27636: \"$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
+  :
 else
-  ac_cv_prog_CPP=$CPP
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
+rm -f conftest*
 fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
+rm -f conftest*
 fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
 fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+  CPP="$ac_cv_prog_CPP"
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  ac_cv_prog_CPP="$CPP"
 fi
+echo "$ac_t""$CPP" 1>&6
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    echo "$as_me:$LINENO: checking for openssl support in libcurl" >&5
-echo $ECHO_N "checking for openssl support in libcurl... $ECHO_C" >&6
+    echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
+echo "configure:27661: checking for openssl support in libcurl" >&5
     if test "$cross_compiling" = yes; then
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  
+      echo "$ac_t""no" 1>&6
+    
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 27668 "configure"
+#include "confdefs.h"
 
 #include <curl/curl.h>
 
@@ -39023,214 +27681,87 @@
   }
   return 1;
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-for ac_header in openssl/crypto.h
+    
+EOF
+if { (eval echo configure:27687: \"$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
+      for ac_hdr in openssl/crypto.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:27695: 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 27700 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:27705: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+        cat >> confdefs.h <<\EOF
 #define HAVE_CURL_OPENSSL 1
-_ACEOF
-
+EOF
 
+      
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
-
+    
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
-    echo "$as_me:$LINENO: checking for gnutls support in libcurl" >&5
-echo $ECHO_N "checking for gnutls support in libcurl... $ECHO_C" >&6
+   
+    echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
+echo "configure:27750: checking for gnutls support in libcurl" >&5
     if test "$cross_compiling" = yes; then
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  
+      echo "$ac_t""no" 1>&6
+    
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 27757 "configure"
+#include "confdefs.h"
 
 #include <curl/curl.h>
 
 int main(int argc, char *argv[])
 {
   curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-
+  
   if (data && data->ssl_version && *data->ssl_version) {
     const char *ptr = data->ssl_version;
 
@@ -39240,209 +27771,86 @@
   return 1;
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-      if test "${ac_cv_header_gcrypt_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for gcrypt.h" >&5
-echo $ECHO_N "checking for gcrypt.h... $ECHO_C" >&6
-if test "${ac_cv_header_gcrypt_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_gcrypt_h" >&5
-echo "${ECHO_T}$ac_cv_header_gcrypt_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking gcrypt.h usability" >&5
-echo $ECHO_N "checking gcrypt.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <gcrypt.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking gcrypt.h presence" >&5
-echo $ECHO_N "checking gcrypt.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+EOF
+if { (eval echo configure:27776: \"$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:27782: 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 27787 "configure"
+#include "confdefs.h"
 #include <gcrypt.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: gcrypt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: gcrypt.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: gcrypt.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: gcrypt.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: gcrypt.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: gcrypt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: gcrypt.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: gcrypt.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for gcrypt.h" >&5
-echo $ECHO_N "checking for gcrypt.h... $ECHO_C" >&6
-if test "${ac_cv_header_gcrypt_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:27792: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  ac_cv_header_gcrypt_h=$ac_header_preproc
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_gcrypt_h" >&5
-echo "${ECHO_T}$ac_cv_header_gcrypt_h" >&6
-
+rm -f conftest*
 fi
-if test $ac_cv_header_gcrypt_h = yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+        cat >> confdefs.h <<\EOF
 #define HAVE_CURL_GNUTLS 1
-_ACEOF
-
+EOF
 
+      
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-
-
+    
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+   
     CFLAGS="$save_CFLAGS"
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
   "
-
+  
   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"
@@ -39453,20 +27861,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -39479,157 +27887,125 @@
     ;;
     -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 "$as_me:$LINENO: checking for curl_easy_perform in -lcurl" >&5
-echo $ECHO_N "checking for curl_easy_perform in -lcurl... $ECHO_C" >&6
-if test "${ac_cv_lib_curl_curl_easy_perform+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
+echo "configure:27934: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcurl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 27942 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char curl_easy_perform ();
-int
-main ()
-{
-curl_easy_perform ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_curl_curl_easy_perform=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_curl_curl_easy_perform=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_perform" >&5
-echo "${ECHO_T}$ac_cv_lib_curl_curl_easy_perform" >&6
-if test $ac_cv_lib_curl_curl_easy_perform = yes; then
+    builtin and then its argument prototype would still apply.  */
+char curl_easy_perform();
 
+int main() {
+curl_easy_perform()
+; return 0; }
+EOF
+if { (eval echo configure:27953: \"$ac_link\") 1>&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
+     
+    cat >> confdefs.h <<\EOF
+#define HAVE_CURL 1
+EOF
 
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURL 1
-_ACEOF
-
-
-
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_curl_curl_easy_perform
-
-    { { echo "$as_me:$LINENO: error: There is something wrong. Please check config.log for more information." >&5
-echo "$as_me: error: There is something wrong. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: There is something wrong. Please check config.log for more information." 1>&2; exit 1; }
+  
+  
 fi
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
   "
-
+  
   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"
@@ -39640,20 +28016,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -39666,153 +28042,123 @@
     ;;
     -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 "$as_me:$LINENO: checking for curl_version_info in -lcurl" >&5
-echo $ECHO_N "checking for curl_version_info in -lcurl... $ECHO_C" >&6
-if test "${ac_cv_lib_curl_curl_version_info+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6
+echo "configure:28089: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcurl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 28097 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char curl_version_info ();
-int
-main ()
-{
-curl_version_info ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_curl_curl_version_info=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_curl_curl_version_info=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_version_info" >&5
-echo "${ECHO_T}$ac_cv_lib_curl_curl_version_info" >&6
-if test $ac_cv_lib_curl_curl_version_info = yes; then
+    builtin and then its argument prototype would still apply.  */
+char curl_version_info();
+
+int main() {
+curl_version_info()
+; return 0; }
+EOF
+if { (eval echo configure:28108: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_CURL_VERSION_INFO 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_curl_curl_version_info
-
-
+    
+  
 fi
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
   "
-
+  
   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"
@@ -39823,20 +28169,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -39849,153 +28195,123 @@
     ;;
     -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 "$as_me:$LINENO: checking for curl_easy_strerror in -lcurl" >&5
-echo $ECHO_N "checking for curl_easy_strerror in -lcurl... $ECHO_C" >&6
-if test "${ac_cv_lib_curl_curl_easy_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6
+echo "configure:28242: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcurl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 28250 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char curl_easy_strerror ();
-int
-main ()
-{
-curl_easy_strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_curl_curl_easy_strerror=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_curl_curl_easy_strerror=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_curl_curl_easy_strerror" >&6
-if test $ac_cv_lib_curl_curl_easy_strerror = yes; then
+    builtin and then its argument prototype would still apply.  */
+char curl_easy_strerror();
+
+int main() {
+curl_easy_strerror()
+; return 0; }
+EOF
+if { (eval echo configure:28261: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_CURL_EASY_STRERROR 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_curl_curl_easy_strerror
-
-
+    
+  
 fi
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
   "
-
+  
   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"
@@ -40006,20 +28322,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -40032,143 +28348,112 @@
     ;;
     -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 "$as_me:$LINENO: checking for curl_multi_strerror in -lcurl" >&5
-echo $ECHO_N "checking for curl_multi_strerror in -lcurl... $ECHO_C" >&6
-if test "${ac_cv_lib_curl_curl_multi_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6
+echo "configure:28395: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcurl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 28403 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char curl_multi_strerror ();
-int
-main ()
-{
-curl_multi_strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_curl_curl_multi_strerror=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_curl_curl_multi_strerror=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_multi_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_curl_curl_multi_strerror" >&6
-if test $ac_cv_lib_curl_curl_multi_strerror = yes; then
+    builtin and then its argument prototype would still apply.  */
+char curl_multi_strerror();
+
+int main() {
+curl_multi_strerror()
+; return 0; }
+EOF
+if { (eval echo configure:28414: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_CURL_MULTI_STRERROR 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_curl_curl_multi_strerror
-
-
+    
+  
 fi
 
 
   if test "$PHP_CURLWRAPPERS" != "no" ; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define PHP_CURL_URL_WRAPPERS 1
-_ACEOF
+EOF
 
   fi
 
-
+  
   ext_builddir=ext/curl
   ext_srcdir=$abs_srcdir/ext/curl
 
@@ -40176,15 +28461,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_CURL_SHARED=no
-
-
+    
+  
   case ext/curl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -40197,12 +28482,12 @@
 
   old_IFS=$IFS
   for ac_src in interface.c multi.c streams.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
@@ -40226,14 +28511,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_CURL_SHARED=yes
-
+      
   case ext/curl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -40246,12 +28531,12 @@
 
   old_IFS=$IFS
   for ac_src in interface.c multi.c streams.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_curl="$shared_objects_curl $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -40269,7 +28554,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -40279,7 +28564,7 @@
       ;;
     *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_curl) -L$(top_builddir)/netware -lphp5lib $(CURL_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_curl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCURL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -40292,7 +28577,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcurl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_curl"
 
   cat >>Makefile.objects<<EOF
@@ -40306,7 +28591,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -40316,7 +28601,7 @@
       ;;
     *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_curl) -L$(top_builddir)/netware -lphp5lib $(L_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_curl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CURL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -40329,7 +28614,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/curl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_curl"
 
   cat >>Makefile.objects<<EOF
@@ -40343,10 +28628,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_CURL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -40355,15 +28639,15 @@
     PHP_CURL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/curl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -40376,12 +28660,12 @@
 
   old_IFS=$IFS
   for ac_src in interface.c multi.c streams.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
@@ -40401,15 +28685,15 @@
         EXT_STATIC="$EXT_STATIC curl"
         ;;
       *)
-
-
+        
+  
   case ext/curl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -40422,13 +28706,13 @@
 
   old_IFS=$IFS
   for ac_src in interface.c multi.c streams.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -40448,20 +28732,20 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC curl"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=curl
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST CURL_SHARED_LIBADD"
 
 fi
@@ -40490,11 +28774,12 @@
   enableval="$enable_dba"
   PHP_DBA=$enableval
 else
-
+  
   PHP_DBA=no
   test "$PHP_ENABLE_ALL" && PHP_DBA=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -40527,17 +28812,17 @@
 php_with_qdbm=no
 
 
-
 # Check whether --with-qdbm or --without-qdbm was given.
 if test "${with_qdbm+set}" = set; then
   withval="$with_qdbm"
   PHP_QDBM=$withval
 else
-
+  
   PHP_QDBM=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_QDBM
 
@@ -40549,17 +28834,17 @@
 php_with_gdbm=no
 
 
-
 # Check whether --with-gdbm or --without-gdbm was given.
 if test "${with_gdbm+set}" = set; then
   withval="$with_gdbm"
   PHP_GDBM=$withval
 else
-
+  
   PHP_GDBM=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_GDBM
 
@@ -40571,17 +28856,17 @@
 php_with_ndbm=no
 
 
-
 # Check whether --with-ndbm or --without-ndbm was given.
 if test "${with_ndbm+set}" = set; then
   withval="$with_ndbm"
   PHP_NDBM=$withval
 else
-
+  
   PHP_NDBM=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_NDBM
 
@@ -40593,17 +28878,17 @@
 php_with_db4=no
 
 
-
 # Check whether --with-db4 or --without-db4 was given.
 if test "${with_db4+set}" = set; then
   withval="$with_db4"
   PHP_DB4=$withval
 else
-
+  
   PHP_DB4=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_DB4
 
@@ -40615,17 +28900,17 @@
 php_with_db3=no
 
 
-
 # Check whether --with-db3 or --without-db3 was given.
 if test "${with_db3+set}" = set; then
   withval="$with_db3"
   PHP_DB3=$withval
 else
-
+  
   PHP_DB3=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_DB3
 
@@ -40637,17 +28922,17 @@
 php_with_db2=no
 
 
-
 # Check whether --with-db2 or --without-db2 was given.
 if test "${with_db2+set}" = set; then
   withval="$with_db2"
   PHP_DB2=$withval
 else
-
+  
   PHP_DB2=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_DB2
 
@@ -40659,17 +28944,17 @@
 php_with_db1=no
 
 
-
 # Check whether --with-db1 or --without-db1 was given.
 if test "${with_db1+set}" = set; then
   withval="$with_db1"
   PHP_DB1=$withval
 else
-
+  
   PHP_DB1=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_DB1
 
@@ -40681,17 +28966,17 @@
 php_with_dbm=no
 
 
-
 # Check whether --with-dbm or --without-dbm was given.
 if test "${with_dbm+set}" = set; then
   withval="$with_dbm"
   PHP_DBM=$withval
 else
-
+  
   PHP_DBM=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_DBM
 
@@ -40702,7 +28987,7 @@
 
 # QDBM
 if test "$PHP_QDBM" != "no"; then
-
+  
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
   for i in $PHP_QDBM /usr/local /usr; do
@@ -40715,23 +29000,23 @@
 
   if test -n "$THIS_INCLUDE"; then
     for LIB in qdbm; do
-
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR"
-
+  
   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"
@@ -40742,20 +29027,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -40768,138 +29053,106 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIB''_dpopen" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for dpopen in -l$LIB" >&5
-echo $ECHO_N "checking for dpopen in -l$LIB... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6
+echo "configure:29100: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 29108 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dpopen ();
-int
-main ()
-{
-dpopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dpopen();
+
+int main() {
+dpopen()
+; return 0; }
+EOF
+if { (eval echo configure:29119: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<_ACEOF
+    
+        cat >> confdefs.h <<EOF
 #define QDBM_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define DBA_QDBM 1
-_ACEOF
+EOF
 
         THIS_LIBS=$LIB
-
-
+      
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_dpopen
-
-
+    
+  
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -40908,113 +29161,109 @@
     done
   fi
 
-
+  
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
   fi
 
-
+  
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; }
   fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
-
+      
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_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 "$THIS_LFLAGS"; then
-
+    
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   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 $THIS_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$THIS_LIBS $LIBS"
+  *) 
+      LIBS="-l$THIS_LIBS $LIBS" 
    ;;
   esac
 
@@ -41034,53 +29283,45 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:29288: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 # GDBM
 if test "$PHP_GDBM" != "no"; then
-
+  
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
   if test "$HAVE_QDBM" = "1"; then
-
+    
   THIS_NAME=GDBM
   if test -n "gdbm"; then
     THIS_FULL_NAME="gdbm"
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:29316: checking for $THIS_FULL_NAME support" >&5
   if test -n "You cannot combine --with-gdbm with --with-qdbm"; then
-    { { echo "$as_me:$LINENO: error: You cannot combine --with-gdbm with --with-qdbm" >&5
-echo "$as_me: error: You cannot combine --with-gdbm with --with-qdbm" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; }
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -41094,23 +29335,23 @@
   done
 
   if test -n "$THIS_INCLUDE"; then
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR"
-
+  
   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"
@@ -41121,20 +29362,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -41147,248 +29388,213 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
-echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6
-if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
+echo "configure:29435: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgdbm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 29443 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdbm_open ();
-int
-main ()
-{
-gdbm_open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gdbm_gdbm_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gdbm_gdbm_open=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6
-if test $ac_cv_lib_gdbm_gdbm_open = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdbm_open();
+
+int main() {
+gdbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:29454: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<_ACEOF
+    
+      cat >> confdefs.h <<EOF
 #define GDBM_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define DBA_GDBM 1
-_ACEOF
-
+EOF
+ 
       THIS_LIBS=gdbm
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gdbm_gdbm_open
-
-
+    
+  
 fi
 
   fi
-
-
+    
+  
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
   fi
 
-
+  
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; }
   fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
-
+      
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_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 "$THIS_LFLAGS"; then
-
+    
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   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 $THIS_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$THIS_LIBS $LIBS"
+  *) 
+      LIBS="-l$THIS_LIBS $LIBS" 
    ;;
   esac
 
@@ -41408,28 +29614,24 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:29619: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 # NDBM
 if test "$PHP_NDBM" != "no"; then
-
+  
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
   for i in $PHP_NDBM /usr/local /usr; do
@@ -41443,26 +29645,26 @@
       break
     fi
   done
-
+  
   if test -n "$THIS_INCLUDE"; then
     for LIB in ndbm db1 c; do
-
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR"
-
+  
   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"
@@ -41473,20 +29675,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -41499,138 +29701,106 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIB''_dbm_open" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for dbm_open in -l$LIB" >&5
-echo $ECHO_N "checking for dbm_open in -l$LIB... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
+echo "configure:29748: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 29756 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dbm_open ();
-int
-main ()
-{
-dbm_open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dbm_open();
+
+int main() {
+dbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:29767: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<_ACEOF
+    
+        cat >> confdefs.h <<EOF
 #define NDBM_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define DBA_NDBM 1
-_ACEOF
-
+EOF
+ 
         THIS_LIBS=$LIB
-
-
+      
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_dbm_open
-
-
+    
+  
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -41639,113 +29809,109 @@
     done
   fi
 
-
+  
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
   fi
 
-
+  
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; }
   fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
-
+      
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_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 "$THIS_LFLAGS"; then
-
+    
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   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 $THIS_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$THIS_LIBS $LIBS"
+  *) 
+      LIBS="-l$THIS_LIBS $LIBS" 
    ;;
   esac
 
@@ -41765,21 +29931,17 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:29936: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -41788,7 +29950,7 @@
 
 # DB4
 if test "$PHP_DB4" != "no"; then
-
+  
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
   dbdp4="/usr/local/BerkeleyDB.4."
@@ -41844,94 +30006,61 @@
       break
     fi
   done
-
+  
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
   fi
   for LIB in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do
     if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
       lib_found="";
-
+      
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS"
   old_LIBS=$LIBS
   LIBS="-l$LIB $LIBS"
-
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+        cat > conftest.$ac_ext <<EOF
+#line 30024 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
-
-int
-main ()
-{
+        
+int main() {
 
           (void)db_create((DB**)0, (DB_ENV*)0, 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+        
+; return 0; }
+EOF
+if { (eval echo configure:30035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+          cat > conftest.$ac_ext <<EOF
+#line 30039 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR == 4 || (4 == 4 && DB_VERSION_MAJOR == 5)
             yes
 #endif
-
-_ACEOF
+          
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
             THIS_LIBS=$LIB
             lib_found=1
-
+          
 fi
 rm -f conftest*
 
-
+        
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
+rm -f conftest*
+      
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -41942,192 +30071,178 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    echo "$as_me:$LINENO: checking for DB4 major version" >&5
-echo $ECHO_N "checking for DB4 major version... $ECHO_C" >&6
-    { { echo "$as_me:$LINENO: error: Header contains different version" >&5
-echo "$as_me: error: Header contains different version" >&2;}
-   { (exit 1); exit 1; }; }
+    echo $ac_n "checking for DB4 major version""... $ac_c" 1>&6
+echo "configure:30076: checking for DB4 major version" >&5
+    { echo "configure: error: Header contains different version" 1>&2; exit 1; }
   fi
   if test "4" = "4"; then
-    echo "$as_me:$LINENO: checking for DB4 minor version and patch level" >&5
-echo $ECHO_N "checking for DB4 minor version and patch level... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
+echo "configure:30081: checking for DB4 minor version and patch level" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 30083 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25)
       yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t""ok" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: Version 4.1 requires patch level 25" >&5
-echo "$as_me: error: Version 4.1 requires patch level 25" >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: Version 4.1 requires patch level 25" 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    echo "$as_me:$LINENO: checking if dba can be used as shared extension" >&5
-echo $ECHO_N "checking if dba can be used as shared extension... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
+echo "configure:30109: checking if dba can be used as shared extension" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 30111 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2)
       yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t""yes" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: At least version 3.3 is required" >&5
-echo "$as_me: error: At least version 3.3 is required" >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: At least version 3.3 is required" 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define DBA_DB4 1
-_ACEOF
-
+EOF
+ 
     if test -n "$THIS_INCLUDE"; then
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define DB4_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+EOF
 
     fi
   else
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; }
   fi
   THIS_RESULT=yes
   DB4_LIBS=$THIS_LIBS
   DB4_PREFIX=$THIS_PREFIX
   DB4_INCLUDE=$THIS_INCLUDE
-
+  
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
   fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
-
+      
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_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 "$THIS_LFLAGS"; then
-
+    
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   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 $THIS_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$THIS_LIBS $LIBS"
+  *) 
+      LIBS="-l$THIS_LIBS $LIBS" 
    ;;
   esac
 
@@ -42148,53 +30263,45 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:30268: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 # DB3
 if test "$PHP_DB3" != "no"; then
-
+  
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
   if test "$HAVE_DB4" = "1"; then
-
+    
   THIS_NAME=DB3
   if test -n "Berkeley DB3"; then
     THIS_FULL_NAME="Berkeley DB3"
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:30296: checking for $THIS_FULL_NAME support" >&5
   if test -n "You cannot combine --with-db3 with --with-db4"; then
-    { { echo "$as_me:$LINENO: error: You cannot combine --with-db3 with --with-db4" >&5
-echo "$as_me: error: You cannot combine --with-db3 with --with-db4" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; }
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -42222,94 +30329,61 @@
       break
     fi
   done
-
+  
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
   fi
   for LIB in db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db; do
     if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
       lib_found="";
-
+      
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS"
   old_LIBS=$LIBS
   LIBS="-l$LIB $LIBS"
-
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+        cat > conftest.$ac_ext <<EOF
+#line 30347 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
-
-int
-main ()
-{
+        
+int main() {
 
           (void)db_create((DB**)0, (DB_ENV*)0, 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+        
+; return 0; }
+EOF
+if { (eval echo configure:30358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+          cat > conftest.$ac_ext <<EOF
+#line 30362 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR == 3 || (3 == 4 && DB_VERSION_MAJOR == 5)
             yes
 #endif
-
-_ACEOF
+          
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
             THIS_LIBS=$LIB
             lib_found=1
-
+          
 fi
 rm -f conftest*
 
-
+        
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
+rm -f conftest*
+      
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -42320,192 +30394,178 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    echo "$as_me:$LINENO: checking for DB3 major version" >&5
-echo $ECHO_N "checking for DB3 major version... $ECHO_C" >&6
-    { { echo "$as_me:$LINENO: error: Header contains different version" >&5
-echo "$as_me: error: Header contains different version" >&2;}
-   { (exit 1); exit 1; }; }
+    echo $ac_n "checking for DB3 major version""... $ac_c" 1>&6
+echo "configure:30399: checking for DB3 major version" >&5
+    { echo "configure: error: Header contains different version" 1>&2; exit 1; }
   fi
   if test "3" = "4"; then
-    echo "$as_me:$LINENO: checking for DB4 minor version and patch level" >&5
-echo $ECHO_N "checking for DB4 minor version and patch level... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
+echo "configure:30404: checking for DB4 minor version and patch level" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 30406 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25)
       yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t""ok" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: Version 4.1 requires patch level 25" >&5
-echo "$as_me: error: Version 4.1 requires patch level 25" >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: Version 4.1 requires patch level 25" 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    echo "$as_me:$LINENO: checking if dba can be used as shared extension" >&5
-echo $ECHO_N "checking if dba can be used as shared extension... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
+echo "configure:30432: checking if dba can be used as shared extension" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 30434 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2)
       yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t""yes" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: At least version 3.3 is required" >&5
-echo "$as_me: error: At least version 3.3 is required" >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: At least version 3.3 is required" 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define DBA_DB3 1
-_ACEOF
-
+EOF
+ 
     if test -n "$THIS_INCLUDE"; then
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define DB3_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+EOF
 
     fi
   else
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; }
   fi
   THIS_RESULT=yes
   DB3_LIBS=$THIS_LIBS
   DB3_PREFIX=$THIS_PREFIX
   DB3_INCLUDE=$THIS_INCLUDE
-
+  
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
   fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
-
+      
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_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 "$THIS_LFLAGS"; then
-
+    
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   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 $THIS_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$THIS_LIBS $LIBS"
+  *) 
+      LIBS="-l$THIS_LIBS $LIBS" 
    ;;
   esac
 
@@ -42526,53 +30586,45 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:30591: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 # DB2
 if test "$PHP_DB2" != "no"; then
-
+  
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
   if test "$HAVE_DB3" = "1" || test "$HAVE_DB4" = "1"; then
-
+    
   THIS_NAME=DB2
   if test -n "Berkeley DB2"; then
     THIS_FULL_NAME="Berkeley DB2"
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:30619: checking for $THIS_FULL_NAME support" >&5
   if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
-    { { echo "$as_me:$LINENO: error: You cannot combine --with-db2 with --with-db3 or --with-db4" >&5
-echo "$as_me: error: You cannot combine --with-db2 with --with-db3 or --with-db4" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; }
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -42600,94 +30652,61 @@
       break
     fi
   done
-
+  
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
   fi
   for LIB in db-2 db2 db; do
     if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
       lib_found="";
-
+      
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS"
   old_LIBS=$LIBS
   LIBS="-l$LIB $LIBS"
-
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+        cat > conftest.$ac_ext <<EOF
+#line 30670 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
-
-int
-main ()
-{
+        
+int main() {
 
           (void)db_appinit("", NULL, (DB_ENV*)0, 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+        
+; return 0; }
+EOF
+if { (eval echo configure:30681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+          cat > conftest.$ac_ext <<EOF
+#line 30685 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR == 2 || (2 == 4 && DB_VERSION_MAJOR == 5)
             yes
 #endif
-
-_ACEOF
+          
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
             THIS_LIBS=$LIB
             lib_found=1
-
+          
 fi
 rm -f conftest*
 
-
+        
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
+rm -f conftest*
+      
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -42698,192 +30717,178 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    echo "$as_me:$LINENO: checking for DB2 major version" >&5
-echo $ECHO_N "checking for DB2 major version... $ECHO_C" >&6
-    { { echo "$as_me:$LINENO: error: Header contains different version" >&5
-echo "$as_me: error: Header contains different version" >&2;}
-   { (exit 1); exit 1; }; }
+    echo $ac_n "checking for DB2 major version""... $ac_c" 1>&6
+echo "configure:30722: checking for DB2 major version" >&5
+    { echo "configure: error: Header contains different version" 1>&2; exit 1; }
   fi
   if test "2" = "4"; then
-    echo "$as_me:$LINENO: checking for DB4 minor version and patch level" >&5
-echo $ECHO_N "checking for DB4 minor version and patch level... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
+echo "configure:30727: checking for DB4 minor version and patch level" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 30729 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25)
       yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t""ok" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: Version 4.1 requires patch level 25" >&5
-echo "$as_me: error: Version 4.1 requires patch level 25" >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: Version 4.1 requires patch level 25" 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    echo "$as_me:$LINENO: checking if dba can be used as shared extension" >&5
-echo $ECHO_N "checking if dba can be used as shared extension... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
+echo "configure:30755: checking if dba can be used as shared extension" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 30757 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2)
       yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t""yes" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: At least version 3.3 is required" >&5
-echo "$as_me: error: At least version 3.3 is required" >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: At least version 3.3 is required" 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define DBA_DB2 1
-_ACEOF
-
+EOF
+ 
     if test -n "$THIS_INCLUDE"; then
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define DB2_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+EOF
 
     fi
   else
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; }
   fi
   THIS_RESULT=yes
   DB2_LIBS=$THIS_LIBS
   DB2_PREFIX=$THIS_PREFIX
   DB2_INCLUDE=$THIS_INCLUDE
-
+  
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
   fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
-
+      
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_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 "$THIS_LFLAGS"; then
-
+    
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   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 $THIS_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$THIS_LIBS $LIBS"
+  *) 
+      LIBS="-l$THIS_LIBS $LIBS" 
    ;;
   esac
 
@@ -42904,32 +30909,28 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:30914: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 # DB1
 if test "$PHP_DB1" != "no"; then
-
+  
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
-  echo "$as_me:$LINENO: checking for DB1 in library" >&5
-echo $ECHO_N "checking for DB1 in library... $ECHO_C" >&6
+  echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6
+echo "configure:30934: checking for DB1 in library" >&5
   if test "$HAVE_DB4" = "1"; then
     THIS_VERSION=4
     THIS_LIBS=$DB4_LIBS
@@ -42943,10 +30944,9 @@
     THIS_PREFIX=$DB2_PREFIX
   fi
   if test "$HAVE_DB4" = "1" || test "$HAVE_DB3" = "1" || test "$HAVE_DB2" = "1"; then
-
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define DB1_VERSION "Berkeley DB 1.85 emulation in DB$THIS_VERSION"
-_ACEOF
+EOF
 
     for i in db$THIS_VERSION/db_185.h include/db$THIS_VERSION/db_185.h include/db/db_185.h; do
       if test -f "$THIS_PREFIX/$i"; then
@@ -42955,10 +30955,9 @@
       fi
     done
   else
-
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define DB1_VERSION "Unknown DB1"
-_ACEOF
+EOF
 
     for i in $PHP_DB1 /usr/local /usr; do
       if test -f "$i/db1/db.h"; then
@@ -42977,195 +30976,159 @@
     done
     THIS_LIBS=db
   fi
-  echo "$as_me:$LINENO: result: $THIS_LIBS" >&5
-echo "${ECHO_T}$THIS_LIBS" >&6
-  echo "$as_me:$LINENO: checking for DB1 in header" >&5
-echo $ECHO_N "checking for DB1 in header... $ECHO_C" >&6
-  echo "$as_me:$LINENO: result: $THIS_INCLUDE" >&5
-echo "${ECHO_T}$THIS_INCLUDE" >&6
+  echo "$ac_t""$THIS_LIBS" 1>&6
+  echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6
+echo "configure:30982: checking for DB1 in header" >&5
+  echo "$ac_t""$THIS_INCLUDE" 1>&6
   if test -n "$THIS_INCLUDE"; then
-
+    
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS"
   old_LIBS=$LIBS
   LIBS="-l$THIS_LIBS $LIBS"
-
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+      cat > conftest.$ac_ext <<EOF
+#line 30992 "configure"
+#include "confdefs.h"
 
 #include "$THIS_INCLUDE"
-
-int
-main ()
-{
+      
+int main() {
 
         DB * dbp = dbopen("", 0, 0, DB_HASH, 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<_ACEOF
+      
+; return 0; }
+EOF
+if { (eval echo configure:31003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+        cat >> confdefs.h <<EOF
 #define DB1_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define DBA_DB1 1
-_ACEOF
+EOF
 
         THIS_RESULT=yes
-
+      
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
         THIS_RESULT=no
-
+      
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
+rm -f conftest*
+    
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
   fi
-
+  
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
   fi
 
-
+  
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; }
   fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
-
+      
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_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 "$THIS_LFLAGS"; then
-
+    
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   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 $THIS_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$THIS_LIBS $LIBS"
+  *) 
+      LIBS="-l$THIS_LIBS $LIBS" 
    ;;
   esac
 
@@ -43185,53 +31148,45 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:31153: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 # DBM
 if test "$PHP_DBM" != "no"; then
-
+  
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
   if test "$HAVE_QDBM" = "1"; then
-
+    
   THIS_NAME=DBM
   if test -n "dbm"; then
     THIS_FULL_NAME="dbm"
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:31181: checking for $THIS_FULL_NAME support" >&5
   if test -n "You cannot combine --with-dbm with --with-qdbm"; then
-    { { echo "$as_me:$LINENO: error: You cannot combine --with-dbm with --with-qdbm" >&5
-echo "$as_me: error: You cannot combine --with-dbm with --with-qdbm" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; }
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -43250,23 +31205,23 @@
 
   if test -n "$THIS_INCLUDE"; then
     for LIB in dbm c gdbm; do
-
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR"
-
+  
   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"
@@ -43277,20 +31232,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -43303,157 +31258,121 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIB''_dbminit" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for dbminit in -l$LIB" >&5
-echo $ECHO_N "checking for dbminit in -l$LIB... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
+echo "configure:31305: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 31313 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dbminit ();
-int
-main ()
-{
-dbminit ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dbminit();
+
+int main() {
+dbminit()
+; return 0; }
+EOF
+if { (eval echo configure:31324: \"$ac_link\") 1>&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
-
-        echo "$as_me:$LINENO: checking for DBM using GDBM" >&5
-echo $ECHO_N "checking for DBM using GDBM... $ECHO_C" >&6
-
-cat >>confdefs.h <<_ACEOF
+    
+        echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6
+echo "configure:31344: checking for DBM using GDBM" >&5
+        cat >> confdefs.h <<EOF
 #define DBM_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+EOF
 
         if test "$LIB" = "gdbm"; then
-
-cat >>confdefs.h <<_ACEOF
+          cat >> confdefs.h <<EOF
 #define DBM_VERSION "GDBM"
-_ACEOF
+EOF
 
-          echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+          echo "$ac_t""yes" 1>&6
         else
-
-cat >>confdefs.h <<_ACEOF
+          cat >> confdefs.h <<EOF
 #define DBM_VERSION "DBM"
-_ACEOF
+EOF
 
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+          echo "$ac_t""no" 1>&6
         fi
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define DBA_DBM 1
-_ACEOF
-
+EOF
+ 
         THIS_LIBS=$LIB
-
-
+      
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_dbminit
-
-
+    
+  
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -43461,114 +31380,110 @@
       fi
     done
   fi
-
-
+  
+  
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
   fi
 
-
+  
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; }
   fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
-
+      
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_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 "$THIS_LFLAGS"; then
-
+    
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   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 $THIS_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$THIS_LIBS $LIBS"
+  *) 
+      LIBS="-l$THIS_LIBS $LIBS" 
    ;;
   esac
 
@@ -43588,21 +31503,17 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:31508: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -43617,17 +31528,17 @@
 php_with_cdb=$php_dba_enable
 
 
-
 # Check whether --with-cdb or --without-cdb was given.
 if test "${with_cdb+set}" = set; then
   withval="$with_cdb"
   PHP_CDB=$withval
 else
-
+  
   PHP_CDB=$php_dba_enable
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_CDB
 
@@ -43644,11 +31555,12 @@
   enableval="$enable_inifile"
   PHP_INIFILE=$enableval
 else
-
+  
   PHP_INIFILE=$php_dba_enable
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_INIFILE
 
@@ -43665,11 +31577,12 @@
   enableval="$enable_flatfile"
   PHP_FLATFILE=$enableval
 else
-
+  
   PHP_FLATFILE=$php_dba_enable
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_FLATFILE
 
@@ -43679,25 +31592,22 @@
 
 # CDB
 if test "$PHP_CDB" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define DBA_CDB_BUILTIN 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define DBA_CDB_MAKE 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define DBA_CDB 1
-_ACEOF
+EOF
 
   cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c"
   THIS_RESULT="builtin"
 elif test "$PHP_CDB" != "no"; then
-
+  
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
   for i in $PHP_CDB /usr/local /usr; do
@@ -43710,23 +31620,23 @@
 
   if test -n "$THIS_INCLUDE"; then
     for LIB in cdb c; do
-
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR"
-
+  
   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"
@@ -43737,20 +31647,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -43763,138 +31673,106 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIB''_cdb_read" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for cdb_read in -l$LIB" >&5
-echo $ECHO_N "checking for cdb_read in -l$LIB... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6
+echo "configure:31720: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 31728 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char cdb_read ();
-int
-main ()
-{
-cdb_read ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char cdb_read();
 
+int main() {
+cdb_read()
+; return 0; }
+EOF
+if { (eval echo configure:31739: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<_ACEOF
+    
+        cat >> confdefs.h <<EOF
 #define CDB_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define DBA_CDB 1
-_ACEOF
-
+EOF
+ 
         THIS_LIBS=$LIB
-
-
+      
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_cdb_read
-
-
+    
+  
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -43903,113 +31781,109 @@
     done
   fi
 
-
+  
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR
   fi
 
-
+  
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; }
   fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
-
+      
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_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 "$THIS_LFLAGS"; then
-
+    
   if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then
-
+    
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
   else
-
+    
     ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
   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 $THIS_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$THIS_LIBS $LIBS"
+  *) 
+      LIBS="-l$THIS_LIBS $LIBS" 
    ;;
   esac
 
@@ -44029,31 +31903,26 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:31908: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 # INIFILE
 if test "$PHP_INIFILE" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define DBA_INIFILE 1
-_ACEOF
+EOF
 
   ini_sources="libinifile/inifile.c"
   THIS_RESULT="builtin"
@@ -44065,31 +31934,26 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:31939: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 # FLATFILE
 if test "$PHP_FLATFILE" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define DBA_FLATFILE 1
-_ACEOF
+EOF
 
   flat_sources="libflatfile/flatfile.c"
   THIS_RESULT="builtin"
@@ -44101,41 +31965,34 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6
+  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
+echo "configure:31970: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    { 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 "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6
+    echo "$ac_t""$THIS_RESULT" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
-echo "$as_me:$LINENO: checking whether to enable DBA interface" >&5
-echo $ECHO_N "checking whether to enable DBA interface... $ECHO_C" >&6
+echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
+echo "configure:31985: checking whether to enable DBA interface" >&5
 if test "$HAVE_DBA" = "1"; then
   if test "$ext_shared" = "yes"; then
-    echo "$as_me:$LINENO: result: yes, shared" >&5
-echo "${ECHO_T}yes, shared" >&6
+    echo "$ac_t""yes, shared" 1>&6
   else
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   fi
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_DBA 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/dba
   ext_srcdir=$abs_srcdir/ext/dba
 
@@ -44143,15 +32000,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_DBA_SHARED=no
-
-
+    
+  
   case ext/dba 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" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -44164,12 +32021,12 @@
 
   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
-
+  
       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
@@ -44193,14 +32050,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_DBA_SHARED=yes
-
+      
   case ext/dba 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" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -44213,12 +32070,12 @@
 
   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
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_dba="$shared_objects_dba $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -44236,7 +32093,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -44246,7 +32103,7 @@
       ;;
     *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 $(DBA_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
@@ -44259,7 +32116,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdba.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dba"
 
   cat >>Makefile.objects<<EOF
@@ -44273,7 +32130,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -44283,7 +32140,7 @@
       ;;
     *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 $(_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
@@ -44296,7 +32153,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/dba.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dba"
 
   cat >>Makefile.objects<<EOF
@@ -44310,10 +32167,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_DBA 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -44321,16 +32177,16 @@
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
     PHP_DBA_SHARED=no
     case "$PHP_SAPI" in
-      cgi|embed)
-
-
+      cgi|embed)
+        
+  
   case ext/dba 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" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -44343,12 +32199,12 @@
 
   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
-
+  
       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
@@ -44368,15 +32224,15 @@
         EXT_STATIC="$EXT_STATIC dba"
         ;;
       *)
-
-
+        
+  
   case ext/dba 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" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -44389,13 +32245,13 @@
 
   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
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -44415,58 +32271,58 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC dba"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     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 "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 
 
 php_enable_dom=yes
 
-echo "$as_me:$LINENO: checking whether to enable DOM support" >&5
-echo $ECHO_N "checking whether to enable DOM support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6
+echo "configure:32315: 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"
   PHP_DOM=$enableval
 else
-
+  
   PHP_DOM=yes
   test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -44490,33 +32346,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_LIBXML_DIR"; then
-
+  
 php_with_libxml_dir=no
 
-echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
+echo "configure:32360: 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"
   PHP_LIBXML_DIR=$withval
 else
-
+  
   PHP_LIBXML_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBXML_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -44524,19 +32378,17 @@
 
 if test "$PHP_DOM" != "no"; then
 
-  if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: DOM extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: DOM extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+  if test "$PHP_LIBXML" = "no"; then   
+    { echo "configure: error: DOM extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
   fi
 
-
-echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
+echo "configure:32388: 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
-
+  
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
     if test -x "$i/bin/xml2-config"; then
       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
@@ -44545,8 +32397,8 @@
   done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6
+
+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -44559,17 +32411,17 @@
     if test "$LIBXML_VERSION" -ge "2006011"; then
       LIBXML_LIBS=`$XML2_CONFIG --libs`
       LIBXML_INCS=`$XML2_CONFIG --cflags`
-
+      
   for ac_i in $LIBXML_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         DOM_SHARED_LIBADD="$DOM_SHARED_LIBADD -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"
@@ -44580,20 +32432,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        DOM_SHARED_LIBADD="$DOM_SHARED_LIBADD -l$ac_ii"
+        DOM_SHARED_LIBADD="$DOM_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -44606,80 +32458,80 @@
     ;;
     -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
         DOM_SHARED_LIBADD="-L$ai_p $DOM_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && DOM_SHARED_LIBADD="$ld_runpath_switch$ai_p $DOM_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $LIBXML_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -44689,92 +32541,74 @@
   done
 
 
-            echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
+echo "configure:32546: 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
-
-
+  
+        
   old_LIBS=$LIBS
   LIBS="
           $DOM_SHARED_LIBADD
          $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 32562 "configure"
+#include "confdefs.h"
 
+    
     char xmlInitParser();
     int main() {
       xmlInitParser();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:32573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
+    
           php_cv_libxml_build_works=yes
-
-
+        
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
+        
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+      
 fi
-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6
-      if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_libxml_build_works" 1>&6
+      if test "$php_cv_libxml_build_works" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
+EOF
 
       fi
-
-
-cat >>confdefs.h <<\_ACEOF
+      
+    cat >> confdefs.h <<\EOF
 #define HAVE_DOM 1
-_ACEOF
-
+EOF
 
+    
   ext_builddir=ext/dom
   ext_srcdir=$abs_srcdir/ext/dom
 
@@ -44782,15 +32616,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_DOM_SHARED=no
-
-
+    
+  
   case ext/dom in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -44812,12 +32646,12 @@
                             domimplementationsource.c entityreference.c \
                             notation.c xpath.c dom_iterators.c \
                             typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.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
@@ -44841,14 +32675,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_DOM_SHARED=yes
-
+      
   case ext/dom in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -44870,12 +32704,12 @@
                             domimplementationsource.c entityreference.c \
                             notation.c xpath.c dom_iterators.c \
                             typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_dom="$shared_objects_dom $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -44893,7 +32727,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -44903,7 +32737,7 @@
       ;;
     *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_dom) -L$(top_builddir)/netware -lphp5lib $(DOM_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_dom) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDOM, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -44916,7 +32750,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdom.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dom"
 
   cat >>Makefile.objects<<EOF
@@ -44930,7 +32764,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -44940,7 +32774,7 @@
       ;;
     *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_dom) -L$(top_builddir)/netware -lphp5lib $(_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_dom) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DOM, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -44953,7 +32787,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/dom.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dom"
 
   cat >>Makefile.objects<<EOF
@@ -44967,10 +32801,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_DOM 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -44979,15 +32812,15 @@
     PHP_DOM_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/dom in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -45009,12 +32842,12 @@
                             domimplementationsource.c entityreference.c \
                             notation.c xpath.c dom_iterators.c \
                             typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.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
@@ -45034,15 +32867,15 @@
         EXT_STATIC="$EXT_STATIC dom"
         ;;
       *)
-
-
+        
+  
   case ext/dom in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -45064,13 +32897,13 @@
                             domimplementationsource.c entityreference.c \
                             notation.c xpath.c dom_iterators.c \
                             typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -45090,82 +32923,66 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC dom"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=dom
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST DOM_SHARED_LIBADD"
 
-
-
+    
+  
     for header_file in ext/dom/xml_common.h; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
+    
   am_i_shared=$PHP_DOM_SHARED
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension dom to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build dom shared or build libxml statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension dom to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build dom shared or build libxml statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension dom, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension dom, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
     fi
-else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
+  
   fi
 
 fi
@@ -45174,19 +32991,19 @@
 
 php_with_enchant=no
 
-echo "$as_me:$LINENO: checking for ENCHANT support" >&5
-echo $ECHO_N "checking for ENCHANT support... $ECHO_C" >&6
-
+echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6
+echo "configure:32996: checking for ENCHANT support" >&5
 # Check whether --with-enchant or --without-enchant was given.
 if test "${with_enchant+set}" = set; then
   withval="$with_enchant"
   PHP_ENCHANT=$withval
 else
-
+  
   PHP_ENCHANT=no
   test "$PHP_ENABLE_ALL" && PHP_ENCHANT=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -45210,14 +33027,13 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_ENCHANT" != "no"; then
-
+	
   ext_builddir=ext/enchant
   ext_srcdir=$abs_srcdir/ext/enchant
 
@@ -45225,15 +33041,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_ENCHANT_SHARED=no
-
-
+    
+  
   case ext/enchant in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -45246,12 +33062,12 @@
 
   old_IFS=$IFS
   for ac_src in enchant.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
@@ -45275,14 +33091,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_ENCHANT_SHARED=yes
-
+      
   case ext/enchant in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -45295,12 +33111,12 @@
 
   old_IFS=$IFS
   for ac_src in enchant.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_enchant="$shared_objects_enchant $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -45318,7 +33134,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -45328,7 +33144,7 @@
       ;;
     *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_enchant) -L$(top_builddir)/netware -lphp5lib $(ENCHANT_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_enchant) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPENCHANT, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -45341,7 +33157,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpenchant.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_enchant"
 
   cat >>Makefile.objects<<EOF
@@ -45355,7 +33171,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -45365,7 +33181,7 @@
       ;;
     *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_enchant) -L$(top_builddir)/netware -lphp5lib $(HANT_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_enchant) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ENCHANT, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -45378,7 +33194,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/enchant.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_enchant"
 
   cat >>Makefile.objects<<EOF
@@ -45392,10 +33208,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_ENCHANT 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -45404,15 +33219,15 @@
     PHP_ENCHANT_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/enchant in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -45425,12 +33240,12 @@
 
   old_IFS=$IFS
   for ac_src in enchant.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
@@ -45450,15 +33265,15 @@
         EXT_STATIC="$EXT_STATIC enchant"
         ;;
       *)
-
-
+        
+  
   case ext/enchant in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -45471,13 +33286,13 @@
 
   old_IFS=$IFS
   for ac_src in enchant.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -45497,15 +33312,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC enchant"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=enchant
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -45526,109 +33341,106 @@
 	done
 
 	if test -z "$ENCHANT_DIR"; then
-		{ { echo "$as_me:$LINENO: error: Cannot find enchant" >&5
-echo "$as_me: error: Cannot find enchant" >&2;}
-   { (exit 1); exit 1; }; }
+		{ echo "configure: error: Cannot find enchant" 1>&2; exit 1; }
 	fi
 
 	ENCHANT_LIBDIR=$ENCHANT_DIR/lib
 
-
-cat >>confdefs.h <<\_ACEOF
+	cat >> confdefs.h <<\EOF
 #define HAVE_ENCHANT 1
-_ACEOF
-
+EOF
 
+	
   PHP_VAR_SUBST="$PHP_VAR_SUBST ENCHANT_SHARED_LIBADD"
 
-
+	
 
   if test "$ext_shared" = "yes"; then
     ENCHANT_SHARED_LIBADD="-lenchant $ENCHANT_SHARED_LIBADD"
     if test -n "$ENCHANT_LIBDIR"; then
-
+      
   if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$ENCHANT_LIBDIR" || echo "$ENCHANT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ENCHANT_LIBDIR
   else
-
+    
     ep_dir="`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ENCHANT_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         ENCHANT_SHARED_LIBADD="-L$ai_p $ENCHANT_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && ENCHANT_SHARED_LIBADD="$ld_runpath_switch$ai_p $ENCHANT_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 "$ENCHANT_LIBDIR"; then
-
+    
   if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$ENCHANT_LIBDIR" || echo "$ENCHANT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ENCHANT_LIBDIR
   else
-
+    
     ep_dir="`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ENCHANT_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 enchant in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lenchant $LIBS"
+  *) 
+      LIBS="-lenchant $LIBS" 
    ;;
   esac
 
@@ -45638,54 +33450,54 @@
   fi
 
 
-
+	
   if test "$ENCHANT_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$ENCHANT_INCDIR" || echo "$ENCHANT_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$ENCHANT_INCDIR
   else
-
+    
     ep_dir="`echo $ENCHANT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ENCHANT_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
 
-
+	
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$ENCHANT_LIB $ENCHANT_SHARED_LIBADD"
-
+  
   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"
@@ -45696,20 +33508,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -45722,136 +33534,105 @@
     ;;
     -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 "$as_me:$LINENO: checking for enchant_broker_set_param in -lenchant" >&5
-echo $ECHO_N "checking for enchant_broker_set_param in -lenchant... $ECHO_C" >&6
-if test "${ac_cv_lib_enchant_enchant_broker_set_param+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6
+echo "configure:33581: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lenchant  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 33589 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char enchant_broker_set_param ();
-int
-main ()
-{
-enchant_broker_set_param ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_enchant_enchant_broker_set_param=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_enchant_enchant_broker_set_param=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5
-echo "${ECHO_T}$ac_cv_lib_enchant_enchant_broker_set_param" >&6
-if test $ac_cv_lib_enchant_enchant_broker_set_param = yes; then
+    builtin and then its argument prototype would still apply.  */
+char enchant_broker_set_param();
+
+int main() {
+enchant_broker_set_param()
+; return 0; }
+EOF
+if { (eval echo configure:33600: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+	  cat >> confdefs.h <<\EOF
 #define HAVE_ENCHANT_BROKER_SET_PARAM 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+	  cat >> confdefs.h <<\EOF
 #define ENCHANT_VERSION_STRING "1.5.x"
-_ACEOF
-
-
+EOF
 
+	
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_enchant_enchant_broker_set_param
-
-
+    
+  
 fi
 
 
@@ -45861,18 +33642,19 @@
 
 php_enable_exif=no
 
-echo "$as_me:$LINENO: checking whether to enable EXIF (metadata from images) support" >&5
-echo $ECHO_N "checking whether to enable EXIF (metadata from images) support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6
+echo "configure:33647: 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"
   PHP_EXIF=$enableval
 else
-
+  
   PHP_EXIF=no
   test "$PHP_ENABLE_ALL" && PHP_EXIF=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -45896,19 +33678,17 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_EXIF" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_EXIF 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/exif
   ext_srcdir=$abs_srcdir/ext/exif
 
@@ -45916,15 +33696,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_EXIF_SHARED=no
-
-
+    
+  
   case ext/exif in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -45937,12 +33717,12 @@
 
   old_IFS=$IFS
   for ac_src in exif.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
@@ -45966,14 +33746,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_EXIF_SHARED=yes
-
+      
   case ext/exif in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -45986,12 +33766,12 @@
 
   old_IFS=$IFS
   for ac_src in exif.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_exif="$shared_objects_exif $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -46009,7 +33789,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -46019,7 +33799,7 @@
       ;;
     *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_exif) -L$(top_builddir)/netware -lphp5lib $(EXIF_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_exif) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPEXIF, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -46032,7 +33812,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpexif.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_exif"
 
   cat >>Makefile.objects<<EOF
@@ -46046,7 +33826,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -46056,7 +33836,7 @@
       ;;
     *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_exif) -L$(top_builddir)/netware -lphp5lib $(F_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_exif) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(EXIF, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -46069,7 +33849,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/exif.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_exif"
 
   cat >>Makefile.objects<<EOF
@@ -46083,10 +33863,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_EXIF 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -46095,15 +33874,15 @@
     PHP_EXIF_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/exif in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -46116,12 +33895,12 @@
 
   old_IFS=$IFS
   for ac_src in exif.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
@@ -46141,15 +33920,15 @@
         EXT_STATIC="$EXT_STATIC exif"
         ;;
       *)
-
-
+        
+  
   case ext/exif in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -46162,13 +33941,13 @@
 
   old_IFS=$IFS
   for ac_src in exif.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -46188,15 +33967,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC exif"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=exif
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -46207,18 +33986,19 @@
 
 php_enable_fileinfo=yes
 
-echo "$as_me:$LINENO: checking for fileinfo support" >&5
-echo $ECHO_N "checking for fileinfo support... $ECHO_C" >&6
+echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6
+echo "configure:33991: checking for fileinfo support" >&5
 # Check whether --enable-fileinfo or --disable-fileinfo was given.
 if test "${enable_fileinfo+set}" = set; then
   enableval="$enable_fileinfo"
   PHP_FILEINFO=$enableval
 else
-
+  
   PHP_FILEINFO=yes
   test "$PHP_ENABLE_ALL" && PHP_FILEINFO=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -46242,8 +34022,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -46257,7 +34036,7 @@
     libmagic/is_tar.c libmagic/magic.c libmagic/print.c \
     libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c"
 
-
+  
   ext_builddir=ext/fileinfo
   ext_srcdir=$abs_srcdir/ext/fileinfo
 
@@ -46265,15 +34044,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_FILEINFO_SHARED=no
-
-
+    
+  
   case ext/fileinfo in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -46286,12 +34065,12 @@
 
   old_IFS=$IFS
   for ac_src in fileinfo.c $libmagic_sources; 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
@@ -46315,14 +34094,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_FILEINFO_SHARED=yes
-
+      
   case ext/fileinfo in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -46335,12 +34114,12 @@
 
   old_IFS=$IFS
   for ac_src in fileinfo.c $libmagic_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_fileinfo="$shared_objects_fileinfo $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -46358,7 +34137,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -46368,7 +34147,7 @@
       ;;
     *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_fileinfo) -L$(top_builddir)/netware -lphp5lib $(FILEINFO_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_fileinfo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPFILEINFO, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -46381,7 +34160,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpfileinfo.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_fileinfo"
 
   cat >>Makefile.objects<<EOF
@@ -46395,7 +34174,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -46405,7 +34184,7 @@
       ;;
     *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_fileinfo) -L$(top_builddir)/netware -lphp5lib $(EINFO_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_fileinfo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(FILEINFO, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -46418,7 +34197,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/fileinfo.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_fileinfo"
 
   cat >>Makefile.objects<<EOF
@@ -46432,10 +34211,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_FILEINFO 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -46444,15 +34222,15 @@
     PHP_FILEINFO_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/fileinfo in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -46465,12 +34243,12 @@
 
   old_IFS=$IFS
   for ac_src in fileinfo.c $libmagic_sources; 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
@@ -46490,15 +34268,15 @@
         EXT_STATIC="$EXT_STATIC fileinfo"
         ;;
       *)
-
-
+        
+  
   case ext/fileinfo in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -46511,13 +34289,13 @@
 
   old_IFS=$IFS
   for ac_src in fileinfo.c $libmagic_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -46537,130 +34315,82 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC fileinfo"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=fileinfo
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir/libmagic"
+  
 
 
-
-
-
-for ac_func in utimes strndup
+  for ac_func in utimes strndup
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:34341: 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 34346 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:34369: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
 
-
+  
   src=$ext_srcdir/Makefile.frag
   ac_srcdir=$ext_srcdir
   ac_builddir=$ext_builddir
@@ -46672,18 +34402,19 @@
 
 php_enable_filter=yes
 
-echo "$as_me:$LINENO: checking whether to enable input filter support" >&5
-echo $ECHO_N "checking whether to enable input filter support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6
+echo "configure:34407: 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"
   PHP_FILTER=$enableval
 else
-
+  
   PHP_FILTER=yes
   test "$PHP_ENABLE_ALL" && PHP_FILTER=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -46707,8 +34438,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -46716,23 +34446,22 @@
 
 php_with_pcre_dir=no
 
-echo "$as_me:$LINENO: checking pcre install prefix" >&5
-echo $ECHO_N "checking pcre install prefix... $ECHO_C" >&6
-
+echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
+echo "configure:34451: 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"
   PHP_PCRE_DIR=$withval
 else
-
+  
   PHP_PCRE_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_PCRE_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -46744,59 +34473,57 @@
   else
         old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=$INCLUDES
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    cat > conftest.$ac_ext <<EOF
+#line 34478 "configure"
+#include "confdefs.h"
 
 #include <main/php_config.h>
 #if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
 yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
       PHP_PCRE_REGEX=yes
-
+    
 else
-
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  rm -rf conftest*
+  
+      cat > conftest.$ac_ext <<EOF
+#line 34497 "configure"
+#include "confdefs.h"
 
 #include <main/php_config.h>
 #if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
 yes
 #endif
-
-_ACEOF
+      
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
         PHP_PCRE_REGEX=pecl
-
+      
 else
-
+  rm -rf conftest*
+  
         PHP_PCRE_REGEX=no
-
+      
 fi
 rm -f conftest*
 
-
+    
 fi
 rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
   fi
 
-
+  
   ext_builddir=ext/filter
   ext_srcdir=$abs_srcdir/ext/filter
 
@@ -46804,15 +34531,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_FILTER_SHARED=no
-
-
+    
+  
   case ext/filter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -46825,12 +34552,12 @@
 
   old_IFS=$IFS
   for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.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
@@ -46854,14 +34581,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_FILTER_SHARED=yes
-
+      
   case ext/filter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -46874,12 +34601,12 @@
 
   old_IFS=$IFS
   for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_filter="$shared_objects_filter $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -46897,7 +34624,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -46907,7 +34634,7 @@
       ;;
     *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_filter) -L$(top_builddir)/netware -lphp5lib $(FILTER_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_filter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPFILTER, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -46920,7 +34647,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpfilter.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_filter"
 
   cat >>Makefile.objects<<EOF
@@ -46934,7 +34661,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -46944,7 +34671,7 @@
       ;;
     *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_filter) -L$(top_builddir)/netware -lphp5lib $(TER_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_filter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(FILTER, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -46957,7 +34684,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/filter.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_filter"
 
   cat >>Makefile.objects<<EOF
@@ -46971,10 +34698,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_FILTER 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -46983,15 +34709,15 @@
     PHP_FILTER_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/filter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -47004,12 +34730,12 @@
 
   old_IFS=$IFS
   for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.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
@@ -47029,15 +34755,15 @@
         EXT_STATIC="$EXT_STATIC filter"
         ;;
       *)
-
-
+        
+  
   case ext/filter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -47050,13 +34776,13 @@
 
   old_IFS=$IFS
   for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -47076,90 +34802,79 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC filter"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=filter
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST FILTER_SHARED_LIBADD"
 
 
-
-
+  
+  
     for header_file in ext/filter/php_filter.h; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
+  
   am_i_shared=$PHP_FILTER_SHARED
   is_it_shared=$PHP_PCRE_SHARED
   is_it_enabled=$PHP_PCRE
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension filter to build statically, but it
-depends on extension pcre, which you've configured to build shared.
-You either need to build filter shared or build pcre statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension filter to build statically, but it
 depends on extension pcre, which you've configured to build shared.
 You either need to build filter shared or build pcre statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension filter, which depends on extension pcre,
-but you've either not enabled pcre, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension filter, which depends on extension pcre,
 but you've either not enabled pcre, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
+  
 fi
 
 
 
 php_enable_ftp=no
 
-echo "$as_me:$LINENO: checking whether to enable FTP support" >&5
-echo $ECHO_N "checking whether to enable FTP support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6
+echo "configure:34867: 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"
   PHP_FTP=$enableval
 else
-
+  
   PHP_FTP=no
   test "$PHP_ENABLE_ALL" && PHP_FTP=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -47183,8 +34898,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -47192,34 +34906,32 @@
 
 php_with_openssl_dir=no
 
-echo "$as_me:$LINENO: checking OpenSSL dir for FTP" >&5
-echo $ECHO_N "checking OpenSSL dir for FTP... $ECHO_C" >&6
-
+echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6
+echo "configure:34911: 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"
   PHP_OPENSSL_DIR=$withval
 else
-
+  
   PHP_OPENSSL_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_OPENSSL_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_FTP" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_FTP 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/ftp
   ext_srcdir=$abs_srcdir/ext/ftp
 
@@ -47227,15 +34939,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_FTP_SHARED=no
-
-
+    
+  
   case ext/ftp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -47248,12 +34960,12 @@
 
   old_IFS=$IFS
   for ac_src in php_ftp.c ftp.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
@@ -47277,14 +34989,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_FTP_SHARED=yes
-
+      
   case ext/ftp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -47297,12 +35009,12 @@
 
   old_IFS=$IFS
   for ac_src in php_ftp.c ftp.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_ftp="$shared_objects_ftp $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -47320,7 +35032,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -47330,7 +35042,7 @@
       ;;
     *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_ftp) -L$(top_builddir)/netware -lphp5lib $(FTP_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_ftp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPFTP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -47343,7 +35055,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpftp.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ftp"
 
   cat >>Makefile.objects<<EOF
@@ -47357,7 +35069,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -47367,7 +35079,7 @@
       ;;
     *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_ftp) -L$(top_builddir)/netware -lphp5lib $(_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_ftp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(FTP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -47380,7 +35092,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/ftp.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ftp"
 
   cat >>Makefile.objects<<EOF
@@ -47394,10 +35106,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_FTP 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -47406,15 +35117,15 @@
     PHP_FTP_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/ftp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -47427,12 +35138,12 @@
 
   old_IFS=$IFS
   for ac_src in php_ftp.c ftp.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
@@ -47452,15 +35163,15 @@
         EXT_STATIC="$EXT_STATIC ftp"
         ;;
       *)
-
-
+        
+  
   case ext/ftp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -47473,13 +35184,13 @@
 
   old_IFS=$IFS
   for ac_src in php_ftp.c ftp.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -47499,15 +35210,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC ftp"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=ftp
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -47516,7 +35227,7 @@
     test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
 
   if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
-
+    
   found_openssl=no
   unset OPENSSL_INCDIR
   unset OPENSSL_LIBDIR
@@ -47533,42 +35244,38 @@
     if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:35249: 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
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
+  case "$PKG_CONFIG" in
+  /*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  echo "$ac_t""$PKG_CONFIG" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   fi
@@ -47580,23 +35287,21 @@
       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
     else
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
     fi
 
     if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
-
+      
   for ac_i in $OPENSSL_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         FTP_SHARED_LIBADD="$FTP_SHARED_LIBADD -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"
@@ -47607,20 +35312,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        FTP_SHARED_LIBADD="$FTP_SHARED_LIBADD -l$ac_ii"
+        FTP_SHARED_LIBADD="$FTP_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -47633,80 +35338,80 @@
     ;;
     -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
         FTP_SHARED_LIBADD="-L$ai_p $FTP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && FTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $FTP_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $OPENSSL_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -47719,7 +35424,7 @@
   fi
 
     if test "$found_openssl" = "no"; then
-
+  
     if test "$PHP_OPENSSL_DIR" = "yes"; then
       PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
     fi
@@ -47735,102 +35440,94 @@
     done
 
     if test -z "$OPENSSL_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5
-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; }
     fi
 
     if test -z "$OPENSSL_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5
-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; }
     fi
 
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
-    echo "$as_me:$LINENO: checking for OpenSSL version" >&5
-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
+echo "configure:35454: checking for OpenSSL version" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 35456 "configure"
+#include "confdefs.h"
 
 #include <openssl/opensslv.h>
 #if OPENSSL_VERSION_NUMBER >= 0x0090600fL
   yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: >= 0.9.6" >&5
-echo "${ECHO_T}>= 0.9.6" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t"">= 0.9.6" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
-
+    
   if test "$OPENSSL_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$OPENSSL_INCDIR
   else
-
+    
     ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OPENSSL_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
 
-
-
+  
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$OPENSSL_LIBDIR
     "
-
+  
   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"
@@ -47841,20 +35538,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -47867,131 +35564,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6
-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
+echo "configure:35611: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 35619 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char CRYPTO_free ();
-int
-main ()
-{
-CRYPTO_free ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypto_CRYPTO_free=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_crypto_CRYPTO_free=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6
-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then
+    builtin and then its argument prototype would still apply.  */
+char CRYPTO_free();
+
+int main() {
+CRYPTO_free()
+; return 0; }
+EOF
+if { (eval echo configure:35630: \"$ac_link\") 1>&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
-
-
-
+    
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD"
+        FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcrypto $LIBS"
+  *) 
+      LIBS="-lcrypto $LIBS" 
    ;;
   esac
 
@@ -48001,43 +35668,42 @@
   esac
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypto_CRYPTO_free
-
-      { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5
-echo "$as_me: error: libcrypto not found!" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: libcrypto not found!" 1>&2; exit 1; }
+    
+  
 fi
 
 
     old_LIBS=$LIBS
     LIBS="$LIBS -lcrypto"
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$OPENSSL_LIBDIR
     "
-
+  
   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"
@@ -48048,20 +35714,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -48074,148 +35740,117 @@
     ;;
     -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 "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6
-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
+echo "configure:35787: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 35795 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char SSL_CTX_set_ssl_version ();
-int
-main ()
-{
-SSL_CTX_set_ssl_version ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6
-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then
+    builtin and then its argument prototype would still apply.  */
+char SSL_CTX_set_ssl_version();
+
+int main() {
+SSL_CTX_set_ssl_version()
+; return 0; }
+EOF
+if { (eval echo configure:35806: \"$ac_link\") 1>&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
-
+    
       found_openssl=yes
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
-
-      { { echo "$as_me:$LINENO: error: libssl not found!" >&5
-echo "$as_me: error: libssl not found!" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: libssl not found!" 1>&2; exit 1; }
+    
+  
 fi
 
     LIBS=$old_LIBS
-
-
+    
+  
   case ssl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        FTP_SHARED_LIBADD="-lssl $FTP_SHARED_LIBADD"
+        FTP_SHARED_LIBADD="-lssl $FTP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case ssl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lssl $LIBS"
+  *) 
+      LIBS="-lssl $LIBS" 
    ;;
   esac
 
@@ -48225,20 +35860,20 @@
   esac
 
 
-
-
+    
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD"
+        FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcrypto $LIBS"
+  *) 
+      LIBS="-lcrypto $LIBS" 
    ;;
   esac
 
@@ -48249,55 +35884,55 @@
 
 
 
-
+    
   if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$OPENSSL_LIBDIR
   else
-
+    
     ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         FTP_SHARED_LIBADD="-L$ai_p $FTP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && FTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $FTP_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
 
   if test "$found_openssl" = "yes"; then
     OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
-
+  
 
 :
 
   fi
 
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST FTP_SHARED_LIBADD"
 
   fi
@@ -48308,19 +35943,19 @@
 
 php_with_gd=no
 
-echo "$as_me:$LINENO: checking for GD support" >&5
-echo $ECHO_N "checking for GD support... $ECHO_C" >&6
-
+echo $ac_n "checking for GD support""... $ac_c" 1>&6
+echo "configure:35948: checking for GD support" >&5
 # Check whether --with-gd or --without-gd was given.
 if test "${with_gd+set}" = set; then
   withval="$with_gd"
   PHP_GD=$withval
 else
-
+  
   PHP_GD=no
   test "$PHP_ENABLE_ALL" && PHP_GD=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -48344,85 +35979,81 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_JPEG_DIR"; then
-
+  
 php_with_jpeg_dir=no
 
-echo "$as_me:$LINENO: checking for the location of libjpeg" >&5
-echo $ECHO_N "checking for the location of libjpeg... $ECHO_C" >&6
-
+echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
+echo "configure:35993: 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"
   PHP_JPEG_DIR=$withval
 else
-
+  
   PHP_JPEG_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_JPEG_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 fi
 
 if test -z "$PHP_PNG_DIR"; then
-
+  
 php_with_png_dir=no
 
-echo "$as_me:$LINENO: checking for the location of libpng" >&5
-echo $ECHO_N "checking for the location of libpng... $ECHO_C" >&6
-
+echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
+echo "configure:36018: 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"
   PHP_PNG_DIR=$withval
 else
-
+  
   PHP_PNG_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_PNG_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 fi
 
 if test -z "$PHP_ZLIB_DIR"; then
-
+  
 php_with_zlib_dir=no
 
-echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6
-
+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
+echo "configure:36043: 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"
   PHP_ZLIB_DIR=$withval
 else
-
+  
   PHP_ZLIB_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ZLIB_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -48431,23 +36062,22 @@
 
 php_with_xpm_dir=no
 
-echo "$as_me:$LINENO: checking for the location of libXpm" >&5
-echo $ECHO_N "checking for the location of libXpm... $ECHO_C" >&6
-
+echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6
+echo "configure:36067: 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"
   PHP_XPM_DIR=$withval
 else
-
+  
   PHP_XPM_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_XPM_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -48455,23 +36085,22 @@
 
 php_with_freetype_dir=no
 
-echo "$as_me:$LINENO: checking for FreeType 2" >&5
-echo $ECHO_N "checking for FreeType 2... $ECHO_C" >&6
-
+echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6
+echo "configure:36090: 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"
   PHP_FREETYPE_DIR=$withval
 else
-
+  
   PHP_FREETYPE_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_FREETYPE_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -48479,23 +36108,22 @@
 
 php_with_t1lib=no
 
-echo "$as_me:$LINENO: checking for T1lib support" >&5
-echo $ECHO_N "checking for T1lib support... $ECHO_C" >&6
-
+echo $ac_n "checking for T1lib support""... $ac_c" 1>&6
+echo "configure:36113: checking for T1lib support" >&5
 # Check whether --with-t1lib or --without-t1lib was given.
 if test "${with_t1lib+set}" = set; then
   withval="$with_t1lib"
   PHP_T1LIB=$withval
 else
-
+  
   PHP_T1LIB=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_T1LIB
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -48503,22 +36131,22 @@
 
 php_enable_gd_native_ttf=no
 
-echo "$as_me:$LINENO: checking whether to enable truetype string function in GD" >&5
-echo $ECHO_N "checking whether to enable truetype string function in GD... $ECHO_C" >&6
+echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6
+echo "configure:36136: 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"
   PHP_GD_NATIVE_TTF=$enableval
 else
-
+  
   PHP_GD_NATIVE_TTF=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_GD_NATIVE_TTF
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -48526,22 +36154,22 @@
 
 php_enable_gd_jis_conv=no
 
-echo "$as_me:$LINENO: checking whether to enable JIS-mapped Japanese font support in GD" >&5
-echo $ECHO_N "checking whether to enable JIS-mapped Japanese font support in GD... $ECHO_C" >&6
+echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6
+echo "configure:36159: 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"
   PHP_GD_JIS_CONV=$enableval
 else
-
+  
   PHP_GD_JIS_CONV=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_GD_JIS_CONV
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -48576,113 +36204,65 @@
                  libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c libgd/gd_filter.c \
                  libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c libgd/gd_color.c"
 
-
-
-for ac_func in fabsf floorf
+  for ac_func in fabsf floorf
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:36211: 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 36216 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:36239: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
 
   test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes
 
-
+  
 	if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
 		if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
 			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
@@ -48691,9 +36271,7 @@
 			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
 			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
 		else
-			{ { echo "$as_me:$LINENO: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&5
-echo "$as_me: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;}
-   { (exit 1); exit 1; }; }
+			{ echo "configure: error: Can't find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; }
 		fi
 	else
 		for i in /usr/local /usr; do
@@ -48707,21 +36285,20 @@
 		done
 	fi
 
-
+  
   if test "$PHP_GD_NATIVE_TTF" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define USE_GD_IMGSTRTTF 1
-_ACEOF
+EOF
 
   fi
 
-
+  
   if test "$PHP_GD_JIS_CONV" = "yes"; then
     USE_GD_JIS_CONV=1
   fi
 
-
+  
   if test "$PHP_JPEG_DIR" != "no"; then
 
     for i in $PHP_JPEG_DIR /usr/local /usr; do
@@ -48729,30 +36306,28 @@
     done
 
     if test -z "$GD_JPEG_DIR"; then
-      { { echo "$as_me:$LINENO: error: jpeglib.h not found." >&5
-echo "$as_me: error: jpeglib.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: jpeglib.h not found." 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$GD_JPEG_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -48763,20 +36338,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -48789,236 +36364,206 @@
     ;;
     -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 "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
-echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6
-if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
+echo "configure:36411: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 36419 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char jpeg_read_header ();
-int
-main ()
-{
-jpeg_read_header ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_jpeg_jpeg_read_header=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_jpeg_jpeg_read_header=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6
-if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
+    builtin and then its argument prototype would still apply.  */
+char jpeg_read_header();
+
+int main() {
+jpeg_read_header()
+; return 0; }
+EOF
+if { (eval echo configure:36430: \"$ac_link\") 1>&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 "$GD_JPEG_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$GD_JPEG_DIR/include" || echo "$GD_JPEG_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$GD_JPEG_DIR/include
   else
-
+    
     ep_dir="`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/include\"`"
   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
     GD_SHARED_LIBADD="-ljpeg $GD_SHARED_LIBADD"
     if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_JPEG_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_JPEG_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_JPEG_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`"
   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 jpeg in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ljpeg $LIBS"
+  *) 
+      LIBS="-ljpeg $LIBS" 
    ;;
   esac
 
@@ -49028,27 +36573,25 @@
   fi
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_jpeg_jpeg_read_header
-
-      { { echo "$as_me:$LINENO: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
   else
-    echo "$as_me:$LINENO: result: If configure fails try --with-jpeg-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-jpeg-dir=<DIR>" >&6
+    echo "$ac_t""If configure fails try --with-jpeg-dir=<DIR>" 1>&6
   fi
 
-
+  
   if test "$PHP_PNG_DIR" != "no"; then
 
     for i in $PHP_PNG_DIR /usr/local /usr; do
@@ -49056,36 +36599,32 @@
     done
 
     if test -z "$GD_PNG_DIR"; then
-      { { echo "$as_me:$LINENO: error: png.h not found." >&5
-echo "$as_me: error: png.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: png.h not found." 1>&2; exit 1; }
     fi
 
     if test "$PHP_ZLIB_DIR" = "no"; then
-      { { echo "$as_me:$LINENO: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&5
-echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -49096,20 +36635,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -49122,236 +36661,206 @@
     ;;
     -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 "$as_me:$LINENO: checking for png_write_image in -lpng" >&5
-echo $ECHO_N "checking for png_write_image in -lpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png_png_write_image+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
+echo "configure:36708: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpng  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 36716 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char png_write_image ();
-int
-main ()
-{
-png_write_image ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_png_png_write_image=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png_png_write_image=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_write_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_write_image" >&6
-if test $ac_cv_lib_png_png_write_image = yes; then
+    builtin and then its argument prototype would still apply.  */
+char png_write_image();
+
+int main() {
+png_write_image()
+; return 0; }
+EOF
+if { (eval echo configure:36727: \"$ac_link\") 1>&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 "$GD_PNG_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$GD_PNG_DIR/include" || echo "$GD_PNG_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$GD_PNG_DIR/include
   else
-
+    
     ep_dir="`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/include\"`"
   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
     GD_SHARED_LIBADD="-lz $GD_SHARED_LIBADD"
     if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
   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 z in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lz $LIBS"
+  *) 
+      LIBS="-lz $LIBS" 
    ;;
   esac
 
@@ -49361,94 +36870,94 @@
   fi
 
 
-
+      
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lpng $GD_SHARED_LIBADD"
     if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_PNG_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_PNG_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_PNG_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`"
   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 png in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lpng $LIBS"
+  *) 
+      LIBS="-lpng $LIBS" 
    ;;
   esac
 
@@ -49458,28 +36967,26 @@
   fi
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
-    ext_shared=$save_ext_shared
-    unset ac_cv_lib_png_png_write_image
-
-      { { echo "$as_me:$LINENO: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    ext_shared=$save_ext_shared
+    unset ac_cv_lib_png_png_write_image
+    
+      { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
 
   else
-    echo "$as_me:$LINENO: result: If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&6
+    echo "$ac_t""If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" 1>&6
   fi
 
-
+  
   if test "$PHP_XPM_DIR" != "no"; then
 
     for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
@@ -49487,9 +36994,7 @@
     done
 
     if test -z "$GD_XPM_DIR"; then
-      { { echo "$as_me:$LINENO: error: libXpm.(a|so) not found." >&5
-echo "$as_me: error: libXpm.(a|so) not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libXpm.(a|so) not found." 1>&2; exit 1; }
     fi
 
     for i in include include/X11; do
@@ -49497,30 +37002,28 @@
     done
 
     if test -z "$GD_XPM_INC"; then
-      { { echo "$as_me:$LINENO: error: xpm.h not found." >&5
-echo "$as_me: error: xpm.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: xpm.h not found." 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$GD_XPM_DIR/$PHP_LIBDIR -lX11
     "
-
+  
   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"
@@ -49531,20 +37034,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -49557,236 +37060,206 @@
     ;;
     -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 "$as_me:$LINENO: checking for XpmFreeXpmImage in -lXpm" >&5
-echo $ECHO_N "checking for XpmFreeXpmImage in -lXpm... $ECHO_C" >&6
-if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
+echo "configure:37107: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lXpm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 37115 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XpmFreeXpmImage ();
-int
-main ()
-{
-XpmFreeXpmImage ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_Xpm_XpmFreeXpmImage=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xpm_XpmFreeXpmImage=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5
-echo "${ECHO_T}$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6
-if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
+    builtin and then its argument prototype would still apply.  */
+char XpmFreeXpmImage();
+
+int main() {
+XpmFreeXpmImage()
+; return 0; }
+EOF
+if { (eval echo configure:37126: \"$ac_link\") 1>&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 "$GD_XPM_INC" != "/usr/include"; then
-
+    
   if test -z "$GD_XPM_INC" || echo "$GD_XPM_INC" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_INC
   else
-
+    
     ep_dir="`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_INC\"`"
   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
     GD_SHARED_LIBADD="-lXpm $GD_SHARED_LIBADD"
     if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_XPM_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
   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 Xpm in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lXpm $LIBS"
+  *) 
+      LIBS="-lXpm $LIBS" 
    ;;
   esac
 
@@ -49796,94 +37269,94 @@
   fi
 
 
-
+      
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lX11 $GD_SHARED_LIBADD"
     if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_XPM_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
   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 X11 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lX11 $LIBS"
+  *) 
+      LIBS="-lX11 $LIBS" 
    ;;
   esac
 
@@ -49893,27 +37366,25 @@
   fi
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_Xpm_XpmFreeXpmImage
-
-      { { echo "$as_me:$LINENO: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
   else
-    echo "$as_me:$LINENO: result: If configure fails try --with-xpm-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-xpm-dir=<DIR>" >&6
+    echo "$ac_t""If configure fails try --with-xpm-dir=<DIR>" 1>&6
   fi
 
-
+  
   if test "$PHP_FREETYPE_DIR" != "no"; then
 
     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
@@ -49925,30 +37396,28 @@
     done
 
     if test -z "$FREETYPE2_DIR"; then
-      { { echo "$as_me:$LINENO: error: freetype.h not found." >&5
-echo "$as_me: error: freetype.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: freetype.h not found." 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$FREETYPE2_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -49959,20 +37428,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -49985,205 +37454,175 @@
     ;;
     -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 "$as_me:$LINENO: checking for FT_New_Face in -lfreetype" >&5
-echo $ECHO_N "checking for FT_New_Face in -lfreetype... $ECHO_C" >&6
-if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
+echo "configure:37501: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lfreetype  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 37509 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char FT_New_Face ();
-int
-main ()
-{
-FT_New_Face ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_freetype_FT_New_Face=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_freetype_FT_New_Face=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_New_Face" >&5
-echo "${ECHO_T}$ac_cv_lib_freetype_FT_New_Face" >&6
-if test $ac_cv_lib_freetype_FT_New_Face = yes; then
+    builtin and then its argument prototype would still apply.  */
+char FT_New_Face();
+
+int main() {
+FT_New_Face()
+; return 0; }
+EOF
+if { (eval echo configure:37520: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lfreetype $GD_SHARED_LIBADD"
     if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$FREETYPE2_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$FREETYPE2_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$FREETYPE2_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case freetype in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lfreetype $LIBS"
+  *) 
+      LIBS="-lfreetype $LIBS" 
    ;;
   esac
 
@@ -50193,104 +37632,99 @@
   fi
 
 
-
+      
   if test "$FREETYPE2_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$FREETYPE2_DIR/include" || echo "$FREETYPE2_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$FREETYPE2_DIR/include
   else
-
+    
     ep_dir="`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/include\"`"
   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 "$FREETYPE2_INC_DIR" != "/usr/include"; then
-
+    
   if test -z "$FREETYPE2_INC_DIR" || echo "$FREETYPE2_INC_DIR" | grep '^/' >/dev/null ; then
     ai_p=$FREETYPE2_INC_DIR
   else
-
+    
     ep_dir="`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETYPE2_INC_DIR\"`"
   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
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define USE_GD_IMGSTRTTF 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_LIBFREETYPE 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define ENABLE_GD_TTF 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_freetype_FT_New_Face
-
-      { { echo "$as_me:$LINENO: error: Problem with freetype.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with freetype.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with freetype.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
   else
-    echo "$as_me:$LINENO: result: If configure fails try --with-freetype-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-freetype-dir=<DIR>" >&6
+    echo "$ac_t""If configure fails try --with-freetype-dir=<DIR>" 1>&6
   fi
 
-
+  
   if test "$PHP_T1LIB" != "no"; then
 
     for i in $PHP_T1LIB /usr/local /usr; do
@@ -50298,30 +37732,28 @@
     done
 
     if test -z "$GD_T1_DIR"; then
-      { { echo "$as_me:$LINENO: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&5
-echo "$as_me: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$GD_T1_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -50332,20 +37764,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -50358,241 +37790,210 @@
     ;;
     -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 "$as_me:$LINENO: checking for T1_StrError in -lt1" >&5
-echo $ECHO_N "checking for T1_StrError in -lt1... $ECHO_C" >&6
-if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
+echo "configure:37837: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lt1  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 37845 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char T1_StrError ();
-int
-main ()
-{
-T1_StrError ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_t1_T1_StrError=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_t1_T1_StrError=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_StrError" >&5
-echo "${ECHO_T}$ac_cv_lib_t1_T1_StrError" >&6
-if test $ac_cv_lib_t1_T1_StrError = yes; then
+    builtin and then its argument prototype would still apply.  */
+char T1_StrError();
+
+int main() {
+T1_StrError()
+; return 0; }
+EOF
+if { (eval echo configure:37856: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+      cat >> confdefs.h <<\EOF
 #define HAVE_LIBT1 1
-_ACEOF
-
+EOF
 
+      
   if test "$GD_T1_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$GD_T1_DIR/include" || echo "$GD_T1_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$GD_T1_DIR/include
   else
-
+    
     ep_dir="`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_T1_DIR/include\"`"
   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
     GD_SHARED_LIBADD="-lt1 $GD_SHARED_LIBADD"
     if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_T1_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_T1_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_T1_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`"
   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 t1 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lt1 $LIBS"
+  *) 
+      LIBS="-lt1 $LIBS" 
    ;;
   esac
 
@@ -50602,175 +38003,147 @@
   fi
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_t1_T1_StrError
-
-      { { echo "$as_me:$LINENO: error: Problem with libt1.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libt1.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD13 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD15 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD20 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD204 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_IMAGESETTILE 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_IMAGESETBRUSH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GDIMAGECOLORRESOLVE 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_COLORCLOSESTHWB 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_WBMP 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_GD2 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_PNG 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_XBM 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_BUNDLED 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_GIF_READ 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_GIF_CREATE 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_IMAGEELLIPSE 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_FONTCACHESHUTDOWN 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_FONTMUTEX 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_DYNAMIC_CTX_EX 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GD_GIF_CTX 1
-_ACEOF
+EOF
 
 
   GDLIB_CFLAGS="-DHAVE_LIBPNG"
 
 
   if test -n "$GD_JPEG_DIR"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_JPG 1
-_ACEOF
+EOF
 
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG"
   fi
 
   if test -n "$GD_XPM_DIR"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_XPM 1
-_ACEOF
+EOF
 
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM"
   fi
 
   if test -n "$FREETYPE2_DIR"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_STRINGFT 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_STRINGFTEX 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define ENABLE_GD_TTF 1
-_ACEOF
+EOF
 
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE -DENABLE_GD_TTF"
   fi
 
   if test -n "$USE_GD_JIS_CONV"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define USE_GD_JISX0208 1
-_ACEOF
+EOF
 
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
   fi
@@ -50782,7 +38155,7 @@
   extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c libgd/gd_pixelate.c libgd/gd_arc.c \
                  libgd/gd_rotate.c libgd/gd_color.c"
 
-
+  
 	if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
 		if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
 			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
@@ -50791,9 +38164,7 @@
 			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
 			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
 		else
-			{ { echo "$as_me:$LINENO: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&5
-echo "$as_me: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;}
-   { (exit 1); exit 1; }; }
+			{ echo "configure: error: Can't find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; }
 		fi
 	else
 		for i in /usr/local /usr; do
@@ -50807,16 +38178,15 @@
 		done
 	fi
 
-
+  
   if test "$PHP_GD_NATIVE_TTF" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define USE_GD_IMGSTRTTF 1
-_ACEOF
+EOF
 
   fi
 
-
+  
   if test "$PHP_JPEG_DIR" != "no"; then
 
     for i in $PHP_JPEG_DIR /usr/local /usr; do
@@ -50824,30 +38194,28 @@
     done
 
     if test -z "$GD_JPEG_DIR"; then
-      { { echo "$as_me:$LINENO: error: jpeglib.h not found." >&5
-echo "$as_me: error: jpeglib.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: jpeglib.h not found." 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$GD_JPEG_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -50858,20 +38226,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -50884,236 +38252,206 @@
     ;;
     -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 "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
-echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6
-if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
+echo "configure:38299: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 38307 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char jpeg_read_header ();
-int
-main ()
-{
-jpeg_read_header ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_jpeg_jpeg_read_header=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_jpeg_jpeg_read_header=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6
-if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
+    builtin and then its argument prototype would still apply.  */
+char jpeg_read_header();
+
+int main() {
+jpeg_read_header()
+; return 0; }
+EOF
+if { (eval echo configure:38318: \"$ac_link\") 1>&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 "$GD_JPEG_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$GD_JPEG_DIR/include" || echo "$GD_JPEG_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$GD_JPEG_DIR/include
   else
-
+    
     ep_dir="`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/include\"`"
   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
     GD_SHARED_LIBADD="-ljpeg $GD_SHARED_LIBADD"
     if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_JPEG_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_JPEG_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_JPEG_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`"
   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 jpeg in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ljpeg $LIBS"
+  *) 
+      LIBS="-ljpeg $LIBS" 
    ;;
   esac
 
@@ -51123,27 +38461,25 @@
   fi
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_jpeg_jpeg_read_header
-
-      { { echo "$as_me:$LINENO: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
   else
-    echo "$as_me:$LINENO: result: If configure fails try --with-jpeg-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-jpeg-dir=<DIR>" >&6
+    echo "$ac_t""If configure fails try --with-jpeg-dir=<DIR>" 1>&6
   fi
 
-
+  
   if test "$PHP_PNG_DIR" != "no"; then
 
     for i in $PHP_PNG_DIR /usr/local /usr; do
@@ -51151,36 +38487,32 @@
     done
 
     if test -z "$GD_PNG_DIR"; then
-      { { echo "$as_me:$LINENO: error: png.h not found." >&5
-echo "$as_me: error: png.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: png.h not found." 1>&2; exit 1; }
     fi
 
     if test "$PHP_ZLIB_DIR" = "no"; then
-      { { echo "$as_me:$LINENO: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&5
-echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -51191,20 +38523,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -51217,236 +38549,206 @@
     ;;
     -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 "$as_me:$LINENO: checking for png_write_image in -lpng" >&5
-echo $ECHO_N "checking for png_write_image in -lpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png_png_write_image+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
+echo "configure:38596: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpng  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 38604 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char png_write_image ();
-int
-main ()
-{
-png_write_image ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_png_png_write_image=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png_png_write_image=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_write_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_write_image" >&6
-if test $ac_cv_lib_png_png_write_image = yes; then
+    builtin and then its argument prototype would still apply.  */
+char png_write_image();
 
+int main() {
+png_write_image()
+; return 0; }
+EOF
+if { (eval echo configure:38615: \"$ac_link\") 1>&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 "$GD_PNG_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$GD_PNG_DIR/include" || echo "$GD_PNG_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$GD_PNG_DIR/include
   else
-
+    
     ep_dir="`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/include\"`"
   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
     GD_SHARED_LIBADD="-lz $GD_SHARED_LIBADD"
     if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
   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 z in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lz $LIBS"
+  *) 
+      LIBS="-lz $LIBS" 
    ;;
   esac
 
@@ -51456,94 +38758,94 @@
   fi
 
 
-
+      
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lpng $GD_SHARED_LIBADD"
     if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_PNG_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_PNG_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_PNG_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`"
   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 png in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lpng $LIBS"
+  *) 
+      LIBS="-lpng $LIBS" 
    ;;
   esac
 
@@ -51553,28 +38855,26 @@
   fi
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_png_png_write_image
-
-      { { echo "$as_me:$LINENO: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
 
   else
-    echo "$as_me:$LINENO: result: If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&6
+    echo "$ac_t""If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" 1>&6
   fi
 
-
+  
   if test "$PHP_XPM_DIR" != "no"; then
 
     for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
@@ -51582,9 +38882,7 @@
     done
 
     if test -z "$GD_XPM_DIR"; then
-      { { echo "$as_me:$LINENO: error: libXpm.(a|so) not found." >&5
-echo "$as_me: error: libXpm.(a|so) not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libXpm.(a|so) not found." 1>&2; exit 1; }
     fi
 
     for i in include include/X11; do
@@ -51592,30 +38890,28 @@
     done
 
     if test -z "$GD_XPM_INC"; then
-      { { echo "$as_me:$LINENO: error: xpm.h not found." >&5
-echo "$as_me: error: xpm.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: xpm.h not found." 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$GD_XPM_DIR/$PHP_LIBDIR -lX11
     "
-
+  
   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"
@@ -51626,20 +38922,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -51652,236 +38948,206 @@
     ;;
     -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 "$as_me:$LINENO: checking for XpmFreeXpmImage in -lXpm" >&5
-echo $ECHO_N "checking for XpmFreeXpmImage in -lXpm... $ECHO_C" >&6
-if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
+echo "configure:38995: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lXpm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 39003 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XpmFreeXpmImage ();
-int
-main ()
-{
-XpmFreeXpmImage ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_Xpm_XpmFreeXpmImage=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xpm_XpmFreeXpmImage=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5
-echo "${ECHO_T}$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6
-if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
+    builtin and then its argument prototype would still apply.  */
+char XpmFreeXpmImage();
+
+int main() {
+XpmFreeXpmImage()
+; return 0; }
+EOF
+if { (eval echo configure:39014: \"$ac_link\") 1>&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 "$GD_XPM_INC" != "/usr/include"; then
-
+    
   if test -z "$GD_XPM_INC" || echo "$GD_XPM_INC" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_INC
   else
-
+    
     ep_dir="`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_INC\"`"
   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
     GD_SHARED_LIBADD="-lXpm $GD_SHARED_LIBADD"
     if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_XPM_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
   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 Xpm in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lXpm $LIBS"
+  *) 
+      LIBS="-lXpm $LIBS" 
    ;;
   esac
 
@@ -51891,94 +39157,94 @@
   fi
 
 
-
+      
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lX11 $GD_SHARED_LIBADD"
     if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_XPM_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
   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 X11 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lX11 $LIBS"
+  *) 
+      LIBS="-lX11 $LIBS" 
    ;;
   esac
 
@@ -51988,27 +39254,25 @@
   fi
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_Xpm_XpmFreeXpmImage
-
-      { { echo "$as_me:$LINENO: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
   else
-    echo "$as_me:$LINENO: result: If configure fails try --with-xpm-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-xpm-dir=<DIR>" >&6
+    echo "$ac_t""If configure fails try --with-xpm-dir=<DIR>" 1>&6
   fi
 
-
+  
   if test "$PHP_FREETYPE_DIR" != "no"; then
 
     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
@@ -52020,30 +39284,28 @@
     done
 
     if test -z "$FREETYPE2_DIR"; then
-      { { echo "$as_me:$LINENO: error: freetype.h not found." >&5
-echo "$as_me: error: freetype.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: freetype.h not found." 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$FREETYPE2_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -52054,20 +39316,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -52080,205 +39342,175 @@
     ;;
     -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 "$as_me:$LINENO: checking for FT_New_Face in -lfreetype" >&5
-echo $ECHO_N "checking for FT_New_Face in -lfreetype... $ECHO_C" >&6
-if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
+echo "configure:39389: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lfreetype  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 39397 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char FT_New_Face ();
-int
-main ()
-{
-FT_New_Face ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_freetype_FT_New_Face=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_freetype_FT_New_Face=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_New_Face" >&5
-echo "${ECHO_T}$ac_cv_lib_freetype_FT_New_Face" >&6
-if test $ac_cv_lib_freetype_FT_New_Face = yes; then
+    builtin and then its argument prototype would still apply.  */
+char FT_New_Face();
+
+int main() {
+FT_New_Face()
+; return 0; }
+EOF
+if { (eval echo configure:39408: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lfreetype $GD_SHARED_LIBADD"
     if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$FREETYPE2_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$FREETYPE2_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$FREETYPE2_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case freetype in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lfreetype $LIBS"
+  *) 
+      LIBS="-lfreetype $LIBS" 
    ;;
   esac
 
@@ -52288,104 +39520,99 @@
   fi
 
 
-
+      
   if test "$FREETYPE2_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$FREETYPE2_DIR/include" || echo "$FREETYPE2_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$FREETYPE2_DIR/include
   else
-
+    
     ep_dir="`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/include\"`"
   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 "$FREETYPE2_INC_DIR" != "/usr/include"; then
-
+    
   if test -z "$FREETYPE2_INC_DIR" || echo "$FREETYPE2_INC_DIR" | grep '^/' >/dev/null ; then
     ai_p=$FREETYPE2_INC_DIR
   else
-
+    
     ep_dir="`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETYPE2_INC_DIR\"`"
   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
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define USE_GD_IMGSTRTTF 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_LIBFREETYPE 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define ENABLE_GD_TTF 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_freetype_FT_New_Face
-
-      { { echo "$as_me:$LINENO: error: Problem with freetype.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with freetype.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with freetype.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
   else
-    echo "$as_me:$LINENO: result: If configure fails try --with-freetype-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-freetype-dir=<DIR>" >&6
+    echo "$ac_t""If configure fails try --with-freetype-dir=<DIR>" 1>&6
   fi
 
-
+  
   if test "$PHP_T1LIB" != "no"; then
 
     for i in $PHP_T1LIB /usr/local /usr; do
@@ -52393,30 +39620,28 @@
     done
 
     if test -z "$GD_T1_DIR"; then
-      { { echo "$as_me:$LINENO: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&5
-echo "$as_me: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$GD_T1_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -52427,20 +39652,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -52453,241 +39678,210 @@
     ;;
     -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 "$as_me:$LINENO: checking for T1_StrError in -lt1" >&5
-echo $ECHO_N "checking for T1_StrError in -lt1... $ECHO_C" >&6
-if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
+echo "configure:39725: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lt1  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 39733 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char T1_StrError ();
-int
-main ()
-{
-T1_StrError ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_t1_T1_StrError=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_t1_T1_StrError=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_StrError" >&5
-echo "${ECHO_T}$ac_cv_lib_t1_T1_StrError" >&6
-if test $ac_cv_lib_t1_T1_StrError = yes; then
+    builtin and then its argument prototype would still apply.  */
+char T1_StrError();
+
+int main() {
+T1_StrError()
+; return 0; }
+EOF
+if { (eval echo configure:39744: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+      cat >> confdefs.h <<\EOF
 #define HAVE_LIBT1 1
-_ACEOF
-
+EOF
 
+      
   if test "$GD_T1_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$GD_T1_DIR/include" || echo "$GD_T1_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$GD_T1_DIR/include
   else
-
+    
     ep_dir="`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_T1_DIR/include\"`"
   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
     GD_SHARED_LIBADD="-lt1 $GD_SHARED_LIBADD"
     if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_T1_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_T1_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GD_T1_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`"
   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 t1 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lt1 $LIBS"
+  *) 
+      LIBS="-lt1 $LIBS" 
    ;;
   esac
 
@@ -52697,19 +39891,18 @@
   fi
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_t1_T1_StrError
-
-      { { echo "$as_me:$LINENO: error: Problem with libt1.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libt1.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
   fi
@@ -52724,94 +39917,94 @@
   done
 
   if test -n "$GD_INCLUDE" && test -n "$GD_LIB"; then
-
+    
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lgd $GD_SHARED_LIBADD"
     if test -n "$GD_LIB"; then
-
+      
   if test "$GD_LIB" != "/usr/$PHP_LIBDIR" && test "$GD_LIB" != "/usr/lib"; then
-
+    
   if test -z "$GD_LIB" || echo "$GD_LIB" | grep '^/' >/dev/null ; then
     ai_p=$GD_LIB
   else
-
+    
     ep_dir="`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_LIB\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_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 "$GD_LIB"; then
-
+    
   if test "$GD_LIB" != "/usr/$PHP_LIBDIR" && test "$GD_LIB" != "/usr/lib"; then
-
+    
   if test -z "$GD_LIB" || echo "$GD_LIB" | grep '^/' >/dev/null ; then
     ai_p=$GD_LIB
   else
-
+    
     ep_dir="`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_LIB\"`"
   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 gd in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lgd $LIBS"
+  *) 
+      LIBS="-lgd $LIBS" 
    ;;
   esac
 
@@ -52821,29 +40014,28 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD 1
-_ACEOF
-
-
+EOF
 
+    
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -52854,20 +40046,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -52880,148 +40072,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageString16 in -lgd" >&5
-echo $ECHO_N "checking for gdImageString16 in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageString16+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
+echo "configure:40119: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 40127 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageString16 ();
-int
-main ()
-{
-gdImageString16 ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageString16=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageString16=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageString16" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageString16" >&6
-if test $ac_cv_lib_gd_gdImageString16 = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageString16();
+
+int main() {
+gdImageString16()
+; return 0; }
+EOF
+if { (eval echo configure:40138: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD13 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageString16
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -53032,20 +40194,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -53058,148 +40220,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImagePaletteCopy in -lgd" >&5
-echo $ECHO_N "checking for gdImagePaletteCopy in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImagePaletteCopy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6
+echo "configure:40267: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 40275 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImagePaletteCopy ();
-int
-main ()
-{
-gdImagePaletteCopy ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImagePaletteCopy=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImagePaletteCopy=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImagePaletteCopy" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImagePaletteCopy" >&6
-if test $ac_cv_lib_gd_gdImagePaletteCopy = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImagePaletteCopy();
+
+int main() {
+gdImagePaletteCopy()
+; return 0; }
+EOF
+if { (eval echo configure:40286: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD15 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImagePaletteCopy
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -53210,20 +40342,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -53236,148 +40368,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageCreateFromPng in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromPng in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageCreateFromPng+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
+echo "configure:40415: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 40423 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageCreateFromPng ();
-int
-main ()
-{
-gdImageCreateFromPng ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageCreateFromPng=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageCreateFromPng=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromPng" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromPng" >&6
-if test $ac_cv_lib_gd_gdImageCreateFromPng = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageCreateFromPng();
 
+int main() {
+gdImageCreateFromPng()
+; return 0; }
+EOF
+if { (eval echo configure:40434: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_PNG 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreateFromPng
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -53388,20 +40490,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -53414,148 +40516,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageCreateFromGif in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromGif in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageCreateFromGif+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
+echo "configure:40563: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 40571 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageCreateFromGif ();
-int
-main ()
-{
-gdImageCreateFromGif ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageCreateFromGif=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageCreateFromGif=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromGif" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromGif" >&6
-if test $ac_cv_lib_gd_gdImageCreateFromGif = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageCreateFromGif();
+
+int main() {
+gdImageCreateFromGif()
+; return 0; }
+EOF
+if { (eval echo configure:40582: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_GIF_READ 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreateFromGif
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -53566,20 +40638,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -53592,148 +40664,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
-echo $ECHO_N "checking for gdImageGif in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
+echo "configure:40711: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 40719 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageGif ();
-int
-main ()
-{
-gdImageGif ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageGif=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageGif=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGif" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageGif" >&6
-if test $ac_cv_lib_gd_gdImageGif = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageGif();
+
+int main() {
+gdImageGif()
+; return 0; }
+EOF
+if { (eval echo configure:40730: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_GIF_CREATE 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageGif
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -53744,20 +40786,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -53770,148 +40812,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageWBMP in -lgd" >&5
-echo $ECHO_N "checking for gdImageWBMP in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageWBMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6
+echo "configure:40859: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 40867 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageWBMP ();
-int
-main ()
-{
-gdImageWBMP ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageWBMP=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageWBMP=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageWBMP" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageWBMP" >&6
-if test $ac_cv_lib_gd_gdImageWBMP = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageWBMP();
+
+int main() {
+gdImageWBMP()
+; return 0; }
+EOF
+if { (eval echo configure:40878: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_WBMP 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageWBMP
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -53922,20 +40934,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -53948,148 +40960,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageCreateFromJpeg in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromJpeg in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageCreateFromJpeg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
+echo "configure:41007: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 41015 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageCreateFromJpeg ();
-int
-main ()
-{
-gdImageCreateFromJpeg ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageCreateFromJpeg=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageCreateFromJpeg=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromJpeg" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromJpeg" >&6
-if test $ac_cv_lib_gd_gdImageCreateFromJpeg = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageCreateFromJpeg();
+
+int main() {
+gdImageCreateFromJpeg()
+; return 0; }
+EOF
+if { (eval echo configure:41026: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_JPG 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreateFromJpeg
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -54100,20 +41082,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -54126,148 +41108,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageCreateFromXpm in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromXpm in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageCreateFromXpm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6
+echo "configure:41155: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 41163 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageCreateFromXpm ();
-int
-main ()
-{
-gdImageCreateFromXpm ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageCreateFromXpm=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageCreateFromXpm=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromXpm" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromXpm" >&6
-if test $ac_cv_lib_gd_gdImageCreateFromXpm = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageCreateFromXpm();
+
+int main() {
+gdImageCreateFromXpm()
+; return 0; }
+EOF
+if { (eval echo configure:41174: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_XPM 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreateFromXpm
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -54278,20 +41230,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -54304,148 +41256,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageCreateFromGd2 in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromGd2 in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageCreateFromGd2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6
+echo "configure:41303: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 41311 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageCreateFromGd2 ();
-int
-main ()
-{
-gdImageCreateFromGd2 ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageCreateFromGd2=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageCreateFromGd2=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromGd2" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromGd2" >&6
-if test $ac_cv_lib_gd_gdImageCreateFromGd2 = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageCreateFromGd2();
+
+int main() {
+gdImageCreateFromGd2()
+; return 0; }
+EOF
+if { (eval echo configure:41322: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_GD2 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreateFromGd2
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -54456,20 +41378,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -54482,148 +41404,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageCreateTrueColor in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateTrueColor in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageCreateTrueColor+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6
+echo "configure:41451: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 41459 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageCreateTrueColor ();
-int
-main ()
-{
-gdImageCreateTrueColor ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageCreateTrueColor=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageCreateTrueColor=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateTrueColor" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateTrueColor" >&6
-if test $ac_cv_lib_gd_gdImageCreateTrueColor = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageCreateTrueColor();
+
+int main() {
+gdImageCreateTrueColor()
+; return 0; }
+EOF
+if { (eval echo configure:41470: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD20 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreateTrueColor
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -54634,20 +41526,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -54660,148 +41552,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageSetTile in -lgd" >&5
-echo $ECHO_N "checking for gdImageSetTile in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageSetTile+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6
+echo "configure:41599: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 41607 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageSetTile ();
-int
-main ()
-{
-gdImageSetTile ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageSetTile=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageSetTile=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageSetTile" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageSetTile" >&6
-if test $ac_cv_lib_gd_gdImageSetTile = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageSetTile();
+
+int main() {
+gdImageSetTile()
+; return 0; }
+EOF
+if { (eval echo configure:41618: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_IMAGESETTILE 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageSetTile
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -54812,20 +41674,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -54838,148 +41700,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageEllipse in -lgd" >&5
-echo $ECHO_N "checking for gdImageEllipse in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageEllipse+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6
+echo "configure:41747: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 41755 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageEllipse ();
-int
-main ()
-{
-gdImageEllipse ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageEllipse=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageEllipse=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageEllipse" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageEllipse" >&6
-if test $ac_cv_lib_gd_gdImageEllipse = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageEllipse();
+
+int main() {
+gdImageEllipse()
+; return 0; }
+EOF
+if { (eval echo configure:41766: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_IMAGEELLIPSE 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageEllipse
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -54990,20 +41822,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -55016,148 +41848,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageSetBrush in -lgd" >&5
-echo $ECHO_N "checking for gdImageSetBrush in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageSetBrush+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6
+echo "configure:41895: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 41903 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageSetBrush ();
-int
-main ()
-{
-gdImageSetBrush ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageSetBrush=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageSetBrush=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageSetBrush" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageSetBrush" >&6
-if test $ac_cv_lib_gd_gdImageSetBrush = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageSetBrush();
+
+int main() {
+gdImageSetBrush()
+; return 0; }
+EOF
+if { (eval echo configure:41914: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_IMAGESETBRUSH 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageSetBrush
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -55168,20 +41970,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -55194,148 +41996,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageStringTTF in -lgd" >&5
-echo $ECHO_N "checking for gdImageStringTTF in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageStringTTF+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6
+echo "configure:42043: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 42051 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageStringTTF ();
-int
-main ()
-{
-gdImageStringTTF ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageStringTTF=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageStringTTF=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageStringTTF" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageStringTTF" >&6
-if test $ac_cv_lib_gd_gdImageStringTTF = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageStringTTF();
+
+int main() {
+gdImageStringTTF()
+; return 0; }
+EOF
+if { (eval echo configure:42062: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_STRINGTTF 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageStringTTF
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -55346,20 +42118,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -55372,148 +42144,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageStringFT in -lgd" >&5
-echo $ECHO_N "checking for gdImageStringFT in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageStringFT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6
+echo "configure:42191: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 42199 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageStringFT ();
-int
-main ()
-{
-gdImageStringFT ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageStringFT=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageStringFT=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageStringFT" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageStringFT" >&6
-if test $ac_cv_lib_gd_gdImageStringFT = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageStringFT();
+
+int main() {
+gdImageStringFT()
+; return 0; }
+EOF
+if { (eval echo configure:42210: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_STRINGFT 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageStringFT
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -55524,20 +42266,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -55550,148 +42292,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageStringFTEx in -lgd" >&5
-echo $ECHO_N "checking for gdImageStringFTEx in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageStringFTEx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6
+echo "configure:42339: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 42347 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageStringFTEx ();
-int
-main ()
-{
-gdImageStringFTEx ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageStringFTEx=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageStringFTEx=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageStringFTEx" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageStringFTEx" >&6
-if test $ac_cv_lib_gd_gdImageStringFTEx = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageStringFTEx();
+
+int main() {
+gdImageStringFTEx()
+; return 0; }
+EOF
+if { (eval echo configure:42358: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_STRINGFTEX 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageStringFTEx
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -55702,20 +42414,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -55728,148 +42440,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageColorClosestHWB in -lgd" >&5
-echo $ECHO_N "checking for gdImageColorClosestHWB in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageColorClosestHWB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6
+echo "configure:42487: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 42495 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageColorClosestHWB ();
-int
-main ()
-{
-gdImageColorClosestHWB ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageColorClosestHWB=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageColorClosestHWB=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageColorClosestHWB" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageColorClosestHWB" >&6
-if test $ac_cv_lib_gd_gdImageColorClosestHWB = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageColorClosestHWB();
+
+int main() {
+gdImageColorClosestHWB()
+; return 0; }
+EOF
+if { (eval echo configure:42506: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_COLORCLOSESTHWB 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageColorClosestHWB
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -55880,20 +42562,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -55906,148 +42588,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageColorResolve in -lgd" >&5
-echo $ECHO_N "checking for gdImageColorResolve in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageColorResolve+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
+echo "configure:42635: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 42643 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageColorResolve ();
-int
-main ()
-{
-gdImageColorResolve ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageColorResolve=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageColorResolve=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageColorResolve" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageColorResolve" >&6
-if test $ac_cv_lib_gd_gdImageColorResolve = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageColorResolve();
+
+int main() {
+gdImageColorResolve()
+; return 0; }
+EOF
+if { (eval echo configure:42654: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GDIMAGECOLORRESOLVE 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageColorResolve
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -56058,20 +42710,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -56084,148 +42736,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageGifCtx in -lgd" >&5
-echo $ECHO_N "checking for gdImageGifCtx in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageGifCtx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6
+echo "configure:42783: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 42791 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageGifCtx ();
-int
-main ()
-{
-gdImageGifCtx ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageGifCtx=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageGifCtx=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGifCtx" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageGifCtx" >&6
-if test $ac_cv_lib_gd_gdImageGifCtx = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageGifCtx();
 
+int main() {
+gdImageGifCtx()
+; return 0; }
+EOF
+if { (eval echo configure:42802: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_GIF_CTX 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageGifCtx
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -56236,20 +42858,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -56262,148 +42884,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdCacheCreate in -lgd" >&5
-echo $ECHO_N "checking for gdCacheCreate in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdCacheCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
+echo "configure:42931: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 42939 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdCacheCreate ();
-int
-main ()
-{
-gdCacheCreate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdCacheCreate=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdCacheCreate=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdCacheCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdCacheCreate" >&6
-if test $ac_cv_lib_gd_gdCacheCreate = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdCacheCreate();
+
+int main() {
+gdCacheCreate()
+; return 0; }
+EOF
+if { (eval echo configure:42950: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_CACHE_CREATE 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdCacheCreate
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -56414,20 +43006,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -56440,148 +43032,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdFontCacheShutdown in -lgd" >&5
-echo $ECHO_N "checking for gdFontCacheShutdown in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdFontCacheShutdown+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6
+echo "configure:43079: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 43087 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdFontCacheShutdown ();
-int
-main ()
-{
-gdFontCacheShutdown ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdFontCacheShutdown=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdFontCacheShutdown=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdFontCacheShutdown" >&6
-if test $ac_cv_lib_gd_gdFontCacheShutdown = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdFontCacheShutdown();
+
+int main() {
+gdFontCacheShutdown()
+; return 0; }
+EOF
+if { (eval echo configure:43098: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_FONTCACHESHUTDOWN 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdFontCacheShutdown
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -56592,20 +43154,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -56618,148 +43180,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdFreeFontCache in -lgd" >&5
-echo $ECHO_N "checking for gdFreeFontCache in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdFreeFontCache+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6
+echo "configure:43227: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 43235 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdFreeFontCache ();
-int
-main ()
-{
-gdFreeFontCache ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdFreeFontCache=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdFreeFontCache=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdFreeFontCache" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdFreeFontCache" >&6
-if test $ac_cv_lib_gd_gdFreeFontCache = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdFreeFontCache();
+
+int main() {
+gdFreeFontCache()
+; return 0; }
+EOF
+if { (eval echo configure:43246: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_FREEFONTCACHE 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdFreeFontCache
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -56770,20 +43302,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -56796,148 +43328,118 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdFontCacheMutexSetup in -lgd" >&5
-echo $ECHO_N "checking for gdFontCacheMutexSetup in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdFontCacheMutexSetup+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6
+echo "configure:43375: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 43383 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdFontCacheMutexSetup ();
-int
-main ()
-{
-gdFontCacheMutexSetup ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdFontCacheMutexSetup=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdFontCacheMutexSetup=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdFontCacheMutexSetup" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdFontCacheMutexSetup" >&6
-if test $ac_cv_lib_gd_gdFontCacheMutexSetup = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdFontCacheMutexSetup();
+
+int main() {
+gdFontCacheMutexSetup()
+; return 0; }
+EOF
+if { (eval echo configure:43394: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_FONTMUTEX 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdFontCacheMutexSetup
-
-
+    
+  
 fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -56948,20 +43450,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -56974,149 +43476,115 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdNewDynamicCtxEx in -lgd" >&5
-echo $ECHO_N "checking for gdNewDynamicCtxEx in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdNewDynamicCtxEx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6
+echo "configure:43523: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 43531 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdNewDynamicCtxEx ();
-int
-main ()
-{
-gdNewDynamicCtxEx ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdNewDynamicCtxEx=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdNewDynamicCtxEx=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdNewDynamicCtxEx" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdNewDynamicCtxEx" >&6
-if test $ac_cv_lib_gd_gdNewDynamicCtxEx = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdNewDynamicCtxEx();
+
+int main() {
+gdNewDynamicCtxEx()
+; return 0; }
+EOF
+if { (eval echo configure:43542: \"$ac_link\") 1>&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
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_GD_DYNAMIC_CTX_EX 1
-_ACEOF
-
+EOF
 
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdNewDynamicCtxEx
-
-
+    
+  
 fi
 
 
   elif test -z "$GD_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: Unable to find gd.h anywhere under $PHP_GD" >&5
-echo "$as_me: error: Unable to find gd.h anywhere under $PHP_GD" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    { { echo "$as_me:$LINENO: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" >&5
-echo "$as_me: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Unable to find gd.h anywhere under $PHP_GD" 1>&2; exit 1; }
+  else
+    { echo "configure: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" 1>&2; exit 1; }
   fi
 
-
+  
   if test -z "$GD_INCLUDE" || echo "$GD_INCLUDE" | grep '^/' >/dev/null ; then
     GD_INCLUDE=$GD_INCLUDE
   else
-
+    
     ep_dir="`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     GD_INCLUDE="$ep_realdir/`basename \"$GD_INCLUDE\"`"
   fi
@@ -57124,70 +43592,41 @@
 
         old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$GD_INCLUDE
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 43597 "configure"
+#include "confdefs.h"
 
 #include <gd.h>
 #include <stdlib.h>
-
-int
-main ()
-{
+  
+int main() {
 
 gdIOCtx *ctx;
 ctx = malloc(sizeof(gdIOCtx));
 ctx->gd_free = 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+  
+; return 0; }
+EOF
+if { (eval echo configure:43611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBGD204 1
-_ACEOF
-
+EOF
 
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
   CPPFLAGS=$old_CPPFLAGS
 
  fi
 fi
 
 if test "$PHP_GD" != "no"; then
-
+  
   ext_builddir=ext/gd
   ext_srcdir=$abs_srcdir/ext/gd
 
@@ -57195,15 +43634,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_GD_SHARED=no
-
-
+    
+  
   case ext/gd in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -57216,12 +43655,12 @@
 
   old_IFS=$IFS
   for ac_src in gd.c $extra_sources; 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
@@ -57245,14 +43684,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_GD_SHARED=yes
-
+      
   case ext/gd in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -57265,12 +43704,12 @@
 
   old_IFS=$IFS
   for ac_src in gd.c $extra_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_gd="$shared_objects_gd $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -57288,7 +43727,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -57298,7 +43737,7 @@
       ;;
     *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_gd) -L$(top_builddir)/netware -lphp5lib $(GD_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_gd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPGD, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -57311,7 +43750,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpgd.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gd"
 
   cat >>Makefile.objects<<EOF
@@ -57325,7 +43764,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -57335,7 +43774,7 @@
       ;;
     *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_gd) -L$(top_builddir)/netware -lphp5lib $(_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_gd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(GD, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -57348,7 +43787,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/gd.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gd"
 
   cat >>Makefile.objects<<EOF
@@ -57362,10 +43801,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_GD 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -57374,15 +43812,15 @@
     PHP_GD_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/gd in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -57395,12 +43833,12 @@
 
   old_IFS=$IFS
   for ac_src in gd.c $extra_sources; 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
@@ -57420,15 +43858,15 @@
         EXT_STATIC="$EXT_STATIC gd"
         ;;
       *)
-
-
+        
+  
   case ext/gd in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -57441,13 +43879,13 @@
 
   old_IFS=$IFS
   for ac_src in gd.c $extra_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -57467,44 +43905,41 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC gd"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=gd
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
 
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir/libgd"
-
+  
 
 
   if test "$GD_MODULE_TYPE" = "builtin"; then
     GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
     GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
 
-
+    
   old_LIBS=$LIBS
   LIBS=" $GD_SHARED_LIBADD  $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 43942 "configure"
+#include "confdefs.h"
 
     char foobar () {}
     char foobar();
@@ -57512,92 +43947,80 @@
       foobar();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:43953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
-
+    
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-      { { echo "$as_me:$LINENO: error: GD build test failed. Please check the config.log for details." >&5
-echo "$as_me: error: GD build test failed. Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: GD build test failed. Please check the config.log for details." 1>&2; exit 1; }
+    
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+
   else
     GD_HEADER_DIRS="ext/gd/"
     GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
-
+    
   if test "$GD_INCLUDE" != "/usr/include"; then
-
+    
   if test -z "$GD_INCLUDE" || echo "$GD_INCLUDE" | grep '^/' >/dev/null ; then
     ai_p=$GD_INCLUDE
   else
-
+    
     ep_dir="`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GD_INCLUDE\"`"
   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
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
-
+  
   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"
@@ -57608,20 +44031,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -57634,155 +44057,124 @@
     ;;
     -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 "$as_me:$LINENO: checking for gdImageCreate in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreate in -lgd... $ECHO_C" >&6
-if test "${ac_cv_lib_gd_gdImageCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
+echo "configure:44104: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 44112 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gdImageCreate ();
-int
-main ()
-{
-gdImageCreate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gd_gdImageCreate=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gd_gdImageCreate=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreate" >&6
-if test $ac_cv_lib_gd_gdImageCreate = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gdImageCreate();
 
+int main() {
+gdImageCreate()
+; return 0; }
+EOF
+if { (eval echo configure:44123: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreate
-
-      { { echo "$as_me:$LINENO: error: GD build test failed. Please check the config.log for details." >&5
-echo "$as_me: error: GD build test failed. Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: GD build test failed. Please check the config.log for details." 1>&2; exit 1; }
+    
+  
 fi
 
   fi
 
-
-
+  
+  
     for header_file in $GD_HEADER_DIRS; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST GDLIB_CFLAGS"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST GD_SHARED_LIBADD"
 
 fi
@@ -57791,19 +44183,19 @@
 
 php_with_gettext=no
 
-echo "$as_me:$LINENO: checking for GNU gettext support" >&5
-echo $ECHO_N "checking for GNU gettext support... $ECHO_C" >&6
-
+echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6
+echo "configure:44188: 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"
   PHP_GETTEXT=$withval
 else
-
+  
   PHP_GETTEXT=no
   test "$PHP_ENABLE_ALL" && PHP_GETTEXT=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -57827,8 +44219,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -57839,174 +44230,111 @@
   done
 
   if test -z "$GETTEXT_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot locate header file libintl.h" >&5
-echo "$as_me: error: Cannot locate header file libintl.h" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot locate header file libintl.h" 1>&2; exit 1; }
   fi
 
   GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR
   GETTEXT_INCDIR=$GETTEXT_DIR/include
-
+  
   O_LDFLAGS=$LDFLAGS
   LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
-  echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
+echo "configure:44243: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 44251 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char bindtextdomain ();
-int
-main ()
-{
-bindtextdomain ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_intl_bindtextdomain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_intl_bindtextdomain=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
-if test $ac_cv_lib_intl_bindtextdomain = yes; then
+    builtin and then its argument prototype would still apply.  */
+char bindtextdomain();
+
+int main() {
+bindtextdomain()
+; return 0; }
+EOF
+if { (eval echo configure:44262: \"$ac_link\") 1>&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
+  
 	GETTEXT_LIBS=intl
 	GETTEXT_CHECK_IN_LIB=intl
-
+	
 else
-  echo "$as_me:$LINENO: checking for bindtextdomain in -lc" >&5
-echo $ECHO_N "checking for bindtextdomain in -lc... $ECHO_C" >&6
-if test "${ac_cv_lib_c_bindtextdomain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
+echo "configure:44284: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 44292 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char bindtextdomain ();
-int
-main ()
-{
-bindtextdomain ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_c_bindtextdomain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_bindtextdomain=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_c_bindtextdomain" >&6
-if test $ac_cv_lib_c_bindtextdomain = yes; then
+    builtin and then its argument prototype would still apply.  */
+char bindtextdomain();
+
+int main() {
+bindtextdomain()
+; return 0; }
+EOF
+if { (eval echo configure:44303: \"$ac_link\") 1>&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
+  
 		GETTEXT_LIBS=
 		GETTEXT_CHECK_IN_LIB=c
-
+	
 else
+  echo "$ac_t""no" 1>&6
 
-		{ { echo "$as_me:$LINENO: error: Unable to find required gettext library" >&5
-echo "$as_me: error: Unable to find required gettext library" >&2;}
-   { (exit 1); exit 1; }; }
-
+		{ echo "configure: error: Unable to find required gettext library" 1>&2; exit 1; }
+	
 fi
 
-
+  
 fi
 
   LDFLAGS=$O_LDFLAGS
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBINTL 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/gettext
   ext_srcdir=$abs_srcdir/ext/gettext
 
@@ -58014,15 +44342,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_GETTEXT_SHARED=no
-
-
+    
+  
   case ext/gettext in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -58035,12 +44363,12 @@
 
   old_IFS=$IFS
   for ac_src in gettext.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
@@ -58064,14 +44392,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_GETTEXT_SHARED=yes
-
+      
   case ext/gettext in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -58084,12 +44412,12 @@
 
   old_IFS=$IFS
   for ac_src in gettext.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_gettext="$shared_objects_gettext $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -58107,7 +44435,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -58117,7 +44445,7 @@
       ;;
     *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_gettext) -L$(top_builddir)/netware -lphp5lib $(GETTEXT_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_gettext) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPGETTEXT, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -58130,7 +44458,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpgettext.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gettext"
 
   cat >>Makefile.objects<<EOF
@@ -58144,7 +44472,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -58154,7 +44482,7 @@
       ;;
     *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_gettext) -L$(top_builddir)/netware -lphp5lib $(TEXT_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_gettext) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(GETTEXT, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -58167,7 +44495,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/gettext.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gettext"
 
   cat >>Makefile.objects<<EOF
@@ -58181,10 +44509,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_GETTEXT 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -58193,15 +44520,15 @@
     PHP_GETTEXT_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/gettext in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -58214,12 +44541,12 @@
 
   old_IFS=$IFS
   for ac_src in gettext.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
@@ -58239,15 +44566,15 @@
         EXT_STATIC="$EXT_STATIC gettext"
         ;;
       *)
-
-
+        
+  
   case ext/gettext in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -58260,13 +44587,13 @@
 
   old_IFS=$IFS
   for ac_src in gettext.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -58286,112 +44613,112 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC gettext"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=gettext
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST GETTEXT_SHARED_LIBADD"
 
 
   if test -n "$GETTEXT_LIBS"; then
-
+    
 
   if test "$ext_shared" = "yes"; then
     GETTEXT_SHARED_LIBADD="-l$GETTEXT_LIBS $GETTEXT_SHARED_LIBADD"
     if test -n "$GETTEXT_LIBDIR"; then
-
+      
   if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GETTEXT_LIBDIR
   else
-
+    
     ep_dir="`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GETTEXT_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GETTEXT_SHARED_LIBADD="-L$ai_p $GETTEXT_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GETTEXT_SHARED_LIBADD="$ld_runpath_switch$ai_p $GETTEXT_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 "$GETTEXT_LIBDIR"; then
-
+    
   if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GETTEXT_LIBDIR
   else
-
+    
     ep_dir="`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GETTEXT_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 $GETTEXT_LIBS in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$GETTEXT_LIBS $LIBS"
+  *) 
+      LIBS="-l$GETTEXT_LIBS $LIBS" 
    ;;
   esac
 
@@ -58403,350 +44730,230 @@
 
   fi
 
-
+  
   if test "$GETTEXT_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$GETTEXT_INCDIR" || echo "$GETTEXT_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$GETTEXT_INCDIR
   else
-
+    
     ep_dir="`echo $GETTEXT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GETTEXT_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
 
 
-  as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_ngettext" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-echo $ECHO_N "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
+echo "configure:44767: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 44775 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char ngettext ();
-int
-main ()
-{
-ngettext ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char ngettext();
+
+int main() {
+ngettext()
+; return 0; }
+EOF
+if { (eval echo configure:44786: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_NGETTEXT 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dngettext" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-echo $ECHO_N "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
+echo "configure:44810: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 44818 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dngettext ();
-int
-main ()
-{
-dngettext ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dngettext();
+
+int main() {
+dngettext()
+; return 0; }
+EOF
+if { (eval echo configure:44829: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_DNGETTEXT 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dcngettext" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-echo $ECHO_N "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
+echo "configure:44853: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 44861 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dcngettext ();
-int
-main ()
-{
-dcngettext ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dcngettext();
+
+int main() {
+dcngettext()
+; return 0; }
+EOF
+if { (eval echo configure:44872: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_DCNGETTEXT 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_bind_textdomain_codeset" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
+echo "configure:44896: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 44904 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char bind_textdomain_codeset ();
-int
-main ()
-{
-bind_textdomain_codeset ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char bind_textdomain_codeset();
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-_ACEOF
+int main() {
+bind_textdomain_codeset()
+; return 0; }
+EOF
+if { (eval echo configure:44915: \"$ac_link\") 1>&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
+  cat >> confdefs.h <<\EOF
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
+fi
 
+  
 fi
 
 
 
 php_with_gmp=no
 
-echo "$as_me:$LINENO: checking for GNU MP support" >&5
-echo $ECHO_N "checking for GNU MP support... $ECHO_C" >&6
-
+echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6
+echo "configure:44946: 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"
   PHP_GMP=$withval
 else
-
+  
   PHP_GMP=no
   test "$PHP_ENABLE_ALL" && PHP_GMP=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -58770,8 +44977,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -58783,30 +44989,28 @@
   done
 
   if test -z "$GMP_DIR"; then
-    { { echo "$as_me:$LINENO: error: Unable to locate gmp.h" >&5
-echo "$as_me: error: Unable to locate gmp.h" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Unable to locate gmp.h" 1>&2; exit 1; }
   fi
-
-
+ 
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$GMP_DIR/$PHP_LIBDIR
   "
-
+  
   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"
@@ -58817,20 +45021,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -58843,143 +45047,114 @@
     ;;
     -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 "$as_me:$LINENO: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
-echo $ECHO_N "checking for __gmp_randinit_lc_2exp_size in -lgmp... $ECHO_C" >&6
-if test "${ac_cv_lib_gmp___gmp_randinit_lc_2exp_size+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
+echo "configure:45094: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgmp  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 45102 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __gmp_randinit_lc_2exp_size ();
-int
-main ()
-{
-__gmp_randinit_lc_2exp_size ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gmp___gmp_randinit_lc_2exp_size=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gmp___gmp_randinit_lc_2exp_size=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&5
-echo "${ECHO_T}$ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&6
-if test $ac_cv_lib_gmp___gmp_randinit_lc_2exp_size = yes; then
+    builtin and then its argument prototype would still apply.  */
+char __gmp_randinit_lc_2exp_size();
+
+int main() {
+__gmp_randinit_lc_2exp_size()
+; return 0; }
+EOF
+if { (eval echo configure:45113: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gmp___gmp_randinit_lc_2exp_size
-
-
+    
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$GMP_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -58990,20 +45165,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -59016,224 +45191,193 @@
     ;;
     -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 "$as_me:$LINENO: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
-echo $ECHO_N "checking for gmp_randinit_lc_2exp_size in -lgmp... $ECHO_C" >&6
-if test "${ac_cv_lib_gmp_gmp_randinit_lc_2exp_size+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
+echo "configure:45238: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgmp  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 45246 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gmp_randinit_lc_2exp_size ();
-int
-main ()
-{
-gmp_randinit_lc_2exp_size ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gmp_gmp_randinit_lc_2exp_size=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gmp_gmp_randinit_lc_2exp_size=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&5
-echo "${ECHO_T}$ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&6
-if test $ac_cv_lib_gmp_gmp_randinit_lc_2exp_size = yes; then
+    builtin and then its argument prototype would still apply.  */
+char gmp_randinit_lc_2exp_size();
+
+int main() {
+gmp_randinit_lc_2exp_size()
+; return 0; }
+EOF
+if { (eval echo configure:45257: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gmp_gmp_randinit_lc_2exp_size
-
-      { { echo "$as_me:$LINENO: error: GNU MP Library version 4.1.2 or greater required." >&5
-echo "$as_me: error: GNU MP Library version 4.1.2 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: GNU MP Library version 4.1.2 or greater required." 1>&2; exit 1; }
+    
+  
 fi
 
-
-
+  
+  
 fi
 
 
-
+  
 
   if test "$ext_shared" = "yes"; then
     GMP_SHARED_LIBADD="-lgmp $GMP_SHARED_LIBADD"
     if test -n "$GMP_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$GMP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GMP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GMP_DIR/$PHP_LIBDIR" || echo "$GMP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GMP_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GMP_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         GMP_SHARED_LIBADD="-L$ai_p $GMP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && GMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $GMP_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 "$GMP_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$GMP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GMP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$GMP_DIR/$PHP_LIBDIR" || echo "$GMP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GMP_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GMP_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case gmp in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lgmp $LIBS"
+  *) 
+      LIBS="-lgmp $LIBS" 
    ;;
   esac
 
@@ -59243,39 +45387,39 @@
   fi
 
 
-
+  
   if test "$GMP_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$GMP_DIR/include" || echo "$GMP_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$GMP_DIR/include
   else
-
+    
     ep_dir="`echo $GMP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$GMP_DIR/include\"`"
   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
 
 
-
+  
   ext_builddir=ext/gmp
   ext_srcdir=$abs_srcdir/ext/gmp
 
@@ -59283,15 +45427,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_GMP_SHARED=no
-
-
+    
+  
   case ext/gmp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -59304,12 +45448,12 @@
 
   old_IFS=$IFS
   for ac_src in gmp.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
@@ -59333,14 +45477,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_GMP_SHARED=yes
-
+      
   case ext/gmp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -59353,12 +45497,12 @@
 
   old_IFS=$IFS
   for ac_src in gmp.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_gmp="$shared_objects_gmp $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -59376,7 +45520,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -59386,7 +45530,7 @@
       ;;
     *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_gmp) -L$(top_builddir)/netware -lphp5lib $(GMP_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_gmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPGMP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -59399,7 +45543,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpgmp.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gmp"
 
   cat >>Makefile.objects<<EOF
@@ -59413,7 +45557,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -59423,7 +45567,7 @@
       ;;
     *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_gmp) -L$(top_builddir)/netware -lphp5lib $(_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_gmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(GMP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -59436,7 +45580,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/gmp.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gmp"
 
   cat >>Makefile.objects<<EOF
@@ -59450,10 +45594,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_GMP 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -59462,15 +45605,15 @@
     PHP_GMP_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/gmp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -59483,12 +45626,12 @@
 
   old_IFS=$IFS
   for ac_src in gmp.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
@@ -59508,15 +45651,15 @@
         EXT_STATIC="$EXT_STATIC gmp"
         ;;
       *)
-
-
+        
+  
   case ext/gmp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -59529,13 +45672,13 @@
 
   old_IFS=$IFS
   for ac_src in gmp.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -59555,26 +45698,25 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC gmp"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=gmp
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST GMP_SHARED_LIBADD"
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_GMP 1
-_ACEOF
+EOF
 
 fi
 
@@ -59582,19 +45724,19 @@
 
 php_with_mhash=no
 
-echo "$as_me:$LINENO: checking for mhash support" >&5
-echo $ECHO_N "checking for mhash support... $ECHO_C" >&6
-
+echo $ac_n "checking for mhash support""... $ac_c" 1>&6
+echo "configure:45729: checking for mhash support" >&5
 # Check whether --with-mhash or --without-mhash was given.
 if test "${with_mhash+set}" = set; then
   withval="$with_mhash"
   PHP_MHASH=$withval
 else
-
+  
   PHP_MHASH=no
   test "$PHP_ENABLE_ALL" && PHP_MHASH=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -59618,8 +45760,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -59627,18 +45768,19 @@
 
 php_enable_hash=yes
 
-echo "$as_me:$LINENO: checking whether to enable hash support" >&5
-echo $ECHO_N "checking whether to enable hash support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6
+echo "configure:45773: 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"
   PHP_HASH=$enableval
 else
-
+  
   PHP_HASH=yes
   test "$PHP_ENABLE_ALL" && PHP_HASH=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -59662,8 +45804,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -59673,36 +45814,31 @@
     PHP_HASH="yes"
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define PHP_MHASH_BC 1
-_ACEOF
+EOF
 
 fi
 
 if test "$PHP_HASH" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_HASH_EXT 1
-_ACEOF
+EOF
 
 
-  echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian_php+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:45831: 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
-
+  
   ac_cv_c_bigendian_php=unknown
   if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian_php=unknown
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 45841 "configure"
+#include "confdefs.h"
 
 int main(void)
 {
@@ -59715,1700 +45851,189 @@
     return(1);
   }
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  
+EOF
+if { (eval echo configure:45857: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian_php=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_bigendian_php=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+ 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian_php" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian_php" >&6
- if test $ac_cv_c_bigendian_php = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN
-_ACEOF
+echo "$ac_t""$ac_cv_c_bigendian_php" 1>&6
+ if test $ac_cv_c_bigendian_php = yes; then
+   cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 
+EOF
 
  fi
 
 
-  echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((short *) 0)
-  return 0;
-if (sizeof (short))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_short=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
-
-echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6
-if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_short" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+  echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:45882: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (short)); }
-unsigned long ulongval () { return (long) (sizeof (short)); }
+  ac_cv_sizeof_short=2
+else
+  cat > conftest.$ac_ext <<EOF
+#line 45890 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (short))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (short))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (short))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_short=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:45901: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_short=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-
-
-  echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((int *) 0)
-  return 0;
-if (sizeof (int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
+fi
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+  echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:45921: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
+  ac_cv_sizeof_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 45929 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:45940: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_int=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-  echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+  echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:45960: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
+  ac_cv_sizeof_long=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 45968 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:45979: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-  echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long long *) 0)
-  return 0;
-if (sizeof (long long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
-
-echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+  echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:45999: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long long)); }
-unsigned long ulongval () { return (long) (sizeof (long long)); }
+  ac_cv_sizeof_long_long=8
+else
+  cat > conftest.$ac_ext <<EOF
+#line 46007 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:46018: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long_long=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
 
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+EOF
 
 
+  
   EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \
     hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \
     hash_crc32.c hash_salsa.c"
@@ -61416,8 +46041,8 @@
     php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \
     php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_salsa.h \
     php_hash_types.h"
-
-
+  
+  
   ext_builddir=ext/hash
   ext_srcdir=$abs_srcdir/ext/hash
 
@@ -61425,15 +46050,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_HASH_SHARED=no
-
-
+    
+  
   case ext/hash in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -61446,12 +46071,12 @@
 
   old_IFS=$IFS
   for ac_src in $EXT_HASH_SOURCES; 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
@@ -61475,14 +46100,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_HASH_SHARED=yes
-
+      
   case ext/hash in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -61495,12 +46120,12 @@
 
   old_IFS=$IFS
   for ac_src in $EXT_HASH_SOURCES; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_hash="$shared_objects_hash $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -61518,7 +46143,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -61528,7 +46153,7 @@
       ;;
     *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_hash) -L$(top_builddir)/netware -lphp5lib $(HASH_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_hash) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPHASH, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -61541,7 +46166,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phphash.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_hash"
 
   cat >>Makefile.objects<<EOF
@@ -61555,7 +46180,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -61565,7 +46190,7 @@
       ;;
     *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_hash) -L$(top_builddir)/netware -lphp5lib $(H_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_hash) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(HASH, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -61578,7 +46203,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/hash.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_hash"
 
   cat >>Makefile.objects<<EOF
@@ -61592,10 +46217,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_HASH 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -61604,15 +46228,15 @@
     PHP_HASH_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/hash in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -61625,12 +46249,12 @@
 
   old_IFS=$IFS
   for ac_src in $EXT_HASH_SOURCES; 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
@@ -61650,15 +46274,15 @@
         EXT_STATIC="$EXT_STATIC hash"
         ;;
       *)
-
-
+        
+  
   case ext/hash in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -61671,13 +46295,13 @@
 
   old_IFS=$IFS
   for ac_src in $EXT_HASH_SOURCES; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -61697,60 +46321,60 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC hash"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=hash
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
-
+  
+  	
+  
     header_path=ext/hash
     for header_file in $EXT_HASH_HEADERS; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
+  
 fi
 
 
 
 php_with_iconv=yes
 
-echo "$as_me:$LINENO: checking for iconv support" >&5
-echo $ECHO_N "checking for iconv support... $ECHO_C" >&6
-
+echo $ac_n "checking for iconv support""... $ac_c" 1>&6
+echo "configure:46367: checking for iconv support" >&5
 # Check whether --with-iconv or --without-iconv was given.
 if test "${with_iconv+set}" = set; then
   withval="$with_iconv"
   PHP_ICONV=$withval
 else
-
+  
   PHP_ICONV=yes
   test "$PHP_ENABLE_ALL" && PHP_ICONV=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -61774,15 +46398,14 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_ICONV" != "no"; then
 
-
+  
   found_iconv=no
   unset ICONV_DIR
 
@@ -61799,211 +46422,117 @@
   echo > ext/iconv/php_php_iconv_h_path.h
   echo > ext/iconv/php_iconv_supports_errno.h
 
-
+      
   if test "$PHP_ICONV" = "yes"; then
             LIBS_save="$LIBS"
     LIBS=
-    echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-if test "${ac_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define iconv to an innocuous variant, in case <limits.h> declares iconv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define iconv innocuous_iconv
-
+    echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:46431: 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 46436 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char iconv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef iconv
-
+    which can conflict with char iconv(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char iconv ();
+    builtin and then its argument prototype would still apply.  */
+char iconv();
+
+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_iconv) || defined (__stub___iconv)
 choke me
 #else
-char (*f) () = iconv;
-#endif
-#ifdef __cplusplus
-}
+iconv();
 #endif
 
-int
-main ()
-{
-return f != iconv;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_iconv=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_iconv" >&5
-echo "${ECHO_T}$ac_cv_func_iconv" >&6
-if test $ac_cv_func_iconv = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:46459: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_iconv=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
       found_iconv=yes
-
+    
 else
+  echo "$ac_t""no" 1>&6
 
-      echo "$as_me:$LINENO: checking for libiconv" >&5
-echo $ECHO_N "checking for libiconv... $ECHO_C" >&6
-if test "${ac_cv_func_libiconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define libiconv to an innocuous variant, in case <limits.h> declares libiconv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define libiconv innocuous_libiconv
-
+      echo $ac_n "checking for libiconv""... $ac_c" 1>&6
+echo "configure:46480: 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 46485 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char libiconv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef libiconv
-
+    which can conflict with char libiconv(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char libiconv ();
+    builtin and then its argument prototype would still apply.  */
+char libiconv();
+
+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_libiconv) || defined (__stub___libiconv)
 choke me
 #else
-char (*f) () = libiconv;
+libiconv();
 #endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != libiconv;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_libiconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_libiconv=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_libiconv" >&5
-echo "${ECHO_T}$ac_cv_func_libiconv" >&6
-if test $ac_cv_func_libiconv = yes; then
 
+; return 0; }
+EOF
+if { (eval echo configure:46508: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_libiconv=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+        
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBICONV 1
-_ACEOF
+EOF
 
         found_iconv=yes
-
+      
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-
+    
 fi
 
     LIBS="$LIBS_save"
@@ -62013,10 +46542,9 @@
 
     for i in $PHP_ICONV /usr/local /usr; do
       if test -r $i/include/giconv.h; then
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_GICONV_H 1
-_ACEOF
+EOF
 
         ICONV_DIR=$i
         iconv_lib_name=giconv
@@ -62029,33 +46557,31 @@
     done
 
     if test -z "$ICONV_DIR"; then
-      { { echo "$as_me:$LINENO: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&5
-echo "$as_me: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
     fi
-
+  
     if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
        test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
     then
-
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
         -L$ICONV_DIR/$PHP_LIBDIR
       "
-
+  
   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"
@@ -62066,20 +46592,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -62092,162 +46618,130 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for libiconv in -l$iconv_lib_name" >&5
-echo $ECHO_N "checking for libiconv in -l$iconv_lib_name... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
+echo "configure:46665: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 46673 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char libiconv ();
-int
-main ()
-{
-libiconv ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char libiconv();
+
+int main() {
+libiconv()
+; return 0; }
+EOF
+if { (eval echo configure:46684: \"$ac_link\") 1>&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
-
+    
         found_iconv=yes
-
+        
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBICONV 1
-_ACEOF
-
+EOF
 
+        
   echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define ICONV_ALIASED_LIBICONV 1
-_ACEOF
-
-
+EOF
 
+      
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$iconv_lib_name_libiconv
-
-
+    
+        
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
           -L$ICONV_DIR/$PHP_LIBDIR
         "
-
+  
   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"
@@ -62258,20 +46752,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -62284,235 +46778,204 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for iconv in -l$iconv_lib_name" >&5
-echo $ECHO_N "checking for iconv in -l$iconv_lib_name... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
+echo "configure:46825: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 46833 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char iconv ();
-int
-main ()
-{
-iconv ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char iconv();
 
+int main() {
+iconv()
+; return 0; }
+EOF
+if { (eval echo configure:46844: \"$ac_link\") 1>&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
-
+    
           found_iconv=yes
-
-
+        
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$iconv_lib_name_iconv
-
-
+    
+  
 fi
 
-
-
+      
+  
 fi
 
     fi
   fi
 
   if test "$found_iconv" = "yes"; then
-
+    
   echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ICONV 1
-_ACEOF
+EOF
 
     if test -n "$ICONV_DIR"; then
-
+      
 
   if test "$ext_shared" = "yes"; then
     ICONV_SHARED_LIBADD="-l$iconv_lib_name $ICONV_SHARED_LIBADD"
     if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ICONV_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         ICONV_SHARED_LIBADD="-L$ai_p $ICONV_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && ICONV_SHARED_LIBADD="$ld_runpath_switch$ai_p $ICONV_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 "$ICONV_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ICONV_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case $iconv_lib_name in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$iconv_lib_name $LIBS"
+  *) 
+      LIBS="-l$iconv_lib_name $LIBS" 
    ;;
   esac
 
@@ -62522,44 +46985,44 @@
   fi
 
 
-
+      
   if test "$ICONV_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$ICONV_DIR/include
   else
-
+    
     ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`"
   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
 
     fi
-
+    
     iconv_avail="yes";
-
-else
+  
+else 
     iconv_avail="no";
-
+  
   fi
 
 
@@ -62585,239 +47048,133 @@
       PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
     else
       PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
-    fi
+    fi 
 
-    echo "$as_me:$LINENO: checking if iconv is glibc's" >&5
-echo $ECHO_N "checking if iconv is glibc's... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6
+echo "configure:47055: checking if iconv is glibc's" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 47057 "configure"
+#include "confdefs.h"
 #include <gnu/libc-version.h>
-int
-main ()
-{
+int main() {
 gnu_get_libc_version();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+; return 0; }
+EOF
+if { (eval echo configure:47064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+      echo "$ac_t""yes" 1>&6
       iconv_impl_name="glibc"
-
+    
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 
     if test -z "$iconv_impl_name"; then
-      echo "$as_me:$LINENO: checking if using GNU libiconv" >&5
-echo $ECHO_N "checking if using GNU libiconv... $ECHO_C" >&6
+      echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6
+echo "configure:47082: checking if using GNU libiconv" >&5
       php_iconv_old_ld="$LDFLAGS"
       LDFLAGS="-liconv $LDFLAGS"
       if test "$cross_compiling" = yes; then
-
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  
+        echo "$ac_t""no" 1>&6
         LDFLAGS="$php_iconv_old_ld"
-
+      
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 47092 "configure"
+#include "confdefs.h"
 
 #include <$PHP_ICONV_H_PATH>
 int main() {
 	printf("%d", _libiconv_version);
 	return 0;
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      
+EOF
+if { (eval echo configure:47102: \"$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
         iconv_impl_name="gnu_libiconv"
-
+      
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+        echo "$ac_t""no" 1>&6
         LDFLAGS="$php_iconv_old_ld"
-
+      
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     fi
 
     if test -z "$iconv_impl_name"; then
-      echo "$as_me:$LINENO: checking if iconv is Konstantin Chuguev's" >&5
-echo $ECHO_N "checking if iconv is Konstantin Chuguev's... $ECHO_C" >&6
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+      echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6
+echo "configure:47124: checking if iconv is Konstantin Chuguev's" >&5
+      cat > conftest.$ac_ext <<EOF
+#line 47126 "configure"
+#include "confdefs.h"
 #include <iconv.h>
-int
-main ()
-{
+int main() {
 iconv_ccs_init(NULL, NULL);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+; return 0; }
+EOF
+if { (eval echo configure:47133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+        echo "$ac_t""yes" 1>&6
         iconv_impl_name="bsd"
-
+      
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+        echo "$ac_t""no" 1>&6
+      
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
     fi
 
     if test -z "$iconv_impl_name"; then
-      echo "$as_me:$LINENO: checking if using IBM iconv" >&5
-echo $ECHO_N "checking if using IBM iconv... $ECHO_C" >&6
+      echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6
+echo "configure:47152: checking if using IBM iconv" >&5
       php_iconv_old_ld="$LDFLAGS"
       LDFLAGS="-liconv $LDFLAGS"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+      cat > conftest.$ac_ext <<EOF
+#line 47156 "configure"
+#include "confdefs.h"
 #include <iconv.h>
-int
-main ()
-{
+int main() {
 cstoccsid("");
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+; return 0; }
+EOF
+if { (eval echo configure:47163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+        echo "$ac_t""yes" 1>&6
         iconv_impl_name="ibm"
-
+      
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+        echo "$ac_t""no" 1>&6
         LDFLAGS="$php_iconv_old_ld"
-
+      
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
     fi
 
     echo > ext/iconv/php_have_bsd_iconv.h
@@ -62827,105 +47184,104 @@
 
     case "$iconv_impl_name" in
       gnu_libiconv )
-
+        
   echo "#define PHP_ICONV_IMPL \"libiconv\"" > ext/iconv/php_php_iconv_impl.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define PHP_ICONV_IMPL "libiconv"
-_ACEOF
-
+EOF
 
+        
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
 
-
+        
 
   if test "$ext_shared" = "yes"; then
     ICONV_SHARED_LIBADD="-liconv $ICONV_SHARED_LIBADD"
     if test -n ""$PHP_ICONV_PREFIX/$PHP_LIBDIR""; then
-
+      
   if test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/$PHP_LIBDIR" && test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/lib"; then
-
+    
   if test -z ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" || echo ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" | grep '^/' >/dev/null ; then
     ai_p="$PHP_ICONV_PREFIX/$PHP_LIBDIR"
   else
-
+    
     ep_dir="`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \""$PHP_ICONV_PREFIX/$PHP_LIBDIR"\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         ICONV_SHARED_LIBADD="-L$ai_p $ICONV_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && ICONV_SHARED_LIBADD="$ld_runpath_switch$ai_p $ICONV_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 ""$PHP_ICONV_PREFIX/$PHP_LIBDIR""; then
-
+    
   if test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/$PHP_LIBDIR" && test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/lib"; then
-
+    
   if test -z ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" || echo ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" | grep '^/' >/dev/null ; then
     ai_p="$PHP_ICONV_PREFIX/$PHP_LIBDIR"
   else
-
+    
     ep_dir="`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \""$PHP_ICONV_PREFIX/$PHP_LIBDIR"\"`"
   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 iconv in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-liconv $LIBS"
+  *) 
+      LIBS="-liconv $LIBS" 
    ;;
   esac
 
@@ -62938,84 +47294,73 @@
         ;;
 
       bsd )
-
+        
   echo "#define HAVE_BSD_ICONV 1" > ext/iconv/php_have_bsd_iconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_BSD_ICONV 1
-_ACEOF
-
+EOF
 
+        
   echo "#define PHP_ICONV_IMPL \"BSD iconv\"" > ext/iconv/php_php_iconv_impl.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define PHP_ICONV_IMPL "BSD iconv"
-_ACEOF
+EOF
 
         ;;
 
       glibc )
-
+        
   echo "#define HAVE_GLIBC_ICONV 1" > ext/iconv/php_have_glibc_iconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_GLIBC_ICONV 1
-_ACEOF
-
+EOF
 
+        
   echo "#define PHP_ICONV_IMPL \"glibc\"" > ext/iconv/php_php_iconv_impl.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define PHP_ICONV_IMPL "glibc"
-_ACEOF
+EOF
 
         ;;
       ibm )
-
+        
   echo "#define HAVE_IBM_ICONV 1" > ext/iconv/php_have_ibm_iconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_IBM_ICONV 1
-_ACEOF
-
+EOF
 
+        
   echo "#define PHP_ICONV_IMPL \"IBM iconv\"" > ext/iconv/php_php_iconv_impl.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define PHP_ICONV_IMPL "IBM iconv"
-_ACEOF
+EOF
 
         ;;
     esac
 
-    echo "$as_me:$LINENO: checking if iconv supports errno" >&5
-echo $ECHO_N "checking if iconv supports errno... $ECHO_C" >&6
+    echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
+echo "configure:47349: checking if iconv supports errno" >&5
     if test "$cross_compiling" = yes; then
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  
+      echo "$ac_t""no" 1>&6
+      
   echo "#define ICONV_SUPPORTS_ERRNO 0" > ext/iconv/php_iconv_supports_errno.h
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define ICONV_SUPPORTS_ERRNO 0
-_ACEOF
-
+EOF
 
+    
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 47363 "configure"
+#include "confdefs.h"
 
 #include <$PHP_ICONV_H_PATH>
 #include <errno.h>
@@ -63033,119 +47378,75 @@
   iconv_close( cd );
   return 2;
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+    
+EOF
+if { (eval echo configure:47384: \"$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
+      
   echo "#define ICONV_SUPPORTS_ERRNO 1" > ext/iconv/php_iconv_supports_errno.h
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define ICONV_SUPPORTS_ERRNO 1
-_ACEOF
-
+EOF
 
+    
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+      echo "$ac_t""no" 1>&6
+      
   echo "#define ICONV_SUPPORTS_ERRNO 0" > ext/iconv/php_iconv_supports_errno.h
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define ICONV_SUPPORTS_ERRNO 0
-_ACEOF
-
+EOF
 
+    
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
-    echo "$as_me:$LINENO: checking if your cpp allows macro usage in include lines" >&5
-echo $ECHO_N "checking if your cpp allows macro usage in include lines... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+
+    echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6
+echo "configure:47416: checking if your cpp allows macro usage in include lines" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 47418 "configure"
+#include "confdefs.h"
 
 #define FOO <$PHP_ICONV_H_PATH>
 #include FOO
+    
+int main() {
 
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+; return 0; }
+EOF
+if { (eval echo configure:47428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+      echo "$ac_t""yes" 1>&6
+      
   echo "#define PHP_ICONV_H_PATH <$PHP_ICONV_H_PATH>" > ext/iconv/php_php_iconv_h_path.h
 
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define PHP_ICONV_H_PATH <$PHP_ICONV_H_PATH>
-_ACEOF
-
+EOF
 
+    
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+      echo "$ac_t""no" 1>&6
+    
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
 
+    
   ext_builddir=ext/iconv
   ext_srcdir=$abs_srcdir/ext/iconv
 
@@ -63153,15 +47454,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_ICONV_SHARED=no
-
-
+    
+  
   case ext/iconv in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -63174,12 +47475,12 @@
 
   old_IFS=$IFS
   for ac_src in iconv.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
@@ -63203,14 +47504,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_ICONV_SHARED=yes
-
+      
   case ext/iconv in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -63223,12 +47524,12 @@
 
   old_IFS=$IFS
   for ac_src in iconv.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_iconv="$shared_objects_iconv $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -63246,7 +47547,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -63256,7 +47557,7 @@
       ;;
     *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_iconv) -L$(top_builddir)/netware -lphp5lib $(ICONV_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_iconv) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPICONV, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -63269,7 +47570,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpiconv.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_iconv"
 
   cat >>Makefile.objects<<EOF
@@ -63283,7 +47584,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -63293,7 +47594,7 @@
       ;;
     *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_iconv) -L$(top_builddir)/netware -lphp5lib $(NV_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_iconv) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ICONV, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -63306,7 +47607,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/iconv.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_iconv"
 
   cat >>Makefile.objects<<EOF
@@ -63320,10 +47621,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_ICONV 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -63332,15 +47632,15 @@
     PHP_ICONV_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/iconv in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -63353,12 +47653,12 @@
 
   old_IFS=$IFS
   for ac_src in iconv.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
@@ -63378,15 +47678,15 @@
         EXT_STATIC="$EXT_STATIC iconv"
         ;;
       *)
-
-
+        
+  
   case ext/iconv in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -63399,13 +47699,13 @@
 
   old_IFS=$IFS
   for ac_src in iconv.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -63425,44 +47725,42 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC iconv"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=iconv
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST ICONV_SHARED_LIBADD"
 
-
-
+    
+  
     for header_file in ext/iconv/; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
+    done 
+  
 
   else
-    { { echo "$as_me:$LINENO: error: Please reinstall the iconv library." >&5
-echo "$as_me: error: Please reinstall the iconv library." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Please reinstall the iconv library." 1>&2; exit 1; }
   fi
 fi
 
@@ -63481,19 +47779,19 @@
 
 php_with_imap=no
 
-echo "$as_me:$LINENO: checking for IMAP support" >&5
-echo $ECHO_N "checking for IMAP support... $ECHO_C" >&6
-
+echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
+echo "configure:47784: checking for IMAP support" >&5
 # Check whether --with-imap or --without-imap was given.
 if test "${with_imap+set}" = set; then
   withval="$with_imap"
   PHP_IMAP=$withval
 else
-
+  
   PHP_IMAP=no
   test "$PHP_ENABLE_ALL" && PHP_IMAP=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -63517,8 +47815,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -63526,23 +47823,22 @@
 
 php_with_kerberos=no
 
-echo "$as_me:$LINENO: checking for IMAP Kerberos support" >&5
-echo $ECHO_N "checking for IMAP Kerberos support... $ECHO_C" >&6
-
+echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
+echo "configure:47828: 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"
   PHP_KERBEROS=$withval
 else
-
+  
   PHP_KERBEROS=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_KERBEROS
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -63550,33 +47846,32 @@
 
 php_with_imap_ssl=no
 
-echo "$as_me:$LINENO: checking for IMAP SSL support" >&5
-echo $ECHO_N "checking for IMAP SSL support... $ECHO_C" >&6
-
+echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
+echo "configure:47851: 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"
   PHP_IMAP_SSL=$withval
 else
-
+  
   PHP_IMAP_SSL=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_IMAP_SSL
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
-
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
-if test "$PHP_IMAP" != "no"; then
 
+if test "$PHP_IMAP" != "no"; then  
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST IMAP_SHARED_LIBADD"
 
-
+    
   ext_builddir=ext/imap
   ext_srcdir=$abs_srcdir/ext/imap
 
@@ -63584,15 +47879,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_IMAP_SHARED=no
-
-
+    
+  
   case ext/imap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -63605,12 +47900,12 @@
 
   old_IFS=$IFS
   for ac_src in php_imap.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
@@ -63634,14 +47929,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_IMAP_SHARED=yes
-
+      
   case ext/imap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -63654,12 +47949,12 @@
 
   old_IFS=$IFS
   for ac_src in php_imap.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_imap="$shared_objects_imap $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -63677,7 +47972,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -63687,7 +47982,7 @@
       ;;
     *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_imap) -L$(top_builddir)/netware -lphp5lib $(IMAP_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_imap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPIMAP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -63700,7 +47995,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpimap.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_imap"
 
   cat >>Makefile.objects<<EOF
@@ -63714,7 +48009,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -63724,7 +48019,7 @@
       ;;
     *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_imap) -L$(top_builddir)/netware -lphp5lib $(P_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_imap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(IMAP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -63737,7 +48032,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/imap.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_imap"
 
   cat >>Makefile.objects<<EOF
@@ -63751,10 +48046,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_IMAP 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -63763,15 +48057,15 @@
     PHP_IMAP_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/imap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -63784,12 +48078,12 @@
 
   old_IFS=$IFS
   for ac_src in php_imap.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
@@ -63809,15 +48103,15 @@
         EXT_STATIC="$EXT_STATIC imap"
         ;;
       *)
-
-
+        
+  
   case ext/imap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -63830,13 +48124,13 @@
 
   old_IFS=$IFS
   for ac_src in php_imap.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -63856,333 +48150,260 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC imap"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=imap
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_IMAP 1
-_ACEOF
+EOF
 
 
     for i in $PHP_IMAP /usr/local /usr; do
       if test -r "$i/c-client.h"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_IMAP2000 1
-_ACEOF
+EOF
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i
     break
-  elif test -r "$i/rfc822.h"; then
-    IMAP_DIR=$i;
+  elif test -r "$i/rfc822.h"; then 
+    IMAP_DIR=$i; 
     IMAP_INC_DIR=$i
 	break
 
       elif test -r "$i/include/c-client/c-client.h"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_IMAP2000 1
-_ACEOF
+EOF
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/c-client
     break
-  elif test -r "$i/include/c-client/rfc822.h"; then
-    IMAP_DIR=$i;
+  elif test -r "$i/include/c-client/rfc822.h"; then 
+    IMAP_DIR=$i; 
     IMAP_INC_DIR=$i/include/c-client
 	break
 
       elif test -r "$i/include/imap/c-client.h"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_IMAP2000 1
-_ACEOF
+EOF
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/imap
     break
-  elif test -r "$i/include/imap/rfc822.h"; then
-    IMAP_DIR=$i;
+  elif test -r "$i/include/imap/rfc822.h"; then 
+    IMAP_DIR=$i; 
     IMAP_INC_DIR=$i/include/imap
 	break
 
       elif test -r "$i/include/c-client.h"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_IMAP2000 1
-_ACEOF
+EOF
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include
     break
-  elif test -r "$i/include/rfc822.h"; then
-    IMAP_DIR=$i;
+  elif test -r "$i/include/rfc822.h"; then 
+    IMAP_DIR=$i; 
     IMAP_INC_DIR=$i/include
 	break
 
       elif test -r "$i/imap/c-client.h"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_IMAP2000 1
-_ACEOF
+EOF
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/imap
     break
-  elif test -r "$i/imap/rfc822.h"; then
-    IMAP_DIR=$i;
+  elif test -r "$i/imap/rfc822.h"; then 
+    IMAP_DIR=$i; 
     IMAP_INC_DIR=$i/imap
 	break
 
       elif test -r "$i/c-client/c-client.h"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_IMAP2000 1
-_ACEOF
+EOF
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/c-client
     break
-  elif test -r "$i/c-client/rfc822.h"; then
-    IMAP_DIR=$i;
+  elif test -r "$i/c-client/rfc822.h"; then 
+    IMAP_DIR=$i; 
     IMAP_INC_DIR=$i/c-client
 	break
 
       fi
     done
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+        cat > conftest.$ac_ext <<EOF
+#line 48255 "configure"
+#include "confdefs.h"
 #include <$IMAP_INC_DIR/mail.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "mail_fetch_overview_sequence" >/dev/null 2>&1; then
-
-
-cat >>confdefs.h <<\_ACEOF
+  egrep "mail_fetch_overview_sequence" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      cat >> confdefs.h <<\EOF
 #define HAVE_IMAP2004 1
-_ACEOF
-
+EOF
 
+    
 fi
 rm -f conftest*
 
 
         old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    echo "$as_me:$LINENO: checking for utf8_mime2text signature" >&5
-echo $ECHO_N "checking for utf8_mime2text signature... $ECHO_C" >&6
-if test "${ac_cv_utf8_mime2text+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6
+echo "configure:48275: checking for utf8_mime2text signature" >&5
+if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 48280 "configure"
+#include "confdefs.h"
 
 #include <stdio.h>
 #include <c-client.h>
-
-int
-main ()
-{
+      
+int main() {
 
         SIZEDTEXT *src, *dst;
         utf8_mime2text(src, dst);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+      
+; return 0; }
+EOF
+if { (eval echo configure:48293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
         ac_cv_utf8_mime2text=old
-
+      
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
         ac_cv_utf8_mime2text=new
-
+      
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+    
 fi
-echo "$as_me:$LINENO: result: $ac_cv_utf8_mime2text" >&5
-echo "${ECHO_T}$ac_cv_utf8_mime2text" >&6
-    if test "$ac_cv_utf8_mime2text" = "new"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_utf8_mime2text" 1>&6
+    if test "$ac_cv_utf8_mime2text" = "new"; then
+      cat >> confdefs.h <<\EOF
 #define HAVE_NEW_MIME2TEXT 1
-_ACEOF
+EOF
 
     fi
     CFLAGS=$old_CFLAGS
 
     old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    echo "$as_me:$LINENO: checking for U8T_DECOMPOSE" >&5
-echo $ECHO_N "checking for U8T_DECOMPOSE... $ECHO_C" >&6
-if test "${ac_cv_u8t_canonical+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6
+echo "configure:48322: checking for U8T_DECOMPOSE" >&5
+if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 48327 "configure"
+#include "confdefs.h"
 
 #include <c-client.h>
-
-int
-main ()
-{
+      
+int main() {
 
          int i = U8T_CANONICAL;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+      
+; return 0; }
+EOF
+if { (eval echo configure:48338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
          ac_cv_u8t_decompose=yes
-
+      
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
          ac_cv_u8t_decompose=no
-
+      
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+    
 fi
-echo "$as_me:$LINENO: result: $ac_cv_u8t_canonical" >&5
-echo "${ECHO_T}$ac_cv_u8t_canonical" >&6
+
+echo "$ac_t""$ac_cv_u8t_canonical" 1>&6
     CFLAGS=$old_CFLAGS
 
     if test "$ac_cv_u8t_decompose" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then
-		{ { echo "$as_me:$LINENO: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." >&5
-echo "$as_me: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." >&2;}
-   { (exit 1); exit 1; }; }
+		{ echo "configure: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." 1>&2; exit 1; }
     fi
     if test "$ac_cv_u8t_decompose" = "yes" && test "$ac_cv_utf8_mime2text" = "old"; then
-		{ { echo "$as_me:$LINENO: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." >&5
-echo "$as_me: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." >&2;}
-   { (exit 1); exit 1; }; }
+		{ echo "configure: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." 1>&2; exit 1; }
     fi
 
         old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$IMAP_INC_DIR
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    cat > conftest.$ac_ext <<EOF
+#line 48368 "configure"
+#include "confdefs.h"
 
 #include "imap4r1.h"
 #if defined(IMAPSSLPORT)
       this_is_true
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "this_is_true" >/dev/null 2>&1; then
-
-
-cat >>confdefs.h <<\_ACEOF
+  egrep "this_is_true" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      cat >> confdefs.h <<\EOF
 #define HAVE_IMAP2001 1
-_ACEOF
-
+EOF
 
+    
 fi
 rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=""
-
+  
   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"
@@ -64193,20 +48414,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -64219,131 +48440,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for pam_start in -lpam" >&5
-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
-if test "${ac_cv_lib_pam_pam_start+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
+echo "configure:48487: 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
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpam  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 48495 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pam_start ();
-int
-main ()
-{
-pam_start ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pam_pam_start=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pam_pam_start=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
-if test $ac_cv_lib_pam_pam_start = yes; then
-
-    LDFLAGS=$save_old_LDFLAGS
-    ext_shared=$save_ext_shared
-
+    builtin and then its argument prototype would still apply.  */
+char pam_start();
 
+int main() {
+pam_start()
+; return 0; }
+EOF
+if { (eval echo configure:48506: \"$ac_link\") 1>&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
+    
+      
+  
   case pam in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="-lpam $IMAP_SHARED_LIBADD"
+        IMAP_SHARED_LIBADD="-lpam $IMAP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case pam in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lpam $LIBS"
+  *) 
+      LIBS="-lpam $LIBS" 
    ;;
   esac
 
@@ -64353,40 +48544,40 @@
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_LIBPAM 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_pam_pam_start
-
-
+    
+  
 fi
 
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=""
-
+  
   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"
@@ -64397,20 +48588,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -64423,131 +48614,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+echo "configure:48661: 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
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 48669 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char crypt ();
-int
-main ()
-{
-crypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypt_crypt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_crypt_crypt=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-if test $ac_cv_lib_crypt_crypt = yes; then
+    builtin and then its argument prototype would still apply.  */
+char crypt();
+
+int main() {
+crypt()
+; return 0; }
+EOF
+if { (eval echo configure:48680: \"$ac_link\") 1>&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
-
-
-
+    
+      
+  
   case crypt in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="-lcrypt $IMAP_SHARED_LIBADD"
+        IMAP_SHARED_LIBADD="-lcrypt $IMAP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case crypt in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcrypt $LIBS"
+  *) 
+      LIBS="-lcrypt $LIBS" 
    ;;
   esac
 
@@ -64557,39 +48718,37 @@
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_LIBCRYPT 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypt_crypt
-
-
+    
+  
 fi
 
-
-
+	    
+    
   if test -z "$IMAP_DIR" || echo "$IMAP_DIR" | grep '^/' >/dev/null ; then
     IMAP_DIR=$IMAP_DIR
   else
-
+    
     ep_dir="`echo $IMAP_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     IMAP_DIR="$ep_realdir/`basename \"$IMAP_DIR\"`"
   fi
 
 
     if test -z "$IMAP_DIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find rfc822.h. Please check your c-client installation." >&5
-echo "$as_me: error: Cannot find rfc822.h. Please check your c-client installation." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find rfc822.h. Please check your c-client installation." 1>&2; exit 1; }
     fi
 
     if test -r "$IMAP_DIR/c-client/c-client.a"; then
@@ -64600,13 +48759,13 @@
 
     for lib in c-client4 c-client imap; do
       IMAP_LIB=$lib
-
+      
   str="$IMAP_DIR/$PHP_LIBDIR/lib$lib.*"
   for i in `echo $str`; do
     test -r $i && IMAP_LIBDIR=$IMAP_DIR/$PHP_LIBDIR && break 2
   done
 
-
+      
   str="$IMAP_DIR/c-client/lib$lib.*"
   for i in `echo $str`; do
     test -r $i && IMAP_LIBDIR=$IMAP_DIR/c-client && break 2
@@ -64615,56 +48774,54 @@
     done
 
     if test -z "$IMAP_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find imap library (libc-client.a). Please check your c-client installation." >&5
-echo "$as_me: error: Cannot find imap library (libc-client.a). Please check your c-client installation." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find imap library (libc-client.a). Please check your c-client installation." 1>&2; exit 1; }
     fi
 
-
+    
   if test "$IMAP_INC_DIR" != "/usr/include"; then
-
+    
   if test -z "$IMAP_INC_DIR" || echo "$IMAP_INC_DIR" | grep '^/' >/dev/null ; then
     ai_p=$IMAP_INC_DIR
   else
-
+    
     ep_dir="`echo $IMAP_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$IMAP_INC_DIR\"`"
   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
 
-
-
+    
+  
   case $IMAP_LIB in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="-l$IMAP_LIB $IMAP_SHARED_LIBADD"
+        IMAP_SHARED_LIBADD="-l$IMAP_LIB $IMAP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case $IMAP_LIB in
   c|c_r|pthread*) ;;
-  *)
-      DLIBS="-l$IMAP_LIB $DLIBS"
+  *) 
+      DLIBS="-l$IMAP_LIB $DLIBS" 
    ;;
   esac
 
@@ -64674,47 +48831,47 @@
   esac
 
 
-
+    
   if test "$IMAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$IMAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$IMAP_LIBDIR" || echo "$IMAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$IMAP_LIBDIR
   else
-
+    
     ep_dir="`echo $IMAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$IMAP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_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
 
-
+    
   if test "$PHP_KERBEROS" != "no"; then
-
+    
   found_kerberos=no
   unset KERBEROS_CFLAGS
   unset KERBEROS_LIBS
@@ -64722,43 +48879,38 @@
     if test -z "$KRB5_CONFIG"; then
     # Extract the first word of "krb5-config", so it can be a program name with args.
 set dummy krb5-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:48884: 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
-  case $KRB5_CONFIG in
-  [\\/]* | ?:[\\/]*)
+  case "$KRB5_CONFIG" in
+  /*)
   ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_KRB5_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   test -z "$ac_cv_path_KRB5_CONFIG" && ac_cv_path_KRB5_CONFIG="no"
   ;;
 esac
 fi
-KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG
-
+KRB5_CONFIG="$ac_cv_path_KRB5_CONFIG"
 if test -n "$KRB5_CONFIG"; then
-  echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5
-echo "${ECHO_T}$KRB5_CONFIG" >&6
+  echo "$ac_t""$KRB5_CONFIG" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   fi
@@ -64769,17 +48921,17 @@
 
     if test -n "$KERBEROS_LIBS"; then
       found_kerberos=yes
-
+      
   for ac_i in $KERBEROS_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -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"
@@ -64790,20 +48942,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii"
+        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -64816,80 +48968,80 @@
     ;;
     -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
         IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $KERBEROS_CFLAGS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -64916,58 +49068,58 @@
 
     if test "$PHP_KERBEROS_DIR"; then
       found_kerberos=yes
-
+      
   if test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_KERBEROS_DIR/$PHP_LIBDIR" || echo "$PHP_KERBEROS_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_KERBEROS_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_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
 
-
-
+      
+  
   case gssapi_krb5 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lgssapi_krb5"
+        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lgssapi_krb5" 
     else
-
-
+      
+  
   case gssapi_krb5 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lgssapi_krb5"
+  *) 
+      LIBS="$LIBS -lgssapi_krb5" 
    ;;
   esac
 
@@ -64977,20 +49129,20 @@
   esac
 
 
-
-
+      
+  
   case krb5 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lkrb5"
+        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lkrb5" 
     else
-
-
+      
+  
   case krb5 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lkrb5"
+  *) 
+      LIBS="$LIBS -lkrb5" 
    ;;
   esac
 
@@ -65000,20 +49152,20 @@
   esac
 
 
-
-
+      
+  
   case k5crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lk5crypto"
+        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lk5crypto" 
     else
-
-
+      
+  
   case k5crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lk5crypto"
+  *) 
+      LIBS="$LIBS -lk5crypto" 
    ;;
   esac
 
@@ -65023,20 +49175,20 @@
   esac
 
 
-
-
+      
+  
   case com_err in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lcom_err"
+        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lcom_err" 
     else
-
-
+      
+  
   case com_err in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lcom_err"
+  *) 
+      LIBS="$LIBS -lcom_err" 
    ;;
   esac
 
@@ -65046,33 +49198,33 @@
   esac
 
 
-
+      
   if test "$PHP_KERBEROS_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$PHP_KERBEROS_DIR/include" || echo "$PHP_KERBEROS_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$PHP_KERBEROS_DIR/include
   else
-
+    
     ep_dir="`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/include\"`"
   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
@@ -65082,59 +49234,45 @@
 
   if test "$found_kerberos" = "yes"; then
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_IMAP_KRB 1
-_ACEOF
-
-
-else
-      { { echo "$as_me:$LINENO: error: Kerberos libraries not found.
-
-      Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
-      " >&5
-echo "$as_me: error: Kerberos libraries not found.
+EOF
 
+    
+else 
+      { echo "configure: error: Kerberos libraries not found. 
+      
       Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
-      " >&2;}
-   { (exit 1); exit 1; }; }
-
+      " 1>&2; exit 1; }
+    
   fi
 
   else
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    cat > conftest.$ac_ext <<EOF
+#line 49253 "configure"
+#include "confdefs.h"
 #include <$IMAP_INC_DIR/linkage.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "auth_gss" >/dev/null 2>&1; then
-
-      { { echo "$as_me:$LINENO: error: This c-client library is built with Kerberos support.
-
-      Add --with-kerberos to your configure line. Check config.log for details.
-      " >&5
-echo "$as_me: error: This c-client library is built with Kerberos support.
+  egrep "auth_gss" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      { echo "configure: error: This c-client library is built with Kerberos support. 
 
       Add --with-kerberos to your configure line. Check config.log for details.
-      " >&2;}
-   { (exit 1); exit 1; }; }
-
+      " 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
   fi
 
-
+    
   if test "$PHP_IMAP_SSL" != "no"; then
     if test "$PHP_OPENSSL" = ""; then
       PHP_OPENSSL='no'
     fi
-
+    
   found_openssl=no
   unset OPENSSL_INCDIR
   unset OPENSSL_LIBDIR
@@ -65151,42 +49289,38 @@
     if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:49294: 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
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
+  case "$PKG_CONFIG" in
+  /*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  echo "$ac_t""$PKG_CONFIG" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   fi
@@ -65198,23 +49332,21 @@
       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
     else
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
     fi
 
     if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
-
+      
   for ac_i in $OPENSSL_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -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"
@@ -65225,20 +49357,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii"
+        IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -65251,80 +49383,80 @@
     ;;
     -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
         IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $OPENSSL_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -65337,7 +49469,7 @@
   fi
 
     if test "$found_openssl" = "no"; then
-
+  
     if test "$PHP_OPENSSL_DIR" = "yes"; then
       PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
     fi
@@ -65353,102 +49485,94 @@
     done
 
     if test -z "$OPENSSL_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5
-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; }
     fi
 
     if test -z "$OPENSSL_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5
-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; }
     fi
 
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
-    echo "$as_me:$LINENO: checking for OpenSSL version" >&5
-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
+echo "configure:49499: checking for OpenSSL version" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 49501 "configure"
+#include "confdefs.h"
 
 #include <openssl/opensslv.h>
 #if OPENSSL_VERSION_NUMBER >= 0x0090600fL
   yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: >= 0.9.6" >&5
-echo "${ECHO_T}>= 0.9.6" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t"">= 0.9.6" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
-
+    
   if test "$OPENSSL_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$OPENSSL_INCDIR
   else
-
+    
     ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OPENSSL_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
 
-
-
+  
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$OPENSSL_LIBDIR
     "
-
+  
   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"
@@ -65459,20 +49583,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -65485,131 +49609,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6
-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
+echo "configure:49656: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 49664 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char CRYPTO_free ();
-int
-main ()
-{
-CRYPTO_free ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypto_CRYPTO_free=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_crypto_CRYPTO_free=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6
-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then
+    builtin and then its argument prototype would still apply.  */
+char CRYPTO_free();
+
+int main() {
+CRYPTO_free()
+; return 0; }
+EOF
+if { (eval echo configure:49675: \"$ac_link\") 1>&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
-
-
-
+    
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD"
+        IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcrypto $LIBS"
+  *) 
+      LIBS="-lcrypto $LIBS" 
    ;;
   esac
 
@@ -65619,43 +49713,42 @@
   esac
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypto_CRYPTO_free
-
-      { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5
-echo "$as_me: error: libcrypto not found!" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: libcrypto not found!" 1>&2; exit 1; }
+    
+  
 fi
 
 
     old_LIBS=$LIBS
     LIBS="$LIBS -lcrypto"
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$OPENSSL_LIBDIR
     "
-
+  
   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"
@@ -65666,20 +49759,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -65692,148 +49785,117 @@
     ;;
     -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 "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6
-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
+echo "configure:49832: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 49840 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char SSL_CTX_set_ssl_version ();
-int
-main ()
-{
-SSL_CTX_set_ssl_version ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6
-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then
+    builtin and then its argument prototype would still apply.  */
+char SSL_CTX_set_ssl_version();
+
+int main() {
+SSL_CTX_set_ssl_version()
+; return 0; }
+EOF
+if { (eval echo configure:49851: \"$ac_link\") 1>&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
-
+    
       found_openssl=yes
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
-
-      { { echo "$as_me:$LINENO: error: libssl not found!" >&5
-echo "$as_me: error: libssl not found!" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: libssl not found!" 1>&2; exit 1; }
+    
+  
 fi
 
     LIBS=$old_LIBS
-
-
+    
+  
   case ssl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="-lssl $IMAP_SHARED_LIBADD"
+        IMAP_SHARED_LIBADD="-lssl $IMAP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case ssl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lssl $LIBS"
+  *) 
+      LIBS="-lssl $LIBS" 
    ;;
   esac
 
@@ -65843,20 +49905,20 @@
   esac
 
 
-
-
+    
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD"
+        IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcrypto $LIBS"
+  *) 
+      LIBS="-lcrypto $LIBS" 
    ;;
   esac
 
@@ -65867,93 +49929,79 @@
 
 
 
-
+    
   if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$OPENSSL_LIBDIR
   else
-
+    
     ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_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
 
   if test "$found_openssl" = "yes"; then
     OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
+  
 
 
-
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_IMAP_SSL 1
-_ACEOF
-
-
-else
-      { { echo "$as_me:$LINENO: error: OpenSSL libraries not found.
-
-      Check the path given to --with-openssl-dir and output in config.log)
-      " >&5
-echo "$as_me: error: OpenSSL libraries not found.
+EOF
 
+    
+else 
+      { echo "configure: error: OpenSSL libraries not found. 
+      
       Check the path given to --with-openssl-dir and output in config.log)
-      " >&2;}
-   { (exit 1); exit 1; }; }
-
+      " 1>&2; exit 1; }
+    
   fi
 
   elif test -f "$IMAP_INC_DIR/linkage.c"; then
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    cat > conftest.$ac_ext <<EOF
+#line 49993 "configure"
+#include "confdefs.h"
 #include <$IMAP_INC_DIR/linkage.c>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "ssl_onceonlyinit" >/dev/null 2>&1; then
-
-      { { echo "$as_me:$LINENO: error: This c-client library is built with SSL support.
-
-      Add --with-imap-ssl to your configure line. Check config.log for details.
-      " >&5
-echo "$as_me: error: This c-client library is built with SSL support.
+  egrep "ssl_onceonlyinit" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      { echo "configure: error: This c-client library is built with SSL support. 
 
       Add --with-imap-ssl to your configure line. Check config.log for details.
-      " >&2;}
-   { (exit 1); exit 1; }; }
-
+      " 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
@@ -65962,23 +50010,20 @@
 
         TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD"
 
-
-
+        
+  
   old_LIBS=$LIBS
   LIBS="$TST_LIBS $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 50024 "configure"
+#include "confdefs.h"
 
+    
 #if defined(__GNUC__) && __GNUC__ >= 4
 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
 #else
@@ -66000,68 +50045,54 @@
     PHP_IMAP_EXPORT void mm_exists(void){}
     PHP_IMAP_EXPORT void mm_searched(void){}
     PHP_IMAP_EXPORT void mm_expunged(void){}
-
+  
     char auth_gssapi_valid();
     int main() {
       auth_gssapi_valid();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:50057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+      cat >> confdefs.h <<\EOF
 #define HAVE_IMAP_AUTH_GSS 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-
+    
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
 
 
-
+        
+  
   old_LIBS=$LIBS
   LIBS="$TST_LIBS $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 50093 "configure"
+#include "confdefs.h"
 
+    
 #if defined(__GNUC__) && __GNUC__ >= 4
 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
 #else
@@ -66083,71 +50114,57 @@
     PHP_IMAP_EXPORT void mm_exists(void){}
     PHP_IMAP_EXPORT void mm_searched(void){}
     PHP_IMAP_EXPORT void mm_expunged(void){}
-
+  
     char utf8_to_mutf7();
     int main() {
       utf8_to_mutf7();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:50126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+      cat >> confdefs.h <<\EOF
 #define HAVE_IMAP_MUTF7 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-
+    
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
 
-    echo "$as_me:$LINENO: checking whether rfc822_output_address_list function present" >&5
-echo $ECHO_N "checking whether rfc822_output_address_list function present... $ECHO_C" >&6
 
+    echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6
+echo "configure:50153: checking whether rfc822_output_address_list function present" >&5
+    
   old_LIBS=$LIBS
   LIBS="
       $TST_LIBS
      $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 50165 "configure"
+#include "confdefs.h"
 
+    
 #if defined(__GNUC__) && __GNUC__ >= 4
 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
 #else
@@ -66172,74 +50189,58 @@
       void rfc822_output_address_list(void);
       void (*f)(void);
       char foobar () {f = rfc822_output_address_list;}
-
+    
     char foobar();
     int main() {
       foobar();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:50201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+    
+      echo "$ac_t""yes" 1>&6
+      cat >> confdefs.h <<\EOF
 #define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-
+    
+      echo "$ac_t""no" 1>&6
+	
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
-    echo "$as_me:$LINENO: checking whether build with IMAP works" >&5
-echo $ECHO_N "checking whether build with IMAP works... $ECHO_C" >&6
-
 
+    echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6
+echo "configure:50230: checking whether build with IMAP works" >&5
+    
+  
   old_LIBS=$LIBS
   LIBS="$TST_LIBS $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 50241 "configure"
+#include "confdefs.h"
 
+    
 #if defined(__GNUC__) && __GNUC__ >= 4
 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
 #else
@@ -66261,72 +50262,58 @@
     PHP_IMAP_EXPORT void mm_exists(void){}
     PHP_IMAP_EXPORT void mm_searched(void){}
     PHP_IMAP_EXPORT void mm_expunged(void){}
-
+  
     char mail_newbody();
     int main() {
       mail_newbody();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:50274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-
+    
+      echo "$ac_t""yes" 1>&6
+    
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-    LIBS=$old_LIBS
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-      { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5
-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+    LIBS=$old_LIBS
+    
+      echo "$ac_t""no" 1>&6
+      { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
+    
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+
 fi
 
 
 
 php_with_interbase=no
 
-echo "$as_me:$LINENO: checking for InterBase support" >&5
-echo $ECHO_N "checking for InterBase support... $ECHO_C" >&6
-
+echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
+echo "configure:50306: checking for InterBase support" >&5
 # Check whether --with-interbase or --without-interbase was given.
 if test "${with_interbase+set}" = set; then
   withval="$with_interbase"
   PHP_INTERBASE=$withval
 else
-
+  
   PHP_INTERBASE=no
   test "$PHP_ENABLE_ALL" && PHP_INTERBASE=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -66350,8 +50337,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -66365,25 +50351,25 @@
     IBASE_LIBDIR=$PHP_INTERBASE/$PHP_LIBDIR
   fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$IBASE_LIBDIR
   "
-
+  
   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"
@@ -66394,20 +50380,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -66420,145 +50406,116 @@
     ;;
     -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 "$as_me:$LINENO: checking for isc_detach_database in -lfbclient" >&5
-echo $ECHO_N "checking for isc_detach_database in -lfbclient... $ECHO_C" >&6
-if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
+echo "configure:50453: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lfbclient  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 50461 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char isc_detach_database ();
-int
-main ()
-{
-isc_detach_database ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_fbclient_isc_detach_database=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_fbclient_isc_detach_database=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_fbclient_isc_detach_database" >&6
-if test $ac_cv_lib_fbclient_isc_detach_database = yes; then
+    builtin and then its argument prototype would still apply.  */
+char isc_detach_database();
+
+int main() {
+isc_detach_database()
+; return 0; }
+EOF
+if { (eval echo configure:50472: \"$ac_link\") 1>&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
-
+    
     IBASE_LIBNAME=fbclient
-
-
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_fbclient_isc_detach_database
-
-
+    
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$IBASE_LIBDIR
     "
-
+  
   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"
@@ -66569,20 +50526,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -66595,145 +50552,116 @@
     ;;
     -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 "$as_me:$LINENO: checking for isc_detach_database in -lgds" >&5
-echo $ECHO_N "checking for isc_detach_database in -lgds... $ECHO_C" >&6
-if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
+echo "configure:50599: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgds  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 50607 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char isc_detach_database ();
-int
-main ()
-{
-isc_detach_database ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gds_isc_detach_database=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gds_isc_detach_database=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gds_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_gds_isc_detach_database" >&6
-if test $ac_cv_lib_gds_isc_detach_database = yes; then
+    builtin and then its argument prototype would still apply.  */
+char isc_detach_database();
+
+int main() {
+isc_detach_database()
+; return 0; }
+EOF
+if { (eval echo configure:50618: \"$ac_link\") 1>&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
-
+    
       IBASE_LIBNAME=gds
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gds_isc_detach_database
-
-
+    
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
         -L$IBASE_LIBDIR
       "
-
+  
   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"
@@ -66744,20 +50672,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -66770,230 +50698,199 @@
     ;;
     -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 "$as_me:$LINENO: checking for isc_detach_database in -lib_util" >&5
-echo $ECHO_N "checking for isc_detach_database in -lib_util... $ECHO_C" >&6
-if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
+echo "configure:50745: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lib_util  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 50753 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char isc_detach_database ();
-int
-main ()
-{
-isc_detach_database ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ib_util_isc_detach_database=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ib_util_isc_detach_database=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_ib_util_isc_detach_database" >&6
-if test $ac_cv_lib_ib_util_isc_detach_database = yes; then
+    builtin and then its argument prototype would still apply.  */
+char isc_detach_database();
+
+int main() {
+isc_detach_database()
+; return 0; }
+EOF
+if { (eval echo configure:50764: \"$ac_link\") 1>&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
-
+    
         IBASE_LIBNAME=ib_util
-
-
+      
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ib_util_isc_detach_database
-
-        { { echo "$as_me:$LINENO: error: libgds, libib_util or libfbclient not found! Check config.log for more information." >&5
-echo "$as_me: error: libgds, libib_util or libfbclient not found! Check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+        { echo "configure: error: libgds, libib_util or libfbclient not found! Check config.log for more information." 1>&2; exit 1; }
+      
+  
 fi
 
-
-
+    
+  
 fi
 
-
-
+  
+  
 fi
 
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     INTERBASE_SHARED_LIBADD="-l$IBASE_LIBNAME $INTERBASE_SHARED_LIBADD"
     if test -n "$IBASE_LIBDIR"; then
-
+      
   if test "$IBASE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$IBASE_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$IBASE_LIBDIR" || echo "$IBASE_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$IBASE_LIBDIR
   else
-
+    
     ep_dir="`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$IBASE_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         INTERBASE_SHARED_LIBADD="-L$ai_p $INTERBASE_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && INTERBASE_SHARED_LIBADD="$ld_runpath_switch$ai_p $INTERBASE_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 "$IBASE_LIBDIR"; then
-
+    
   if test "$IBASE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$IBASE_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$IBASE_LIBDIR" || echo "$IBASE_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$IBASE_LIBDIR
   else
-
+    
     ep_dir="`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$IBASE_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 $IBASE_LIBNAME in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$IBASE_LIBNAME $LIBS"
+  *) 
+      LIBS="-l$IBASE_LIBNAME $LIBS" 
    ;;
   esac
 
@@ -67003,43 +50900,42 @@
   fi
 
 
-
+  
   if test "$IBASE_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$IBASE_INCDIR" || echo "$IBASE_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$IBASE_INCDIR
   else
-
+    
     ep_dir="`echo $IBASE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$IBASE_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
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_IBASE 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/interbase
   ext_srcdir=$abs_srcdir/ext/interbase
 
@@ -67047,15 +50943,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_INTERBASE_SHARED=no
-
-
+    
+  
   case ext/interbase in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -67068,12 +50964,12 @@
 
   old_IFS=$IFS
   for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.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
@@ -67097,14 +50993,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_INTERBASE_SHARED=yes
-
+      
   case ext/interbase in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -67117,12 +51013,12 @@
 
   old_IFS=$IFS
   for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_interbase="$shared_objects_interbase $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -67140,7 +51036,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -67150,7 +51046,7 @@
       ;;
     *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_interbase) -L$(top_builddir)/netware -lphp5lib $(INTERBASE_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_interbase) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPINTERBASE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -67163,7 +51059,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpinterbase.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_interbase"
 
   cat >>Makefile.objects<<EOF
@@ -67177,7 +51073,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -67187,7 +51083,7 @@
       ;;
     *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_interbase) -L$(top_builddir)/netware -lphp5lib $(ERBASE_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_interbase) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(INTERBASE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -67200,7 +51096,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/interbase.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_interbase"
 
   cat >>Makefile.objects<<EOF
@@ -67214,10 +51110,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_INTERBASE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -67226,15 +51121,15 @@
     PHP_INTERBASE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/interbase in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -67247,12 +51142,12 @@
 
   old_IFS=$IFS
   for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.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
@@ -67272,15 +51167,15 @@
         EXT_STATIC="$EXT_STATIC interbase"
         ;;
       *)
-
-
+        
+  
   case ext/interbase in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -67293,13 +51188,13 @@
 
   old_IFS=$IFS
   for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -67319,20 +51214,20 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC interbase"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=interbase
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST INTERBASE_SHARED_LIBADD"
 
 fi
@@ -67341,18 +51236,19 @@
 
 php_enable_intl=no
 
-echo "$as_me:$LINENO: checking whether to enable internationalization support" >&5
-echo $ECHO_N "checking whether to enable internationalization support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6
+echo "configure:51241: 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"
   PHP_INTL=$enableval
 else
-
+  
   PHP_INTL=no
   test "$PHP_ENABLE_ALL" && PHP_INTL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -67376,29 +51272,28 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_INTL" != "no"; then
-
-
+  
+  
 php_with_icu_dir=DEFAULT
 
 
-
 # Check whether --with-icu-dir or --without-icu-dir was given.
 if test "${with_icu_dir+set}" = set; then
   withval="$with_icu_dir"
   PHP_ICU_DIR=$withval
 else
-
+  
   PHP_ICU_DIR=DEFAULT
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ICU_DIR
 
@@ -67413,115 +51308,103 @@
   if test "$PHP_ICU_DIR" = "DEFAULT"; then
         # Extract the first word of "icu-config", so it can be a program name with args.
 set dummy icu-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ICU_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:51313: 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
-  case $ICU_CONFIG in
-  [\\/]* | ?:[\\/]*)
+  case "$ICU_CONFIG" in
+  /*)
   ac_cv_path_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/local/bin"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ICU_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH:/usr/local/bin"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_ICU_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   test -z "$ac_cv_path_ICU_CONFIG" && ac_cv_path_ICU_CONFIG="no"
   ;;
 esac
 fi
-ICU_CONFIG=$ac_cv_path_ICU_CONFIG
-
+ICU_CONFIG="$ac_cv_path_ICU_CONFIG"
 if test -n "$ICU_CONFIG"; then
-  echo "$as_me:$LINENO: result: $ICU_CONFIG" >&5
-echo "${ECHO_T}$ICU_CONFIG" >&6
+  echo "$ac_t""$ICU_CONFIG" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   else
     ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
   fi
 
-  echo "$as_me:$LINENO: checking for location of ICU headers and libraries" >&5
-echo $ECHO_N "checking for location of ICU headers and libraries... $ECHO_C" >&6
+  echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6
+echo "configure:51351: 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
-    echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-    { { echo "$as_me:$LINENO: error: Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." >&5
-echo "$as_me: error: Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." >&2;}
-   { (exit 1); exit 1; }; }
+    echo "$ac_t""not found" 1>&6
+    { echo "configure: error: Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." 1>&2; exit 1; }
   else
-    echo "$as_me:$LINENO: result: $icu_install_prefix" >&5
-echo "${ECHO_T}$icu_install_prefix" >&6
+    echo "$ac_t""$icu_install_prefix" 1>&6
 
-        echo "$as_me:$LINENO: checking for ICU 3.4 or greater" >&5
-echo $ECHO_N "checking for ICU 3.4 or greater... $ECHO_C" >&6
+        echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6
+echo "configure:51361: checking for ICU 3.4 or greater" >&5
     icu_version_full=`$ICU_CONFIG --version`
     ac_IFS=$IFS
     IFS="."
     set $icu_version_full
     IFS=$ac_IFS
     icu_version=`expr $1 \* 1000 + $2`
-    echo "$as_me:$LINENO: result: found $icu_version_full" >&5
-echo "${ECHO_T}found $icu_version_full" >&6
+    echo "$ac_t""found $icu_version_full" 1>&6
 
     if test "$icu_version" -lt "3004"; then
-      { { echo "$as_me:$LINENO: error: ICU version 3.4 or later is required" >&5
-echo "$as_me: error: ICU version 3.4 or later is required" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: ICU version 3.4 or later is required" 1>&2; exit 1; }
     fi
 
     ICU_VERSION=$icu_version
     ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
     ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
-
+    
   for ac_i in $ICU_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -67530,17 +51413,17 @@
     esac
   done
 
-
+    
   for ac_i in $ICU_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         INTL_SHARED_LIBADD="$INTL_SHARED_LIBADD -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"
@@ -67551,20 +51434,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        INTL_SHARED_LIBADD="$INTL_SHARED_LIBADD -l$ac_ii"
+        INTL_SHARED_LIBADD="$INTL_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -67577,42 +51460,42 @@
     ;;
     -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
         INTL_SHARED_LIBADD="-L$ai_p $INTL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && INTL_SHARED_LIBADD="$ld_runpath_switch$ai_p $INTL_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
 
     ;;
@@ -67621,241 +51504,140 @@
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST INTL_SHARED_LIBADD"
 
-
+  
   if test -z "$php_cxx_done"; then
-    ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:51518: 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
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CXX="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-CXX=$ac_cv_prog_CXX
+CXX="$ac_cv_prog_CXX"
 if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+  echo "$ac_t""$CXX" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+test -n "$CXX" && break
 done
+test -n "$CXX" || CXX="gcc"
 
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
 
-  test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:51550: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
-  CXX=$ac_ct_CXX
-fi
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
 
+cat > conftest.$ac_ext << EOF
 
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#line 51561 "configure"
+#include "confdefs.h"
 
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
+int main(){return(0);}
+EOF
+if { (eval echo configure:51566: \"$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
+    ac_cv_prog_cxx_cross=no
+  else
+    ac_cv_prog_cxx_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cxx_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+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:51592: 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:51597: 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
+  cat > conftest.C <<EOF
+#ifdef __GNUC__
+  yes;
 #endif
+EOF
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:51606: \"$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
+fi
+fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo "$ac_t""$ac_cv_prog_gxx" 1>&6
 
-int
-main ()
-{
+if test $ac_cv_prog_gxx = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+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:51625: 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
+  echo 'void f(){}' > conftest.cc
+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cxx_g=no
+  ac_cv_prog_cxx_g=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+
+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
 if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
+  CXXFLAGS="$ac_save_CXXFLAGS"
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
     CXXFLAGS="-g -O2"
@@ -67869,353 +51651,55 @@
     CXXFLAGS=
   fi
 fi
-for ac_declaration in \
-   '' \
-   '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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
+
+    echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+echo "configure:51657: 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
+  ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+  CXXCPP="${CXX-g++} -E"
+  cat > conftest.$ac_ext <<EOF
+#line 51670 "configure"
+#include "confdefs.h"
 #include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:51675: \"$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
   :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CXXCPP=/lib/cpp
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
 rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
+  ac_cv_prog_CXXCPP="$CXXCPP"
 ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
 fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+CXXCPP="$ac_cv_prog_CXXCPP"
+echo "$ac_t""$CXXCPP" 1>&6
 
     php_cxx_done=yes
   fi
 
 
-
+  
   ext_builddir=ext/intl
   ext_srcdir=$abs_srcdir/ext/intl
 
@@ -68223,15 +51707,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_INTL_SHARED=no
-
-
+    
+  
   case ext/intl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -68289,12 +51773,12 @@
     resourcebundle/resourcebundle_class.c \
     resourcebundle/resourcebundle_iterator.c \
     idn/idn.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
@@ -68318,14 +51802,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_INTL_SHARED=yes
-
+      
   case ext/intl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -68383,12 +51867,12 @@
     resourcebundle/resourcebundle_class.c \
     resourcebundle/resourcebundle_iterator.c \
     idn/idn.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_intl="$shared_objects_intl $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -68406,7 +51890,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -68416,7 +51900,7 @@
       ;;
     *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_intl) -L$(top_builddir)/netware -lphp5lib $(INTL_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_intl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPINTL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -68429,7 +51913,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpintl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_intl"
 
   cat >>Makefile.objects<<EOF
@@ -68443,7 +51927,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -68453,7 +51937,7 @@
       ;;
     *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_intl) -L$(top_builddir)/netware -lphp5lib $(L_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_intl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(INTL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -68466,7 +51950,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/intl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_intl"
 
   cat >>Makefile.objects<<EOF
@@ -68480,10 +51964,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_INTL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -68492,15 +51975,15 @@
     PHP_INTL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/intl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -68558,12 +52041,12 @@
     resourcebundle/resourcebundle_class.c \
     resourcebundle/resourcebundle_iterator.c \
     idn/idn.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
@@ -68583,15 +52066,15 @@
         EXT_STATIC="$EXT_STATIC intl"
         ;;
       *)
-
-
+        
+  
   case ext/intl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -68649,13 +52132,13 @@
     resourcebundle/resourcebundle_class.c \
     resourcebundle/resourcebundle_iterator.c \
     idn/idn.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -68675,69 +52158,69 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC intl"
   fi
+  
+  
+    BUILD_DIR="$BUILD_DIR $ext_builddir"
+  
 
 
-    BUILD_DIR="$BUILD_DIR $ext_builddir"
-
-
-
-  if test "$ext_builddir" = "."; then
-    PHP_PECL_EXTENSION=intl
-
-  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
-  fi
-
-
-
-
-    BUILD_DIR="$BUILD_DIR $ext_builddir/collator"
-
-
-
-
-    BUILD_DIR="$BUILD_DIR $ext_builddir/common"
-
-
-
-
-    BUILD_DIR="$BUILD_DIR $ext_builddir/formatter"
-
-
-
-
-    BUILD_DIR="$BUILD_DIR $ext_builddir/normalizer"
-
-
-
-
-    BUILD_DIR="$BUILD_DIR $ext_builddir/dateformat"
-
-
+  if test "$ext_builddir" = "."; then
+    PHP_PECL_EXTENSION=intl
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
+  fi
 
-    BUILD_DIR="$BUILD_DIR $ext_builddir/locale"
 
+  
+  
+    BUILD_DIR="$BUILD_DIR $ext_builddir/collator"
+  
 
+  
+  
+    BUILD_DIR="$BUILD_DIR $ext_builddir/common"
+  
 
+  
+  
+    BUILD_DIR="$BUILD_DIR $ext_builddir/formatter"
+  
 
-    BUILD_DIR="$BUILD_DIR $ext_builddir/msgformat"
+  
+  
+    BUILD_DIR="$BUILD_DIR $ext_builddir/normalizer"
+  
 
+  
+  
+    BUILD_DIR="$BUILD_DIR $ext_builddir/dateformat"
+  
 
+  
+  
+    BUILD_DIR="$BUILD_DIR $ext_builddir/locale"
+  
 
+  
+  
+    BUILD_DIR="$BUILD_DIR $ext_builddir/msgformat"
+  
 
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir/grapheme"
+  
 
-
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir/resourcebundle"
+  
 
-
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir/idn"
-
+  
 
 fi
 
@@ -68745,18 +52228,19 @@
 
 php_enable_json=yes
 
-echo "$as_me:$LINENO: checking whether to enable JavaScript Object Serialization support" >&5
-echo $ECHO_N "checking whether to enable JavaScript Object Serialization support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6
+echo "configure:52233: 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"
   PHP_JSON=$enableval
 else
-
+  
   PHP_JSON=yes
   test "$PHP_ENABLE_ALL" && PHP_JSON=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -68780,88 +52264,56 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_JSON" != "no"; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_JSON 1 
+EOF
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_JSON 1
-_ACEOF
-
-  echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:52279: 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 52284 "configure"
+#include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:52292: \"$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_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+cat > conftest.$ac_ext <<EOF
+#line 52309 "configure"
+#include "confdefs.h"
 #include <string.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
+  egrep "memchr" >/dev/null 2>&1; then
   :
 else
+  rm -rf conftest*
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
@@ -68870,19 +52322,16 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+cat > conftest.$ac_ext <<EOF
+#line 52327 "configure"
+#include "confdefs.h"
 #include <stdlib.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
+  egrep "free" >/dev/null 2>&1; then
   :
 else
+  rm -rf conftest*
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
@@ -68891,75 +52340,46 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 52348 "configure"
+#include "confdefs.h"
 #include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:52359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  cat >> confdefs.h <<\EOF
 #define STDC_HEADERS 1
-_ACEOF
+EOF
 
 fi
 
 
-
+  
   ext_builddir=ext/json
   ext_srcdir=$abs_srcdir/ext/json
 
@@ -68967,15 +52387,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_JSON_SHARED=no
-
-
+    
+  
   case ext/json in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -68988,12 +52408,12 @@
 
   old_IFS=$IFS
   for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.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
@@ -69017,14 +52437,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_JSON_SHARED=yes
-
+      
   case ext/json in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -69037,12 +52457,12 @@
 
   old_IFS=$IFS
   for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_json="$shared_objects_json $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -69060,7 +52480,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -69070,7 +52490,7 @@
       ;;
     *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_json) -L$(top_builddir)/netware -lphp5lib $(JSON_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_json) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPJSON, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -69083,7 +52503,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpjson.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_json"
 
   cat >>Makefile.objects<<EOF
@@ -69097,7 +52517,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -69107,7 +52527,7 @@
       ;;
     *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_json) -L$(top_builddir)/netware -lphp5lib $(N_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_json) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(JSON, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -69120,7 +52540,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/json.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_json"
 
   cat >>Makefile.objects<<EOF
@@ -69134,10 +52554,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_JSON 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -69146,15 +52565,15 @@
     PHP_JSON_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/json in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -69167,12 +52586,12 @@
 
   old_IFS=$IFS
   for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.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
@@ -69192,15 +52611,15 @@
         EXT_STATIC="$EXT_STATIC json"
         ;;
       *)
-
-
+        
+  
   case ext/json in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -69213,13 +52632,13 @@
 
   old_IFS=$IFS
   for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -69239,40 +52658,40 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC json"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=json
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+  
     header_path=ext/json
     for header_file in php_json.h; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST JSON_SHARED_LIBADD"
 
 fi
@@ -69285,19 +52704,19 @@
 
 php_with_ldap=no
 
-echo "$as_me:$LINENO: checking for LDAP support" >&5
-echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6
-
+echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
+echo "configure:52709: checking for LDAP support" >&5
 # Check whether --with-ldap or --without-ldap was given.
 if test "${with_ldap+set}" = set; then
   withval="$with_ldap"
   PHP_LDAP=$withval
 else
-
+  
   PHP_LDAP=no
   test "$PHP_ENABLE_ALL" && PHP_LDAP=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -69321,8 +52740,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -69330,30 +52748,29 @@
 
 php_with_ldap_sasl=no
 
-echo "$as_me:$LINENO: checking for LDAP Cyrus SASL support" >&5
-echo $ECHO_N "checking for LDAP Cyrus SASL support... $ECHO_C" >&6
-
+echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6
+echo "configure:52753: 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"
   PHP_LDAP_SASL=$withval
 else
-
+  
   PHP_LDAP_SASL=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LDAP_SASL
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_LDAP" != "no"; then
 
-
+  
   ext_builddir=ext/ldap
   ext_srcdir=$abs_srcdir/ext/ldap
 
@@ -69361,15 +52778,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_LDAP_SHARED=no
-
-
+    
+  
   case ext/ldap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -69382,12 +52799,12 @@
 
   old_IFS=$IFS
   for ac_src in ldap.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
@@ -69411,14 +52828,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_LDAP_SHARED=yes
-
+      
   case ext/ldap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -69431,12 +52848,12 @@
 
   old_IFS=$IFS
   for ac_src in ldap.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_ldap="$shared_objects_ldap $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -69454,7 +52871,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -69464,7 +52881,7 @@
       ;;
     *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_ldap) -L$(top_builddir)/netware -lphp5lib $(LDAP_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_ldap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPLDAP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -69477,7 +52894,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpldap.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ldap"
 
   cat >>Makefile.objects<<EOF
@@ -69491,7 +52908,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -69501,7 +52918,7 @@
       ;;
     *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_ldap) -L$(top_builddir)/netware -lphp5lib $(P_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_ldap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(LDAP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -69514,7 +52931,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/ldap.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ldap"
 
   cat >>Makefile.objects<<EOF
@@ -69528,10 +52945,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_LDAP 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -69540,15 +52956,15 @@
     PHP_LDAP_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/ldap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -69561,12 +52977,12 @@
 
   old_IFS=$IFS
   for ac_src in ldap.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
@@ -69586,15 +53002,15 @@
         EXT_STATIC="$EXT_STATIC ldap"
         ;;
       *)
-
-
+        
+  
   case ext/ldap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -69607,13 +53023,13 @@
 
   old_IFS=$IFS
   for ac_src in ldap.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -69633,15 +53049,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC ldap"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=ldap
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -69649,7 +53065,7 @@
 
   if test "$PHP_LDAP" = "yes"; then
     for i in /usr/local /usr; do
-
+      
   if test -f $i/include/ldap.h; then
     LDAP_DIR=$i
     LDAP_INCDIR=$i/include
@@ -69666,7 +53082,7 @@
 
     done
   else
-
+    
   if test -f $PHP_LDAP/include/ldap.h; then
     LDAP_DIR=$PHP_LDAP
     LDAP_INCDIR=$PHP_LDAP/include
@@ -69684,12 +53100,10 @@
   fi
 
   if test -z "$LDAP_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find ldap.h" >&5
-echo "$as_me: error: Cannot find ldap.h" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find ldap.h" 1>&2; exit 1; }
   fi
 
-
+        
   if test `uname` = "Linux"; then
     LDAP_PTHREAD=pthread
   else
@@ -69697,94 +53111,94 @@
   fi
 
   if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-llber $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 lber in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-llber $LIBS"
+  *) 
+      LIBS="-llber $LIBS" 
    ;;
   esac
 
@@ -69794,94 +53208,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lldap $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 ldap in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lldap $LIBS"
+  *) 
+      LIBS="-lldap $LIBS" 
    ;;
   esac
 
@@ -69893,94 +53307,94 @@
 
 
   elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lldap $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 ldap in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lldap $LIBS"
+  *) 
+      LIBS="-lldap $LIBS" 
    ;;
   esac
 
@@ -69992,106 +53406,106 @@
 
 
   elif test -f $LDAP_LIBDIR/libssldap50.$SHLIB_SUFFIX_NAME; then
-    if test -n "$LDAP_PTHREAD"; then
-
-
+    if test -n "$LDAP_PTHREAD"; then 
+      
+  
   case $LDAP_PTHREAD in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$LDAP_PTHREAD $LIBS"
+  *) 
+      LIBS="-l$LDAP_PTHREAD $LIBS" 
    ;;
   esac
 
 
     fi
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lnspr4 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 nspr4 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lnspr4 $LIBS"
+  *) 
+      LIBS="-lnspr4 $LIBS" 
    ;;
   esac
 
@@ -70101,94 +53515,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lplc4 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 plc4 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lplc4 $LIBS"
+  *) 
+      LIBS="-lplc4 $LIBS" 
    ;;
   esac
 
@@ -70198,94 +53612,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lplds4 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 plds4 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lplds4 $LIBS"
+  *) 
+      LIBS="-lplds4 $LIBS" 
    ;;
   esac
 
@@ -70295,94 +53709,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lssldap50 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 ssldap50 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lssldap50 $LIBS"
+  *) 
+      LIBS="-lssldap50 $LIBS" 
    ;;
   esac
 
@@ -70392,94 +53806,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lldap50 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 ldap50 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lldap50 $LIBS"
+  *) 
+      LIBS="-lldap50 $LIBS" 
    ;;
   esac
 
@@ -70489,94 +53903,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lprldap50 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 prldap50 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lprldap50 $LIBS"
+  *) 
+      LIBS="-lprldap50 $LIBS" 
    ;;
   esac
 
@@ -70586,94 +54000,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lssl3 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 ssl3 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lssl3 $LIBS"
+  *) 
+      LIBS="-lssl3 $LIBS" 
    ;;
   esac
 
@@ -70683,113 +54097,112 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_NSLDAP 1
-_ACEOF
+EOF
 
 
   elif test -f $LDAP_LIBDIR/libldapssl41.$SHLIB_SUFFIX_NAME; then
-    if test -n "$LDAP_PTHREAD"; then
-
-
+    if test -n "$LDAP_PTHREAD"; then 
+      
+  
   case $LDAP_PTHREAD in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$LDAP_PTHREAD $LIBS"
+  *) 
+      LIBS="-l$LDAP_PTHREAD $LIBS" 
    ;;
   esac
 
 
     fi
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lnspr3 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 nspr3 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lnspr3 $LIBS"
+  *) 
+      LIBS="-lnspr3 $LIBS" 
    ;;
   esac
 
@@ -70799,94 +54212,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lplc3 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 plc3 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lplc3 $LIBS"
+  *) 
+      LIBS="-lplc3 $LIBS" 
    ;;
   esac
 
@@ -70896,94 +54309,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lplds3 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 plds3 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lplds3 $LIBS"
+  *) 
+      LIBS="-lplds3 $LIBS" 
    ;;
   esac
 
@@ -70993,94 +54406,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lldapssl41 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 ldapssl41 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lldapssl41 $LIBS"
+  *) 
+      LIBS="-lldapssl41 $LIBS" 
    ;;
   esac
 
@@ -71090,113 +54503,112 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_NSLDAP 1
-_ACEOF
+EOF
 
 
   elif test -f $LDAP_LIBDIR/libldapssl30.$SHLIB_SUFFIX_NAME; then
-    if test -n "$LDAP_PTHREAD"; then
-
-
+    if test -n "$LDAP_PTHREAD"; then 
+      
+  
   case $LDAP_PTHREAD in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$LDAP_PTHREAD $LIBS"
+  *) 
+      LIBS="-l$LDAP_PTHREAD $LIBS" 
    ;;
   esac
 
 
     fi
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lldapssl30 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 ldapssl30 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lldapssl30 $LIBS"
+  *) 
+      LIBS="-lldapssl30 $LIBS" 
    ;;
   esac
 
@@ -71206,113 +54618,112 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_NSLDAP 1
-_ACEOF
+EOF
 
 
   elif test -f $LDAP_LIBDIR/libldap30.$SHLIB_SUFFIX_NAME; then
-    if test -n "$LDAP_PTHREAD"; then
-
-
+    if test -n "$LDAP_PTHREAD"; then 
+      
+  
   case $LDAP_PTHREAD in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$LDAP_PTHREAD $LIBS"
+  *) 
+      LIBS="-l$LDAP_PTHREAD $LIBS" 
    ;;
   esac
 
 
     fi
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lldap30 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 ldap30 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lldap30 $LIBS"
+  *) 
+      LIBS="-lldap30 $LIBS" 
    ;;
   esac
 
@@ -71322,101 +54733,100 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_NSLDAP 1
-_ACEOF
+EOF
 
 
   elif test -f $LDAP_LIBDIR/libumich_ldap.$SHLIB_SUFFIX_NAME; then
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lumich_lber $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 umich_lber in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lumich_lber $LIBS"
+  *) 
+      LIBS="-lumich_lber $LIBS" 
    ;;
   esac
 
@@ -71426,94 +54836,94 @@
   fi
 
 
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lumich_ldap $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 umich_ldap in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lumich_ldap $LIBS"
+  *) 
+      LIBS="-lumich_ldap $LIBS" 
    ;;
   esac
 
@@ -71525,94 +54935,94 @@
 
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME; then
-
+    
 
   if test "$ext_shared" = "yes"; then
     LDAP_SHARED_LIBADD="-lclntsh $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
-
+      
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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_LIBDIR"; then
-
+    
   if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
   else
-
+    
     ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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 clntsh in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lclntsh $LIBS"
+  *) 
+      LIBS="-lclntsh $LIBS" 
    ;;
   esac
 
@@ -71622,237 +55032,155 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ORALDAP 1
-_ACEOF
+EOF
 
     if test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_ORALDAP_10 1
-_ACEOF
+EOF
 
     fi
   else
-    { { echo "$as_me:$LINENO: error: Cannot find ldap libraries in $LDAP_LIBDIR." >&5
-echo "$as_me: error: Cannot find ldap libraries in $LDAP_LIBDIR." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find ldap libraries in $LDAP_LIBDIR." 1>&2; exit 1; }
   fi
 
-
+  
   if test "$LDAP_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$LDAP_INCDIR" || echo "$LDAP_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_INCDIR
   else
-
+    
     ep_dir="`echo $LDAP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LDAP_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
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST LDAP_SHARED_LIBADD"
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LDAP 1
-_ACEOF
-
+EOF
 
+  
     _SAVE_CPPFLAGS=$CPPFLAGS
   _SAVE_LIBS=$LIBS
   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
   LIBS="$LIBS $LDAP_SHARED_LIBADD"
 
-    echo "$as_me:$LINENO: checking for 3 arg ldap_set_rebind_proc" >&5
-echo $ECHO_N "checking for 3 arg ldap_set_rebind_proc... $ECHO_C" >&6
-if test "${ac_cv_3arg_setrebindproc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6
+echo "configure:55095: 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 55100 "configure"
+#include "confdefs.h"
 #include <ldap.h>
-int
-main ()
-{
+int main() {
 ldap_set_rebind_proc(0,0,0)
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:55107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_3arg_setrebindproc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_3arg_setrebindproc=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_3arg_setrebindproc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_3arg_setrebindproc" >&5
-echo "${ECHO_T}$ac_cv_3arg_setrebindproc" >&6
-  if test "$ac_cv_3arg_setrebindproc" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_3arg_setrebindproc" 1>&6
+  if test "$ac_cv_3arg_setrebindproc" = yes; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_3ARG_SETREBINDPROC 1
-_ACEOF
+EOF
 
   fi
 
-
-
-
-for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s
+      for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:55130: 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 55135 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:55158: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  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
@@ -71862,30 +55190,26 @@
   for i in $SEARCH_DIRS; do
     if test -f $i/include/sasl/sasl.h; then
       LDAP_SASL_DIR=$i
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_LDAP_SASL_SASL_H 1
-_ACEOF
+EOF
 
       break
     elif test -f $i/include/sasl.h; then
       LDAP_SASL_DIR=$i
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_LDAP_SASL_H 1
-_ACEOF
+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 "$as_me:$LINENO: error: sasl.h not found!" >&5
-echo "$as_me: error: sasl.h not found!" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: sasl.h not found!" 1>&2; exit 1; }
   fi
 
   if test "$PHP_LDAP_SASL" = "yes"; then
@@ -71893,26 +55217,26 @@
   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"
@@ -71923,20 +55247,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -71949,236 +55273,206 @@
     ;;
     -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 "$as_me:$LINENO: checking for sasl_version in -lsasl2" >&5
-echo $ECHO_N "checking for sasl_version in -lsasl2... $ECHO_C" >&6
-if test "${ac_cv_lib_sasl2_sasl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for sasl_version in -lsasl2""... $ac_c" 1>&6
+echo "configure:55320: checking for sasl_version in -lsasl2" >&5
+ac_lib_var=`echo sasl2'_'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_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsasl2  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 55328 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* 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;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sasl2_sasl_version=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sasl2_sasl_version=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_version" >&5
-echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_version" >&6
-if test $ac_cv_lib_sasl2_sasl_version = yes; then
+    builtin and then its argument prototype would still apply.  */
+char sasl_version();
+
+int main() {
+sasl_version()
+; return 0; }
+EOF
+if { (eval echo configure:55339: \"$ac_link\") 1>&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"
+  *) 
+      LIBS="-lsasl2 $LIBS" 
    ;;
   esac
 
@@ -72188,133 +55482,82 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LDAP_SASL 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sasl2_sasl_version
-
-    { { echo "$as_me:$LINENO: error: LDAP SASL check failed. Please check config.log for more information." >&5
-echo "$as_me: error: LDAP SASL check failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: LDAP SASL check failed. Please check config.log for more information." 1>&2; exit 1; }
+  
+  
 fi
 
 
   fi
 
-        echo "$as_me:$LINENO: checking for ldap_bind_s" >&5
-echo $ECHO_N "checking for ldap_bind_s... $ECHO_C" >&6
-if test "${ac_cv_func_ldap_bind_s+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
+echo "configure:55508: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define ldap_bind_s to an innocuous variant, in case <limits.h> declares ldap_bind_s.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define ldap_bind_s innocuous_ldap_bind_s
-
+  cat > conftest.$ac_ext <<EOF
+#line 55513 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char ldap_bind_s (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef ldap_bind_s
-
+    which can conflict with char ldap_bind_s(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    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
-char (*f) () = ldap_bind_s;
-#endif
-#ifdef __cplusplus
-}
+ldap_bind_s();
 #endif
 
-int
-main ()
-{
-return f != ldap_bind_s;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_ldap_bind_s=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_ldap_bind_s=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_ldap_bind_s" >&5
-echo "${ECHO_T}$ac_cv_func_ldap_bind_s" >&6
-if test $ac_cv_func_ldap_bind_s = yes; then
-  :
+; return 0; }
+EOF
+if { (eval echo configure:55536: \"$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
 
-    { { echo "$as_me:$LINENO: error: LDAP build check failed. Please check config.log for more information." >&5
-echo "$as_me: error: LDAP build check failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+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 "configure: error: LDAP build check failed. Please check config.log for more information." 1>&2; exit 1; } 
+  
 fi
 
-
+  
     CPPFLAGS=$_SAVE_CPPFLAGS
   LIBS=$_SAVE_LIBS
-fi
+fi 
 
 
 
@@ -72341,18 +55584,19 @@
 
 php_enable_mbstring=no
 
-echo "$as_me:$LINENO: checking whether to enable multibyte string support" >&5
-echo $ECHO_N "checking whether to enable multibyte string support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
+echo "configure:55589: 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"
   PHP_MBSTRING=$enableval
 else
-
+  
   PHP_MBSTRING=no
   test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -72376,8 +55620,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -72385,22 +55628,22 @@
 
 php_enable_mbregex=yes
 
-echo "$as_me:$LINENO: checking whether to enable multibyte regex support" >&5
-echo $ECHO_N "checking whether to enable multibyte regex support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
+echo "configure:55633: 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"
   PHP_MBREGEX=$enableval
 else
-
+  
   PHP_MBREGEX=yes
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_MBREGEX
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -72408,22 +55651,22 @@
 
 php_enable_mbregex_backtrack=yes
 
-echo "$as_me:$LINENO: checking whether to check multibyte regex backtrack" >&5
-echo $ECHO_N "checking whether to check multibyte regex backtrack... $ECHO_C" >&6
+echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6
+echo "configure:55656: 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"
   PHP_MBREGEX_BACKTRACK=$enableval
 else
-
+  
   PHP_MBREGEX_BACKTRACK=yes
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_MBREGEX_BACKTRACK
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -72431,23 +55674,22 @@
 
 php_with_libmbfl=no
 
-echo "$as_me:$LINENO: checking for external libmbfl" >&5
-echo $ECHO_N "checking for external libmbfl... $ECHO_C" >&6
-
+echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
+echo "configure:55679: checking for external libmbfl" >&5
 # Check whether --with-libmbfl or --without-libmbfl was given.
 if test "${with_libmbfl+set}" = set; then
   withval="$with_libmbfl"
   PHP_LIBMBFL=$withval
 else
-
+  
   PHP_LIBMBFL=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBMBFL
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -72455,58 +55697,55 @@
 
 php_with_onig=no
 
-echo "$as_me:$LINENO: checking for external oniguruma" >&5
-echo $ECHO_N "checking for external oniguruma... $ECHO_C" >&6
-
+echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6
+echo "configure:55702: checking for external oniguruma" >&5
 # Check whether --with-onig or --without-onig was given.
 if test "${with_onig+set}" = set; then
   withval="$with_onig"
   PHP_ONIG=$withval
 else
-
+  
   PHP_ONIG=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ONIG
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
-
+echo "$ac_t""$ext_output" 1>&6
 
 
 
-if test "$PHP_MBSTRING" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
+if test "$PHP_MBSTRING" != "no"; then  
+  cat >> confdefs.h <<\EOF
 #define HAVE_MBSTRING 1
-_ACEOF
-
+EOF
 
 
+  
   PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c"
 
 
   if test "$PHP_MBREGEX" != "no"; then
-
+    
   if test "$PHP_MBREGEX" = "yes"; then
     if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then
                         if test "$PHP_MBREGEX_BACKTRACK" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define USE_COMBINATION_EXPLOSION_CHECK 1
-_ACEOF
+EOF
 
       fi
 
-      echo "$as_me:$LINENO: checking for variable length prototypes and stdarg.h" >&5
-echo $ECHO_N "checking for variable length prototypes and stdarg.h... $ECHO_C" >&6
-if test "${php_cv_mbstring_stdarg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
+echo "configure:55743: 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
-
+  
         if test "$cross_compiling" = yes; then
-
+  
                     case $host_alias in
           *netware*)
           php_cv_mbstring_stdarg=yes
@@ -72515,14 +55754,11 @@
           php_cv_mbstring_stdarg=no
           ;;
           esac
-
+        
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 55761 "configure"
+#include "confdefs.h"
 
 #include <stdarg.h>
 int foo(int x, ...) {
@@ -72534,1680 +55770,336 @@
 	return 0;
 }
 int main() { return foo(10, "", 3.14); }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+        
+EOF
+if { (eval echo configure:55776: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-php_cv_mbstring_stdarg=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-fi
-echo "$as_me:$LINENO: result: $php_cv_mbstring_stdarg" >&5
-echo "${ECHO_T}$php_cv_mbstring_stdarg" >&6
-
-
-
-
-
-
-
-
-for ac_header in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  php_cv_mbstring_stdarg=no
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -fr conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
+      
 fi
 
-done
-
-      echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((int *) 0)
-  return 0;
-if (sizeof (int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
+echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+      for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:55797: 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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
+  cat > conftest.$ac_ext <<EOF
+#line 55802 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:55807: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+
+      echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:55834: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
+  ac_cv_sizeof_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 55842 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:55853: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_int=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-      echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((short *) 0)
-  return 0;
-if (sizeof (short))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_short=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
-
-echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6
-if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_short" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+      echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:55873: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (short)); }
-unsigned long ulongval () { return (long) (sizeof (short)); }
+  ac_cv_sizeof_short=2
+else
+  cat > conftest.$ac_ext <<EOF
+#line 55881 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (short))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (short))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (short))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_short=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:55892: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_short=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-
-
-      echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
+fi
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+      echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:55912: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
+  ac_cv_sizeof_long=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 55920 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:55931: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
 
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
 
-      echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset x;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
+      echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:55951: 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 55956 "configure"
+#include "confdefs.h"
 
-    *t++ = 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-  }
-#endif
+int main() {
 
-  ;
-  return 0;
+/* Ultrix mips cc rejects this.  */
+typedef int charset[2]; const charset x;
+/* SunOS 4.1.1 cc rejects this.  */
+char const *const *ccp;
+char **p;
+/* NEC SVR4.0.2 mips cc rejects this.  */
+struct point {int x, y;};
+static struct point const zero = {0,0};
+/* AIX XL C 1.02.0.0 rejects this.
+   It does not let you subtract one const X* pointer from another in an arm
+   of an if-expression whose if-part is not a constant expression */
+const char *g = "string";
+ccp = &g + (g ? g-g : 0);
+/* HPUX 7.0 cc rejects these. */
+++ccp;
+p = (char**) ccp;
+ccp = (char const *const *) p;
+{ /* SCO 3.2v4 cc rejects this.  */
+  char *t;
+  char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+  *t++ = 0;
+}
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  int x[] = {25, 17};
+  const int *foo = &x[0];
+  ++foo;
+}
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+  typedef const int *iptr;
+  iptr p = 0;
+  ++p;
+}
+{ /* AIX XL C 1.02.0.0 rejects this saying
+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+  struct s { int j; const int *ap[3]; };
+  struct s *b; b->j = 5;
 }
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+  const int foo = 10;
+}
+
+; return 0; }
+EOF
+if { (eval echo configure:56005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_const=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  cat >> confdefs.h <<\EOF
+#define const 
+EOF
 
 fi
 
-      echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+      echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+echo "configure:56026: 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 56031 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+struct tm *tp;
+; return 0; }
+EOF
+if { (eval echo configure:56040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_header_time=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_time=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_time=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
-if test $ac_cv_header_time = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_header_time" 1>&6
+if test $ac_cv_header_time = yes; then
+  cat >> confdefs.h <<\EOF
 #define TIME_WITH_SYS_TIME 1
-_ACEOF
+EOF
 
 fi
-
+ 
       # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+echo "configure:56063: 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 56068 "configure"
+#include "confdefs.h"
 #include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_working_alloca_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_working_alloca_h=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-if test $ac_cv_working_alloca_h = yes; then
+int main() {
+char *p = alloca(2 * sizeof(int));
+; return 0; }
+EOF
+if { (eval echo configure:56075: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_alloca_h=no
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
+if test $ac_cv_header_alloca_h = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_ALLOCA_H 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for alloca""... $ac_c" 1>&6
+echo "configure:56096: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 56101 "configure"
+#include "confdefs.h"
+
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
@@ -74229,217 +56121,137 @@
 # endif
 #endif
 
-int
-main ()
-{
-char *p = (char *) alloca (1);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+char *p = (char *) alloca(1);
+; return 0; }
+EOF
+if { (eval echo configure:56129: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_alloca_works=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_alloca_works=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
 if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_ALLOCA 1
-_ACEOF
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
+EOF
 
-ALLOCA=alloca.$ac_objext
+fi
 
-cat >>confdefs.h <<\_ACEOF
+if test $ac_cv_func_alloca_works = no; then
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+  # that cause trouble.  Some versions do not even contain alloca or
+  # contain a buggy version.  If you still want to use their alloca,
+  # use ar to extract alloca.o from them instead of compiling alloca.c.
+  ALLOCA=alloca.${ac_objext}
+  cat >> confdefs.h <<\EOF
 #define C_ALLOCA 1
-_ACEOF
+EOF
 
 
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+echo "configure:56161: 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 56166 "configure"
+#include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 #else
 wenotbecray
 #endif
 
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  egrep "webecray" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_os_cray=yes
 else
+  rm -rf conftest*
   ac_cv_os_cray=no
 fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
 
+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:56191: 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 56196 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:56219: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<_ACEOF
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<EOF
 #define CRAY_STACKSEG_END $ac_func
-_ACEOF
+EOF
 
-    break
+  break
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  done
+done
 fi
 
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+echo "configure:56246: 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
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
+  cat > conftest.$ac_ext <<EOF
+#line 56254 "configure"
+#include "confdefs.h"
 find_stack_direction ()
 {
   static char *addr = 0;
@@ -74452,302 +56264,131 @@
   else
     return (&dummy > addr) ? 1 : -1;
 }
-
-int
 main ()
 {
-  exit (find_stack_direction () < 0);
+  exit (find_stack_direction() < 0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:56273: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
+cat >> confdefs.h <<EOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
+EOF
 
 fi
 
-      echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
-if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+echo "configure:56295: 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
   if test "$cross_compiling" = yes; then
-  ac_cv_func_memcmp_working=no
+  ac_cv_func_memcmp_clean=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
+  cat > conftest.$ac_ext <<EOF
+#line 56303 "configure"
+#include "confdefs.h"
 
-  /* Some versions of memcmp are not 8-bit clean.  */
+main()
+{
   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-    exit (1);
-
-  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-     or more and with at least one buffer not starting on a 4-byte boundary.
-     William Lewis provided this test program.   */
-  {
-    char foo[21];
-    char bar[21];
-    int i;
-    for (i = 0; i < 4; i++)
-      {
-	char *a = foo + i;
-	char *b = bar + i;
-	strcpy (a, "--------01111111");
-	strcpy (b, "--------10000000");
-	if (memcmp (a, b, 16) >= 0)
-	  exit (1);
-      }
-    exit (0);
-  }
-
-  ;
-  return 0;
+  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_memcmp_working=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
-test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
-    "memcmp.$ac_objext"   | \
-  *" memcmp.$ac_objext"   | \
-    "memcmp.$ac_objext "* | \
-  *" memcmp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
-esac
-
 
-      if test "${ac_cv_header_stdarg_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for stdarg.h" >&5
-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6
-if test "${ac_cv_header_stdarg_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking stdarg.h usability" >&5
-echo $ECHO_N "checking stdarg.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <stdarg.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking stdarg.h presence" >&5
-echo $ECHO_N "checking stdarg.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stdarg.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: stdarg.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stdarg.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stdarg.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stdarg.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: stdarg.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stdarg.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for stdarg.h" >&5
-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6
-if test "${ac_cv_header_stdarg_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+EOF
+if { (eval echo configure:56313: \"$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
-  ac_cv_header_stdarg_h=$ac_header_preproc
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_memcmp_clean=no
+fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6
 
 fi
-if test $ac_cv_header_stdarg_h = yes; then
 
+echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
+test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
 
-cat >>confdefs.h <<\_ACEOF
+      ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6
+echo "configure:56332: 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 56337 "configure"
+#include "confdefs.h"
+#include <stdarg.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:56342: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+        cat >> confdefs.h <<\EOF
 #define HAVE_STDARG_PROTOTYPES 1
-_ACEOF
-
+EOF
 
+      
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define PHP_ONIG_BUNDLED 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_ONIG 1
-_ACEOF
-
-
+EOF
+ 
+      
   PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY"
 
-
+      
   PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma"
 
-
+      
   PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma/enc"
 
-
+      
   PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES oniguruma"
 
-
+      
   PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS oniguruma/config.h"
 
-
-  PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES
+      
+  PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES 
         oniguruma/regcomp.c
         oniguruma/regerror.c
         oniguruma/regexec.c
@@ -74790,66 +56431,64 @@
         oniguruma/enc/utf32_le.c
       "
 
-
+      
   PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS oniguruma/oniguruma.h"
 
     else
                         if test ! -f "$PHP_ONIG/include/oniguruma.h"; then
-        { { echo "$as_me:$LINENO: error: oniguruma.h not found in $PHP_ONIG/include" >&5
-echo "$as_me: error: oniguruma.h not found in $PHP_ONIG/include" >&2;}
-   { (exit 1); exit 1; }; }
+        { echo "configure: error: oniguruma.h not found in $PHP_ONIG/include" 1>&2; exit 1; }
       fi
-
+      
   if test "$PHP_ONIG/include" != "/usr/include"; then
-
+    
   if test -z "$PHP_ONIG/include" || echo "$PHP_ONIG/include" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ONIG/include
   else
-
+    
     ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`"
   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
 
 
-
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
         -L$PHP_ONIG/$PHP_LIBDIR
       "
-
+  
   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"
@@ -74860,20 +56499,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -74886,205 +56525,175 @@
     ;;
     -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 "$as_me:$LINENO: checking for onig_init in -lonig" >&5
-echo $ECHO_N "checking for onig_init in -lonig... $ECHO_C" >&6
-if test "${ac_cv_lib_onig_onig_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6
+echo "configure:56572: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lonig  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 56580 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char onig_init ();
-int
-main ()
-{
-onig_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_onig_onig_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_onig_onig_init=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_onig_onig_init" >&5
-echo "${ECHO_T}$ac_cv_lib_onig_onig_init" >&6
-if test $ac_cv_lib_onig_onig_init = yes; then
+    builtin and then its argument prototype would still apply.  */
+char onig_init();
+
+int main() {
+onig_init()
+; return 0; }
+EOF
+if { (eval echo configure:56591: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
     MBSTRING_SHARED_LIBADD="-lonig $MBSTRING_SHARED_LIBADD"
     if test -n "$PHP_ONIG/$PHP_LIBDIR"; then
-
+      
   if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ONIG/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_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 "$PHP_ONIG/$PHP_LIBDIR"; then
-
+    
   if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ONIG/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case onig in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lonig $LIBS"
+  *) 
+      LIBS="-lonig $LIBS" 
    ;;
   esac
 
@@ -75094,39 +56703,37 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_ONIG 1
-_ACEOF
-
-
-
+EOF
+ 
+      
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_onig_onig_init
-
-        { { echo "$as_me:$LINENO: error: Problem with oniguruma. Please check config.log for more information." >&5
-echo "$as_me: error: Problem with oniguruma. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+        { echo "configure: error: Problem with oniguruma. Please check config.log for more information." 1>&2; exit 1; }
+      
+  
 fi
 
 
       save_old_LDFLAGS=$LDFLAGS
-
+      
   for ac_i in $MBSTRING_SHARED_LIBADD; 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"
@@ -75137,20 +56744,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -75163,163 +56770,131 @@
     ;;
     -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 "$as_me:$LINENO: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
-echo $ECHO_N "checking if oniguruma has an invalid entry for KOI8 encoding... $ECHO_C" >&6
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+      echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6
+echo "configure:56817: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
+      cat > conftest.$ac_ext <<EOF
+#line 56819 "configure"
+#include "confdefs.h"
 
 #include <oniguruma.h>
-
-int
-main ()
-{
+      
+int main() {
 
 return (int)(ONIG_ENCODING_KOI8 + 1);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+      
+; return 0; }
+EOF
+if { (eval echo configure:56830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+        echo "$ac_t""no" 1>&6
+      
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+        echo "$ac_t""yes" 1>&6
+        cat >> confdefs.h <<\EOF
 #define PHP_ONIG_BAD_KOI8_ENTRY 1
-_ACEOF
-
+EOF
 
+      
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
       LDFLAGS=$save_old_LDFLAGS
     fi
 
-
+    
   PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DONIG_ESCAPE_UCHAR_COLLISION=1"
 
-
+    
   PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DUChar=OnigUChar"
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_MBREGEX 1
-_ACEOF
-
+EOF
 
 
+    
   PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES php_mbregex.c"
 
-
+    
   PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS php_mbregex.h php_onig_compat.h"
 
   fi
 
   fi
-
-
+  
+    
     if test "$PHP_LIBMBFL" = "yes" || test "$PHP_LIBMBFL" = "no"; then
-
+                
   PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl"
 
-
+    
   PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/mbfl"
 
-
+    
   PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/filters"
 
-
+    
   PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/nls"
 
-
+    
   PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl"
 
-
+    
   PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl/mbfl"
 
-
+    
   PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS libmbfl/config.h"
 
 
-
-  PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES
+    
+  PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES 
      libmbfl/filters/html_entities.c
      libmbfl/filters/mbfilter_7bit.c
      libmbfl/filters/mbfilter_ascii.c
@@ -75401,10 +56976,10 @@
      libmbfl/nls/nls_ua.c
     "
 
-
+    
   PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DHAVE_CONFIG_H"
 
-
+    
   PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h"
 
   else
@@ -75416,62 +56991,60 @@
     done
 
     if test -z "$PHP_LIBMBFL_INCLUDE"; then
-      { { echo "$as_me:$LINENO: error: mbfilter.h not found. Please reinstall libmbfl library." >&5
-echo "$as_me: error: mbfilter.h not found. Please reinstall libmbfl library." >&2;}
-   { (exit 1); exit 1; }; }
-    else
-
+      { echo "configure: error: mbfilter.h not found. Please reinstall libmbfl library." 1>&2; exit 1; }
+    else 
+      
   if test "$PHP_LIBMBFL_INCLUDE" != "/usr/include"; then
-
+    
   if test -z "$PHP_LIBMBFL_INCLUDE" || echo "$PHP_LIBMBFL_INCLUDE" | grep '^/' >/dev/null ; then
     ai_p=$PHP_LIBMBFL_INCLUDE
   else
-
+    
     ep_dir="`echo $PHP_LIBMBFL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL_INCLUDE\"`"
   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
 
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$PHP_LIBMBFL/$PHP_LIBDIR
     "
-
+  
   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"
@@ -75482,20 +57055,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -75508,205 +57081,175 @@
     ;;
     -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 "$as_me:$LINENO: checking for mbfl_buffer_converter_new in -lmbfl" >&5
-echo $ECHO_N "checking for mbfl_buffer_converter_new in -lmbfl... $ECHO_C" >&6
-if test "${ac_cv_lib_mbfl_mbfl_buffer_converter_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
+echo "configure:57128: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lmbfl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 57136 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mbfl_buffer_converter_new ();
-int
-main ()
-{
-mbfl_buffer_converter_new ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_mbfl_mbfl_buffer_converter_new=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mbfl_mbfl_buffer_converter_new=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&5
-echo "${ECHO_T}$ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&6
-if test $ac_cv_lib_mbfl_mbfl_buffer_converter_new = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mbfl_buffer_converter_new();
+
+int main() {
+mbfl_buffer_converter_new()
+; return 0; }
+EOF
+if { (eval echo configure:57147: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
     MBSTRING_SHARED_LIBADD="-lmbfl $MBSTRING_SHARED_LIBADD"
     if test -n "$PHP_LIBMBFL/$PHP_LIBDIR"; then
-
+      
   if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_LIBMBFL/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_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 "$PHP_LIBMBFL/$PHP_LIBDIR"; then
-
+    
   if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_LIBMBFL/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case mbfl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lmbfl $LIBS"
+  *) 
+      LIBS="-lmbfl $LIBS" 
    ;;
   esac
 
@@ -75716,25 +57259,24 @@
   fi
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_mbfl_mbfl_buffer_converter_new
-
-      { { echo "$as_me:$LINENO: error: Problem with libmbfl. Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libmbfl. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Problem with libmbfl. Please check config.log for more information." 1>&2; exit 1; }
+    
+  
 fi
 
   fi
 
-
-
+  
+  
   ext_builddir=ext/mbstring
   ext_srcdir=$abs_srcdir/ext/mbstring
 
@@ -75742,15 +57284,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_MBSTRING_SHARED=no
-
-
+    
+  
   case ext/mbstring in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -75763,12 +57305,12 @@
 
   old_IFS=$IFS
   for ac_src in $PHP_MBSTRING_SOURCES; 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
@@ -75792,14 +57334,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_MBSTRING_SHARED=yes
-
+      
   case ext/mbstring in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -75812,12 +57354,12 @@
 
   old_IFS=$IFS
   for ac_src in $PHP_MBSTRING_SOURCES; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -75835,7 +57377,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -75845,7 +57387,7 @@
       ;;
     *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_mbstring) -L$(top_builddir)/netware -lphp5lib $(MBSTRING_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_mbstring) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMBSTRING, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -75858,7 +57400,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmbstring.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mbstring"
 
   cat >>Makefile.objects<<EOF
@@ -75872,7 +57414,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -75882,7 +57424,7 @@
       ;;
     *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_mbstring) -L$(top_builddir)/netware -lphp5lib $(TRING_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_mbstring) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MBSTRING, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -75895,7 +57437,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/mbstring.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mbstring"
 
   cat >>Makefile.objects<<EOF
@@ -75909,10 +57451,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_MBSTRING 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -75921,15 +57462,15 @@
     PHP_MBSTRING_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/mbstring in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -75942,12 +57483,12 @@
 
   old_IFS=$IFS
   for ac_src in $PHP_MBSTRING_SOURCES; 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
@@ -75967,15 +57508,15 @@
         EXT_STATIC="$EXT_STATIC mbstring"
         ;;
       *)
-
-
+        
+  
   case ext/mbstring in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -75988,13 +57529,13 @@
 
   old_IFS=$IFS
   for ac_src in $PHP_MBSTRING_SOURCES; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -76014,90 +57555,90 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC mbstring"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=mbstring
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST MBSTRING_SHARED_LIBADD"
 
 
   for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do
-
-
+    
+  
     $php_shtool mkdir -p $ext_builddir/$dir
-
+  
 
   done
-
+  
   for dir in $PHP_MBSTRING_EXTRA_INCLUDES; do
-
+    
   if test "$ext_srcdir/$dir" != "/usr/include"; then
-
+    
   if test -z "$ext_srcdir/$dir" || echo "$ext_srcdir/$dir" | grep '^/' >/dev/null ; then
     ai_p=$ext_srcdir/$dir
   else
-
+    
     ep_dir="`echo $ext_srcdir/$dir|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ext_srcdir/$dir\"`"
   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_builddir/$dir" != "/usr/include"; then
-
+    
   if test -z "$ext_builddir/$dir" || echo "$ext_builddir/$dir" | grep '^/' >/dev/null ; then
     ai_p=$ext_builddir/$dir
   else
-
+    
     ep_dir="`echo $ext_builddir/$dir|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ext_builddir/$dir\"`"
   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
@@ -76105,15 +57646,15 @@
   done
 
   if test "$ext_shared" = "no"; then
-
-
+    
+  
   case ext/mbstring in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -76126,12 +57667,12 @@
 
   old_IFS=$IFS
   for ac_src in $PHP_MBSTRING_BASE_SOURCES; 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
@@ -76150,14 +57691,14 @@
 
     out="php_config.h"
   else
-
+    
   case ext/mbstring in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -76170,12 +57711,12 @@
 
   old_IFS=$IFS
   for ac_src in $PHP_MBSTRING_BASE_SOURCES; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -76197,34 +57738,34 @@
       out="php_config.h"
     fi
   fi
-
+  
   for cfg in $PHP_MBSTRING_EXTRA_CONFIG_HEADERS; do
     cat > $ext_builddir/$cfg <<EOF
 #include "$out"
 EOF
   done
-
+  
   PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS mbstring.h"
 
-
-
+  
+  
     header_path=ext/mbstring
     for header_file in $PHP_MBSTRING_INSTALL_HEADERS; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
+    done 
+  
 
 
 fi
@@ -76232,25 +57773,25 @@
 # vim600: sts=2 sw=2 et
 
 
-
+  
 
 
 
 php_with_mcrypt=no
 
-echo "$as_me:$LINENO: checking for mcrypt support" >&5
-echo $ECHO_N "checking for mcrypt support... $ECHO_C" >&6
-
+echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
+echo "configure:57784: checking for mcrypt support" >&5
 # Check whether --with-mcrypt or --without-mcrypt was given.
 if test "${with_mcrypt+set}" = set; then
   withval="$with_mcrypt"
   PHP_MCRYPT=$withval
 else
-
+  
   PHP_MCRYPT=no
   test "$PHP_ENABLE_ALL" && PHP_MCRYPT=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -76274,8 +57815,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -76286,66 +57826,60 @@
   done
 
   if test -z "$MCRYPT_DIR"; then
-    { { echo "$as_me:$LINENO: error: mcrypt.h not found. Please reinstall libmcrypt." >&5
-echo "$as_me: error: mcrypt.h not found. Please reinstall libmcrypt." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: mcrypt.h not found. Please reinstall libmcrypt." 1>&2; exit 1; }
   fi
 
-
+  
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$MCRYPT_DIR/include
-  echo "$as_me:$LINENO: checking for libmcrypt version" >&5
-echo $ECHO_N "checking for libmcrypt version... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6
+echo "configure:57837: checking for libmcrypt version" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 57839 "configure"
+#include "confdefs.h"
 
 #include <mcrypt.h>
 #if MCRYPT_API_VERSION >= 20021217
   yes
 #endif
-
-_ACEOF
+  
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-    echo "$as_me:$LINENO: result: >= 2.5.6" >&5
-echo "${ECHO_T}>= 2.5.6" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+    echo "$ac_t"">= 2.5.6" 1>&6
+  
 else
-
-    { { echo "$as_me:$LINENO: error: libmcrypt version 2.5.6 or greater required." >&5
-echo "$as_me: error: libmcrypt version 2.5.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+    { echo "configure: error: libmcrypt version 2.5.6 or greater required." 1>&2; exit 1; }
+  
 fi
 rm -f conftest*
 
   CPPFLAGS=$old_CPPFLAGS
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl
   "
-
+  
   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"
@@ -76356,20 +57890,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -76382,131 +57916,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for mcrypt_module_open in -lmcrypt" >&5
-echo $ECHO_N "checking for mcrypt_module_open in -lmcrypt... $ECHO_C" >&6
-if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
+echo "configure:57963: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lmcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 57971 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mcrypt_module_open ();
-int
-main ()
-{
-mcrypt_module_open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_mcrypt_mcrypt_module_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mcrypt_mcrypt_module_open=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5
-echo "${ECHO_T}$ac_cv_lib_mcrypt_mcrypt_module_open" >&6
-if test $ac_cv_lib_mcrypt_mcrypt_module_open = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mcrypt_module_open();
+
+int main() {
+mcrypt_module_open()
+; return 0; }
+EOF
+if { (eval echo configure:57982: \"$ac_link\") 1>&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
-
-
-
+    
+    
+  
   case ltdl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        MCRYPT_SHARED_LIBADD="-lltdl $MCRYPT_SHARED_LIBADD"
+        MCRYPT_SHARED_LIBADD="-lltdl $MCRYPT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case ltdl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lltdl $LIBS"
+  *) 
+      LIBS="-lltdl $LIBS" 
    ;;
   esac
 
@@ -76516,38 +58020,38 @@
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBMCRYPT 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_mcrypt_mcrypt_module_open
-
-
+    
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$MCRYPT_DIR/$PHP_LIBDIR
     "
-
+  
   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"
@@ -76558,20 +58062,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -76584,230 +58088,198 @@
     ;;
     -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 "$as_me:$LINENO: checking for mcrypt_module_open in -lmcrypt" >&5
-echo $ECHO_N "checking for mcrypt_module_open in -lmcrypt... $ECHO_C" >&6
-if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
+echo "configure:58135: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lmcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 58143 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mcrypt_module_open ();
-int
-main ()
-{
-mcrypt_module_open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_mcrypt_mcrypt_module_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mcrypt_mcrypt_module_open=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5
-echo "${ECHO_T}$ac_cv_lib_mcrypt_mcrypt_module_open" >&6
-if test $ac_cv_lib_mcrypt_mcrypt_module_open = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mcrypt_module_open();
+
+int main() {
+mcrypt_module_open()
+; return 0; }
+EOF
+if { (eval echo configure:58154: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+      cat >> confdefs.h <<\EOF
 #define HAVE_LIBMCRYPT 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_mcrypt_mcrypt_module_open
-
-      { { echo "$as_me:$LINENO: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." >&5
-echo "$as_me: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." 1>&2; exit 1; }
+    
+  
 fi
 
-
-
+  
+  
 fi
 
 
-
+  
 
   if test "$ext_shared" = "yes"; then
     MCRYPT_SHARED_LIBADD="-lmcrypt $MCRYPT_SHARED_LIBADD"
     if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$MCRYPT_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         MCRYPT_SHARED_LIBADD="-L$ai_p $MCRYPT_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && MCRYPT_SHARED_LIBADD="$ld_runpath_switch$ai_p $MCRYPT_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 "$MCRYPT_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$MCRYPT_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case mcrypt in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lmcrypt $LIBS"
+  *) 
+      LIBS="-lmcrypt $LIBS" 
    ;;
   esac
 
@@ -76817,42 +58289,42 @@
   fi
 
 
-
+  
   if test "$MCRYPT_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$MCRYPT_DIR/include" || echo "$MCRYPT_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$MCRYPT_DIR/include
   else
-
+    
     ep_dir="`echo $MCRYPT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/include\"`"
   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
 
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST MCRYPT_SHARED_LIBADD"
 
-
+  
   ext_builddir=ext/mcrypt
   ext_srcdir=$abs_srcdir/ext/mcrypt
 
@@ -76860,15 +58332,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_MCRYPT_SHARED=no
-
-
+    
+  
   case ext/mcrypt in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -76881,12 +58353,12 @@
 
   old_IFS=$IFS
   for ac_src in mcrypt.c mcrypt_filter.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
@@ -76910,14 +58382,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_MCRYPT_SHARED=yes
-
+      
   case ext/mcrypt in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -76930,12 +58402,12 @@
 
   old_IFS=$IFS
   for ac_src in mcrypt.c mcrypt_filter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_mcrypt="$shared_objects_mcrypt $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -76953,7 +58425,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -76963,7 +58435,7 @@
       ;;
     *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_mcrypt) -L$(top_builddir)/netware -lphp5lib $(MCRYPT_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_mcrypt) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMCRYPT, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -76976,7 +58448,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmcrypt.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mcrypt"
 
   cat >>Makefile.objects<<EOF
@@ -76990,7 +58462,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -77000,7 +58472,7 @@
       ;;
     *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_mcrypt) -L$(top_builddir)/netware -lphp5lib $(YPT_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_mcrypt) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MCRYPT, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -77013,7 +58485,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/mcrypt.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mcrypt"
 
   cat >>Makefile.objects<<EOF
@@ -77027,10 +58499,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_MCRYPT 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -77039,15 +58510,15 @@
     PHP_MCRYPT_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/mcrypt in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -77060,12 +58531,12 @@
 
   old_IFS=$IFS
   for ac_src in mcrypt.c mcrypt_filter.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
@@ -77085,15 +58556,15 @@
         EXT_STATIC="$EXT_STATIC mcrypt"
         ;;
       *)
-
-
+        
+  
   case ext/mcrypt in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -77106,13 +58577,13 @@
 
   old_IFS=$IFS
   for ac_src in mcrypt.c mcrypt_filter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -77132,15 +58603,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC mcrypt"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=mcrypt
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -77151,19 +58622,19 @@
 
 php_with_mssql=no
 
-echo "$as_me:$LINENO: checking for MSSQL support via FreeTDS" >&5
-echo $ECHO_N "checking for MSSQL support via FreeTDS... $ECHO_C" >&6
-
+echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
+echo "configure:58627: 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"
   PHP_MSSQL=$withval
 else
-
+  
   PHP_MSSQL=no
   test "$PHP_ENABLE_ALL" && PHP_MSSQL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -77187,8 +58658,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -77209,9 +58679,7 @@
     done
 
     if test -z "$FREETDS_INSTALLATION_DIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find FreeTDS in known installation directories" >&5
-echo "$as_me: error: Cannot find FreeTDS in known installation directories" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; }
     fi
 
   elif test "$PHP_MSSQL" != "no"; then
@@ -77223,137 +58691,133 @@
       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
       FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
     else
-      { { echo "$as_me:$LINENO: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" >&5
-echo "$as_me: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" 1>&2; exit 1; }
     fi
-  fi
+  fi  
 
   if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-     { { echo "$as_me:$LINENO: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&5
-echo "$as_me: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&2;}
-   { (exit 1); exit 1; }; }
+     { echo "configure: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; }
   fi
 
-
+  
   if test "$FREETDS_INCLUDE_DIR" != "/usr/include"; then
-
+    
   if test -z "$FREETDS_INCLUDE_DIR" || echo "$FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then
     ai_p=$FREETDS_INCLUDE_DIR
   else
-
+    
     ep_dir="`echo $FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETDS_INCLUDE_DIR\"`"
   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
     MSSQL_SHARED_LIBADD="-lsybdb $MSSQL_SHARED_LIBADD"
     if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_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 "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
   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 sybdb in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybdb $LIBS"
+  *) 
+      LIBS="-lsybdb $LIBS" 
    ;;
   esac
 
@@ -77364,7 +58828,7 @@
 
 
 
-
+  
   ext_builddir=ext/mssql
   ext_srcdir=$abs_srcdir/ext/mssql
 
@@ -77372,15 +58836,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_MSSQL_SHARED=no
-
-
+    
+  
   case ext/mssql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -77393,12 +58857,12 @@
 
   old_IFS=$IFS
   for ac_src in php_mssql.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
@@ -77422,14 +58886,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_MSSQL_SHARED=yes
-
+      
   case ext/mssql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -77442,12 +58906,12 @@
 
   old_IFS=$IFS
   for ac_src in php_mssql.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_mssql="$shared_objects_mssql $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -77465,7 +58929,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -77475,7 +58939,7 @@
       ;;
     *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_mssql) -L$(top_builddir)/netware -lphp5lib $(MSSQL_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_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMSSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -77488,7 +58952,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmssql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql"
 
   cat >>Makefile.objects<<EOF
@@ -77502,7 +58966,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -77512,7 +58976,7 @@
       ;;
     *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_mssql) -L$(top_builddir)/netware -lphp5lib $(QL_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_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MSSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -77525,7 +58989,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/mssql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql"
 
   cat >>Makefile.objects<<EOF
@@ -77539,10 +59003,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_MSSQL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -77551,15 +59014,15 @@
     PHP_MSSQL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/mssql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -77572,12 +59035,12 @@
 
   old_IFS=$IFS
   for ac_src in php_mssql.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
@@ -77597,15 +59060,15 @@
         EXT_STATIC="$EXT_STATIC mssql"
         ;;
       *)
-
-
+        
+  
   case ext/mssql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -77618,13 +59081,13 @@
 
   old_IFS=$IFS
   for ac_src in php_mssql.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -77644,172 +59107,142 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC mssql"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=mssql
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-  echo "$as_me:$LINENO: checking for dnet_addr in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_addr in -ldnet_stub... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
+echo "configure:59125: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 59133 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dnet_addr ();
-int
-main ()
-{
-dnet_addr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_stub_dnet_addr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_stub_dnet_addr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_addr" >&6
-if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dnet_addr();
+
+int main() {
+dnet_addr()
+; return 0; }
+EOF
+if { (eval echo configure:59144: \"$ac_link\") 1>&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
+   
 
   if test "$ext_shared" = "yes"; then
     MSSQL_SHARED_LIBADD="-ldnet_stub $MSSQL_SHARED_LIBADD"
     if test -n ""; then
-
+      
   if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
-
+    
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
   else
-
+    
     ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_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 ""; then
-
+    
   if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
-
+    
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
   else
-
+    
     ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"\"`"
   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 dnet_stub in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ldnet_stub $LIBS"
+  *) 
+      LIBS="-ldnet_stub $LIBS" 
    ;;
   esac
 
@@ -77819,25 +59252,24 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBDNET_STUB 1
-_ACEOF
-
+EOF
 
+     
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_MSSQL 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_FREETDS 1
-_ACEOF
-
+EOF
 
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST MSSQL_SHARED_LIBADD"
 
 fi
@@ -77851,19 +59283,19 @@
 
 php_with_mysql=no
 
-echo "$as_me:$LINENO: checking for MySQL support" >&5
-echo $ECHO_N "checking for MySQL support... $ECHO_C" >&6
-
+echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
+echo "configure:59288: checking for MySQL support" >&5
 # Check whether --with-mysql or --without-mysql was given.
 if test "${with_mysql+set}" = set; then
   withval="$with_mysql"
   PHP_MYSQL=$withval
 else
-
+  
   PHP_MYSQL=no
   test "$PHP_ENABLE_ALL" && PHP_MYSQL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -77887,8 +59319,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -77896,48 +59327,46 @@
 
 php_with_mysql_sock=no
 
-echo "$as_me:$LINENO: checking for specified location of the MySQL UNIX socket" >&5
-echo $ECHO_N "checking for specified location of the MySQL UNIX socket... $ECHO_C" >&6
-
+echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
+echo "configure:59332: 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"
   PHP_MYSQL_SOCK=$withval
 else
-
+  
   PHP_MYSQL_SOCK=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_MYSQL_SOCK
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_ZLIB_DIR"; then
-
+  
 php_with_zlib_dir=no
 
-echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6
-
+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
+echo "configure:59356: 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"
   PHP_ZLIB_DIR=$withval
 else
-
+  
   PHP_ZLIB_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ZLIB_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -77963,11 +59392,8 @@
   done
 
   if test -z "$MYSQL_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find MySQL header files under $PHP_MYSQL.
-Note that the MySQL client library is not bundled anymore!" >&5
-echo "$as_me: error: Cannot find MySQL header files under $PHP_MYSQL.
-Note that the MySQL client library is not bundled anymore!" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find MySQL header files under $PHP_MYSQL.
+Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; }
   fi
 
   if test "$enable_maintainer_zts" = "yes"; then
@@ -77986,7 +59412,7 @@
   fi
 
   for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do
-
+    
   str="$MYSQL_DIR/$i/lib$MYSQL_LIBNAME.*"
   for j in `echo $str`; do
     if test -r $j; then
@@ -77998,7 +59424,7 @@
   done
 
   if test -z "$MYSQL_LIB_DIR"; then
-
+    
   str="$MYSQL_DIR/lib/x86_64-linux-gnu/lib$MYSQL_LIBNAME.*"
   for j in `echo $str`; do
     if test -r $j; then
@@ -78009,7 +59435,7 @@
 
   fi
   if test -z "$MYSQL_LIB_DIR"; then
-
+    
   str="$MYSQL_DIR/lib/i386-linux-gnu/lib$MYSQL_LIBNAME.*"
   for j in `echo $str`; do
     if test -r $j; then
@@ -78021,32 +59447,29 @@
   fi
 
   if test -z "$MYSQL_LIB_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
-Note that the MySQL client library is not bundled anymore!" >&5
-echo "$as_me: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
-Note that the MySQL client library is not bundled anymore!" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
+Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; }
   fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
-    -L$MYSQL_LIB_DIR
+    -L$MYSQL_LIB_DIR 
   "
-
+  
   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"
@@ -78057,20 +59480,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -78083,214 +59506,184 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_close" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_close in -l$MYSQL_LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
+echo "configure:59553: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 59561 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mysql_close ();
-int
-main ()
-{
-mysql_close ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mysql_close();
 
+int main() {
+mysql_close()
+; return 0; }
+EOF
+if { (eval echo configure:59572: \"$ac_link\") 1>&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
-
-
+     
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIBNAME_mysql_close
-
+    
     if test "$PHP_ZLIB_DIR" != "no"; then
-
+      
 
   if test "$ext_shared" = "yes"; then
     MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD"
     if test -n "$PHP_ZLIB_DIR"; then
-
+      
   if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_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 "$PHP_ZLIB_DIR"; then
-
+    
   if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
   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 z in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lz $LIBS"
+  *) 
+      LIBS="-lz $LIBS" 
    ;;
   esac
 
@@ -78300,25 +59693,25 @@
   fi
 
 
-
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
-        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR
+        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR 
       "
-
+  
   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"
@@ -78329,20 +59722,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -78355,148 +59748,116 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_error" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_error in -l$MYSQL_LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
+echo "configure:59795: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 59803 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mysql_error ();
-int
-main ()
-{
-mysql_error ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mysql_error();
+
+int main() {
+mysql_error()
+; return 0; }
+EOF
+if { (eval echo configure:59814: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIBNAME_mysql_error
-
-        { { echo "$as_me:$LINENO: error: mysql configure failed. Please check config.log for more information." >&5
-echo "$as_me: error: mysql configure failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+        { echo "configure: error: mysql configure failed. Please check config.log for more information." 1>&2; exit 1; }
+      
+  
 fi
-
+  
       MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
     else
-
-
+      
+  
   case z in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD"
+        MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD" 
     else
-
-
+      
+  
   case z in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lz $LIBS"
+  *) 
+      LIBS="-lz $LIBS" 
    ;;
   esac
 
@@ -78506,25 +59867,25 @@
   esac
 
 
-
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
         -L$MYSQL_LIB_DIR
       "
-
+  
   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"
@@ -78535,20 +59896,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -78561,227 +59922,195 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_errno" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_errno in -l$MYSQL_LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
+echo "configure:59969: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 59977 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mysql_errno ();
-int
-main ()
-{
-mysql_errno ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mysql_errno();
+
+int main() {
+mysql_errno()
+; return 0; }
+EOF
+if { (eval echo configure:59988: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIBNAME_mysql_errno
-
-        { { echo "$as_me:$LINENO: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&5
-echo "$as_me: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+        { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; }
+      
+  
 fi
-
+   
       MYSQL_LIBS="-lz"
     fi
-
-
+  
+  
 fi
 
 
-
+  
 
   if test "$ext_shared" = "yes"; then
     MYSQL_SHARED_LIBADD="-l$MYSQL_LIBNAME $MYSQL_SHARED_LIBADD"
     if test -n "$MYSQL_LIB_DIR"; then
-
+      
   if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then
-
+    
   if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$MYSQL_LIB_DIR
   else
-
+    
     ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_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 "$MYSQL_LIB_DIR"; then
-
+    
   if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then
-
+    
   if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$MYSQL_LIB_DIR
   else
-
+    
     ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`"
   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 $MYSQL_LIBNAME in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$MYSQL_LIBNAME $LIBS"
+  *) 
+      LIBS="-l$MYSQL_LIBNAME $LIBS" 
    ;;
   esac
 
@@ -78791,33 +60120,33 @@
   fi
 
 
-
+  
   if test "$MYSQL_INC_DIR" != "/usr/include"; then
-
+    
   if test -z "$MYSQL_INC_DIR" || echo "$MYSQL_INC_DIR" | grep '^/' >/dev/null ; then
     ai_p=$MYSQL_INC_DIR
   else
-
+    
     ep_dir="`echo $MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MYSQL_INC_DIR\"`"
   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
@@ -78826,41 +60155,39 @@
   MYSQL_MODULE_TYPE=external
   MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS"
   MYSQL_INCLUDE=-I$MYSQL_INC_DIR
-
-
-
+ 
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_MODULE_TYPE"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_LIBS"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_INCLUDE"
 
-
+  
 
 fi
 
 if test "$PHP_MYSQL" != "no"; then
-  echo "$as_me:$LINENO: checking for MySQL UNIX socket location" >&5
-echo $ECHO_N "checking for MySQL UNIX socket location... $ECHO_C" >&6
+  echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
+echo "configure:60182: 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 <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $MYSQL_SOCK" >&5
-echo "${ECHO_T}$MYSQL_SOCK" >&6
+    echo "$ac_t""$MYSQL_SOCK" 1>&6
   elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then
-
+    
   for i in  \
     /var/run/mysqld/mysqld.sock \
     /var/tmp/mysql.sock \
@@ -78879,29 +60206,24 @@
   done
 
   if test -n "$MYSQL_SOCK"; then
-
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $MYSQL_SOCK" >&5
-echo "${ECHO_T}$MYSQL_SOCK" >&6
+    echo "$ac_t""$MYSQL_SOCK" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_MYSQL 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/mysql
   ext_srcdir=$abs_srcdir/ext/mysql
 
@@ -78909,15 +60231,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_MYSQL_SHARED=no
-
-
+    
+  
   case ext/mysql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -78930,12 +60252,12 @@
 
   old_IFS=$IFS
   for ac_src in php_mysql.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
@@ -78959,14 +60281,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_MYSQL_SHARED=yes
-
+      
   case ext/mysql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -78979,12 +60301,12 @@
 
   old_IFS=$IFS
   for ac_src in php_mysql.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_mysql="$shared_objects_mysql $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -79002,7 +60324,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -79012,7 +60334,7 @@
       ;;
     *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_mysql) -L$(top_builddir)/netware -lphp5lib $(MYSQL_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_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -79025,7 +60347,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql"
 
   cat >>Makefile.objects<<EOF
@@ -79039,7 +60361,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -79049,7 +60371,7 @@
       ;;
     *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_mysql) -L$(top_builddir)/netware -lphp5lib $(QL_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_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -79062,7 +60384,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql"
 
   cat >>Makefile.objects<<EOF
@@ -79076,10 +60398,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_MYSQL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -79088,15 +60409,15 @@
     PHP_MYSQL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/mysql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -79109,12 +60430,12 @@
 
   old_IFS=$IFS
   for ac_src in php_mysql.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
@@ -79134,15 +60455,15 @@
         EXT_STATIC="$EXT_STATIC mysql"
         ;;
       *)
-
-
+        
+  
   case ext/mysql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -79155,13 +60476,13 @@
 
   old_IFS=$IFS
   for ac_src in php_mysql.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -79181,59 +60502,46 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC mysql"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=mysql
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_SHARED_LIBADD"
 
 
   if test "$PHP_MYSQL" = "mysqlnd"; then
-
+    
   am_i_shared=$PHP_MYSQL_SHARED
   is_it_shared=$PHP_MYSQLND_SHARED
   is_it_enabled=$PHP_MYSQLND
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension mysql to build statically, but it
-depends on extension mysqlnd, which you've configured to build shared.
-You either need to build mysql shared or build mysqlnd statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension mysql to build statically, but it
 depends on extension mysqlnd, which you've configured to build shared.
 You either need to build mysql shared or build mysqlnd statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension mysql, which depends on extension mysqlnd,
 but you've either not enabled mysqlnd, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension mysql, which depends on extension mysqlnd,
-but you've either not enabled mysqlnd, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
-cat >>confdefs.h <<\_ACEOF
+  
+    cat >> confdefs.h <<\EOF
 #define MYSQL_USE_MYSQLND 1
-_ACEOF
+EOF
 
   fi
 fi
@@ -79242,19 +60550,19 @@
 
 php_with_mysqli=no
 
-echo "$as_me:$LINENO: checking for MySQLi support" >&5
-echo $ECHO_N "checking for MySQLi support... $ECHO_C" >&6
-
+echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6
+echo "configure:60555: checking for MySQLi support" >&5
 # Check whether --with-mysqli or --without-mysqli was given.
 if test "${with_mysqli+set}" = set; then
   withval="$with_mysqli"
   PHP_MYSQLI=$withval
 else
-
+  
   PHP_MYSQLI=no
   test "$PHP_ENABLE_ALL" && PHP_MYSQLI=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -79278,8 +60586,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -79287,22 +60594,22 @@
 
 php_enable_embedded_mysqli=no
 
-echo "$as_me:$LINENO: checking whether to enable embedded MySQLi support" >&5
-echo $ECHO_N "checking whether to enable embedded MySQLi support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6
+echo "configure:60599: 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"
   PHP_EMBEDDED_MYSQLI=$enableval
 else
-
+  
   PHP_EMBEDDED_MYSQLI=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_EMBEDDED_MYSQLI
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -79320,10 +60627,9 @@
 
   MYSQL_LIB_NAME='mysqlclient'
   if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_EMBEDDED_MYSQLI 1
-_ACEOF
+EOF
 
     MYSQL_LIB_CFG='--libmysqld-libs'
         mysqli_extra_sources="mysqli_embedded.c"
@@ -79333,37 +60639,34 @@
   else
     MYSQL_LIB_CFG='--libs'
   fi
-
+  
   if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then
     MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
     MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`
   else
-    echo "$as_me:$LINENO: result: mysql_config not found" >&5
-echo "${ECHO_T}mysql_config not found" >&6
-    { { echo "$as_me:$LINENO: error: Please reinstall the mysql distribution" >&5
-echo "$as_me: error: Please reinstall the mysql distribution" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "$ac_t""mysql_config not found" 1>&6
+    { echo "configure: error: Please reinstall the mysql distribution" 1>&2; exit 1; }
   fi
 
-
+        
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $MYSQLI_LIBLINE
   "
-
+  
   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"
@@ -79374,20 +60677,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -79400,150 +60703,119 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_server_option" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
-echo $ECHO_N "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
+echo "configure:60750: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$MYSQL_LIB_NAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 60758 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mysql_set_server_option ();
-int
-main ()
-{
-mysql_set_server_option ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mysql_set_server_option();
+
+int main() {
+mysql_set_server_option()
+; return 0; }
+EOF
+if { (eval echo configure:60769: \"$ac_link\") 1>&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
-
-
+    
+    
   for ac_i in $MYSQLI_INCLINE; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -79552,17 +60824,17 @@
     esac
   done
 
-
+    
   for ac_i in $MYSQLI_LIBLINE; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -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"
@@ -79573,20 +60845,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii"
+        MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -79599,70 +60871,69 @@
     ;;
     -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
         MYSQLI_SHARED_LIBADD="-L$ai_p $MYSQLI_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && MYSQLI_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQLI_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
 
     ;;
     esac
   done
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_MYSQLILIB 1
-_ACEOF
-
+EOF
 
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="$MYSQLI_LIBLINE"
-
+  
   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"
@@ -79673,20 +60944,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -79699,166 +60970,133 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_character_set" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
-echo $ECHO_N "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
+echo "configure:61017: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$MYSQL_LIB_NAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 61025 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mysql_set_character_set ();
-int
-main ()
-{
-mysql_set_character_set ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mysql_set_character_set();
+
+int main() {
+mysql_set_character_set()
+; return 0; }
+EOF
+if { (eval echo configure:61036: \"$ac_link\") 1>&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
-
-
+     
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_character_set
-
-      { { echo "$as_me:$LINENO: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." >&5
-echo "$as_me: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." 1>&2; exit 1; }
+    
+  
 fi
 
-
-
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_server_option
-
-    { { echo "$as_me:$LINENO: error: wrong mysql library version or lib not found. Check config.log for more information." >&5
-echo "$as_me: error: wrong mysql library version or lib not found. Check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: wrong mysql library version or lib not found. Check config.log for more information." 1>&2; exit 1; }
+  
+  
 fi
 
-
+        
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $MYSQLI_LIBLINE
   "
-
+  
   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"
@@ -79869,20 +61107,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -79895,133 +61133,102 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_stmt_next_result" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
-echo $ECHO_N "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
+echo "configure:61180: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$MYSQL_LIB_NAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 61188 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mysql_stmt_next_result ();
-int
-main ()
-{
-mysql_stmt_next_result ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mysql_stmt_next_result();
+
+int main() {
+mysql_stmt_next_result()
+; return 0; }
+EOF
+if { (eval echo configure:61199: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_STMT_NEXT_RESULT 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_stmt_next_result
-
-
-
+    
+  
+  
 fi
 
 fi
@@ -80030,7 +61237,7 @@
   mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
                   mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
                   mysqli_exception.c $mysqli_extra_sources"
-
+  
   ext_builddir=ext/mysqli
   ext_srcdir=$abs_srcdir/ext/mysqli
 
@@ -80038,15 +61245,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_MYSQLI_SHARED=no
-
-
+    
+  
   case ext/mysqli in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -80059,12 +61266,12 @@
 
   old_IFS=$IFS
   for ac_src in $mysqli_sources; 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
@@ -80088,14 +61295,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_MYSQLI_SHARED=yes
-
+      
   case ext/mysqli in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -80108,12 +61315,12 @@
 
   old_IFS=$IFS
   for ac_src in $mysqli_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_mysqli="$shared_objects_mysqli $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -80131,7 +61338,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -80141,7 +61348,7 @@
       ;;
     *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_mysqli) -L$(top_builddir)/netware -lphp5lib $(MYSQLI_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_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLI, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -80154,7 +61361,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqli.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
 
   cat >>Makefile.objects<<EOF
@@ -80168,7 +61375,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -80178,7 +61385,7 @@
       ;;
     *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_mysqli) -L$(top_builddir)/netware -lphp5lib $(QLI_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_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQLI, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -80191,7 +61398,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysqli.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
 
   cat >>Makefile.objects<<EOF
@@ -80205,10 +61412,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_MYSQLI 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -80217,15 +61423,15 @@
     PHP_MYSQLI_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/mysqli in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -80238,12 +61444,12 @@
 
   old_IFS=$IFS
   for ac_src in $mysqli_sources; 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
@@ -80263,15 +61469,15 @@
         EXT_STATIC="$EXT_STATIC mysqli"
         ;;
       *)
-
-
+        
+  
   case ext/mysqli in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -80284,13 +61490,13 @@
 
   old_IFS=$IFS
   for ac_src in $mysqli_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -80310,77 +61516,64 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=mysqli
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQLI_SHARED_LIBADD"
 
-
-
+  
+  
     for header_file in ext/mysqli/php_mysqli_structs.h; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
+    done 
+  
 
 
   if test "$PHP_MYSQLI" = "mysqlnd"; then
-
+    
   am_i_shared=$PHP_MYSQLI_SHARED
   is_it_shared=$PHP_MYSQLND_SHARED
   is_it_enabled=$PHP_MYSQLND
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension mysqli to build statically, but it
 depends on extension mysqlnd, which you've configured to build shared.
 You either need to build mysqli shared or build mysqlnd statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension mysqli to build statically, but it
-depends on extension mysqlnd, which you've configured to build shared.
-You either need to build mysqli shared or build mysqlnd statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension mysqli, which depends on extension mysqlnd,
 but you've either not enabled mysqlnd, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension mysqli, which depends on extension mysqlnd,
-but you've either not enabled mysqlnd, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
-cat >>confdefs.h <<\_ACEOF
+  
+    cat >> confdefs.h <<\EOF
 #define MYSQLI_USE_MYSQLND 1
-_ACEOF
+EOF
 
   fi
 fi
@@ -80411,19 +61604,19 @@
 
 php_with_oci8=no
 
-echo "$as_me:$LINENO: checking for Oracle Database OCI8 support" >&5
-echo $ECHO_N "checking for Oracle Database OCI8 support... $ECHO_C" >&6
-
+echo $ac_n "checking for Oracle Database OCI8 support""... $ac_c" 1>&6
+echo "configure:61609: checking for Oracle Database OCI8 support" >&5
 # Check whether --with-oci8 or --without-oci8 was given.
 if test "${with_oci8+set}" = set; then
   withval="$with_oci8"
   PHP_OCI8=$withval
 else
-
+  
   PHP_OCI8=no
   test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -80447,30 +61640,25 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
-if test "$PHP_OCI8" != "no"; then
+if test "$PHP_OCI8" != "no"; then 
 
   if test -z "$PHP_OCI8"; then
-        { { echo "$as_me:$LINENO: error: Empty parameter value passed to --with-oci8" >&5
-echo "$as_me: error: Empty parameter value passed to --with-oci8" >&2;}
-   { (exit 1); exit 1; }; }
+        { echo "configure: error: Empty parameter value passed to --with-oci8" 1>&2; exit 1; }
   fi
 
-
-  echo "$as_me:$LINENO: checking PHP version" >&5
-echo $ECHO_N "checking PHP version... $ECHO_C" >&6
+  
+  echo $ac_n "checking PHP version""... $ac_c" 1>&6
+echo "configure:61657: checking PHP version" >&5
 
   tmp_version=$PHP_VERSION
   if test -z "$tmp_version"; then
     if test -z "$PHP_CONFIG"; then
-      { { echo "$as_me:$LINENO: error: php-config not found" >&5
-echo "$as_me: error: php-config not found" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: php-config not found" 1>&2; exit 1; }
     fi
     php_version=`$PHP_CONFIG --version 2>/dev/null|head -n 1|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
   else
@@ -80478,9 +61666,7 @@
   fi
 
   if test -z "$php_version"; then
-    { { echo "$as_me:$LINENO: error: failed to detect PHP version, please report" >&5
-echo "$as_me: error: failed to detect PHP version, please report" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: failed to detect PHP version, please report" 1>&2; exit 1; }
   fi
 
   ac_IFS=$IFS
@@ -80490,453 +61676,70 @@
   oci8_php_version=`expr $1 \* 1000000 + $2 \* 1000 + $3`
 
   if test "$oci8_php_version" -lt "4003009"; then
-    { { echo "$as_me:$LINENO: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" >&5
-echo "$as_me: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" 1>&2; exit 1; }
   elif test "$oci8_php_version" -ge "6000000"; then
-    { { echo "$as_me:$LINENO: error: This version of OCI8 is not compatible with PHP 6 or higher" >&5
-echo "$as_me: error: This version of OCI8 is not compatible with PHP 6 or higher" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    echo "$as_me:$LINENO: result: $php_version, ok" >&5
-echo "${ECHO_T}$php_version, ok" >&6
+    { echo "configure: error: This version of OCI8 is not compatible with PHP 6 or higher" 1>&2; exit 1; }
+  else
+    echo "$ac_t""$php_version, ok" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for long int" >&5
-echo $ECHO_N "checking for long int... $ECHO_C" >&6
-if test "${ac_cv_type_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long int *) 0)
-  return 0;
-if (sizeof (long int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_int" >&6
-
-echo "$as_me:$LINENO: checking size of long int" >&5
-echo $ECHO_N "checking size of long int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+  
+  echo $ac_n "checking size of long int""... $ac_c" 1>&6
+echo "configure:61689: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long int)); }
-unsigned long ulongval () { return (long) (sizeof (long int)); }
+  ac_cv_sizeof_long_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 61697 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:61708: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long_int=0
 fi
+rm -fr conftest*
+fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
+cat >> confdefs.h <<EOF
 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
-_ACEOF
+EOF
 
 
-  echo "$as_me:$LINENO: checking checking if we're on a 64-bit platform" >&5
-echo $ECHO_N "checking checking if we're on a 64-bit platform... $ECHO_C" >&6
+  echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
+echo "configure:61728: checking checking if we're on a 64-bit platform" >&5
   if test "$ac_cv_sizeof_long_int" = "4"; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    PHP_OCI8_OH_LIBDIR=lib32
+    echo "$ac_t""no" 1>&6
+    PHP_OCI8_OH_LIBDIR=lib32 
     PHP_OCI8_IC_LIBDIR_SUFFIX=""
   else
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
     PHP_OCI8_OH_LIBDIR=lib
     PHP_OCI8_IC_LIBDIR_SUFFIX=64
   fi
 
-
+  
   PHP_OCI8_INSTANT_CLIENT="no"
 
             if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then
-    { echo "$as_me:$LINENO: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5
-echo "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&2;}
+    echo "configure: warning: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" 1>&2
     PHP_OCI8=instantclient
   fi
 
@@ -80963,25 +61766,22 @@
   fi
 
   if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
-
-    echo "$as_me:$LINENO: checking Oracle ORACLE_HOME install directory" >&5
-echo $ECHO_N "checking Oracle ORACLE_HOME install directory... $ECHO_C" >&6
+            
+    echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6
+echo "configure:61772: checking Oracle ORACLE_HOME install directory" >&5
 
     if test "$PHP_OCI8" = "yes"; then
       OCI8_DIR=$ORACLE_HOME
     else
       OCI8_DIR=$PHP_OCI8
     fi
-    echo "$as_me:$LINENO: result: $OCI8_DIR" >&5
-echo "${ECHO_T}$OCI8_DIR" >&6
-
+    echo "$ac_t""$OCI8_DIR" 1>&6
 
-  echo "$as_me:$LINENO: checking ORACLE_HOME library validity" >&5
-echo $ECHO_N "checking ORACLE_HOME library validity... $ECHO_C" >&6
+    
+  echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
+echo "configure:61783: checking ORACLE_HOME library validity" >&5
   if test ! -d "$OCI8_DIR"; then
-    { { echo "$as_me:$LINENO: error: ${OCI8_DIR} is not a directory" >&5
-echo "$as_me: error: ${OCI8_DIR} is not a directory" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; }
   fi
   if test -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then
     OCI8_LIB_DIR=lib
@@ -80991,47 +61791,42 @@
     OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
   else
         if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then
-      { { echo "$as_me:$LINENO: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" >&5
-echo "$as_me: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" 1>&2; exit 1; }
     else
-      { { echo "$as_me:$LINENO: error: Oracle library directory not found in ${OCI8_DIR}" >&5
-echo "$as_me: error: Oracle library directory not found in ${OCI8_DIR}" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Oracle library directory not found in ${OCI8_DIR}" 1>&2; exit 1; }
     fi
   fi
-  echo "$as_me:$LINENO: result: $OCI8_LIB_DIR" >&5
-echo "${ECHO_T}$OCI8_LIB_DIR" >&6
+  echo "$ac_t""$OCI8_LIB_DIR" 1>&6
 
 
     if test -d "$OCI8_DIR/rdbms/public"; then
-
+      
   if test "$OCI8_DIR/rdbms/public" != "/usr/include"; then
-
+    
   if test -z "$OCI8_DIR/rdbms/public" || echo "$OCI8_DIR/rdbms/public" | grep '^/' >/dev/null ; then
     ai_p=$OCI8_DIR/rdbms/public
   else
-
+    
     ep_dir="`echo $OCI8_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/public\"`"
   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
@@ -81039,33 +61834,33 @@
       OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/public"
     fi
     if test -d "$OCI8_DIR/rdbms/demo"; then
-
+      
   if test "$OCI8_DIR/rdbms/demo" != "/usr/include"; then
-
+    
   if test -z "$OCI8_DIR/rdbms/demo" || echo "$OCI8_DIR/rdbms/demo" | grep '^/' >/dev/null ; then
     ai_p=$OCI8_DIR/rdbms/demo
   else
-
+    
     ep_dir="`echo $OCI8_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/demo\"`"
   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
@@ -81073,33 +61868,33 @@
       OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/demo"
     fi
     if test -d "$OCI8_DIR/network/public"; then
-
+      
   if test "$OCI8_DIR/network/public" != "/usr/include"; then
-
+    
   if test -z "$OCI8_DIR/network/public" || echo "$OCI8_DIR/network/public" | grep '^/' >/dev/null ; then
     ai_p=$OCI8_DIR/network/public
   else
-
+    
     ep_dir="`echo $OCI8_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OCI8_DIR/network/public\"`"
   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
@@ -81107,33 +61902,33 @@
       OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/network/public"
     fi
     if test -d "$OCI8_DIR/plsql/public"; then
-
+      
   if test "$OCI8_DIR/plsql/public" != "/usr/include"; then
-
+    
   if test -z "$OCI8_DIR/plsql/public" || echo "$OCI8_DIR/plsql/public" | grep '^/' >/dev/null ; then
     ai_p=$OCI8_DIR/plsql/public
   else
-
+    
     ep_dir="`echo $OCI8_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OCI8_DIR/plsql/public\"`"
   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
@@ -81142,17 +61937,17 @@
     fi
 
     if test -f "$OCI8_DIR/$OCI8_LIB_DIR/sysliblist"; then
-
+      
   for ac_i in `cat $OCI8_DIR/$OCI8_LIB_DIR/sysliblist`; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         OCI8_SYSLIB="$OCI8_SYSLIB -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"
@@ -81163,20 +61958,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
+        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -81189,42 +61984,42 @@
     ;;
     -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
         OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
         test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
       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
 
     ;;
@@ -81232,17 +62027,17 @@
   done
 
     elif test -f "$OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist"; then
-
+      
   for ac_i in `cat $OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist`; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         OCI8_SYSLIB="$OCI8_SYSLIB -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"
@@ -81253,20 +62048,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
+        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -81279,42 +62074,42 @@
     ;;
     -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
         OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
         test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
       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
 
     ;;
@@ -81323,9 +62118,9 @@
 
     fi
 
-
-  echo "$as_me:$LINENO: checking Oracle library version compatibility" >&5
-echo $ECHO_N "checking Oracle library version compatibility... $ECHO_C" >&6
+    
+  echo $ac_n "checking Oracle library version compatibility""... $ac_c" 1>&6
+echo "configure:62124: checking Oracle library version compatibility" >&5
   OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
   OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`  # Oracle 10g, 11g etc
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
@@ -81339,48 +62134,43 @@
     OCI8_ORACLE_VERSION=8.1
   elif test -f $OCI8_LCS_BASE.1.0; then
     OCI8_ORACLE_VERSION=8.0
-  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then
-    if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then
+  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then 
+    if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then 
       OCI8_ORACLE_VERSION=8.0
     else
       OCI8_ORACLE_VERSION=8.1
     fi
   else
-    { { echo "$as_me:$LINENO: error: Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" >&5
-echo "$as_me: error: Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" 1>&2; exit 1; }
   fi
-  echo "$as_me:$LINENO: result: $OCI8_ORACLE_VERSION" >&5
-echo "${ECHO_T}$OCI8_ORACLE_VERSION" >&6
+  echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
 
 
     case $OCI8_ORACLE_VERSION in
       7.3|8.0|8.1)
-	{ { echo "$as_me:$LINENO: error: Oracle client libraries < 9.2 are not supported" >&5
-echo "$as_me: error: Oracle client libraries < 9.2 are not supported" >&2;}
-   { (exit 1); exit 1; }; }
+	{ echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; }
 	;;
 
       9.0)
-
+	
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
 	  -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
 	"
-
+  
   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"
@@ -81391,20 +62181,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -81417,158 +62207,126 @@
     ;;
     -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 "$as_me:$LINENO: checking for OCIEnvNlsCreate in -lclntsh" >&5
-echo $ECHO_N "checking for OCIEnvNlsCreate in -lclntsh... $ECHO_C" >&6
-if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
+echo "configure:62254: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 62262 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char OCIEnvNlsCreate ();
-int
-main ()
-{
-OCIEnvNlsCreate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_clntsh_OCIEnvNlsCreate=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_clntsh_OCIEnvNlsCreate=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6
-if test $ac_cv_lib_clntsh_OCIEnvNlsCreate = yes; then
+    builtin and then its argument prototype would still apply.  */
+char OCIEnvNlsCreate();
+
+int main() {
+OCIEnvNlsCreate()
+; return 0; }
+EOF
+if { (eval echo configure:62273: \"$ac_link\") 1>&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
-
+    
 	  OCI8_ORACLE_VERSION=9.2
-
-
+	
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIEnvNlsCreate
-
-	  { { echo "$as_me:$LINENO: error: Oracle client libraries < 9.2 are not supported" >&5
-echo "$as_me: error: Oracle client libraries < 9.2 are not supported" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+	  { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; }
+	
+  
 fi
 
 	;;
 
       *)
-
-cat >>confdefs.h <<\_ACEOF
+	cat >> confdefs.h <<\EOF
 #define HAVE_OCI_LOB_READ2 1
-_ACEOF
+EOF
 
 	;;
     esac
 
-
-
+    
+  
   case clntsh in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
+        OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" 
     else
-
-
+      
+  
   case clntsh in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lclntsh"
+  *) 
+      LIBS="$LIBS -lclntsh" 
    ;;
   esac
 
@@ -81578,45 +62336,45 @@
   esac
 
 
-
+    
   if test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/lib"; then
-
+    
   if test -z "$OCI8_DIR/$OCI8_LIB_DIR" || echo "$OCI8_DIR/$OCI8_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$OCI8_DIR/$OCI8_LIB_DIR
   else
-
+    
     ep_dir="`echo $OCI8_DIR/$OCI8_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OCI8_DIR/$OCI8_LIB_DIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_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
 
-
+    
   ext_builddir=ext/oci8
   ext_srcdir=$abs_srcdir/ext/oci8
 
@@ -81624,15 +62382,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_OCI8_SHARED=no
-
-
+    
+  
   case ext/oci8 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -81645,12 +62403,12 @@
 
   old_IFS=$IFS
   for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.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
@@ -81674,14 +62432,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_OCI8_SHARED=yes
-
+      
   case ext/oci8 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -81694,12 +62452,12 @@
 
   old_IFS=$IFS
   for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -81717,7 +62475,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -81727,7 +62485,7 @@
       ;;
     *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_oci8) -L$(top_builddir)/netware -lphp5lib $(OCI8_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_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -81740,7 +62498,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
 
   cat >>Makefile.objects<<EOF
@@ -81754,7 +62512,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -81764,7 +62522,7 @@
       ;;
     *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_oci8) -L$(top_builddir)/netware -lphp5lib $(8_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_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -81777,7 +62535,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
 
   cat >>Makefile.objects<<EOF
@@ -81791,10 +62549,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_OCI8 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -81803,15 +62560,15 @@
     PHP_OCI8_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/oci8 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -81824,12 +62581,12 @@
 
   old_IFS=$IFS
   for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.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
@@ -81849,15 +62606,15 @@
         EXT_STATIC="$EXT_STATIC oci8"
         ;;
       *)
-
-
+        
+  
   case ext/oci8 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -81870,13 +62627,13 @@
 
   old_IFS=$IFS
   for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -81896,75 +62653,69 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=oci8
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_OCI8 1
-_ACEOF
-
-
+EOF
 
 
+    
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD"
 
+  
 
-
-
-
+    
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR"
 
+  
 
-
-
-
+    
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION"
 
+  
 
 
-
-
-cat >>confdefs.h <<_ACEOF
+        cat >> confdefs.h <<EOF
 #define PHP_OCI8_DEF_DIR "$OCI8_DIR"
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD"
-_ACEOF
+EOF
 
 
   else
-
-    echo "$as_me:$LINENO: checking Oracle Instant Client directory" >&5
-echo $ECHO_N "checking Oracle Instant Client directory... $ECHO_C" >&6
+            
+    echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
+echo "configure:62706: 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 | $PHP_OCI8_TAIL1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
       if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
-	{ { echo "$as_me:$LINENO: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" >&5
-echo "$as_me: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" >&2;}
-   { (exit 1); exit 1; }; }
+	{ echo "configure: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" 1>&2; exit 1; }
       fi
     fi
-    echo "$as_me:$LINENO: result: $PHP_OCI8_INSTANT_CLIENT" >&5
-echo "${ECHO_T}$PHP_OCI8_INSTANT_CLIENT" >&6
+    echo "$ac_t""$PHP_OCI8_INSTANT_CLIENT" 1>&6
 
     OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
 
-    echo "$as_me:$LINENO: checking Oracle Instant Client SDK header directory" >&5
-echo $ECHO_N "checking Oracle Instant Client SDK header directory... $ECHO_C" >&6
+    echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
+echo "configure:62719: 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!'`
 
@@ -81973,129 +62724,124 @@
         OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib/*$!\1/include!'`
 
     if test -f "$OCISDKRPMINC/oci.h"; then
-      echo "$as_me:$LINENO: result: $OCISDKRPMINC" >&5
-echo "${ECHO_T}$OCISDKRPMINC" >&6
-
+      echo "$ac_t""$OCISDKRPMINC" 1>&6
+      
   if test "$OCISDKRPMINC" != "/usr/include"; then
-
+    
   if test -z "$OCISDKRPMINC" || echo "$OCISDKRPMINC" | grep '^/' >/dev/null ; then
     ai_p=$OCISDKRPMINC
   else
-
+    
     ep_dir="`echo $OCISDKRPMINC|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OCISDKRPMINC\"`"
   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
 
       OCI8INCDIR=$OCISDKRPMINC
     elif test -f "$OCISDKZIPINC/oci.h"; then
-      echo "$as_me:$LINENO: result: $OCISDKZIPINC" >&5
-echo "${ECHO_T}$OCISDKZIPINC" >&6
-
+      echo "$ac_t""$OCISDKZIPINC" 1>&6
+      
   if test "$OCISDKZIPINC" != "/usr/include"; then
-
+    
   if test -z "$OCISDKZIPINC" || echo "$OCISDKZIPINC" | grep '^/' >/dev/null ; then
     ai_p=$OCISDKZIPINC
   else
-
+    
     ep_dir="`echo $OCISDKZIPINC|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OCISDKZIPINC\"`"
   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
 
       OCI8INCDIR=$OCISDKZIPINC
     elif test -f "$OCISDKMANINC/oci.h"; then
-      echo "$as_me:$LINENO: result: $OCISDKMANINC" >&5
-echo "${ECHO_T}$OCISDKMANINC" >&6
-
+      echo "$ac_t""$OCISDKMANINC" 1>&6
+      
   if test "$OCISDKMANINC" != "/usr/include"; then
-
+    
   if test -z "$OCISDKMANINC" || echo "$OCISDKMANINC" | grep '^/' >/dev/null ; then
     ai_p=$OCISDKMANINC
   else
-
+    
     ep_dir="`echo $OCISDKMANINC|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OCISDKMANINC\"`"
   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
 
       OCI8INCDIR=$OCISDKMANINC
     else
-      { { echo "$as_me:$LINENO: error: Oracle Instant Client SDK header files not found" >&5
-echo "$as_me: error: Oracle Instant Client SDK header files not found" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Oracle Instant Client SDK header files not found" 1>&2; exit 1; }
     fi
 
     OCISYSLIBLIST=`echo "$OCI8INCDIR" | $PHP_OCI8_SED -e 's!\(.*\)/include$!\1/demo/sysliblist!'`
     if test -f "$OCISYSLIBLIST"; then
-
+      
   for ac_i in `cat $OCISYSLIBLIST`; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         OCI8_SYSLIB="$OCI8_SYSLIB -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"
@@ -82106,20 +62852,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
+        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -82132,42 +62878,42 @@
     ;;
     -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
         OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
         test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
       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
 
     ;;
@@ -82176,41 +62922,36 @@
 
     fi
 
-
-  echo "$as_me:$LINENO: checking Oracle Instant Client library version compatibility" >&5
-echo $ECHO_N "checking Oracle Instant Client library version compatibility... $ECHO_C" >&6
+    
+  echo $ac_n "checking Oracle Instant Client library version compatibility""... $ac_c" 1>&6
+echo "configure:62928: checking Oracle Instant Client library version compatibility" >&5
   OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
   OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`  # Oracle 10g, 11g etc
   OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | $PHP_OCI8_TAIL1`
   if test -f "$OCI8_NNZ" && test -f "$OCI8_LCS"; then
     if test ! -f "$OCI8_LCS_BASE"; then
-      { { echo "$as_me:$LINENO: error: Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" >&5
-echo "$as_me: error: Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" 1>&2; exit 1; }
     fi
     OCI8_ORACLE_VERSION=`echo $OCI8_LCS | $PHP_OCI8_SED -e 's/.*\.\(.*\)\.1$/\1.1/'`
   else
-    { { echo "$as_me:$LINENO: error: Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" >&5
-echo "$as_me: error: Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" 1>&2; exit 1; }
   fi
-  echo "$as_me:$LINENO: result: $OCI8_ORACLE_VERSION" >&5
-echo "${ECHO_T}$OCI8_ORACLE_VERSION" >&6
-
-
+  echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
 
+    
+  
   case clntsh in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
+        OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" 
     else
-
-
+      
+  
   case clntsh in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lclntsh"
+  *) 
+      LIBS="$LIBS -lclntsh" 
    ;;
   esac
 
@@ -82220,57 +62961,55 @@
   esac
 
 
-
+    
   if test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/$PHP_LIBDIR" && test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/lib"; then
-
+    
   if test -z "$PHP_OCI8_INSTANT_CLIENT" || echo "$PHP_OCI8_INSTANT_CLIENT" | grep '^/' >/dev/null ; then
     ai_p=$PHP_OCI8_INSTANT_CLIENT
   else
-
+    
     ep_dir="`echo $PHP_OCI8_INSTANT_CLIENT|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_OCI8_INSTANT_CLIENT\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_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
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_OCI_INSTANT_CLIENT 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_OCI_LOB_READ2 1
-_ACEOF
-
+EOF
 
 
+    
   ext_builddir=ext/oci8
   ext_srcdir=$abs_srcdir/ext/oci8
 
@@ -82278,15 +63017,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_OCI8_SHARED=no
-
-
+    
+  
   case ext/oci8 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -82299,12 +63038,12 @@
 
   old_IFS=$IFS
   for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.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
@@ -82328,14 +63067,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_OCI8_SHARED=yes
-
+      
   case ext/oci8 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -82348,12 +63087,12 @@
 
   old_IFS=$IFS
   for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -82371,7 +63110,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -82381,7 +63120,7 @@
       ;;
     *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_oci8) -L$(top_builddir)/netware -lphp5lib $(OCI8_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_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -82394,7 +63133,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
 
   cat >>Makefile.objects<<EOF
@@ -82408,7 +63147,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -82418,7 +63157,7 @@
       ;;
     *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_oci8) -L$(top_builddir)/netware -lphp5lib $(8_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_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -82431,7 +63170,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
 
   cat >>Makefile.objects<<EOF
@@ -82445,10 +63184,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_OCI8 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -82457,15 +63195,15 @@
     PHP_OCI8_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/oci8 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -82478,12 +63216,12 @@
 
   old_IFS=$IFS
   for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.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
@@ -82503,15 +63241,15 @@
         EXT_STATIC="$EXT_STATIC oci8"
         ;;
       *)
-
-
+        
+  
   case ext/oci8 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -82524,13 +63262,13 @@
 
   old_IFS=$IFS
   for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -82550,42 +63288,41 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=oci8
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_OCI8 1
-_ACEOF
-
-
+EOF
 
 
+    
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD"
 
+  
 
-
-
-
+    
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR"
 
+  
 
-
-
-
+    
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION"
 
-
+  
 
 
   fi
@@ -82607,17 +63344,17 @@
 php_with_adabas=no
 
 
-
 # Check whether --with-adabas or --without-adabas was given.
 if test "${with_adabas+set}" = set; then
   withval="$with_adabas"
   PHP_ADABAS=$withval
 else
-
+  
   PHP_ADABAS=no
   test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -82647,73 +63384,73 @@
 
 
   if test "$PHP_ADABAS" != "no"; then
-    echo "$as_me:$LINENO: checking for Adabas support" >&5
-echo $ECHO_N "checking for Adabas support... $ECHO_C" >&6
+    echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
+echo "configure:63389: checking for Adabas support" >&5
     if test "$PHP_ADABAS" = "yes"; then
       PHP_ADABAS=/usr/local
     fi
-
+    
   if test "$PHP_ADABAS/incl" != "/usr/include"; then
-
+    
   if test -z "$PHP_ADABAS/incl" || echo "$PHP_ADABAS/incl" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ADABAS/incl
   else
-
+    
     ep_dir="`echo $PHP_ADABAS/incl|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ADABAS/incl\"`"
   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 "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ADABAS/$PHP_LIBDIR" || echo "$PHP_ADABAS/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ADABAS/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_ADABAS/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ADABAS/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
     ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a"
@@ -82721,69 +63458,69 @@
     $srcdir/build/shtool mkdir -f -p ext/odbc
     rm -f "$ODBC_LIB"
     cp "$ODBC_OBJS" "$ODBC_LIB"
-
-
+    
+  
   case sqlptc in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsqlptc $LIBS"
+  *) 
+      LIBS="-lsqlptc $LIBS" 
    ;;
   esac
 
 
-
-
+    
+  
   case sqlrte in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsqlrte $LIBS"
+  *) 
+      LIBS="-lsqlrte $LIBS" 
    ;;
   esac
 
 
-
+    
 
   if test -n "$abs_builddir/ext/odbc"; then
-
+    
   if test "$abs_builddir/ext/odbc" != "/usr/$PHP_LIBDIR" && test "$abs_builddir/ext/odbc" != "/usr/lib"; then
-
+    
   if test -z "$abs_builddir/ext/odbc" || echo "$abs_builddir/ext/odbc" | grep '^/' >/dev/null ; then
     ai_p=$abs_builddir/ext/odbc
   else
-
+    
     ep_dir="`echo $abs_builddir/ext/odbc|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$abs_builddir/ext/odbc\"`"
   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 odbc_adabas in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lodbc_adabas $LIBS"
+  *) 
+      LIBS="-lodbc_adabas $LIBS" 
    ;;
   esac
 
@@ -82792,20 +63529,16 @@
 
     ODBC_TYPE=adabas
     ODBC_INCDIR=$PHP_ADABAS/incl
-
+    
 if ! test -f "$ODBC_INCDIR/sqlext.h"; then
-  { { echo "$as_me:$LINENO: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&5
-echo "$as_me: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
 fi
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ADABAS 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+    echo "$ac_t""$ext_output" 1>&6
   fi
 fi
 
@@ -82814,17 +63547,17 @@
 php_with_sapdb=no
 
 
-
 # Check whether --with-sapdb or --without-sapdb was given.
 if test "${with_sapdb+set}" = set; then
   withval="$with_sapdb"
   PHP_SAPDB=$withval
 else
-
+  
   PHP_SAPDB=no
   test "$PHP_ENABLE_ALL" && PHP_SAPDB=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -82854,93 +63587,91 @@
 
 
   if test "$PHP_SAPDB" != "no"; then
-    echo "$as_me:$LINENO: checking for SAP DB support" >&5
-echo $ECHO_N "checking for SAP DB support... $ECHO_C" >&6
+    echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
+echo "configure:63592: checking for SAP DB support" >&5
     if test "$PHP_SAPDB" = "yes"; then
       PHP_SAPDB=/usr/local
     fi
-
+    
   if test "$PHP_SAPDB/incl" != "/usr/include"; then
-
+    
   if test -z "$PHP_SAPDB/incl" || echo "$PHP_SAPDB/incl" | grep '^/' >/dev/null ; then
     ai_p=$PHP_SAPDB/incl
   else
-
+    
     ep_dir="`echo $PHP_SAPDB/incl|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_SAPDB/incl\"`"
   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 "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_SAPDB/$PHP_LIBDIR" || echo "$PHP_SAPDB/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_SAPDB/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_SAPDB/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_SAPDB/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
-
-
+    
+  
   case sqlod in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsqlod $LIBS"
+  *) 
+      LIBS="-lsqlod $LIBS" 
    ;;
   esac
 
 
     ODBC_TYPE=sapdb
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_SAPDB 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+    echo "$ac_t""$ext_output" 1>&6
   fi
 fi
 
@@ -82949,17 +63680,17 @@
 php_with_solid=no
 
 
-
 # Check whether --with-solid or --without-solid was given.
 if test "${with_solid+set}" = set; then
   withval="$with_solid"
   PHP_SOLID=$withval
 else
-
+  
   PHP_SOLID=no
   test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -82989,8 +63720,8 @@
 
 
   if test "$PHP_SOLID" != "no"; then
-    echo "$as_me:$LINENO: checking for Solid support" >&5
-echo $ECHO_N "checking for Solid support... $ECHO_C" >&6
+    echo $ac_n "checking for Solid support""... $ac_c" 1>&6
+echo "configure:63725: checking for Solid support" >&5
     if test "$PHP_SOLID" = "yes"; then
       PHP_SOLID=/usr/local/solid
     fi
@@ -82999,66 +63730,58 @@
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_TYPE=solid
     if test -f $ODBC_LIBDIR/soc*35.a; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_SOLID_35 1
-_ACEOF
+EOF
 
     elif test -f $ODBC_LIBDIR/scl*30.a; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_SOLID_30 1
-_ACEOF
+EOF
 
     elif test -f $ODBC_LIBDIR/scl*23.a; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_SOLID 1
-_ACEOF
+EOF
 
     fi
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
-
-  echo "$as_me:$LINENO: checking Solid library file" >&5
-echo $ECHO_N "checking Solid library file... $ECHO_C" >&6
+    echo "$ac_t""$ext_output" 1>&6
+    
+  echo $ac_n "checking Solid library file""... $ac_c" 1>&6
+echo "configure:63752: 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
     AIX) ac_solid_os=a3x;;   # a4x for AIX4/ Solid 2.3/3.0 only
     HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10
     IRIX) ac_solid_os=irx;;  # Solid 2.3(?)/ 3.0 only
-    Linux)
+    Linux) 
       if ldd -v /bin/sh | grep GLIBC > /dev/null; then
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define SS_LINUX 1
-_ACEOF
+EOF
 
         ac_solid_os=l2x
       else
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define SS_LINUX 1
-_ACEOF
+EOF
 
         ac_solid_os=lux
-      fi;;
-    SunOS)
+      fi;; 
+    SunOS) 
       ac_solid_os=ssx;; # should we deal with SunOS 4?
-    FreeBSD)
+    FreeBSD) 
       if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define SS_FBX 1
-_ACEOF
+EOF
 
         ac_solid_os=fex
-      else
-
-cat >>confdefs.h <<\_ACEOF
+      else 
+        cat >> confdefs.h <<\EOF
 #define SS_FBX 1
-_ACEOF
+EOF
 
         ac_solid_os=fbx
       fi;;
@@ -83095,8 +63818,7 @@
   ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
 fi
 
-  echo "$as_me:$LINENO: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-echo "${ECHO_T}\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6
+  echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
 
   fi
 fi
@@ -83106,17 +63828,17 @@
 php_with_ibm_db2=no
 
 
-
 # Check whether --with-ibm-db2 or --without-ibm-db2 was given.
 if test "${with_ibm_db2+set}" = set; then
   withval="$with_ibm_db2"
   PHP_IBM_DB2=$withval
 else
-
+  
   PHP_IBM_DB2=no
   test "$PHP_ENABLE_ALL" && PHP_IBM_DB2=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -83146,8 +63868,8 @@
 
 
   if test "$PHP_IBM_DB2" != "no"; then
-    echo "$as_me:$LINENO: checking for IBM DB2 support" >&5
-echo $ECHO_N "checking for IBM DB2 support... $ECHO_C" >&6
+    echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
+echo "configure:63873: 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
@@ -83156,11 +63878,9 @@
       ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR
     fi
 
-
+    
 if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then
-  { { echo "$as_me:$LINENO: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" >&5
-echo "$as_me: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" 1>&2; exit 1; }
 fi
 
 
@@ -83169,82 +63889,60 @@
     ODBC_TYPE=ibm-db2
     ODBC_LIBS=-ldb2
 
-
+    
   old_LIBS=$LIBS
   LIBS="
       $ODBC_LFLAGS $ODBC_LIBS
      $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 63904 "configure"
+#include "confdefs.h"
 
+    
     char SQLExecute();
     int main() {
       SQLExecute();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:63915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+      cat >> confdefs.h <<\EOF
 #define HAVE_IBMDB2 1
-_ACEOF
-
-      echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
-
+EOF
 
+      echo "$ac_t""$ext_output" 1>&6
+    
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-      { { echo "$as_me:$LINENO: error:
-build test failed. Please check the config.log for details.
-You need to source your DB2 environment before running PHP configure:
-# . \$IBM_DB2/db2profile
-" >&5
-echo "$as_me: error:
+    
+      echo "$ac_t""no" 1>&6
+      { echo "configure: error: 
 build test failed. Please check the config.log for details.
 You need to source your DB2 environment before running PHP configure:
 # . \$IBM_DB2/db2profile
-" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+" 1>&2; exit 1; }
+    
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+
   fi
 fi
 
@@ -83253,17 +63951,17 @@
 php_with_odbcrouter=no
 
 
-
 # Check whether --with-ODBCRouter or --without-ODBCRouter was given.
 if test "${with_ODBCRouter+set}" = set; then
   withval="$with_ODBCRouter"
   PHP_ODBCROUTER=$withval
 else
-
+  
   PHP_ODBCROUTER=no
   test "$PHP_ENABLE_ALL" && PHP_ODBCROUTER=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -83293,8 +63991,8 @@
 
 
   if test "$PHP_ODBCROUTER" != "no"; then
-    echo "$as_me:$LINENO: checking for ODBCRouter.com support" >&5
-echo $ECHO_N "checking for ODBCRouter.com support... $ECHO_C" >&6
+    echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
+echo "configure:63996: checking for ODBCRouter.com support" >&5
     if test "$PHP_ODBCROUTER" = "yes"; then
       PHP_ODBCROUTER=/usr
     fi
@@ -83304,13 +64002,11 @@
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=-lodbcsdk
     ODBC_TYPE=ODBCRouter
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ODBC_ROUTER 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+    echo "$ac_t""$ext_output" 1>&6
   fi
 fi
 
@@ -83319,17 +64015,17 @@
 php_with_empress=no
 
 
-
 # Check whether --with-empress or --without-empress was given.
 if test "${with_empress+set}" = set; then
   withval="$with_empress"
   PHP_EMPRESS=$withval
 else
-
+  
   PHP_EMPRESS=no
   test "$PHP_ENABLE_ALL" && PHP_EMPRESS=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -83359,8 +64055,8 @@
 
 
   if test "$PHP_EMPRESS" != "no"; then
-    echo "$as_me:$LINENO: checking for Empress support" >&5
-echo $ECHO_N "checking for Empress support... $ECHO_C" >&6
+    echo $ac_n "checking for Empress support""... $ac_c" 1>&6
+echo "configure:64060: checking for Empress support" >&5
     if test "$PHP_EMPRESS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
       ODBC_LIBDIR=$EMPRESSPATH/shlib
@@ -83371,22 +64067,19 @@
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_TYPE=empress
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_EMPRESS 1
-_ACEOF
-
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+EOF
 
-  echo "$as_me:$LINENO: checking Empress library file" >&5
-echo $ECHO_N "checking Empress library file... $ECHO_C" >&6
+    echo "$ac_t""$ext_output" 1>&6
+    
+  echo $ac_n "checking Empress library file""... $ac_c" 1>&6
+echo "configure:64078: 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`
   fi
-  echo "$as_me:$LINENO: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-echo "${ECHO_T}\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6
+  echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
 
   fi
 fi
@@ -83396,17 +64089,17 @@
 php_with_empress_bcs=no
 
 
-
 # Check whether --with-empress-bcs or --without-empress-bcs was given.
 if test "${with_empress_bcs+set}" = set; then
   withval="$with_empress_bcs"
   PHP_EMPRESS_BCS=$withval
 else
-
+  
   PHP_EMPRESS_BCS=no
   test "$PHP_ENABLE_ALL" && PHP_EMPRESS_BCS=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -83436,8 +64129,8 @@
 
 
   if test "$PHP_EMPRESS_BCS" != "no"; then
-    echo "$as_me:$LINENO: checking for Empress local access support" >&5
-echo $ECHO_N "checking for Empress local access support... $ECHO_C" >&6
+    echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
+echo "configure:64134: checking for Empress local access support" >&5
     if test "$PHP_EMPRESS_BCS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
       ODBC_LIBDIR=$EMPRESSPATH/shlib
@@ -83464,22 +64157,19 @@
     done
     ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
     ODBC_TYPE=empress-bcs
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_EMPRESS 1
-_ACEOF
-
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+EOF
 
-  echo "$as_me:$LINENO: checking Empress local access library file" >&5
-echo $ECHO_N "checking Empress local access library file... $ECHO_C" >&6
+    echo "$ac_t""$ext_output" 1>&6
+    
+  echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
+echo "configure:64168: 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`
   fi
-  echo "$as_me:$LINENO: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5
-echo "${ECHO_T}\`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&6
+  echo "$ac_t""`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`" 1>&6
 
   fi
 fi
@@ -83489,17 +64179,17 @@
 php_with_birdstep=no
 
 
-
 # Check whether --with-birdstep or --without-birdstep was given.
 if test "${with_birdstep+set}" = set; then
   withval="$with_birdstep"
   PHP_BIRDSTEP=$withval
 else
-
+  
   PHP_BIRDSTEP=no
   test "$PHP_ENABLE_ALL" && PHP_BIRDSTEP=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -83527,10 +64217,10 @@
 
 
 
-
+  
   if test "$PHP_BIRDSTEP" != "no"; then
-    echo "$as_me:$LINENO: checking for Birdstep support" >&5
-echo $ECHO_N "checking for Birdstep support... $ECHO_C" >&6
+    echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
+echo "configure:64224: checking for Birdstep support" >&5
     if test "$PHP_BIRDSTEP" = "yes"; then
         ODBC_INCDIR=/usr/local/birdstep/include
         ODBC_LIBDIR=/usr/local/birdstep/lib
@@ -83538,49 +64228,42 @@
         ODBC_INCDIR=$PHP_BIRDSTEP/include
         ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR
     fi
-
+   
     case $host_alias in
       *aix*)
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define AIX 1
-_ACEOF
+EOF
 ;;
       *hpux*)
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HPUX 1
-_ACEOF
+EOF
 ;;
       *linux*)
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define LINUX 1
-_ACEOF
+EOF
 ;;
       *qnx*)
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define NEUTRINO 1
-_ACEOF
+EOF
 ;;
       i?86-*-solaris*)
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define ISOLARIS 1
-_ACEOF
+EOF
 ;;
       sparc-*-solaris*)
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define SOLARIS 1
-_ACEOF
+EOF
 ;;
       *unixware*)
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define UNIXWARE 1
-_ACEOF
+EOF
 ;;
     esac
 
@@ -83595,13 +64278,11 @@
       ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil"
     fi
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_BIRDSTEP 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+    echo "$ac_t""$ext_output" 1>&6
   fi
 fi
 
@@ -83610,17 +64291,17 @@
 php_with_custom_odbc=no
 
 
-
 # Check whether --with-custom-odbc or --without-custom-odbc was given.
 if test "${with_custom_odbc+set}" = set; then
   withval="$with_custom_odbc"
   PHP_CUSTOM_ODBC=$withval
 else
-
+  
   PHP_CUSTOM_ODBC=no
   test "$PHP_ENABLE_ALL" && PHP_CUSTOM_ODBC=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -83650,8 +64331,8 @@
 
 
   if test "$PHP_CUSTOM_ODBC" != "no"; then
-    echo "$as_me:$LINENO: checking for a custom ODBC support" >&5
-echo $ECHO_N "checking for a custom ODBC support... $ECHO_C" >&6
+    echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
+echo "configure:64336: checking for a custom ODBC support" >&5
     if test "$PHP_CUSTOM_ODBC" = "yes"; then
       PHP_CUSTOM_ODBC=/usr/local
     fi
@@ -83661,13 +64342,11 @@
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=$CUSTOM_ODBC_LIBS
     ODBC_TYPE=custom-odbc
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_CODBC 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $ext_ouput" >&5
-echo "${ECHO_T}$ext_ouput" >&6
+    echo "$ac_t""$ext_ouput" 1>&6
   fi
 fi
 
@@ -83676,17 +64355,17 @@
 php_with_iodbc=no
 
 
-
 # Check whether --with-iodbc or --without-iodbc was given.
 if test "${with_iodbc+set}" = set; then
   withval="$with_iodbc"
   PHP_IODBC=$withval
 else
-
+  
   PHP_IODBC=no
   test "$PHP_ENABLE_ALL" && PHP_IODBC=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -83716,87 +64395,87 @@
 
 
   if test "$PHP_IODBC" != "no"; then
-    echo "$as_me:$LINENO: checking for iODBC support" >&5
-echo $ECHO_N "checking for iODBC support... $ECHO_C" >&6
+    echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
+echo "configure:64400: checking for iODBC support" >&5
     if test "$PHP_IODBC" = "yes"; then
       PHP_IODBC=/usr/local
     fi
-
+    
 
   if test -n "$PHP_IODBC/$PHP_LIBDIR"; then
-
+    
   if test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_IODBC/$PHP_LIBDIR" || echo "$PHP_IODBC/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_IODBC/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_IODBC/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_IODBC/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case iodbc in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-liodbc $LIBS"
+  *) 
+      LIBS="-liodbc $LIBS" 
    ;;
   esac
 
 
 
 
-
+    
   if test "$PHP_IODBC/include" != "/usr/include"; then
-
+    
   if test -z "$PHP_IODBC/include" || echo "$PHP_IODBC/include" | grep '^/' >/dev/null ; then
     ai_p=$PHP_IODBC/include
   else
-
+    
     ep_dir="`echo $PHP_IODBC/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_IODBC/include\"`"
   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 "1"; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -83805,18 +64484,15 @@
     ODBC_INCLUDE=-I$PHP_IODBC/include
     ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
     ODBC_LIBS=-liodbc
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_IODBC 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ODBC2 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+    echo "$ac_t""$ext_output" 1>&6
   fi
 fi
 
@@ -83825,17 +64501,17 @@
 php_with_esoob=no
 
 
-
 # Check whether --with-esoob or --without-esoob was given.
 if test "${with_esoob+set}" = set; then
   withval="$with_esoob"
   PHP_ESOOB=$withval
 else
-
+  
   PHP_ESOOB=no
   test "$PHP_ENABLE_ALL" && PHP_ESOOB=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -83865,8 +64541,8 @@
 
 
   if test "$PHP_ESOOB" != "no"; then
-    echo "$as_me:$LINENO: checking for Easysoft ODBC-ODBC Bridge support" >&5
-echo $ECHO_N "checking for Easysoft ODBC-ODBC Bridge support... $ECHO_C" >&6
+    echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
+echo "configure:64546: checking for Easysoft ODBC-ODBC Bridge support" >&5
     if test "$PHP_ESOOB" = "yes"; then
       PHP_ESOOB=/usr/local/easysoft/oob/client
     fi
@@ -83876,13 +64552,11 @@
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=-lesoobclient
     ODBC_TYPE=esoob
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ESOOB 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+    echo "$ac_t""$ext_output" 1>&6
   fi
 fi
 
@@ -83891,17 +64565,17 @@
 php_with_unixodbc=no
 
 
-
 # Check whether --with-unixODBC or --without-unixODBC was given.
 if test "${with_unixODBC+set}" = set; then
   withval="$with_unixODBC"
   PHP_UNIXODBC=$withval
 else
-
+  
   PHP_UNIXODBC=no
   test "$PHP_ENABLE_ALL" && PHP_UNIXODBC=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -83931,8 +64605,8 @@
 
 
   if test "$PHP_UNIXODBC" != "no"; then
-    echo "$as_me:$LINENO: checking for unixODBC support" >&5
-echo $ECHO_N "checking for unixODBC support... $ECHO_C" >&6
+    echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
+echo "configure:64610: checking for unixODBC support" >&5
     if test "$PHP_UNIXODBC" = "yes"; then
       PHP_UNIXODBC=/usr/local
     fi
@@ -83942,20 +64616,16 @@
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=-lodbc
     ODBC_TYPE=unixODBC
-
+    
 if ! test -f "$ODBC_INCDIR/sqlext.h"; then
-  { { echo "$as_me:$LINENO: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&5
-echo "$as_me: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
 fi
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_UNIXODBC 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+    echo "$ac_t""$ext_output" 1>&6
   fi
 fi
 
@@ -83964,17 +64634,17 @@
 php_with_dbmaker=no
 
 
-
 # Check whether --with-dbmaker or --without-dbmaker was given.
 if test "${with_dbmaker+set}" = set; then
   withval="$with_dbmaker"
   PHP_DBMAKER=$withval
 else
-
+  
   PHP_DBMAKER=no
   test "$PHP_ENABLE_ALL" && PHP_DBMAKER=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -84004,8 +64674,8 @@
 
 
   if test "$PHP_DBMAKER" != "no"; then
-    echo "$as_me:$LINENO: checking for DBMaker support" >&5
-echo $ECHO_N "checking for DBMaker support... $ECHO_C" >&6
+    echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
+echo "configure:64679: 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}'`
@@ -84035,96 +64705,93 @@
     ODBC_LIBS="-ldmapic -lc"
     ODBC_TYPE=dbmaker
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DBMAKER 1
-_ACEOF
+EOF
 
 
     if test "$ext_shared" = "yes"; then
-      echo "$as_me:$LINENO: result: yes (shared)" >&5
-echo "${ECHO_T}yes (shared)" >&6
+      echo "$ac_t""yes (shared)" 1>&6
       ODBC_LIBS="-ldmapic -lc -lm"
       ODBC_SHARED="odbc.la"
     else
-      echo "$as_me:$LINENO: result: yes (static)" >&5
-echo "${ECHO_T}yes (static)" >&6
-
+      echo "$ac_t""yes (static)" 1>&6
+      
 
   if test -n "$ODBC_LIBDIR"; then
-
+    
   if test "$ODBC_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ODBC_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$ODBC_LIBDIR" || echo "$ODBC_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ODBC_LIBDIR
   else
-
+    
     ep_dir="`echo $ODBC_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ODBC_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 dmapic in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ldmapic $LIBS"
+  *) 
+      LIBS="-ldmapic $LIBS" 
    ;;
   esac
 
 
 
 
-
+      
   if test "$ODBC_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$ODBC_INCDIR" || echo "$ODBC_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$ODBC_INCDIR
   else
-
+    
     ep_dir="`echo $ODBC_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ODBC_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
@@ -84136,17 +64803,17 @@
 
 if test -n "$ODBC_TYPE"; then
   if test "$ODBC_TYPE" != "dbmaker"; then
-
+    
   for ac_i in $ODBC_LFLAGS $ODBC_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -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"
@@ -84157,20 +64824,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii"
+        ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -84183,42 +64850,42 @@
     ;;
     -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
         ODBC_SHARED_LIBADD="-L$ai_p $ODBC_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $ODBC_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
 
     ;;
@@ -84226,54 +64893,52 @@
   done
 
     if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_SQLDATASOURCES 1
-_ACEOF
+EOF
 
     fi
   fi
-
-
-cat >>confdefs.h <<\_ACEOF
+  
+  cat >> confdefs.h <<\EOF
 #define HAVE_UODBC 1
-_ACEOF
-
+EOF
 
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCDIR"
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBDIR"
 
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCLUDE"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBS"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LFLAGS"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_TYPE"
 
+  
 
 
-
-
+  
   ext_builddir=ext/odbc
   ext_srcdir=$abs_srcdir/ext/odbc
 
@@ -84281,15 +64946,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_ODBC_SHARED=no
-
-
+    
+  
   case ext/odbc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -84302,12 +64967,12 @@
 
   old_IFS=$IFS
   for ac_src in php_odbc.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
@@ -84331,14 +64996,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_ODBC_SHARED=yes
-
+      
   case ext/odbc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -84351,12 +65016,12 @@
 
   old_IFS=$IFS
   for ac_src in php_odbc.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_odbc="$shared_objects_odbc $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -84374,7 +65039,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -84384,7 +65049,7 @@
       ;;
     *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_odbc) -L$(top_builddir)/netware -lphp5lib $(ODBC_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_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPODBC, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -84397,7 +65062,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpodbc.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
 
   cat >>Makefile.objects<<EOF
@@ -84411,7 +65076,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -84421,7 +65086,7 @@
       ;;
     *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_odbc) -L$(top_builddir)/netware -lphp5lib $(C_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_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ODBC, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -84434,7 +65099,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/odbc.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
 
   cat >>Makefile.objects<<EOF
@@ -84448,10 +65113,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_ODBC 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -84460,15 +65124,15 @@
     PHP_ODBC_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/odbc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -84481,12 +65145,12 @@
 
   old_IFS=$IFS
   for ac_src in php_odbc.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
@@ -84506,15 +65170,15 @@
         EXT_STATIC="$EXT_STATIC odbc"
         ;;
       *)
-
-
+        
+  
   case ext/odbc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -84527,13 +65191,13 @@
 
   old_IFS=$IFS
   for ac_src in php_odbc.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -84553,15 +65217,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=odbc
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -84572,18 +65236,19 @@
 
 php_enable_pcntl=no
 
-echo "$as_me:$LINENO: checking whether to enable pcntl support" >&5
-echo $ECHO_N "checking whether to enable pcntl support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
+echo "configure:65241: 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"
   PHP_PCNTL=$enableval
 else
-
+  
   PHP_PCNTL=no
   test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -84607,451 +65272,245 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_PCNTL" != "no"; then
-
-for ac_func in fork
+  for ac_func in fork
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:65285: 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 65290 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:65313: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+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
+  cat >> confdefs.h <<\EOF
 #define HAVE_FORK 1
-_ACEOF
-
+EOF
+ 
 else
-   { { echo "$as_me:$LINENO: error: pcntl: fork() not supported by this platform" >&5
-echo "$as_me: error: pcntl: fork() not supported by this platform" >&2;}
-   { (exit 1); exit 1; }; }
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; } 
 fi
 done
 
-
-for ac_func in waitpid
+  for ac_func in waitpid
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:65344: 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 65349 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:65372: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+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
+  cat >> confdefs.h <<\EOF
 #define HAVE_WAITPID 1
-_ACEOF
-
+EOF
+ 
 else
-   { { echo "$as_me:$LINENO: error: pcntl: waitpid() not supported by this platform" >&5
-echo "$as_me: error: pcntl: waitpid() not supported by this platform" >&2;}
-   { (exit 1); exit 1; }; }
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: pcntl: waitpid() not supported by this platform" 1>&2; exit 1; } 
 fi
 done
 
-
-for ac_func in sigaction
+  for ac_func in sigaction
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:65403: 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 65408 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:65431: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+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
+  cat >> confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
-_ACEOF
-
+EOF
+ 
 else
-   { { echo "$as_me:$LINENO: error: pcntl: sigaction() not supported by this platform" >&5
-echo "$as_me: error: pcntl: sigaction() not supported by this platform" >&2;}
-   { (exit 1); exit 1; }; }
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: pcntl: sigaction() not supported by this platform" 1>&2; exit 1; } 
 fi
 done
 
-
-
-
-
-
-
-for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
+  for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:65462: 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 65467 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:65490: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
-
+  
   ext_builddir=ext/pcntl
   ext_srcdir=$abs_srcdir/ext/pcntl
 
@@ -85059,15 +65518,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then
     PHP_PCNTL_SHARED=no
-
-
+    
+  
   case ext/pcntl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -85080,12 +65539,12 @@
 
   old_IFS=$IFS
   for ac_src in pcntl.c php_signal.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
@@ -85109,14 +65568,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PCNTL_SHARED=yes
-
+      
   case ext/pcntl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -85129,12 +65588,12 @@
 
   old_IFS=$IFS
   for ac_src in pcntl.c php_signal.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pcntl="$shared_objects_pcntl $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -85152,7 +65611,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -85162,7 +65621,7 @@
       ;;
     *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_pcntl) -L$(top_builddir)/netware -lphp5lib $(PCNTL_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_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCNTL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -85175,7 +65634,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcntl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
 
   cat >>Makefile.objects<<EOF
@@ -85189,7 +65648,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -85199,7 +65658,7 @@
       ;;
     *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_pcntl) -L$(top_builddir)/netware -lphp5lib $(TL_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_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCNTL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -85212,7 +65671,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcntl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
 
   cat >>Makefile.objects<<EOF
@@ -85226,10 +65685,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PCNTL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -85238,15 +65696,15 @@
     PHP_PCNTL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pcntl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -85259,12 +65717,12 @@
 
   old_IFS=$IFS
   for ac_src in pcntl.c php_signal.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
@@ -85284,15 +65742,15 @@
         EXT_STATIC="$EXT_STATIC pcntl"
         ;;
       *)
-
-
+        
+  
   case ext/pcntl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -85305,13 +65763,13 @@
 
   old_IFS=$IFS
   for ac_src in pcntl.c php_signal.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -85331,15 +65789,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pcntl
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -85352,18 +65810,19 @@
 
 php_enable_pdo=yes
 
-echo "$as_me:$LINENO: checking whether to enable PDO support" >&5
-echo $ECHO_N "checking whether to enable PDO support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
+echo "configure:65815: 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"
   PHP_PDO=$enableval
 else
-
+  
   PHP_PDO=yes
   test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -85387,8 +65846,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -85397,7 +65855,7 @@
 
     PHP_PDO=yes
 
-
+  
   pdo_running_under_pear=0
   case `pwd` in
     /var/tmp/pear-build-*)
@@ -85409,17 +65867,7 @@
     # we're running in an environment that smells like pear,
     # and the PHP_PEAR_VERSION env var is not set.  That implies
     # that we're running under a slightly broken pear installer
-    { { echo "$as_me:$LINENO: error:
-PDO requires that you upgrade your PEAR installer tools. Please
-do so now by running:
-
-  % sudo pear upgrade pear
-
-or by manually downloading and installing PEAR version 1.3.5 or higher.
-
-Once you've upgraded, please re-try your PDO install.
-    " >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 PDO requires that you upgrade your PEAR installer tools. Please
 do so now by running:
 
@@ -85428,34 +65876,25 @@
 or by manually downloading and installing PEAR version 1.3.5 or higher.
 
 Once you've upgraded, please re-try your PDO install.
-    " >&2;}
-   { (exit 1); exit 1; }; }
+    " 1>&2; exit 1; }
   fi
 
 
   if test "$ext_shared" = "yes" ; then
     case $host_alias in
       *darwin*)
-          { { echo "$as_me:$LINENO: error:
-Due to the way that loadable modules work on OSX/Darwin, you need to
-compile the PDO package statically into the PHP core.
-
-Please follow the instructions at: http://netevil.org/node.php?nid=202
-for more detail on this issue.
-          " >&5
-echo "$as_me: error:
+          { echo "configure: error: 
 Due to the way that loadable modules work on OSX/Darwin, you need to
 compile the PDO package statically into the PHP core.
 
 Please follow the instructions at: http://netevil.org/node.php?nid=202
 for more detail on this issue.
-          " >&2;}
-   { (exit 1); exit 1; }; }
+          " 1>&2; exit 1; }
         ext_shared=no
         ;;
     esac
   fi
-
+  
   ext_builddir=ext/pdo
   ext_srcdir=$abs_srcdir/ext/pdo
 
@@ -85463,15 +65902,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PDO_SHARED=no
-
-
+    
+  
   case ext/pdo in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -85484,12 +65923,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -85513,14 +65952,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PDO_SHARED=yes
-
+      
   case ext/pdo in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -85533,12 +65972,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pdo="$shared_objects_pdo $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -85556,7 +65995,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -85566,7 +66005,7 @@
       ;;
     *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_pdo) -L$(top_builddir)/netware -lphp5lib $(PDO_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_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -85579,7 +66018,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
 
   cat >>Makefile.objects<<EOF
@@ -85593,7 +66032,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -85603,7 +66042,7 @@
       ;;
     *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_pdo) -L$(top_builddir)/netware -lphp5lib $(_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_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -85616,7 +66055,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
 
   cat >>Makefile.objects<<EOF
@@ -85630,10 +66069,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PDO 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -85642,15 +66080,15 @@
     PHP_PDO_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pdo in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -85663,12 +66101,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -85688,15 +66126,15 @@
         EXT_STATIC="$EXT_STATIC pdo"
         ;;
       *)
-
-
+        
+  
   case ext/pdo in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -85709,13 +66147,13 @@
 
   old_IFS=$IFS
   for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -85735,77 +66173,65 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pdo"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pdo
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+    
   am_i_shared=$PHP_PDO_SHARED
   is_it_shared=$PHP_SPL_SHARED
   is_it_enabled=$PHP_SPL
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension pdo to build statically, but it
 depends on extension spl, which you've configured to build shared.
 You either need to build pdo shared or build spl statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo to build statically, but it
-depends on extension spl, which you've configured to build shared.
-You either need to build pdo shared or build spl statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension pdo, which depends on extension spl,
 but you've either not enabled spl, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
-
-
-
-
+  
+  
+  
+  
+        
+  
     header_path=ext/pdo
     for header_file in php_pdo.h php_pdo_driver.h; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
-
-
+    done 
+  
 
+  
 
+    
   src=$ext_srcdir/Makefile.frag
   ac_srcdir=$ext_srcdir
   ac_builddir=$ext_builddir
@@ -85818,19 +66244,19 @@
 
 php_with_pdo_dblib=no
 
-echo "$as_me:$LINENO: checking for PDO_DBLIB support via FreeTDS" >&5
-echo $ECHO_N "checking for PDO_DBLIB support via FreeTDS... $ECHO_C" >&6
-
+echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
+echo "configure:66249: 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"
   PHP_PDO_DBLIB=$withval
 else
-
+  
   PHP_PDO_DBLIB=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_DBLIB=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -85854,8 +66280,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -85863,9 +66288,7 @@
 if test "$PHP_PDO_DBLIB" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
   fi
 
   if test "$PHP_PDO_DBLIB" = "yes"; then
@@ -85883,9 +66306,7 @@
     done
 
     if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find FreeTDS in known installation directories" >&5
-echo "$as_me: error: Cannot find FreeTDS in known installation directories" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; }
     fi
 
   elif test "$PHP_PDO_DBLIB" != "no"; then
@@ -85897,141 +66318,137 @@
       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
     else
-      { { echo "$as_me:$LINENO: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" >&5
-echo "$as_me: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" 1>&2; exit 1; }
     fi
-  fi
+  fi  
 
   if test "x$PHP_LIBDIR" = "x" ; then
     PHP_LIBDIR=lib
   fi
 
   if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-     { { echo "$as_me:$LINENO: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&5
-echo "$as_me: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&2;}
-   { (exit 1); exit 1; }; }
+     { echo "configure: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; }
   fi
 
-
+  
   if test "$PDO_FREETDS_INCLUDE_DIR" != "/usr/include"; then
-
+    
   if test -z "$PDO_FREETDS_INCLUDE_DIR" || echo "$PDO_FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PDO_FREETDS_INCLUDE_DIR
   else
-
+    
     ep_dir="`echo $PDO_FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INCLUDE_DIR\"`"
   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
     PDO_DBLIB_SHARED_LIBADD="-lsybdb $PDO_DBLIB_SHARED_LIBADD"
     if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_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 "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
   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 sybdb in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybdb $LIBS"
+  *) 
+      LIBS="-lsybdb $LIBS" 
    ;;
   esac
 
@@ -86042,16 +66459,16 @@
 
 
 
-
-
-  echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
-if test "${pdo_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+    
+  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:66466: 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 "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
+  
+    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:66472: 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
@@ -86059,22 +66476,20 @@
     elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$prefix/include/php/ext
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5
-echo "${ECHO_T}$pdo_inc_path" >&6
+
+echo "$ac_t""$pdo_inc_path" 1>&6
   if test -n "$pdo_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
   fi
 
-
+  
 
   PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
-
+  
   ext_builddir=ext/pdo_dblib
   ext_srcdir=$abs_srcdir/ext/pdo_dblib
 
@@ -86082,15 +66497,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PDO_DBLIB_SHARED=no
-
-
+    
+  
   case ext/pdo_dblib in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -86103,12 +66518,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.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
@@ -86132,14 +66547,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PDO_DBLIB_SHARED=yes
-
+      
   case ext/pdo_dblib in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -86152,12 +66567,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pdo_dblib="$shared_objects_pdo_dblib $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -86175,7 +66590,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -86185,7 +66600,7 @@
       ;;
     *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_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(PDO_DBLIB_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_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_DBLIB, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -86198,7 +66613,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_dblib.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
 
   cat >>Makefile.objects<<EOF
@@ -86212,7 +66627,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -86222,7 +66637,7 @@
       ;;
     *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_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(_DBLIB_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_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_DBLIB, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -86235,7 +66650,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_dblib.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
 
   cat >>Makefile.objects<<EOF
@@ -86249,10 +66664,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PDO_DBLIB 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -86261,15 +66675,15 @@
     PHP_PDO_DBLIB_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pdo_dblib in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -86282,12 +66696,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.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
@@ -86307,15 +66721,15 @@
         EXT_STATIC="$EXT_STATIC pdo_dblib"
         ;;
       *)
-
-
+        
+  
   case ext/pdo_dblib in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -86328,13 +66742,13 @@
 
   old_IFS=$IFS
   for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -86354,172 +66768,142 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pdo_dblib
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-  echo "$as_me:$LINENO: checking for dnet_addr in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_addr in -ldnet_stub... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
+echo "configure:66786: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 66794 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dnet_addr ();
-int
-main ()
-{
-dnet_addr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_stub_dnet_addr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_stub_dnet_addr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_addr" >&6
-if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dnet_addr();
+
+int main() {
+dnet_addr()
+; return 0; }
+EOF
+if { (eval echo configure:66805: \"$ac_link\") 1>&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
+   
 
   if test "$ext_shared" = "yes"; then
     PDO_DBLIB_SHARED_LIBADD="-ldnet_stub $PDO_DBLIB_SHARED_LIBADD"
     if test -n ""; then
-
+      
   if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
-
+    
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
   else
-
+    
     ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_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 ""; then
-
+    
   if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
-
+    
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
   else
-
+    
     ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"\"`"
   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 dnet_stub in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ldnet_stub $LIBS"
+  *) 
+      LIBS="-ldnet_stub $LIBS" 
    ;;
   esac
 
@@ -86529,80 +66913,67 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBDNET_STUB 1
-_ACEOF
-
+EOF
 
+     
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_PDO_DBLIB 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_FREETDS 1
-_ACEOF
-
+EOF
 
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_DBLIB_SHARED_LIBADD"
 
 
-
-
+  
+    
   am_i_shared=$PHP_PDO_DBLIB_SHARED
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_dblib to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_dblib shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_dblib to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_dblib shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_dblib, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_dblib, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
 fi
 
 
 
 php_with_pdo_firebird=no
 
-echo "$as_me:$LINENO: checking for Firebird support for PDO" >&5
-echo $ECHO_N "checking for Firebird support for PDO... $ECHO_C" >&6
-
+echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
+echo "configure:66966: 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"
   PHP_PDO_FIREBIRD=$withval
 else
-
+  
   PHP_PDO_FIREBIRD=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_FIREBIRD=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -86626,8 +66997,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -86635,9 +67005,7 @@
 if test "$PHP_PDO_FIREBIRD" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
   fi
 
   if test "$PHP_PDO_FIREBIRD" = "yes"; then
@@ -86650,25 +67018,25 @@
     FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR
   fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $FIREBIRD_LIBDIR_FLAG
   "
-
+  
   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"
@@ -86679,20 +67047,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -86705,145 +67073,116 @@
     ;;
     -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 "$as_me:$LINENO: checking for isc_detach_database in -lfbclient" >&5
-echo $ECHO_N "checking for isc_detach_database in -lfbclient... $ECHO_C" >&6
-if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
+echo "configure:67120: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lfbclient  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 67128 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char isc_detach_database ();
-int
-main ()
-{
-isc_detach_database ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_fbclient_isc_detach_database=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_fbclient_isc_detach_database=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_fbclient_isc_detach_database" >&6
-if test $ac_cv_lib_fbclient_isc_detach_database = yes; then
+    builtin and then its argument prototype would still apply.  */
+char isc_detach_database();
+
+int main() {
+isc_detach_database()
+; return 0; }
+EOF
+if { (eval echo configure:67139: \"$ac_link\") 1>&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
-
+    
     FIREBIRD_LIBNAME=fbclient
-
-
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_fbclient_isc_detach_database
-
-
+    
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       $FIREBIRD_LIBDIR_FLAG
     "
-
+  
   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"
@@ -86854,20 +67193,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -86880,145 +67219,116 @@
     ;;
     -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 "$as_me:$LINENO: checking for isc_detach_database in -lgds" >&5
-echo $ECHO_N "checking for isc_detach_database in -lgds... $ECHO_C" >&6
-if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
+echo "configure:67266: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lgds  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 67274 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char isc_detach_database ();
-int
-main ()
-{
-isc_detach_database ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gds_isc_detach_database=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gds_isc_detach_database=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gds_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_gds_isc_detach_database" >&6
-if test $ac_cv_lib_gds_isc_detach_database = yes; then
+    builtin and then its argument prototype would still apply.  */
+char isc_detach_database();
+
+int main() {
+isc_detach_database()
+; return 0; }
+EOF
+if { (eval echo configure:67285: \"$ac_link\") 1>&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
-
+    
       FIREBIRD_LIBNAME=gds
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gds_isc_detach_database
-
-
+    
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
         $FIREBIRD_LIBDIR_FLAG
       "
-
+  
   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"
@@ -87029,20 +67339,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -87055,151 +67365,120 @@
     ;;
     -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 "$as_me:$LINENO: checking for isc_detach_database in -lib_util" >&5
-echo $ECHO_N "checking for isc_detach_database in -lib_util... $ECHO_C" >&6
-if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
+echo "configure:67412: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lib_util  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 67420 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char isc_detach_database ();
-int
-main ()
-{
-isc_detach_database ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ib_util_isc_detach_database=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ib_util_isc_detach_database=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_ib_util_isc_detach_database" >&6
-if test $ac_cv_lib_ib_util_isc_detach_database = yes; then
+    builtin and then its argument prototype would still apply.  */
+char isc_detach_database();
+
+int main() {
+isc_detach_database()
+; return 0; }
+EOF
+if { (eval echo configure:67431: \"$ac_link\") 1>&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
-
+    
         FIREBIRD_LIBNAME=ib_util
-
-
+      
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ib_util_isc_detach_database
-
-        { { echo "$as_me:$LINENO: error: libfbclient, libgds or libib_util not found! Check config.log for more information." >&5
-echo "$as_me: error: libfbclient, libgds or libib_util not found! Check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+        { echo "configure: error: libfbclient, libgds or libib_util not found! Check config.log for more information." 1>&2; exit 1; }
+      
+  
 fi
 
-
-
+    
+  
 fi
 
-
-
+  
+  
 fi
 
-
-
-  echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
-if test "${pdo_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ 
+  
+  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:67476: 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 "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
+  
+    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:67482: 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
@@ -87207,107 +67486,105 @@
     elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$prefix/include/php/ext
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5
-echo "${ECHO_T}$pdo_inc_path" >&6
+
+echo "$ac_t""$pdo_inc_path" 1>&6
   if test -n "$pdo_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
   fi
 
 
-
+  
 
   if test "$ext_shared" = "yes"; then
     PDO_FIREBIRD_SHARED_LIBADD="-l$FIREBIRD_LIBNAME $PDO_FIREBIRD_SHARED_LIBADD"
     if test -n "$FIREBIRD_LIBDIR"; then
-
+      
   if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$FIREBIRD_LIBDIR
   else
-
+    
     ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PDO_FIREBIRD_SHARED_LIBADD="-L$ai_p $PDO_FIREBIRD_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_FIREBIRD_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_FIREBIRD_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 "$FIREBIRD_LIBDIR"; then
-
+    
   if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$FIREBIRD_LIBDIR
   else
-
+    
     ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FIREBIRD_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 $FIREBIRD_LIBNAME in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$FIREBIRD_LIBNAME $LIBS"
+  *) 
+      LIBS="-l$FIREBIRD_LIBNAME $LIBS" 
    ;;
   esac
 
@@ -87317,43 +67594,42 @@
   fi
 
 
-
+  
   if test "$FIREBIRD_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$FIREBIRD_INCDIR" || echo "$FIREBIRD_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$FIREBIRD_INCDIR
   else
-
+    
     ep_dir="`echo $FIREBIRD_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$FIREBIRD_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
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_PDO_FIREBIRD 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/pdo_firebird
   ext_srcdir=$abs_srcdir/ext/pdo_firebird
 
@@ -87361,15 +67637,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PDO_FIREBIRD_SHARED=no
-
-
+    
+  
   case ext/pdo_firebird in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -87382,12 +67658,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.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
@@ -87411,14 +67687,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PDO_FIREBIRD_SHARED=yes
-
+      
   case ext/pdo_firebird in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -87431,12 +67707,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pdo_firebird="$shared_objects_pdo_firebird $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -87454,7 +67730,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -87464,7 +67740,7 @@
       ;;
     *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_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(PDO_FIREBIRD_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_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_FIREBIRD, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -87477,7 +67753,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_firebird.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
 
   cat >>Makefile.objects<<EOF
@@ -87491,7 +67767,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -87501,7 +67777,7 @@
       ;;
     *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_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(_FIREBIRD_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_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_FIREBIRD, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -87514,7 +67790,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_firebird.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
 
   cat >>Makefile.objects<<EOF
@@ -87528,10 +67804,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PDO_FIREBIRD 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -87540,15 +67815,15 @@
     PHP_PDO_FIREBIRD_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pdo_firebird in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -87561,12 +67836,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.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
@@ -87586,15 +67861,15 @@
         EXT_STATIC="$EXT_STATIC pdo_firebird"
         ;;
       *)
-
-
+        
+  
   case ext/pdo_firebird in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -87607,13 +67882,13 @@
 
   old_IFS=$IFS
   for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -87633,72 +67908,60 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pdo_firebird
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_FIREBIRD_SHARED_LIBADD"
 
-
+  
   am_i_shared=$PHP_PDO_FIREBIRD_SHARED
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_firebird to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_firebird shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_firebird to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_firebird shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension pdo_firebird, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_firebird, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
+  
 fi
 
 
 
 php_with_pdo_mysql=no
 
-echo "$as_me:$LINENO: checking for MySQL support for PDO" >&5
-echo $ECHO_N "checking for MySQL support for PDO... $ECHO_C" >&6
-
+echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
+echo "configure:67954: 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"
   PHP_PDO_MYSQL=$withval
 else
-
+  
   PHP_PDO_MYSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -87722,33 +67985,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_ZLIB_DIR"; then
-
+  
 php_with_zlib_dir=no
 
-echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6
-
+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
+echo "configure:67999: 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"
   PHP_ZLIB_DIR=$withval
 else
-
+  
   PHP_ZLIB_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ZLIB_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -87757,12 +68018,10 @@
 if test "$PHP_PDO_MYSQL" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
   fi
 
-
+  
 
   if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then
     PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL
@@ -87789,61 +68048,54 @@
 
   if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
         PHP_MYSQLND_ENABLED=yes
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define PDO_USE_MYSQLND 1
-_ACEOF
+EOF
 
   else
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_MYSQL 1
-_ACEOF
+EOF
 
 
-    echo "$as_me:$LINENO: checking for mysql_config" >&5
-echo $ECHO_N "checking for mysql_config... $ECHO_C" >&6
+    echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
+echo "configure:68063: checking for mysql_config" >&5
     if test -n "$PDO_MYSQL_CONFIG"; then
-      echo "$as_me:$LINENO: result: $PDO_MYSQL_CONFIG" >&5
-echo "${ECHO_T}$PDO_MYSQL_CONFIG" >&6
+      echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6
       if test "x$SED" = "x"; then
         # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:68070: 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
-  case $SED in
-  [\\/]* | ?:[\\/]*)
+  case "$SED" in
+  /*)
   ac_cv_path_SED="$SED" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_SED="$SED" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_SED="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   ;;
 esac
 fi
-SED=$ac_cv_path_SED
-
+SED="$ac_cv_path_SED"
 if test -n "$SED"; then
-  echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
+  echo "$ac_t""$SED" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
       fi
@@ -87856,10 +68108,9 @@
       fi
       PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
     elif test -n "$PDO_MYSQL_DIR"; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-      echo "$as_me:$LINENO: checking for mysql install under $PDO_MYSQL_DIR" >&5
-echo $ECHO_N "checking for mysql install under $PDO_MYSQL_DIR... $ECHO_C" >&6
+      echo "$ac_t""not found" 1>&6
+      echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
+echo "configure:68114: 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
@@ -87872,75 +68123,68 @@
       fi
 
       if test -r "$PDO_MYSQL_LIB_DIR"; then
-        echo "$as_me:$LINENO: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5
-echo "${ECHO_T}libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6
+        echo "$ac_t""libs under $PDO_MYSQL_LIB_DIR; seems promising" 1>&6
       else
-        echo "$as_me:$LINENO: result: can not find it" >&5
-echo "${ECHO_T}can not find it" >&6
-        { { echo "$as_me:$LINENO: error: Unable to find your mysql installation" >&5
-echo "$as_me: error: Unable to find your mysql installation" >&2;}
-   { (exit 1); exit 1; }; }
+        echo "$ac_t""can not find it" 1>&6
+        { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; }
       fi
 
-
+      
   if test "$PDO_MYSQL_INC_DIR" != "/usr/include"; then
-
+    
   if test -z "$PDO_MYSQL_INC_DIR" || echo "$PDO_MYSQL_INC_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PDO_MYSQL_INC_DIR
   else
-
+    
     ep_dir="`echo $PDO_MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_MYSQL_INC_DIR\"`"
   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
 
       PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
     else
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-      { { echo "$as_me:$LINENO: error: Unable to find your mysql installation" >&5
-echo "$as_me: error: Unable to find your mysql installation" >&2;}
-   { (exit 1); exit 1; }; }
+      echo "$ac_t""not found" 1>&6
+      { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       $PDO_MYSQL_LIBS
     "
-
+  
   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"
@@ -87951,20 +68195,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -87977,150 +68221,119 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_query" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_query in -l$PDO_MYSQL_LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
+echo "configure:68268: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 68276 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mysql_query ();
-int
-main ()
-{
-mysql_query ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mysql_query();
+
+int main() {
+mysql_query()
+; return 0; }
+EOF
+if { (eval echo configure:68287: \"$ac_link\") 1>&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
-
-
+    
+      
   for ac_i in $PDO_MYSQL_INCLUDE; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -88129,17 +68342,17 @@
     esac
   done
 
-
+      
   for ac_i in $PDO_MYSQL_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -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"
@@ -88150,20 +68363,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii"
+        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -88176,145 +68389,146 @@
     ;;
     -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
         PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_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
 
     ;;
     esac
   done
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
-
+    
       if test "$PHP_ZLIB_DIR" != "no"; then
-
+        
 
   if test "$ext_shared" = "yes"; then
     PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD"
     if test -n "$PHP_ZLIB_DIR"; then
-
+      
   if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_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 "$PHP_ZLIB_DIR"; then
-
+    
   if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
   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 z in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lz $LIBS"
+  *) 
+      LIBS="-lz $LIBS" 
    ;;
   esac
 
@@ -88324,25 +68538,25 @@
   fi
 
 
-
+        
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
-          -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR
+          -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR 
         "
-
+  
   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"
@@ -88353,20 +68567,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -88379,148 +68593,116 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_query" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_query in -l$PDO_MYSQL_LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
+echo "configure:68640: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 68648 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mysql_query ();
-int
-main ()
-{
-mysql_query ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mysql_query();
+
+int main() {
+mysql_query()
+; return 0; }
+EOF
+if { (eval echo configure:68659: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
-
-          { { echo "$as_me:$LINENO: error: PDO_MYSQL configure failed. Please check config.log for more information." >&5
-echo "$as_me: error: PDO_MYSQL configure failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          { echo "configure: error: PDO_MYSQL configure failed. Please check config.log for more information." 1>&2; exit 1; }
+        
+  
 fi
-
+  
         PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
       else
-
-
+        
+  
   case z in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD"
+        PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD" 
     else
-
-
+      
+  
   case z in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lz $LIBS"
+  *) 
+      LIBS="-lz $LIBS" 
    ;;
   esac
 
@@ -88530,25 +68712,25 @@
   esac
 
 
-
+        
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
           -L$PDO_MYSQL_LIB_DIR
         "
-
+  
   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"
@@ -88559,20 +68741,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -88585,167 +68767,135 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_query" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_query in -l$PDO_MYSQL_LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
+echo "configure:68814: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 68822 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mysql_query ();
-int
-main ()
-{
-mysql_query ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char mysql_query();
+
+int main() {
+mysql_query()
+; return 0; }
+EOF
+if { (eval echo configure:68833: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
-
-          { { echo "$as_me:$LINENO: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&5
-echo "$as_me: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; }
+        
+  
 fi
-
+   
         PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz"
       fi
 
-
+      
   for ac_i in $PDO_MYSQL_INCLUDE; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -88754,17 +68904,17 @@
     esac
   done
 
-
+      
   for ac_i in $PDO_MYSQL_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -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"
@@ -88775,20 +68925,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii"
+        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -88801,173 +68951,123 @@
     ;;
     -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
         PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_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
 
     ;;
     esac
   done
 
-
-
+    
+  
 fi
 
 
     _SAVE_LIBS=$LIBS
     LIBS="$LIBS $PDO_MYSQL_LIBS"
-
-
-
-
-for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate
+    for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:69007: 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 69012 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:69035: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
-
+ 
     LIBS=$_SAVE_LIBS
   fi
 
-
-
-  echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
-if test "${pdo_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
+  
+    
+  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:69065: 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:69071: 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
@@ -88975,30 +69075,27 @@
     elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$prefix/include/php/ext
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5
-echo "${ECHO_T}$pdo_inc_path" >&6
+
+echo "$ac_t""$pdo_inc_path" 1>&6
   if test -n "$pdo_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
   fi
 
-
+  
 
   if test -n "$PDO_MYSQL_CONFIG"; then
     PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
-
-cat >>confdefs.h <<_ACEOF
+    cat >> confdefs.h <<EOF
 #define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET"
-_ACEOF
+EOF
 
   fi
 
-
+    
   ext_builddir=ext/pdo_mysql
   ext_srcdir=$abs_srcdir/ext/pdo_mysql
 
@@ -89006,15 +69103,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PDO_MYSQL_SHARED=no
-
-
+    
+  
   case ext/pdo_mysql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -89027,12 +69124,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.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
@@ -89056,14 +69153,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PDO_MYSQL_SHARED=yes
-
+      
   case ext/pdo_mysql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -89076,12 +69173,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pdo_mysql="$shared_objects_pdo_mysql $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -89099,7 +69196,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -89109,7 +69206,7 @@
       ;;
     *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_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(PDO_MYSQL_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_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_MYSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -89122,7 +69219,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_mysql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
 
   cat >>Makefile.objects<<EOF
@@ -89136,7 +69233,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -89146,7 +69243,7 @@
       ;;
     *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_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(_MYSQL_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_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_MYSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -89159,7 +69256,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_mysql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
 
   cat >>Makefile.objects<<EOF
@@ -89173,10 +69270,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PDO_MYSQL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -89185,15 +69281,15 @@
     PHP_PDO_MYSQL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pdo_mysql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -89206,12 +69302,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.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
@@ -89231,15 +69327,15 @@
         EXT_STATIC="$EXT_STATIC pdo_mysql"
         ;;
       *)
-
-
+        
+  
   case ext/pdo_mysql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -89252,13 +69348,13 @@
 
   old_IFS=$IFS
   for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -89278,120 +69374,96 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pdo_mysql
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+    
   am_i_shared=$PHP_PDO_MYSQL_SHARED
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_mysql to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_mysql shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_mysql to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_mysql shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_mysql, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_mysql, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
+  
     if test "$PHP_MYSQL" = "mysqlnd"; then
-
+      
   am_i_shared=$PHP_PDO_MYSQL_SHARED
   is_it_shared=$PHP_MYSQLND_SHARED
   is_it_enabled=$PHP_MYSQLND
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_mysql to build statically, but it
-depends on extension mysqlnd, which you've configured to build shared.
-You either need to build pdo_mysql shared or build mysqlnd statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_mysql to build statically, but it
 depends on extension mysqlnd, which you've configured to build shared.
 You either need to build pdo_mysql shared or build mysqlnd statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_mysql, which depends on extension mysqlnd,
-but you've either not enabled mysqlnd, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_mysql, which depends on extension mysqlnd,
 but you've either not enabled mysqlnd, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
+  
     fi
-
+  
   PDO_MYSQL_MODULE_TYPE=external
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_SHARED_LIBADD"
 
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_MODULE_TYPE"
 
-
+  
 
 fi
 
 
 SUPPORTED_LIB_VERS="9.0 10.1 11.1"  # This caters for all Oracle 9.x, 10.x and 11.1 installs
-
+                                                                                                                                                                
 
 
 
 
 php_with_pdo_oci=no
 
-echo "$as_me:$LINENO: checking Oracle OCI support for PDO" >&5
-echo $ECHO_N "checking Oracle OCI support for PDO... $ECHO_C" >&6
-
+echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
+echo "configure:69456: 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"
   PHP_PDO_OCI=$withval
 else
-
+  
   PHP_PDO_OCI=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_OCI=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -89415,8 +69487,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -89424,449 +69495,66 @@
 if test "$PHP_PDO_OCI" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
   fi
 
-  echo "$as_me:$LINENO: checking Oracle Install-Dir" >&5
-echo $ECHO_N "checking Oracle Install-Dir... $ECHO_C" >&6
+  echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
+echo "configure:69503: checking Oracle Install-Dir" >&5
   if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
     PDO_OCI_DIR=$ORACLE_HOME
   else
     PDO_OCI_DIR=$PHP_PDO_OCI
   fi
-  echo "$as_me:$LINENO: result: $PHP_PDO_OCI" >&5
-echo "${ECHO_T}$PHP_PDO_OCI" >&6
+  echo "$ac_t""$PHP_PDO_OCI" 1>&6
 
-  echo "$as_me:$LINENO: checking if that is sane" >&5
-echo $ECHO_N "checking if that is sane... $ECHO_C" >&6
+  echo $ac_n "checking if that is sane""... $ac_c" 1>&6
+echo "configure:69512: checking if that is sane" >&5
   if test -z "$PDO_OCI_DIR"; then
-    { { echo "$as_me:$LINENO: error:
-You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   else
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   fi
 
   if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
-    echo "$as_me:$LINENO: checking for long int" >&5
-echo $ECHO_N "checking for long int... $ECHO_C" >&6
-if test "${ac_cv_type_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long int *) 0)
-  return 0;
-if (sizeof (long int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_int" >&6
-
-echo "$as_me:$LINENO: checking size of long int" >&5
-echo $ECHO_N "checking size of long int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+    echo $ac_n "checking size of long int""... $ac_c" 1>&6
+echo "configure:69523: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long int)); }
-unsigned long ulongval () { return (long) (sizeof (long int)); }
+  ac_cv_sizeof_long_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 69531 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:69542: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long_int=0
 fi
+rm -fr conftest*
+fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
+cat >> confdefs.h <<EOF
 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
-_ACEOF
+EOF
 
 
     if test "$ac_cv_sizeof_long_int" = "4" ; then
@@ -89883,148 +69571,142 @@
         PDO_OCI_IC_VERS="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
       fi
     fi
-    echo "$as_me:$LINENO: checking for oci.h" >&5
-echo $ECHO_N "checking for oci.h... $ECHO_C" >&6
+    echo $ac_n "checking for oci.h""... $ac_c" 1>&6
+echo "configure:69576: checking for oci.h" >&5
     if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/oci.h ; then
-
+      
   if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" != "/usr/include"; then
-
+    
   if test -z "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" || echo "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR
   else
-
+    
     ep_dir="`echo $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR\"`"
   fi
 
-
-
+    
+  
   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 "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" >&5
-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" >&6
+      echo "$ac_t""$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" 1>&6
     elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include/oci.h ; then
-
+      
   if test "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" || echo "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include
   else
-
+    
     ep_dir="`echo $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include\"`"
   fi
 
-
-
+    
+  
   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 "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" >&5
-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" >&6
+      echo "$ac_t""$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" 1>&6
     elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then
-
+      
   if test "$PDO_OCI_IC_PREFIX/sdk/include" != "/usr/include"; then
-
+    
   if test -z "$PDO_OCI_IC_PREFIX/sdk/include" || echo "$PDO_OCI_IC_PREFIX/sdk/include" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_IC_PREFIX/sdk/include
   else
-
+    
     ep_dir="`echo $PDO_OCI_IC_PREFIX/sdk/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/sdk/include\"`"
   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 "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/sdk/include" >&5
-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/sdk/include" >&6
+      echo "$ac_t""$PDO_OCI_IC_PREFIX/sdk/include" 1>&6
     elif test -f $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include/oci.h ; then
-
+      
   if test "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" || echo "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include
   else
-
+    
     ep_dir="`echo $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include\"`"
   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 "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&5
-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&6
+      echo "$ac_t""$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" 1>&6
     else
-      { { echo "$as_me:$LINENO: error: I'm too dumb to figure out where the include dir is in your Instant Client install" >&5
-echo "$as_me: error: I'm too dumb to figure out where the include dir is in your Instant Client install" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: I'm too dumb to figure out where the include dir is in your Instant Client install" 1>&2; exit 1; }
     fi
     if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
     PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib"
@@ -90033,441 +69715,62 @@
     elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.$SHLIB_SUFFIX_NAME" ; then
       PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
     else
-      { { echo "$as_me:$LINENO: error: I'm too dumb to figure out where the libraries are in your Instant Client install" >&5
-echo "$as_me: error: I'm too dumb to figure out where the libraries are in your Instant Client install" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: I'm too dumb to figure out where the libraries are in your Instant Client install" 1>&2; exit 1; }
     fi
     PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
   else
-
-  echo "$as_me:$LINENO: checking for long int" >&5
-echo $ECHO_N "checking for long int... $ECHO_C" >&6
-if test "${ac_cv_type_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long int *) 0)
-  return 0;
-if (sizeof (long int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_int" >&6
-
-echo "$as_me:$LINENO: checking size of long int" >&5
-echo $ECHO_N "checking size of long int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+    
+  echo $ac_n "checking size of long int""... $ac_c" 1>&6
+echo "configure:69725: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long int)); }
-unsigned long ulongval () { return (long) (sizeof (long int)); }
+  ac_cv_sizeof_long_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 69733 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:69744: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long_int=0
 fi
+rm -fr conftest*
+fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
+cat >> confdefs.h <<EOF
 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
-_ACEOF
+EOF
 
 
-  echo "$as_me:$LINENO: checking if we're on a 64-bit platform" >&5
-echo $ECHO_N "checking if we're on a 64-bit platform... $ECHO_C" >&6
+  echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
+echo "configure:69764: checking if we're on a 64-bit platform" >&5
   if test "$ac_cv_sizeof_long_int" = "4" ; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
   else
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
   fi
 
-  echo "$as_me:$LINENO: checking OCI8 libraries dir" >&5
-echo $ECHO_N "checking OCI8 libraries dir... $ECHO_C" >&6
+  echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
+echo "configure:69774: 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
@@ -90475,42 +69778,39 @@
   elif test -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
     PDO_OCI_LIB_DIR=$TMP_PDO_OCI_LIB_DIR
   else
-    { { echo "$as_me:$LINENO: error: Oracle required OCI8 libraries not found" >&5
-echo "$as_me: error: Oracle required OCI8 libraries not found" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Oracle required OCI8 libraries not found" 1>&2; exit 1; }
   fi
-  echo "$as_me:$LINENO: result: $PDO_OCI_LIB_DIR" >&5
-echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6
+  echo "$ac_t""$PDO_OCI_LIB_DIR" 1>&6
 
 
     if test -d "$PDO_OCI_DIR/rdbms/public"; then
-
+      
   if test "$PDO_OCI_DIR/rdbms/public" != "/usr/include"; then
-
+    
   if test -z "$PDO_OCI_DIR/rdbms/public" || echo "$PDO_OCI_DIR/rdbms/public" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_DIR/rdbms/public
   else
-
+    
     ep_dir="`echo $PDO_OCI_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/public\"`"
   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
@@ -90518,33 +69818,33 @@
       PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/public"
     fi
     if test -d "$PDO_OCI_DIR/rdbms/demo"; then
-
+      
   if test "$PDO_OCI_DIR/rdbms/demo" != "/usr/include"; then
-
+    
   if test -z "$PDO_OCI_DIR/rdbms/demo" || echo "$PDO_OCI_DIR/rdbms/demo" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_DIR/rdbms/demo
   else
-
+    
     ep_dir="`echo $PDO_OCI_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/demo\"`"
   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
@@ -90552,33 +69852,33 @@
       PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/demo"
     fi
     if test -d "$PDO_OCI_DIR/network/public"; then
-
+      
   if test "$PDO_OCI_DIR/network/public" != "/usr/include"; then
-
+    
   if test -z "$PDO_OCI_DIR/network/public" || echo "$PDO_OCI_DIR/network/public" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_DIR/network/public
   else
-
+    
     ep_dir="`echo $PDO_OCI_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/network/public\"`"
   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
@@ -90586,33 +69886,33 @@
       PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/network/public"
     fi
     if test -d "$PDO_OCI_DIR/plsql/public"; then
-
+      
   if test "$PDO_OCI_DIR/plsql/public" != "/usr/include"; then
-
+    
   if test -z "$PDO_OCI_DIR/plsql/public" || echo "$PDO_OCI_DIR/plsql/public" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_DIR/plsql/public
   else
-
+    
     ep_dir="`echo $PDO_OCI_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/plsql/public\"`"
   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
@@ -90620,33 +69920,33 @@
       PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/plsql/public"
     fi
     if test -d "$PDO_OCI_DIR/include"; then
-
+      
   if test "$PDO_OCI_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$PDO_OCI_DIR/include" || echo "$PDO_OCI_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_DIR/include
   else
-
+    
     ep_dir="`echo $PDO_OCI_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/include\"`"
   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
@@ -90655,17 +69955,17 @@
     fi
 
     if test -f "$PDO_OCI_LIB_DIR/sysliblist"; then
-
+      
   for ac_i in `cat $PDO_OCI_LIB_DIR/sysliblist`; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -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"
@@ -90676,20 +69976,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
+        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -90702,42 +70002,42 @@
     ;;
     -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
         PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB"
         test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB"
       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
 
     ;;
@@ -90745,17 +70045,17 @@
   done
 
     elif test -f "$PDO_OCI_DIR/rdbms/lib/sysliblist"; then
-
+      
   for ac_i in `cat $PDO_OCI_DIR/rdbms/lib/sysliblist`; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -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"
@@ -90766,20 +70066,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
+        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -90792,42 +70092,42 @@
     ;;
     -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
         PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB"
         test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB"
       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
 
     ;;
@@ -90835,40 +70135,37 @@
   done
 
     fi
-
-  echo "$as_me:$LINENO: checking Oracle version" >&5
-echo $ECHO_N "checking Oracle version... $ECHO_C" >&6
+    
+  echo $ac_n "checking Oracle version""... $ac_c" 1>&6
+echo "configure:70141: 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"
     fi
   done
   if test -z "$PDO_OCI_VERSION"; then
-    { { echo "$as_me:$LINENO: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" >&5
-echo "$as_me: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" 1>&2; exit 1; }
   fi
-  echo "$as_me:$LINENO: result: $PDO_OCI_VERSION" >&5
-echo "${ECHO_T}$PDO_OCI_VERSION" >&6
+  echo "$ac_t""$PDO_OCI_VERSION" 1>&6
 
   fi
 
   case $PDO_OCI_VERSION in
     9.0|10.1|10.2|11.1|11.2)
-
-
+      
+  
   case clntsh in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -lclntsh"
+        PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -lclntsh" 
     else
-
-
+      
+  
   case clntsh in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -lclntsh"
+  *) 
+      LIBS="$LIBS -lclntsh" 
    ;;
   esac
 
@@ -90881,70 +70178,68 @@
       ;;
 
     *)
-      { { echo "$as_me:$LINENO: error: Unsupported Oracle version $PDO_OCI_VERSION" >&5
-echo "$as_me: error: Unsupported Oracle version $PDO_OCI_VERSION" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Unsupported Oracle version $PDO_OCI_VERSION" 1>&2; exit 1; }
       ;;
   esac
 
-
+  
   if test "$PDO_OCI_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PDO_OCI_LIB_DIR" != "/usr/lib"; then
-
+    
   if test -z "$PDO_OCI_LIB_DIR" || echo "$PDO_OCI_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PDO_OCI_LIB_DIR
   else
-
+    
     ep_dir="`echo $PDO_OCI_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_OCI_LIB_DIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PDO_OCI_SHARED_LIBADD="-L$ai_p $PDO_OCI_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_OCI_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_OCI_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
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
   "
-
+  
   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"
@@ -90955,20 +70250,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -90981,153 +70276,123 @@
     ;;
     -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 "$as_me:$LINENO: checking for OCIEnvCreate in -lclntsh" >&5
-echo $ECHO_N "checking for OCIEnvCreate in -lclntsh... $ECHO_C" >&6
-if test "${ac_cv_lib_clntsh_OCIEnvCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
+echo "configure:70323: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 70331 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char OCIEnvCreate ();
-int
-main ()
-{
-OCIEnvCreate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_clntsh_OCIEnvCreate=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_clntsh_OCIEnvCreate=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIEnvCreate" >&6
-if test $ac_cv_lib_clntsh_OCIEnvCreate = yes; then
+    builtin and then its argument prototype would still apply.  */
+char OCIEnvCreate();
 
+int main() {
+OCIEnvCreate()
+; return 0; }
+EOF
+if { (eval echo configure:70342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_OCIENVCREATE 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIEnvCreate
-
-
+    
+  
 fi
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
   "
-
+  
   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"
@@ -91138,20 +70403,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -91164,153 +70429,123 @@
     ;;
     -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 "$as_me:$LINENO: checking for OCIEnvNlsCreate in -lclntsh" >&5
-echo $ECHO_N "checking for OCIEnvNlsCreate in -lclntsh... $ECHO_C" >&6
-if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
+echo "configure:70476: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 70484 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char OCIEnvNlsCreate ();
-int
-main ()
-{
-OCIEnvNlsCreate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_clntsh_OCIEnvNlsCreate=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_clntsh_OCIEnvNlsCreate=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6
-if test $ac_cv_lib_clntsh_OCIEnvNlsCreate = yes; then
+    builtin and then its argument prototype would still apply.  */
+char OCIEnvNlsCreate();
+
+int main() {
+OCIEnvNlsCreate()
+; return 0; }
+EOF
+if { (eval echo configure:70495: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_OCIENVNLSCREATE 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIEnvNlsCreate
-
-
+    
+  
 fi
 
 
-
+        
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
   "
-
+  
   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"
@@ -91321,20 +70556,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -91347,149 +70582,119 @@
     ;;
     -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 "$as_me:$LINENO: checking for OCILobIsTemporary in -lclntsh" >&5
-echo $ECHO_N "checking for OCILobIsTemporary in -lclntsh... $ECHO_C" >&6
-if test "${ac_cv_lib_clntsh_OCILobIsTemporary+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
+echo "configure:70629: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 70637 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char OCILobIsTemporary ();
-int
-main ()
-{
-OCILobIsTemporary ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_clntsh_OCILobIsTemporary=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_clntsh_OCILobIsTemporary=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCILobIsTemporary" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCILobIsTemporary" >&6
-if test $ac_cv_lib_clntsh_OCILobIsTemporary = yes; then
+    builtin and then its argument prototype would still apply.  */
+char OCILobIsTemporary();
+
+int main() {
+OCILobIsTemporary()
+; return 0; }
+EOF
+if { (eval echo configure:70648: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_OCILOBISTEMPORARY 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCILobIsTemporary
-
-
+    
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
     "
-
+  
   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"
@@ -91500,20 +70705,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -91526,131 +70731,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for OCILobIsTemporary in -locijdbc8" >&5
-echo $ECHO_N "checking for OCILobIsTemporary in -locijdbc8... $ECHO_C" >&6
-if test "${ac_cv_lib_ocijdbc8_OCILobIsTemporary+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
+echo "configure:70778: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-locijdbc8  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 70786 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char OCILobIsTemporary ();
-int
-main ()
-{
-OCILobIsTemporary ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ocijdbc8_OCILobIsTemporary=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ocijdbc8_OCILobIsTemporary=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&5
-echo "${ECHO_T}$ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&6
-if test $ac_cv_lib_ocijdbc8_OCILobIsTemporary = yes; then
+    builtin and then its argument prototype would still apply.  */
+char OCILobIsTemporary();
+
+int main() {
+OCILobIsTemporary()
+; return 0; }
+EOF
+if { (eval echo configure:70797: \"$ac_link\") 1>&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
-
-
-
+    
+      
+  
   case ocijdbc8 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8"
+        PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8" 
     else
-
-
+      
+  
   case ocijdbc8 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -locijdbc8"
+  *) 
+      LIBS="$LIBS -locijdbc8" 
    ;;
   esac
 
@@ -91660,46 +70835,46 @@
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_OCILOBISTEMPORARY 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ocijdbc8_OCILobIsTemporary
-
-
+    
+  
 fi
 
-
-
+  
+  
 fi
 
 
-
+        
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
   "
-
+  
   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"
@@ -91710,20 +70885,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -91736,153 +70911,123 @@
     ;;
     -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 "$as_me:$LINENO: checking for OCICollAssign in -lclntsh" >&5
-echo $ECHO_N "checking for OCICollAssign in -lclntsh... $ECHO_C" >&6
-if test "${ac_cv_lib_clntsh_OCICollAssign+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
+echo "configure:70958: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 70966 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char OCICollAssign ();
-int
-main ()
-{
-OCICollAssign ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_clntsh_OCICollAssign=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_clntsh_OCICollAssign=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCICollAssign" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCICollAssign" >&6
-if test $ac_cv_lib_clntsh_OCICollAssign = yes; then
+    builtin and then its argument prototype would still apply.  */
+char OCICollAssign();
+
+int main() {
+OCICollAssign()
+; return 0; }
+EOF
+if { (eval echo configure:70977: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_OCICOLLASSIGN 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCICollAssign
-
-
+    
+  
 fi
 
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
   "
-
+  
   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"
@@ -91893,20 +71038,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -91919,144 +71064,114 @@
     ;;
     -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 "$as_me:$LINENO: checking for OCIStmtFetch2 in -lclntsh" >&5
-echo $ECHO_N "checking for OCIStmtFetch2 in -lclntsh... $ECHO_C" >&6
-if test "${ac_cv_lib_clntsh_OCIStmtFetch2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
+echo "configure:71111: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 71119 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char OCIStmtFetch2 ();
-int
-main ()
-{
-OCIStmtFetch2 ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_clntsh_OCIStmtFetch2=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_clntsh_OCIStmtFetch2=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIStmtFetch2" >&6
-if test $ac_cv_lib_clntsh_OCIStmtFetch2 = yes; then
+    builtin and then its argument prototype would still apply.  */
+char OCIStmtFetch2();
+
+int main() {
+OCIStmtFetch2()
+; return 0; }
+EOF
+if { (eval echo configure:71130: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+     cat >> confdefs.h <<\EOF
 #define HAVE_OCISTMTFETCH2 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIStmtFetch2
-
-
+    
+  
 fi
 
 
-
-
-  echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
-if test "${pdo_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+    
+  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:71169: 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 "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
+  
+    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:71175: 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
@@ -92064,21 +71179,19 @@
     elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$prefix/include/php/ext
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5
-echo "${ECHO_T}$pdo_inc_path" >&6
+
+echo "$ac_t""$pdo_inc_path" 1>&6
   if test -n "$pdo_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
   fi
 
+  
 
-
-
+  
   ext_builddir=ext/pdo_oci
   ext_srcdir=$abs_srcdir/ext/pdo_oci
 
@@ -92086,15 +71199,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PDO_OCI_SHARED=no
-
-
+    
+  
   case ext/pdo_oci in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -92107,12 +71220,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_oci.c oci_driver.c oci_statement.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
@@ -92136,14 +71249,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PDO_OCI_SHARED=yes
-
+      
   case ext/pdo_oci in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -92156,12 +71269,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pdo_oci="$shared_objects_pdo_oci $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -92179,7 +71292,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -92189,7 +71302,7 @@
       ;;
     *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_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(PDO_OCI_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_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_OCI, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -92202,7 +71315,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_oci.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
 
   cat >>Makefile.objects<<EOF
@@ -92216,7 +71329,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -92226,7 +71339,7 @@
       ;;
     *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_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(_OCI_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_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_OCI, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -92239,7 +71352,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_oci.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
 
   cat >>Makefile.objects<<EOF
@@ -92253,10 +71366,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PDO_OCI 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -92265,15 +71377,15 @@
     PHP_PDO_OCI_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pdo_oci in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -92286,12 +71398,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_oci.c oci_driver.c oci_statement.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
@@ -92311,15 +71423,15 @@
         EXT_STATIC="$EXT_STATIC pdo_oci"
         ;;
       *)
-
-
+        
+  
   case ext/pdo_oci in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -92332,13 +71444,13 @@
 
   old_IFS=$IFS
   for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -92358,77 +71470,64 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pdo_oci
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
 
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_SHARED_LIBADD"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_DIR"
 
+  
 
-
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_VERSION"
 
+  
 
 
-
-
-
+  
+    
   am_i_shared=$PHP_PDO_OCI_SHARED
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_oci to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_oci shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_oci to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_oci shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_oci, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_oci, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
+  
+  
 
-
-
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION"
-_ACEOF
+EOF
 
 fi
 
@@ -92439,19 +71538,19 @@
 
 php_with_pdo_odbc=no
 
-echo "$as_me:$LINENO: checking for ODBC v3 support for PDO" >&5
-echo $ECHO_N "checking for ODBC v3 support for PDO... $ECHO_C" >&6
-
+echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
+echo "configure:71543: 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"
   PHP_PDO_ODBC=$withval
 else
-
+  
   PHP_PDO_ODBC=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -92475,33 +71574,30 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
-
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 
 
+                                  
 if test "$PHP_PDO_ODBC" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
   fi
 
-
-
-  echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
-if test "${pdo_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
+  
+    
+  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:71595: 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:71601: 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
@@ -92509,22 +71605,20 @@
     elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$prefix/include/php/ext
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5
-echo "${ECHO_T}$pdo_inc_path" >&6
+
+echo "$ac_t""$pdo_inc_path" 1>&6
   if test -n "$pdo_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
   fi
 
+  
 
-
-  echo "$as_me:$LINENO: checking for selected PDO ODBC flavour" >&5
-echo $ECHO_N "checking for selected PDO ODBC flavour... $ECHO_C" >&6
+  echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
+echo "configure:71622: 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`"
@@ -92566,39 +71660,22 @@
         ;;
 
       *)
-        { { echo "$as_me:$LINENO: error: Unknown ODBC flavour $pdo_odbc_flavour
-                            include and lib dirs are looked for under 'dir'.
-
-                            'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
-                            If ',dir' part is omitted, default for the flavour
-                            you have selected will used. e.g.:
-
-                              --with-pdo-odbc=unixODBC
-
-                            will check for unixODBC under /usr/local. You may attempt
-                            to use an otherwise unsupported driver using the \"generic\"
-                            flavour.  The syntax for generic ODBC support is:
-
-                              --with-pdo-odbc=generic,dir,libname,ldflags,cflags
-
-                            When build as shared the extension filename is always pdo_odbc.so" >&5
-echo "$as_me: error: Unknown ODBC flavour $pdo_odbc_flavour
+        { echo "configure: error: Unknown ODBC flavour $pdo_odbc_flavour
                             include and lib dirs are looked for under 'dir'.
-
+                            
                             'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
-                            If ',dir' part is omitted, default for the flavour
+                            If ',dir' part is omitted, default for the flavour 
                             you have selected will used. e.g.:
-
+                            
                               --with-pdo-odbc=unixODBC
-
-                            will check for unixODBC under /usr/local. You may attempt
-                            to use an otherwise unsupported driver using the \"generic\"
+                              
+                            will check for unixODBC under /usr/local. You may attempt 
+                            to use an otherwise unsupported driver using the \"generic\" 
                             flavour.  The syntax for generic ODBC support is:
-
+                            
                               --with-pdo-odbc=generic,dir,libname,ldflags,cflags
 
-                            When build as shared the extension filename is always pdo_odbc.so" >&2;}
-   { (exit 1); exit 1; }; }
+                            When build as shared the extension filename is always pdo_odbc.so" 1>&2; exit 1; }
         ;;
   esac
 
@@ -92609,346 +71686,286 @@
     PDO_ODBC_INCDIR="$pdo_odbc_def_incdir"
     PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
   fi
-
-  echo "$as_me:$LINENO: result: $pdo_odbc_flavour
+  
+  echo "$ac_t""$pdo_odbc_flavour
           libs       $PDO_ODBC_LIBDIR,
-          headers    $PDO_ODBC_INCDIR" >&5
-echo "${ECHO_T}$pdo_odbc_flavour
-          libs       $PDO_ODBC_LIBDIR,
-          headers    $PDO_ODBC_INCDIR" >&6
+          headers    $PDO_ODBC_INCDIR" 1>&6
 
   if test ! -d "$PDO_ODBC_LIBDIR" ; then
-    { echo "$as_me:$LINENO: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5
-echo "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;}
+    echo "configure: warning: library dir $PDO_ODBC_LIBDIR does not exist" 1>&2
   fi
 
-
-  echo "$as_me:$LINENO: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for odbc.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71701: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ODBC_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for odbcsdk.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71715: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ODBCSDK_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for iodbc.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71729: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_IODBC_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqlunix.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71743: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_SQLUNIX_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqltypes.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71757: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_SQLTYPES_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqlucode.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71771: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_SQLUCODE_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for sql.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sql.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71785: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_SQL_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for isql.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for isql.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71799: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ISQL_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqlext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71813: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_SQLEXT_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for isqlext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71827: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ISQLEXT_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for udbcext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71841: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_UDBCEXT_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqlcli1.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71855: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_SQLCLI1_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for LibraryManager.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71869: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBRARYMANAGER_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0core.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71883: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_CLI0CORE_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0ext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71897: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_CLI0EXT_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0cli.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71911: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_CLI0CLI_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0defs.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71925: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_CLI0DEFS_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-
-  echo "$as_me:$LINENO: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0env.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6
+  
+  echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
+echo "configure:71939: 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 <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_CLI0ENV_H 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
 
   if test "$php_pdo_have_header" != "yes"; then
-    { { echo "$as_me:$LINENO: error: Cannot find header file(s) for pdo_odbc" >&5
-echo "$as_me: error: Cannot find header file(s) for pdo_odbc" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find header file(s) for pdo_odbc" 1>&2; exit 1; }
   fi
 
   PDO_ODBC_INCLUDE="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\"$pdo_odbc_flavour\\\""
   PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib"
 
-
+  
   for ac_i in $PDO_ODBC_LDFLAGS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -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"
@@ -92959,20 +71976,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -l$ac_ii"
+        PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -92985,42 +72002,42 @@
     ;;
     -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
         PDO_ODBC_SHARED_LIBADD="-L$ai_p $PDO_ODBC_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_ODBC_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
 
     ;;
@@ -93028,23 +72045,23 @@
   done
 
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="$PDO_ODBC_LDFLAGS"
-
+  
   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"
@@ -93055,20 +72072,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -93081,135 +72098,104 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLBindCol" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
-echo $ECHO_N "checking for SQLBindCol in -l$pdo_odbc_def_lib... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
+echo "configure:72145: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$pdo_odbc_def_lib  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 72153 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char SQLBindCol ();
-int
-main ()
-{
-SQLBindCol ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char SQLBindCol();
+
+int main() {
+SQLBindCol()
+; return 0; }
+EOF
+if { (eval echo configure:72164: \"$ac_link\") 1>&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
-
-
+    
+            
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="$PDO_ODBC_LDFLAGS"
-
+  
   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"
@@ -93220,20 +72206,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -93246,158 +72232,120 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLAllocHandle" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
-echo $ECHO_N "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
+echo "configure:72279: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$pdo_odbc_def_lib  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 72287 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char SQLAllocHandle ();
-int
-main ()
-{
-SQLAllocHandle ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char SQLAllocHandle();
+
+int main() {
+SQLAllocHandle()
+; return 0; }
+EOF
+if { (eval echo configure:72298: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle
-
-      { { echo "$as_me:$LINENO: error:
-Your ODBC library does not appear to be ODBC 3 compatible.
-You should consider using iODBC or unixODBC instead, and loading your
-libraries as a driver in that environment; it will emulate the
-functions required for PDO support.
-" >&5
-echo "$as_me: error:
+    
+      { echo "configure: error: 
 Your ODBC library does not appear to be ODBC 3 compatible.
 You should consider using iODBC or unixODBC instead, and loading your
 libraries as a driver in that environment; it will emulate the
 functions required for PDO support.
-" >&2;}
-   { (exit 1); exit 1; }; }
-
+" 1>&2; exit 1; }
+  
 fi
 
-
-
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol
-
-    { { echo "$as_me:$LINENO: error: Your ODBC library does not exist or there was an error. Check config.log for more information" >&5
-echo "$as_me: error: Your ODBC library does not exist or there was an error. Check config.log for more information" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: Your ODBC library does not exist or there was an error. Check config.log for more information" 1>&2; exit 1; }
+  
+  
 fi
 
 
-
+  
   ext_builddir=ext/pdo_odbc
   ext_srcdir=$abs_srcdir/ext/pdo_odbc
 
@@ -93405,15 +72353,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PDO_ODBC_SHARED=no
-
-
+    
+  
   case ext/pdo_odbc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -93426,12 +72374,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.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
@@ -93455,14 +72403,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PDO_ODBC_SHARED=yes
-
+      
   case ext/pdo_odbc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -93475,12 +72423,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pdo_odbc="$shared_objects_pdo_odbc $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -93498,7 +72446,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -93508,7 +72456,7 @@
       ;;
     *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_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(PDO_ODBC_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_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_ODBC, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -93521,7 +72469,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_odbc.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
 
   cat >>Makefile.objects<<EOF
@@ -93535,7 +72483,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -93545,7 +72493,7 @@
       ;;
     *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_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(_ODBC_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_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_ODBC, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -93558,7 +72506,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_odbc.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
 
   cat >>Makefile.objects<<EOF
@@ -93572,10 +72520,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PDO_ODBC 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -93584,15 +72531,15 @@
     PHP_PDO_ODBC_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pdo_odbc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -93605,12 +72552,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.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
@@ -93630,15 +72577,15 @@
         EXT_STATIC="$EXT_STATIC pdo_odbc"
         ;;
       *)
-
-
+        
+  
   case ext/pdo_odbc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -93651,13 +72598,13 @@
 
   old_IFS=$IFS
   for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -93677,74 +72624,62 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pdo_odbc
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_ODBC_SHARED_LIBADD"
 
-
-
+  
+    
   am_i_shared=$PHP_PDO_ODBC_SHARED
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_odbc to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_odbc shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_odbc to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_odbc shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_odbc, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_odbc, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
 fi
 
 
 
 php_with_pdo_pgsql=no
 
-echo "$as_me:$LINENO: checking for PostgreSQL support for PDO" >&5
-echo $ECHO_N "checking for PostgreSQL support for PDO... $ECHO_C" >&6
-
+echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
+echo "configure:72672: 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"
   PHP_PDO_PGSQL=$withval
 else
-
+  
   PHP_PDO_PGSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_PGSQL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -93768,8 +72703,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -93777,25 +72711,23 @@
 if test "$PHP_PDO_PGSQL" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
   fi
 
-
+  
   if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
     PGSQL_INCLUDE=$PGSQL_INCLUDE
   else
-
+    
     ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
   fi
 
 
-  echo "$as_me:$LINENO: checking for pg_config" >&5
-echo $ECHO_N "checking for pg_config... $ECHO_C" >&6
+  echo $ac_n "checking for pg_config""... $ac_c" 1>&6
+echo "configure:72731: 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"
@@ -93804,41 +72736,37 @@
   done
 
   if test -n "$PG_CONFIG"; then
-    echo "$as_me:$LINENO: result: $PG_CONFIG" >&5
-echo "${ECHO_T}$PG_CONFIG" >&6
+    echo "$ac_t""$PG_CONFIG" 1>&6
     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_PG_CONFIG_H 1
-_ACEOF
+EOF
 
   else
-    echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+    echo "$ac_t""not found" 1>&6
     if test "$PHP_PDO_PGSQL" = "yes"; then
       PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
     else
       PGSQL_SEARCH_PATHS=$PHP_PDO_PGSQL
     fi
-
+  
     for i in $PGSQL_SEARCH_PATHS; do
       for j in include include/pgsql include/postgres include/postgresql ""; do
         if test -r "$i/$j/libpq-fe.h"; then
           PGSQL_INC_BASE=$i
           PGSQL_INCLUDE=$i/$j
           if test -r "$i/$j/pg_config.h"; then
-
-cat >>confdefs.h <<\_ACEOF
+            cat >> confdefs.h <<\EOF
 #define HAVE_PG_CONFIG_H 1
-_ACEOF
+EOF
 
           fi
         fi
       done
 
       for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
-        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
+        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 
           PGSQL_LIBDIR=$i/$j
         fi
       done
@@ -93846,546 +72774,387 @@
   fi
 
   if test -z "$PGSQL_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&5
-echo "$as_me: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
   fi
 
   if test -z "$PGSQL_LIBDIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&5
-echo "$as_me: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
   fi
 
   if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
-    { { echo "$as_me:$LINENO: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&5
-echo "$as_me: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_PDO_PGSQL 1
-_ACEOF
+EOF
 
 
-  echo "$as_me:$LINENO: checking for openssl dependencies" >&5
-echo $ECHO_N "checking for openssl dependencies... $ECHO_C" >&6
+  echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
+echo "configure:72795: checking for openssl dependencies" >&5
   grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1
   if test $? -eq 0 ; then
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:72802: 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
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
+  case "$PKG_CONFIG" in
+  /*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  echo "$ac_t""$PKG_CONFIG" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
     if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
       PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags`
     fi
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-  echo "$as_me:$LINENO: checking for PQparameterStatus in -lpq" >&5
-echo $ECHO_N "checking for PQparameterStatus in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
+echo "configure:72846: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 72854 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQparameterStatus ();
-int
-main ()
-{
-PQparameterStatus ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQparameterStatus=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQparameterStatus=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQparameterStatus" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQparameterStatus" >&6
-if test $ac_cv_lib_pq_PQparameterStatus = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQparameterStatus();
+
+int main() {
+PQparameterStatus()
+; return 0; }
+EOF
+if { (eval echo configure:72865: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQPARAMETERSTATUS 1
-_ACEOF
+EOF
 
 else
+  echo "$ac_t""no" 1>&6
 
     echo "Unable to build the PDO PostgreSQL driver: libpq 7.4+ is required"
     exit 1
-
+  
 fi
 
 
-  echo "$as_me:$LINENO: checking for PQprepare in -lpq" >&5
-echo $ECHO_N "checking for PQprepare in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQprepare+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
+echo "configure:72894: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 72902 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQprepare ();
-int
-main ()
-{
-PQprepare ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQprepare=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQprepare=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQprepare" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQprepare" >&6
-if test $ac_cv_lib_pq_PQprepare = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQprepare();
+
+int main() {
+PQprepare()
+; return 0; }
+EOF
+if { (eval echo configure:72913: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQPREPARE 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQescapeStringConn in -lpq" >&5
-echo $ECHO_N "checking for PQescapeStringConn in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
+echo "configure:72937: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 72945 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQescapeStringConn ();
-int
-main ()
-{
-PQescapeStringConn ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQescapeStringConn=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQescapeStringConn=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeStringConn" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeStringConn" >&6
-if test $ac_cv_lib_pq_PQescapeStringConn = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQescapeStringConn();
+
+int main() {
+PQescapeStringConn()
+; return 0; }
+EOF
+if { (eval echo configure:72956: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQESCAPE_CONN 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQescapeByteaConn in -lpq" >&5
-echo $ECHO_N "checking for PQescapeByteaConn in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
+echo "configure:72980: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 72988 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQescapeByteaConn ();
-int
-main ()
-{
-PQescapeByteaConn ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQescapeByteaConn=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQescapeByteaConn=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeByteaConn" >&6
-if test $ac_cv_lib_pq_PQescapeByteaConn = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQescapeByteaConn();
+
+int main() {
+PQescapeByteaConn()
+; return 0; }
+EOF
+if { (eval echo configure:72999: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQESCAPE_BYTEA_CONN 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
 
-  echo "$as_me:$LINENO: checking for pg_encoding_to_char in -lpq" >&5
-echo $ECHO_N "checking for pg_encoding_to_char in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
+echo "configure:73024: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 73032 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pg_encoding_to_char ();
-int
-main ()
-{
-pg_encoding_to_char ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_pg_encoding_to_char=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_pg_encoding_to_char=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_pg_encoding_to_char" >&6
-if test $ac_cv_lib_pq_pg_encoding_to_char = yes; then
+    builtin and then its argument prototype would still apply.  */
+char pg_encoding_to_char();
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
-_ACEOF
+int main() {
+pg_encoding_to_char()
+; return 0; }
+EOF
+if { (eval echo configure:73043: \"$ac_link\") 1>&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
+  cat >> confdefs.h <<\EOF
+#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
+fi
 
+  
 
   LIBS=$old_LIBS
   LDFLAGS=$old_LDFLAGS
 
-
+  
 
   if test "$ext_shared" = "yes"; then
     PDO_PGSQL_SHARED_LIBADD="-lpq $PDO_PGSQL_SHARED_LIBADD"
     if test -n "$PGSQL_LIBDIR"; then
-
+      
   if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PGSQL_LIBDIR
   else
-
+    
     ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PDO_PGSQL_SHARED_LIBADD="-L$ai_p $PDO_PGSQL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_PGSQL_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 "$PGSQL_LIBDIR"; then
-
+    
   if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PGSQL_LIBDIR
   else
-
+    
     ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PGSQL_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 pq in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lpq $LIBS"
+  *) 
+      LIBS="-lpq $LIBS" 
    ;;
   esac
 
@@ -94395,52 +73164,52 @@
   fi
 
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_PGSQL_SHARED_LIBADD"
 
 
-
+  
   if test "$PGSQL_INCLUDE" != "/usr/include"; then
-
+    
   if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
     ai_p=$PGSQL_INCLUDE
   else
-
+    
     ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
   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 "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
-if test "${pdo_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+    
+  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:73207: 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 "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
+  
+    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:73213: 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
@@ -94448,21 +73217,19 @@
     elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$prefix/include/php/ext
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5
-echo "${ECHO_T}$pdo_inc_path" >&6
+
+echo "$ac_t""$pdo_inc_path" 1>&6
   if test -n "$pdo_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
   fi
 
+  
 
-
-
+  
   ext_builddir=ext/pdo_pgsql
   ext_srcdir=$abs_srcdir/ext/pdo_pgsql
 
@@ -94470,15 +73237,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PDO_PGSQL_SHARED=no
-
-
+    
+  
   case ext/pdo_pgsql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -94491,12 +73258,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.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
@@ -94520,14 +73287,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PDO_PGSQL_SHARED=yes
-
+      
   case ext/pdo_pgsql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -94540,12 +73307,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pdo_pgsql="$shared_objects_pdo_pgsql $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -94563,7 +73330,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -94573,7 +73340,7 @@
       ;;
     *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_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(PDO_PGSQL_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_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_PGSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -94586,7 +73353,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_pgsql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
 
   cat >>Makefile.objects<<EOF
@@ -94600,7 +73367,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -94610,7 +73377,7 @@
       ;;
     *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_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(_PGSQL_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_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_PGSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -94623,7 +73390,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_pgsql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
 
   cat >>Makefile.objects<<EOF
@@ -94637,10 +73404,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PDO_PGSQL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -94649,15 +73415,15 @@
     PHP_PDO_PGSQL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pdo_pgsql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -94670,12 +73436,12 @@
 
   old_IFS=$IFS
   for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.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
@@ -94695,15 +73461,15 @@
         EXT_STATIC="$EXT_STATIC pdo_pgsql"
         ;;
       *)
-
-
+        
+  
   case ext/pdo_pgsql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -94716,13 +73482,13 @@
 
   old_IFS=$IFS
   for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -94742,71 +73508,59 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pdo_pgsql
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+    
   am_i_shared=$PHP_PDO_PGSQL_SHARED
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_pgsql to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_pgsql shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_pgsql to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_pgsql shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_pgsql, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_pgsql, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+   
+  
 fi
 
 
 
 php_with_pdo_sqlite=$PHP_PDO
 
-echo "$as_me:$LINENO: checking for sqlite 3 support for PDO" >&5
-echo $ECHO_N "checking for sqlite 3 support for PDO... $ECHO_C" >&6
-
+echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
+echo "configure:73553: 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"
   PHP_PDO_SQLITE=$withval
 else
-
+  
   PHP_PDO_SQLITE=$PHP_PDO
   test "$PHP_ENABLE_ALL" && PHP_PDO_SQLITE=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -94830,8 +73584,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -94839,21 +73592,19 @@
 if test "$PHP_PDO_SQLITE" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
   fi
 
-
-
-  echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
-if test "${pdo_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
+  
+    
+  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:73602: 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:73608: 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
@@ -94861,19 +73612,17 @@
     elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$prefix/include/php/ext
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5
-echo "${ECHO_T}$pdo_inc_path" >&6
+
+echo "$ac_t""$pdo_inc_path" 1>&6
   if test -n "$pdo_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
   fi
 
-
+  
 
   php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
 
@@ -94883,51 +73632,47 @@
     if test -r $PHP_PDO_SQLITE/$SEARCH_FOR; then # path given as parameter
       PDO_SQLITE_DIR=$PHP_PDO_SQLITE
     else # search default path list
-      echo "$as_me:$LINENO: checking for sqlite3 files in default path" >&5
-echo $ECHO_N "checking for sqlite3 files in default path... $ECHO_C" >&6
+      echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
+echo "configure:73637: 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
-          echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6
+          echo "$ac_t""found in $i" 1>&6
         fi
       done
     fi
     if test -z "$PDO_SQLITE_DIR"; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-      { { echo "$as_me:$LINENO: error: Please reinstall the sqlite3 distribution" >&5
-echo "$as_me: error: Please reinstall the sqlite3 distribution" >&2;}
-   { (exit 1); exit 1; }; }
+      echo "$ac_t""not found" 1>&6
+      { echo "configure: error: Please reinstall the sqlite3 distribution" 1>&2; exit 1; }
     fi
 
-
+    
   if test "$PDO_SQLITE_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$PDO_SQLITE_DIR/include" || echo "$PDO_SQLITE_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$PDO_SQLITE_DIR/include
   else
-
+    
     ep_dir="`echo $PDO_SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/include\"`"
   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
@@ -94936,25 +73681,25 @@
     LIBNAME=sqlite3
     LIBSYMBOL=sqlite3_open
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$PDO_SQLITE_DIR/$PHP_LIBDIR -lm
     "
-
+  
   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"
@@ -94965,20 +73710,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -94991,206 +73736,175 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIBNAME''_$LIBSYMBOL" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $LIBSYMBOL in -l$LIBNAME" >&5
-echo $ECHO_N "checking for $LIBSYMBOL in -l$LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
+echo "configure:73783: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 73791 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $LIBSYMBOL ();
-int
-main ()
-{
-$LIBSYMBOL ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char $LIBSYMBOL();
+
+int main() {
+$LIBSYMBOL()
+; return 0; }
+EOF
+if { (eval echo configure:73802: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
     PDO_SQLITE_SHARED_LIBADD="-l$LIBNAME $PDO_SQLITE_SHARED_LIBADD"
     if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PDO_SQLITE_SHARED_LIBADD="-L$ai_p $PDO_SQLITE_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PDO_SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_SQLITE_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 "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
   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 $LIBNAME in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$LIBNAME $LIBS"
+  *) 
+      LIBS="-l$LIBNAME $LIBS" 
    ;;
   esac
 
@@ -95200,43 +73914,41 @@
   fi
 
 
+      cat >> confdefs.h <<\EOF
+#define HAVE_PDO_SQLITELIB 1
+EOF
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PDO_SQLITELIB 1
-_ACEOF
-
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
-
-      { { echo "$as_me:$LINENO: error: wrong sqlite lib version or lib not found" >&5
-echo "$as_me: error: wrong sqlite lib version or lib not found" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
+    
+  
 fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=""
-
+  
   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"
@@ -95247,20 +73959,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -95273,138 +73985,108 @@
     ;;
     -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 "$as_me:$LINENO: checking for sqlite3_key in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_key in -lsqlite3... $ECHO_C" >&6
-if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
+echo "configure:74032: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsqlite3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 74040 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char sqlite3_key ();
-int
-main ()
-{
-sqlite3_key ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sqlite3_sqlite3_key=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sqlite3_sqlite3_key=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_key" >&6
-if test $ac_cv_lib_sqlite3_sqlite3_key = yes; then
+    builtin and then its argument prototype would still apply.  */
+char sqlite3_key();
+
+int main() {
+sqlite3_key()
+; return 0; }
+EOF
+if { (eval echo configure:74051: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+      cat >> confdefs.h <<\EOF
 #define HAVE_SQLITE3_KEY 1
-_ACEOF
-
-
+EOF
 
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_key
-
-
+    
+  
 fi
 
 
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD"
 
-
+    
   ext_builddir=ext/pdo_sqlite
   ext_srcdir=$abs_srcdir/ext/pdo_sqlite
 
@@ -95412,15 +74094,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PDO_SQLITE_SHARED=no
-
-
+    
+  
   case ext/pdo_sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -95433,12 +74115,12 @@
 
   old_IFS=$IFS
   for ac_src in $php_pdo_sqlite_sources_core; 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
@@ -95462,14 +74144,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PDO_SQLITE_SHARED=yes
-
+      
   case ext/pdo_sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -95482,12 +74164,12 @@
 
   old_IFS=$IFS
   for ac_src in $php_pdo_sqlite_sources_core; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -95505,7 +74187,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -95515,7 +74197,7 @@
       ;;
     *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_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(PDO_SQLITE_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_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -95528,7 +74210,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
 
   cat >>Makefile.objects<<EOF
@@ -95542,7 +74224,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -95552,7 +74234,7 @@
       ;;
     *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_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(_SQLITE_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_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -95565,7 +74247,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
 
   cat >>Makefile.objects<<EOF
@@ -95579,10 +74261,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PDO_SQLITE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -95591,15 +74272,15 @@
     PHP_PDO_SQLITE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pdo_sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -95612,12 +74293,12 @@
 
   old_IFS=$IFS
   for ac_src in $php_pdo_sqlite_sources_core; 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
@@ -95637,15 +74318,15 @@
         EXT_STATIC="$EXT_STATIC pdo_sqlite"
         ;;
       *)
-
-
+        
+  
   case ext/pdo_sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -95658,13 +74339,13 @@
 
   old_IFS=$IFS
   for ac_src in $php_pdo_sqlite_sources_core; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -95684,15 +74365,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pdo_sqlite
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -95712,15 +74393,15 @@
       fi
 
       if test "$PHP_SQLITE3" != "yes"; then
-
-
+        
+  
   case ext/sqlite3 in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -95733,12 +74414,12 @@
 
   old_IFS=$IFS
   for ac_src in libsqlite/sqlite3.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
@@ -95757,7 +74438,7 @@
 
       fi
 
-
+      
   ext_builddir=ext/pdo_sqlite
   ext_srcdir=$abs_srcdir/ext/pdo_sqlite
 
@@ -95765,15 +74446,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PDO_SQLITE_SHARED=no
-
-
+    
+  
   case ext/pdo_sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -95786,12 +74467,12 @@
 
   old_IFS=$IFS
   for ac_src in $php_pdo_sqlite_sources_core; 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
@@ -95815,14 +74496,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PDO_SQLITE_SHARED=yes
-
+      
   case ext/pdo_sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -95835,12 +74516,12 @@
 
   old_IFS=$IFS
   for ac_src in $php_pdo_sqlite_sources_core; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -95858,7 +74539,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -95868,7 +74549,7 @@
       ;;
     *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_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(PDO_SQLITE_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_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -95881,7 +74562,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
 
   cat >>Makefile.objects<<EOF
@@ -95895,7 +74576,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -95905,7 +74586,7 @@
       ;;
     *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_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(_SQLITE_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_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -95918,7 +74599,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
 
   cat >>Makefile.objects<<EOF
@@ -95932,10 +74613,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PDO_SQLITE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -95944,15 +74624,15 @@
     PHP_PDO_SQLITE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pdo_sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -95965,12 +74645,12 @@
 
   old_IFS=$IFS
   for ac_src in $php_pdo_sqlite_sources_core; 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
@@ -95990,15 +74670,15 @@
         EXT_STATIC="$EXT_STATIC pdo_sqlite"
         ;;
       *)
-
-
+        
+  
   case ext/pdo_sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -96011,13 +74691,13 @@
 
   old_IFS=$IFS
   for ac_src in $php_pdo_sqlite_sources_core; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -96037,358 +74717,188 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pdo_sqlite
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
 
-
+      
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD"
 
-
+      
   am_i_shared=$PHP_PDO_SQLITE_SHARED
   is_it_shared=$PHP_SQLITE3_SHARED
   is_it_enabled=$PHP_SQLITE3
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_sqlite to build statically, but it
-depends on extension sqlite3, which you've configured to build shared.
-You either need to build pdo_sqlite shared or build sqlite3 statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_sqlite to build statically, but it
 depends on extension sqlite3, which you've configured to build shared.
 You either need to build pdo_sqlite shared or build sqlite3 statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_sqlite, which depends on extension sqlite3,
-but you've either not enabled sqlite3, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_sqlite, which depends on extension sqlite3,
 but you've either not enabled sqlite3, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+      
   if test "$abs_srcdir/ext/sqlite3/libsqlite" != "/usr/include"; then
-
+    
   if test -z "$abs_srcdir/ext/sqlite3/libsqlite" || echo "$abs_srcdir/ext/sqlite3/libsqlite" | grep '^/' >/dev/null ; then
     ai_p=$abs_srcdir/ext/sqlite3/libsqlite
   else
-
+    
     ep_dir="`echo $abs_srcdir/ext/sqlite3/libsqlite|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$abs_srcdir/ext/sqlite3/libsqlite\"`"
   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
 
 
-
-
-for ac_func in usleep nanosleep
+      for ac_func in usleep nanosleep
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:74792: 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 74797 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:74820: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
-
-for ac_header in time.h
+      for ac_hdr in time.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:74848: 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 74853 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:74858: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
   fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=""
-
+  
   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"
@@ -96399,20 +74909,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -96425,130 +74935,100 @@
     ;;
     -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 "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
-echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6
-if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
+echo "configure:74982: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 74990 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char fdatasync ();
-int
-main ()
-{
-fdatasync ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_rt_fdatasync=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_rt_fdatasync=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5
-echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6
-if test $ac_cv_lib_rt_fdatasync = yes; then
+    builtin and then its argument prototype would still apply.  */
+char fdatasync();
+
+int main() {
+fdatasync()
+; return 0; }
+EOF
+if { (eval echo configure:75001: \"$ac_link\") 1>&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
-
-
+    
+  
   case rt in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        PDO_SQLITE_SHARED_LIBADD="-lrt $PDO_SQLITE_SHARED_LIBADD"
+        PDO_SQLITE_SHARED_LIBADD="-lrt $PDO_SQLITE_SHARED_LIBADD" 
     else
-
-
+      
+  
   case rt in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lrt $LIBS"
+  *) 
+      LIBS="-lrt $LIBS" 
    ;;
   esac
 
@@ -96558,69 +75038,58 @@
   esac
 
 
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_rt_fdatasync
-
-
+    
+  
 fi
 
 
-
-
+  
+    
   am_i_shared=$PHP_PDO_SQLITE_SHARED
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_sqlite to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_sqlite shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension pdo_sqlite to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_sqlite shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension pdo_sqlite, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_sqlite, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
 fi
 
 
 
 php_with_pgsql=no
 
-echo "$as_me:$LINENO: checking for PostgreSQL support" >&5
-echo $ECHO_N "checking for PostgreSQL support... $ECHO_C" >&6
-
+echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
+echo "configure:75082: checking for PostgreSQL support" >&5
 # Check whether --with-pgsql or --without-pgsql was given.
 if test "${with_pgsql+set}" = set; then
   withval="$with_pgsql"
   PHP_PGSQL=$withval
 else
-
+  
   PHP_PGSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PGSQL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -96644,27 +75113,26 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_PGSQL" != "no"; then
-
+  
   if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
     PGSQL_INCLUDE=$PGSQL_INCLUDE
   else
-
+    
     ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
   fi
 
 
-  echo "$as_me:$LINENO: checking for pg_config" >&5
-echo $ECHO_N "checking for pg_config... $ECHO_C" >&6
+  echo $ac_n "checking for pg_config""... $ac_c" 1>&6
+echo "configure:75136: 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"
@@ -96673,43 +75141,39 @@
   done
 
   if test -n "$PG_CONFIG"; then
-    echo "$as_me:$LINENO: result: $PG_CONFIG" >&5
-echo "${ECHO_T}$PG_CONFIG" >&6
+    echo "$ac_t""$PG_CONFIG" 1>&6
     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
     if test -r "$PGSQL_INCLUDE/pg_config.h"; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_PG_CONFIG_H 1
-_ACEOF
+EOF
 
     fi
   else
-    echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+    echo "$ac_t""not found" 1>&6
     if test "$PHP_PGSQL" = "yes"; then
       PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
     else
       PGSQL_SEARCH_PATHS=$PHP_PGSQL
     fi
-
+  
     for i in $PGSQL_SEARCH_PATHS; do
       for j in include include/pgsql include/postgres include/postgresql ""; do
         if test -r "$i/$j/libpq-fe.h"; then
           PGSQL_INC_BASE=$i
           PGSQL_INCLUDE=$i/$j
           if test -r "$i/$j/pg_config.h"; then
-
-cat >>confdefs.h <<\_ACEOF
+            cat >> confdefs.h <<\EOF
 #define HAVE_PG_CONFIG_H 1
-_ACEOF
+EOF
 
           fi
         fi
       done
 
       for j in lib $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
-        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
+        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 
           PGSQL_LIBDIR=$i/$j
         fi
       done
@@ -96717,2066 +75181,1276 @@
   fi
 
   if test -z "$PGSQL_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&5
-echo "$as_me: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
   fi
 
   if test -z "$PGSQL_LIBDIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&5
-echo "$as_me: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
   fi
 
   if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
-    { { echo "$as_me:$LINENO: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&5
-echo "$as_me: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_PGSQL 1
-_ACEOF
+EOF
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-  echo "$as_me:$LINENO: checking for PQescapeString in -lpq" >&5
-echo $ECHO_N "checking for PQescapeString in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQescapeString+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
+echo "configure:75204: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75212 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQescapeString ();
-int
-main ()
-{
-PQescapeString ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQescapeString=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQescapeString=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeString" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeString" >&6
-if test $ac_cv_lib_pq_PQescapeString = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQescapeString();
+
+int main() {
+PQescapeString()
+; return 0; }
+EOF
+if { (eval echo configure:75223: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQESCAPE 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQunescapeBytea in -lpq" >&5
-echo $ECHO_N "checking for PQunescapeBytea in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQunescapeBytea+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
+echo "configure:75247: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75255 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQunescapeBytea ();
-int
-main ()
-{
-PQunescapeBytea ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQunescapeBytea=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQunescapeBytea=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQunescapeBytea" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQunescapeBytea" >&6
-if test $ac_cv_lib_pq_PQunescapeBytea = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQunescapeBytea();
+
+int main() {
+PQunescapeBytea()
+; return 0; }
+EOF
+if { (eval echo configure:75266: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQUNESCAPEBYTEA 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQsetnonblocking in -lpq" >&5
-echo $ECHO_N "checking for PQsetnonblocking in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQsetnonblocking+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
+echo "configure:75290: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75298 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQsetnonblocking ();
-int
-main ()
-{
-PQsetnonblocking ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQsetnonblocking=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQsetnonblocking=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsetnonblocking" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsetnonblocking" >&6
-if test $ac_cv_lib_pq_PQsetnonblocking = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQsetnonblocking();
 
-cat >>confdefs.h <<\_ACEOF
+int main() {
+PQsetnonblocking()
+; return 0; }
+EOF
+if { (eval echo configure:75309: \"$ac_link\") 1>&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
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQSETNONBLOCKING 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQcmdTuples in -lpq" >&5
-echo $ECHO_N "checking for PQcmdTuples in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQcmdTuples+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
+echo "configure:75333: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75341 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQcmdTuples ();
-int
-main ()
-{
-PQcmdTuples ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQcmdTuples=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQcmdTuples=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQcmdTuples" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQcmdTuples" >&6
-if test $ac_cv_lib_pq_PQcmdTuples = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQcmdTuples();
+
+int main() {
+PQcmdTuples()
+; return 0; }
+EOF
+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
+  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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQCMDTUPLES 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQoidValue in -lpq" >&5
-echo $ECHO_N "checking for PQoidValue in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQoidValue+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
+echo "configure:75376: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75384 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQoidValue ();
-int
-main ()
-{
-PQoidValue ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQoidValue=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQoidValue=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQoidValue" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQoidValue" >&6
-if test $ac_cv_lib_pq_PQoidValue = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQoidValue();
+
+int main() {
+PQoidValue()
+; return 0; }
+EOF
+if { (eval echo configure:75395: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQOIDVALUE 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQclientEncoding in -lpq" >&5
-echo $ECHO_N "checking for PQclientEncoding in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQclientEncoding+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
+echo "configure:75419: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75427 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQclientEncoding ();
-int
-main ()
-{
-PQclientEncoding ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQclientEncoding=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQclientEncoding=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQclientEncoding" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQclientEncoding" >&6
-if test $ac_cv_lib_pq_PQclientEncoding = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQclientEncoding();
+
+int main() {
+PQclientEncoding()
+; return 0; }
+EOF
+if { (eval echo configure:75438: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQCLIENTENCODING 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQparameterStatus in -lpq" >&5
-echo $ECHO_N "checking for PQparameterStatus in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
+echo "configure:75462: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75470 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQparameterStatus ();
-int
-main ()
-{
-PQparameterStatus ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQparameterStatus=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQparameterStatus=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQparameterStatus" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQparameterStatus" >&6
-if test $ac_cv_lib_pq_PQparameterStatus = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQparameterStatus();
+
+int main() {
+PQparameterStatus()
+; return 0; }
+EOF
+if { (eval echo configure:75481: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQPARAMETERSTATUS 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQprotocolVersion in -lpq" >&5
-echo $ECHO_N "checking for PQprotocolVersion in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQprotocolVersion+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
+echo "configure:75505: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75513 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQprotocolVersion ();
-int
-main ()
-{
-PQprotocolVersion ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQprotocolVersion=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQprotocolVersion=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQprotocolVersion" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQprotocolVersion" >&6
-if test $ac_cv_lib_pq_PQprotocolVersion = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQprotocolVersion();
+
+int main() {
+PQprotocolVersion()
+; return 0; }
+EOF
+if { (eval echo configure:75524: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQPROTOCOLVERSION 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQtransactionStatus in -lpq" >&5
-echo $ECHO_N "checking for PQtransactionStatus in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQtransactionStatus+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
+echo "configure:75548: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75556 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQtransactionStatus ();
-int
-main ()
-{
-PQtransactionStatus ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQtransactionStatus=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQtransactionStatus=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQtransactionStatus" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQtransactionStatus" >&6
-if test $ac_cv_lib_pq_PQtransactionStatus = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQtransactionStatus();
+
+int main() {
+PQtransactionStatus()
+; return 0; }
+EOF
+if { (eval echo configure:75567: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PGTRANSACTIONSTATUS 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQexecParams in -lpq" >&5
-echo $ECHO_N "checking for PQexecParams in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQexecParams+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
+echo "configure:75591: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75599 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQexecParams ();
-int
-main ()
-{
-PQexecParams ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQexecParams=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQexecParams=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQexecParams" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQexecParams" >&6
-if test $ac_cv_lib_pq_PQexecParams = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQexecParams();
+
+int main() {
+PQexecParams()
+; return 0; }
+EOF
+if { (eval echo configure:75610: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQEXECPARAMS 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQprepare in -lpq" >&5
-echo $ECHO_N "checking for PQprepare in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQprepare+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
+echo "configure:75634: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75642 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQprepare ();
-int
-main ()
-{
-PQprepare ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQprepare=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQprepare=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQprepare" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQprepare" >&6
-if test $ac_cv_lib_pq_PQprepare = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQprepare();
 
-cat >>confdefs.h <<\_ACEOF
+int main() {
+PQprepare()
+; return 0; }
+EOF
+if { (eval echo configure:75653: \"$ac_link\") 1>&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
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQPREPARE 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQexecPrepared in -lpq" >&5
-echo $ECHO_N "checking for PQexecPrepared in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQexecPrepared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6
+echo "configure:75677: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75685 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQexecPrepared ();
-int
-main ()
-{
-PQexecPrepared ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQexecPrepared=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQexecPrepared=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQexecPrepared" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQexecPrepared" >&6
-if test $ac_cv_lib_pq_PQexecPrepared = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQexecPrepared();
+
+int main() {
+PQexecPrepared()
+; return 0; }
+EOF
+if { (eval echo configure:75696: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQEXECPREPARED 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQresultErrorField in -lpq" >&5
-echo $ECHO_N "checking for PQresultErrorField in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQresultErrorField+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
+echo "configure:75720: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75728 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQresultErrorField ();
-int
-main ()
-{
-PQresultErrorField ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQresultErrorField=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQresultErrorField=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQresultErrorField" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQresultErrorField" >&6
-if test $ac_cv_lib_pq_PQresultErrorField = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQresultErrorField();
+
+int main() {
+PQresultErrorField()
+; return 0; }
+EOF
+if { (eval echo configure:75739: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQRESULTERRORFIELD 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQsendQueryParams in -lpq" >&5
-echo $ECHO_N "checking for PQsendQueryParams in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQsendQueryParams+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6
+echo "configure:75763: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75771 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQsendQueryParams ();
-int
-main ()
-{
-PQsendQueryParams ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQsendQueryParams=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQsendQueryParams=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryParams" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryParams" >&6
-if test $ac_cv_lib_pq_PQsendQueryParams = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQsendQueryParams();
+
+int main() {
+PQsendQueryParams()
+; return 0; }
+EOF
+if { (eval echo configure:75782: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQSENDQUERYPARAMS 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQsendPrepare in -lpq" >&5
-echo $ECHO_N "checking for PQsendPrepare in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQsendPrepare+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6
+echo "configure:75806: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75814 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQsendPrepare ();
-int
-main ()
-{
-PQsendPrepare ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQsendPrepare=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQsendPrepare=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendPrepare" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendPrepare" >&6
-if test $ac_cv_lib_pq_PQsendPrepare = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQsendPrepare();
+
+int main() {
+PQsendPrepare()
+; return 0; }
+EOF
+if { (eval echo configure:75825: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQSENDPREPARE 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
-echo $ECHO_N "checking for PQsendQueryPrepared in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6
+echo "configure:75849: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75857 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQsendQueryPrepared ();
-int
-main ()
-{
-PQsendQueryPrepared ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQsendQueryPrepared=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQsendQueryPrepared=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryPrepared" >&6
-if test $ac_cv_lib_pq_PQsendQueryPrepared = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQsendQueryPrepared();
+
+int main() {
+PQsendQueryPrepared()
+; return 0; }
+EOF
+if { (eval echo configure:75868: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQSENDQUERYPREPARED 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQputCopyData in -lpq" >&5
-echo $ECHO_N "checking for PQputCopyData in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQputCopyData+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6
+echo "configure:75892: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75900 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQputCopyData ();
-int
-main ()
-{
-PQputCopyData ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQputCopyData=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQputCopyData=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQputCopyData" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQputCopyData" >&6
-if test $ac_cv_lib_pq_PQputCopyData = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQputCopyData();
+
+int main() {
+PQputCopyData()
+; return 0; }
+EOF
+if { (eval echo configure:75911: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQPUTCOPYDATA 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQputCopyEnd in -lpq" >&5
-echo $ECHO_N "checking for PQputCopyEnd in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQputCopyEnd+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6
+echo "configure:75935: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75943 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQputCopyEnd ();
-int
-main ()
-{
-PQputCopyEnd ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQputCopyEnd=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQputCopyEnd=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQputCopyEnd" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQputCopyEnd" >&6
-if test $ac_cv_lib_pq_PQputCopyEnd = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQputCopyEnd();
+
+int main() {
+PQputCopyEnd()
+; return 0; }
+EOF
+if { (eval echo configure:75954: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQPUTCOPYEND 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQgetCopyData in -lpq" >&5
-echo $ECHO_N "checking for PQgetCopyData in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQgetCopyData+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6
+echo "configure:75978: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 75986 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQgetCopyData ();
-int
-main ()
-{
-PQgetCopyData ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQgetCopyData=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQgetCopyData=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQgetCopyData" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQgetCopyData" >&6
-if test $ac_cv_lib_pq_PQgetCopyData = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQgetCopyData();
 
-cat >>confdefs.h <<\_ACEOF
+int main() {
+PQgetCopyData()
+; return 0; }
+EOF
+if { (eval echo configure:75997: \"$ac_link\") 1>&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
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQGETCOPYDATA 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQfreemem in -lpq" >&5
-echo $ECHO_N "checking for PQfreemem in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQfreemem+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6
+echo "configure:76021: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 76029 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQfreemem ();
-int
-main ()
-{
-PQfreemem ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQfreemem=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQfreemem=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQfreemem" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQfreemem" >&6
-if test $ac_cv_lib_pq_PQfreemem = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQfreemem();
+
+int main() {
+PQfreemem()
+; return 0; }
+EOF
+if { (eval echo configure:76040: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQFREEMEM 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQsetErrorVerbosity in -lpq" >&5
-echo $ECHO_N "checking for PQsetErrorVerbosity in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQsetErrorVerbosity+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6
+echo "configure:76064: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 76072 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQsetErrorVerbosity ();
-int
-main ()
-{
-PQsetErrorVerbosity ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQsetErrorVerbosity=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQsetErrorVerbosity=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsetErrorVerbosity" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsetErrorVerbosity" >&6
-if test $ac_cv_lib_pq_PQsetErrorVerbosity = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQsetErrorVerbosity();
+
+int main() {
+PQsetErrorVerbosity()
+; return 0; }
+EOF
+if { (eval echo configure:76083: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQSETERRORVERBOSITY 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQftable in -lpq" >&5
-echo $ECHO_N "checking for PQftable in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQftable+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6
+echo "configure:76107: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 76115 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQftable ();
-int
-main ()
-{
-PQftable ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQftable=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQftable=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQftable" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQftable" >&6
-if test $ac_cv_lib_pq_PQftable = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQftable();
+
+int main() {
+PQftable()
+; return 0; }
+EOF
+if { (eval echo configure:76126: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQFTABLE 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQescapeStringConn in -lpq" >&5
-echo $ECHO_N "checking for PQescapeStringConn in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
+echo "configure:76150: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 76158 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQescapeStringConn ();
-int
-main ()
-{
-PQescapeStringConn ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQescapeStringConn=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQescapeStringConn=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeStringConn" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeStringConn" >&6
-if test $ac_cv_lib_pq_PQescapeStringConn = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQescapeStringConn();
+
+int main() {
+PQescapeStringConn()
+; return 0; }
+EOF
+if { (eval echo configure:76169: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQESCAPE_CONN 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for PQescapeByteaConn in -lpq" >&5
-echo $ECHO_N "checking for PQescapeByteaConn in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
+echo "configure:76193: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 76201 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char PQescapeByteaConn ();
-int
-main ()
-{
-PQescapeByteaConn ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_PQescapeByteaConn=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_PQescapeByteaConn=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeByteaConn" >&6
-if test $ac_cv_lib_pq_PQescapeByteaConn = yes; then
+    builtin and then its argument prototype would still apply.  */
+char PQescapeByteaConn();
+
+int main() {
+PQescapeByteaConn()
+; return 0; }
+EOF
+if { (eval echo configure:76212: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PQESCAPE_BYTEA_CONN 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for pg_encoding_to_char in -lpq" >&5
-echo $ECHO_N "checking for pg_encoding_to_char in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
+echo "configure:76236: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 76244 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pg_encoding_to_char ();
-int
-main ()
-{
-pg_encoding_to_char ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_pg_encoding_to_char=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_pg_encoding_to_char=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_pg_encoding_to_char" >&6
-if test $ac_cv_lib_pq_pg_encoding_to_char = yes; then
+    builtin and then its argument prototype would still apply.  */
+char pg_encoding_to_char();
+
+int main() {
+pg_encoding_to_char()
+; return 0; }
+EOF
+if { (eval echo configure:76255: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for lo_create in -lpq" >&5
-echo $ECHO_N "checking for lo_create in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_lo_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6
+echo "configure:76279: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 76287 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char lo_create ();
-int
-main ()
-{
-lo_create ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_lo_create=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_lo_create=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_lo_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_lo_create" >&6
-if test $ac_cv_lib_pq_lo_create = yes; then
+    builtin and then its argument prototype would still apply.  */
+char lo_create();
+
+int main() {
+lo_create()
+; return 0; }
+EOF
+if { (eval echo configure:76298: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_PG_LO_CREATE 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  echo "$as_me:$LINENO: checking for lo_import_with_oid in -lpq" >&5
-echo $ECHO_N "checking for lo_import_with_oid in -lpq... $ECHO_C" >&6
-if test "${ac_cv_lib_pq_lo_import_with_oid+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6
+echo "configure:76322: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 76330 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char lo_import_with_oid ();
-int
-main ()
-{
-lo_import_with_oid ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pq_lo_import_with_oid=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pq_lo_import_with_oid=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_lo_import_with_oid" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_lo_import_with_oid" >&6
-if test $ac_cv_lib_pq_lo_import_with_oid = yes; then
+    builtin and then its argument prototype would still apply.  */
+char lo_import_with_oid();
 
-cat >>confdefs.h <<\_ACEOF
+int main() {
+lo_import_with_oid()
+; return 0; }
+EOF
+if { (eval echo configure:76341: \"$ac_link\") 1>&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
+  cat >> confdefs.h <<\EOF
 #define HAVE_PG_LO_IMPORT_WITH_OID 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
   LIBS=$old_LIBS
   LDFLAGS=$old_LDFLAGS
 
-
+  
 
   if test "$ext_shared" = "yes"; then
     PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD"
     if test -n "$PGSQL_LIBDIR"; then
-
+      
   if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PGSQL_LIBDIR
   else
-
+    
     ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_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 "$PGSQL_LIBDIR"; then
-
+    
   if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PGSQL_LIBDIR
   else
-
+    
     ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PGSQL_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 pq in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lpq $LIBS"
+  *) 
+      LIBS="-lpq $LIBS" 
    ;;
   esac
 
@@ -98786,43 +76460,43 @@
   fi
 
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD"
 
 
-
+  
   if test "$PGSQL_INCLUDE" != "/usr/include"; then
-
+    
   if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
     ai_p=$PGSQL_INCLUDE
   else
-
+    
     ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
   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
 
 
-
+  
   ext_builddir=ext/pgsql
   ext_srcdir=$abs_srcdir/ext/pgsql
 
@@ -98830,15 +76504,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PGSQL_SHARED=no
-
-
+    
+  
   case ext/pgsql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -98851,12 +76525,12 @@
 
   old_IFS=$IFS
   for ac_src in pgsql.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
@@ -98880,14 +76554,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PGSQL_SHARED=yes
-
+      
   case ext/pgsql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -98900,12 +76574,12 @@
 
   old_IFS=$IFS
   for ac_src in pgsql.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pgsql="$shared_objects_pgsql $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -98923,7 +76597,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -98933,7 +76607,7 @@
       ;;
     *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_pgsql) -L$(top_builddir)/netware -lphp5lib $(PGSQL_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_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPGSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -98946,7 +76620,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppgsql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
 
   cat >>Makefile.objects<<EOF
@@ -98960,7 +76634,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -98970,7 +76644,7 @@
       ;;
     *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_pgsql) -L$(top_builddir)/netware -lphp5lib $(QL_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_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PGSQL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -98983,7 +76657,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pgsql.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
 
   cat >>Makefile.objects<<EOF
@@ -98997,10 +76671,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PGSQL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -99009,15 +76682,15 @@
     PHP_PGSQL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pgsql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -99030,12 +76703,12 @@
 
   old_IFS=$IFS
   for ac_src in pgsql.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
@@ -99055,15 +76728,15 @@
         EXT_STATIC="$EXT_STATIC pgsql"
         ;;
       *)
-
-
+        
+  
   case ext/pgsql in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -99076,13 +76749,13 @@
 
   old_IFS=$IFS
   for ac_src in pgsql.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -99102,15 +76775,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pgsql
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -99123,18 +76796,19 @@
 
 php_enable_phar=yes
 
-echo "$as_me:$LINENO: checking for phar archive support" >&5
-echo $ECHO_N "checking for phar archive support... $ECHO_C" >&6
+echo $ac_n "checking for phar archive support""... $ac_c" 1>&6
+echo "configure:76801: 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"
   PHP_PHAR=$enableval
 else
-
+  
   PHP_PHAR=yes
   test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -99158,14 +76832,13 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_PHAR" != "no"; then
-
+  
   ext_builddir=ext/phar
   ext_srcdir=$abs_srcdir/ext/phar
 
@@ -99173,15 +76846,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PHAR_SHARED=no
-
-
+    
+  
   case ext/phar in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -99194,12 +76867,12 @@
 
   old_IFS=$IFS
   for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.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
@@ -99223,14 +76896,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PHAR_SHARED=yes
-
+      
   case ext/phar in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -99243,12 +76916,12 @@
 
   old_IFS=$IFS
   for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_phar="$shared_objects_phar $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -99266,7 +76939,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -99276,7 +76949,7 @@
       ;;
     *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_phar) -L$(top_builddir)/netware -lphp5lib $(PHAR_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_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPHAR, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -99289,7 +76962,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpphar.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
 
   cat >>Makefile.objects<<EOF
@@ -99303,7 +76976,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -99313,7 +76986,7 @@
       ;;
     *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_phar) -L$(top_builddir)/netware -lphp5lib $(R_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_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHAR, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -99326,7 +76999,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phar.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
 
   cat >>Makefile.objects<<EOF
@@ -99340,10 +77013,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PHAR 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -99352,15 +77024,15 @@
     PHP_PHAR_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/phar in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -99373,12 +77045,12 @@
 
   old_IFS=$IFS
   for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.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
@@ -99398,15 +77070,15 @@
         EXT_STATIC="$EXT_STATIC phar"
         ;;
       *)
-
-
+        
+  
   case ext/phar in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -99419,13 +77091,13 @@
 
   old_IFS=$IFS
   for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -99445,113 +77117,83 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=phar
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-  echo "$as_me:$LINENO: checking for phar openssl support" >&5
-echo $ECHO_N "checking for phar openssl support... $ECHO_C" >&6
+  echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6
+echo "configure:77135: checking for phar openssl support" >&5
   if test "$PHP_HASH_SHARED" != "yes"; then
     if test "$PHP_HASH" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define PHAR_HASH_OK 1
-_ACEOF
+EOF
 
     fi
   else
-    { echo "$as_me:$LINENO: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&5
-echo "$as_me: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&2;}
+    echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2
   fi
   if test "$PHP_OPENSSL_SHARED" = "yes"; then
-    echo "$as_me:$LINENO: result: no (shared openssl)" >&5
-echo "${ECHO_T}no (shared openssl)" >&6
+    echo "$ac_t""no (shared openssl)" 1>&6
   else
     if test "$PHP_OPENSSL" = "yes"; then
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+      echo "$ac_t""yes" 1>&6
+      cat >> confdefs.h <<\EOF
 #define PHAR_HAVE_OPENSSL 1
-_ACEOF
+EOF
 
     else
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+      echo "$ac_t""no" 1>&6
     fi
   fi
-
+  
   am_i_shared=$PHP_PHAR_SHARED
   is_it_shared=$PHP_HASH_SHARED
   is_it_enabled=$PHP_HASH
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension phar to build statically, but it
-depends on extension hash, which you've configured to build shared.
-You either need to build phar shared or build hash statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension phar to build statically, but it
 depends on extension hash, which you've configured to build shared.
 You either need to build phar shared or build hash statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension phar, which depends on extension hash,
-but you've either not enabled hash, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension phar, which depends on extension hash,
 but you've either not enabled hash, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
   am_i_shared=$PHP_PHAR_SHARED
   is_it_shared=$PHP_SPL_SHARED
   is_it_enabled=$PHP_SPL
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension phar to build statically, but it
-depends on extension spl, which you've configured to build shared.
-You either need to build phar shared or build spl statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension phar to build statically, but it
 depends on extension spl, which you've configured to build shared.
 You either need to build phar shared or build spl statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension phar, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension phar, which depends on extension spl,
 but you've either not enabled spl, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
   src=$ext_srcdir/Makefile.frag
   ac_srcdir=$ext_srcdir
   ac_builddir=$ext_builddir
@@ -99563,18 +77205,19 @@
 
 php_enable_posix=yes
 
-echo "$as_me:$LINENO: checking whether to enable POSIX-like functions" >&5
-echo $ECHO_N "checking whether to enable POSIX-like functions... $ECHO_C" >&6
+echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
+echo "configure:77210: 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"
   PHP_POSIX=$enableval
 else
-
+  
   PHP_POSIX=yes
   test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -99598,19 +77241,17 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_POSIX" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_POSIX 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/posix
   ext_srcdir=$abs_srcdir/ext/posix
 
@@ -99618,15 +77259,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_POSIX_SHARED=no
-
-
+    
+  
   case ext/posix in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -99639,12 +77280,12 @@
 
   old_IFS=$IFS
   for ac_src in posix.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
@@ -99668,14 +77309,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_POSIX_SHARED=yes
-
+      
   case ext/posix in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -99688,12 +77329,12 @@
 
   old_IFS=$IFS
   for ac_src in posix.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -99711,7 +77352,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -99721,7 +77362,7 @@
       ;;
     *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_posix) -L$(top_builddir)/netware -lphp5lib $(POSIX_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_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPOSIX, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -99734,7 +77375,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
 
   cat >>Makefile.objects<<EOF
@@ -99748,7 +77389,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -99758,7 +77399,7 @@
       ;;
     *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_posix) -L$(top_builddir)/netware -lphp5lib $(IX_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_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(POSIX, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -99771,7 +77412,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/posix.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
 
   cat >>Makefile.objects<<EOF
@@ -99785,10 +77426,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_POSIX 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -99797,15 +77437,15 @@
     PHP_POSIX_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/posix in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -99818,12 +77458,12 @@
 
   old_IFS=$IFS
   for ac_src in posix.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
@@ -99843,15 +77483,15 @@
         EXT_STATIC="$EXT_STATIC posix"
         ;;
       *)
-
-
+        
+  
   case ext/posix in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -99864,13 +77504,13 @@
 
   old_IFS=$IFS
   for ac_src in posix.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -99890,303 +77530,127 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=posix
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
 
-
-for ac_header in sys/mkdev.h
+  for ac_hdr in sys/mkdev.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:77552: 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 77557 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:77562: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
+  for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:77592: 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 77597 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:77620: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
 
-  echo "$as_me:$LINENO: checking for working ttyname_r() implementation" >&5
-echo $ECHO_N "checking for working ttyname_r() implementation... $ECHO_C" >&6
+  echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6
+echo "configure:77646: checking for working ttyname_r() implementation" >&5
   if test "$cross_compiling" = yes; then
-
-    echo "$as_me:$LINENO: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5
-echo "${ECHO_T}no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&6
-
+  
+    echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 77653 "configure"
+#include "confdefs.h"
 
 #include <unistd.h>
 
@@ -100196,111 +77660,70 @@
 
 	return ttyname_r(0, buf, 64) ? 1 : 0;
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+  
+EOF
+if { (eval echo configure:77666: \"$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
+    cat >> confdefs.h <<\EOF
 #define HAVE_TTYNAME_R 1
-_ACEOF
-
+EOF
 
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-    echo "$as_me:$LINENO: result: no, posix_ttyname() will be thread-unsafe" >&5
-echo "${ECHO_T}no, posix_ttyname() will be thread-unsafe" >&6
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+    echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
-  echo "$as_me:$LINENO: checking for utsname.domainname" >&5
-echo $ECHO_N "checking for utsname.domainname... $ECHO_C" >&6
-if test "${ac_cv_have_utsname_domainname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6
+echo "configure:77688: 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 77694 "configure"
+#include "confdefs.h"
 
       #define _GNU_SOURCE
       #include <sys/utsname.h>
-
-int
-main ()
-{
+    
+int main() {
 
       return sizeof(((struct utsname *)0)->domainname);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+    
+; return 0; }
+EOF
+if { (eval echo configure:77706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
       ac_cv_have_utsname_domainname=yes
-
+    
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
       ac_cv_have_utsname_domainname=no
-
+    
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_have_utsname_domainname" >&5
-echo "${ECHO_T}$ac_cv_have_utsname_domainname" >&6
-  if test "$ac_cv_have_utsname_domainname" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6
+  if test "$ac_cv_have_utsname_domainname" = yes; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_UTSNAME_DOMAINNAME 1
-_ACEOF
+EOF
 
   fi
 fi
@@ -100309,19 +77732,19 @@
 
 php_with_pspell=no
 
-echo "$as_me:$LINENO: checking for PSPELL support" >&5
-echo $ECHO_N "checking for PSPELL support... $ECHO_C" >&6
-
+echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
+echo "configure:77737: checking for PSPELL support" >&5
 # Check whether --with-pspell or --without-pspell was given.
 if test "${with_pspell+set}" = set; then
   withval="$with_pspell"
   PHP_PSPELL=$withval
 else
-
+  
   PHP_PSPELL=no
   test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -100345,14 +77768,13 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_PSPELL" != "no"; then
-
+	
   ext_builddir=ext/pspell
   ext_srcdir=$abs_srcdir/ext/pspell
 
@@ -100360,15 +77782,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_PSPELL_SHARED=no
-
-
+    
+  
   case ext/pspell in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -100381,12 +77803,12 @@
 
   old_IFS=$IFS
   for ac_src in pspell.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
@@ -100410,14 +77832,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_PSPELL_SHARED=yes
-
+      
   case ext/pspell in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -100430,12 +77852,12 @@
 
   old_IFS=$IFS
   for ac_src in pspell.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -100453,7 +77875,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -100463,7 +77885,7 @@
       ;;
     *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_pspell) -L$(top_builddir)/netware -lphp5lib $(PSPELL_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_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPSPELL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -100476,7 +77898,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
 
   cat >>Makefile.objects<<EOF
@@ -100490,7 +77912,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -100500,7 +77922,7 @@
       ;;
     *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_pspell) -L$(top_builddir)/netware -lphp5lib $(ELL_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_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PSPELL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -100513,7 +77935,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/pspell.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
 
   cat >>Makefile.objects<<EOF
@@ -100527,10 +77949,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_PSPELL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -100539,15 +77960,15 @@
     PHP_PSPELL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/pspell in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -100560,12 +77981,12 @@
 
   old_IFS=$IFS
   for ac_src in pspell.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
@@ -100585,15 +78006,15 @@
         EXT_STATIC="$EXT_STATIC pspell"
         ;;
       *)
-
-
+        
+  
   case ext/pspell in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -100606,13 +78027,13 @@
 
   old_IFS=$IFS
   for ac_src in pspell.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -100632,15 +78053,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=pspell
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -100661,101 +78082,99 @@
 	done
 
 	if test -z "$PSPELL_DIR"; then
-		{ { echo "$as_me:$LINENO: error: Cannot find pspell" >&5
-echo "$as_me: error: Cannot find pspell" >&2;}
-   { (exit 1); exit 1; }; }
+		{ echo "configure: error: Cannot find pspell" 1>&2; exit 1; }
 	fi
 
 	PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR
 
-
+	
 
   if test "$ext_shared" = "yes"; then
     PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD"
     if test -n "$PSPELL_LIBDIR"; then
-
+      
   if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PSPELL_LIBDIR
   else
-
+    
     ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_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 "$PSPELL_LIBDIR"; then
-
+    
   if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PSPELL_LIBDIR
   else
-
+    
     ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PSPELL_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 pspell in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lpspell $LIBS"
+  *) 
+      LIBS="-lpspell $LIBS" 
    ;;
   esac
 
@@ -100766,25 +78185,25 @@
 
 
 
-
+		
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
 		-L$PSPELL_LIBDIR
 	"
-
+  
   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"
@@ -100795,20 +78214,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -100821,205 +78240,175 @@
     ;;
     -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 "$as_me:$LINENO: checking for new_aspell_config in -laspell" >&5
-echo $ECHO_N "checking for new_aspell_config in -laspell... $ECHO_C" >&6
-if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
+echo "configure:78287: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-laspell  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 78295 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char new_aspell_config ();
-int
-main ()
-{
-new_aspell_config ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_aspell_new_aspell_config=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_aspell_new_aspell_config=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_config" >&5
-echo "${ECHO_T}$ac_cv_lib_aspell_new_aspell_config" >&6
-if test $ac_cv_lib_aspell_new_aspell_config = yes; then
+    builtin and then its argument prototype would still apply.  */
+char new_aspell_config();
 
+int main() {
+new_aspell_config()
+; return 0; }
+EOF
+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
+  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 "$ext_shared" = "yes"; then
     PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD"
     if test -n "$PSPELL_LIBDIR"; then
-
+      
   if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PSPELL_LIBDIR
   else
-
+    
     ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_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 "$PSPELL_LIBDIR"; then
-
+    
   if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PSPELL_LIBDIR
   else
-
+    
     ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PSPELL_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 aspell in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-laspell $LIBS"
+  *) 
+      LIBS="-laspell $LIBS" 
    ;;
   esac
 
@@ -101029,56 +78418,56 @@
   fi
 
 
-
-
+	
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_aspell_new_aspell_config
-
-
+    
+  
 fi
 
 
-
+	
   if test "$PSPELL_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$PSPELL_INCDIR
   else
-
+    
     ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PSPELL_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
 
-
+	
   PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD"
 
-
-cat >>confdefs.h <<\_ACEOF
+	cat >> confdefs.h <<\EOF
 #define HAVE_PSPELL 1
-_ACEOF
+EOF
 
 fi
 
@@ -101086,19 +78475,19 @@
 
 php_with_libedit=no
 
-echo "$as_me:$LINENO: checking for libedit readline replacement" >&5
-echo $ECHO_N "checking for libedit readline replacement... $ECHO_C" >&6
-
+echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
+echo "configure:78480: 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"
   PHP_LIBEDIT=$withval
 else
-
+  
   PHP_LIBEDIT=no
   test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -101122,29 +78511,28 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_LIBEDIT" = "no"; then
-
+  
 php_with_readline=no
 
-echo "$as_me:$LINENO: checking for readline support" >&5
-echo $ECHO_N "checking for readline support... $ECHO_C" >&6
-
+echo $ac_n "checking for readline support""... $ac_c" 1>&6
+echo "configure:78525: checking for readline support" >&5
 # Check whether --with-readline or --without-readline was given.
 if test "${with_readline+set}" = set; then
   withval="$with_readline"
   PHP_READLINE=$withval
 else
-
+  
   PHP_READLINE=no
   test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -101168,8 +78556,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -101183,124 +78570,92 @@
   done
 
   if test -z "$READLINE_DIR"; then
-    { { echo "$as_me:$LINENO: error: Please reinstall readline - I cannot find readline.h" >&5
-echo "$as_me: error: Please reinstall readline - I cannot find readline.h" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; }
   fi
 
-
+  
   if test "$READLINE_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$READLINE_DIR/include
   else
-
+    
     ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`"
   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
 
 
   PHP_READLINE_LIBS=""
-  echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
-echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6
-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
+echo "configure:78611: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 78619 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char tgetent ();
-int
-main ()
-{
-tgetent ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ncurses_tgetent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ncurses_tgetent=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6
-if test $ac_cv_lib_ncurses_tgetent = yes; then
-
+    builtin and then its argument prototype would still apply.  */
+char tgetent();
 
+int main() {
+tgetent()
+; return 0; }
+EOF
+if { (eval echo configure:78630: \"$ac_link\") 1>&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
+  
+    
+  
   case ncurses in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
+        READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" 
     else
-
-
+      
+  
   case ncurses in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lncurses $LIBS"
+  *) 
+      LIBS="-lncurses $LIBS" 
    ;;
   esac
 
@@ -101311,89 +78666,60 @@
 
 
     PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
+echo "configure:78675: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 78683 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char tgetent ();
-int
-main ()
-{
-tgetent ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_termcap_tgetent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_termcap_tgetent=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
-if test $ac_cv_lib_termcap_tgetent = yes; then
-
+    builtin and then its argument prototype would still apply.  */
+char tgetent();
 
+int main() {
+tgetent()
+; return 0; }
+EOF
+if { (eval echo configure:78694: \"$ac_link\") 1>&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
+  
+      
+  
   case termcap in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
+        READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" 
     else
-
-
+      
+  
   case termcap in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ltermcap $LIBS"
+  *) 
+      LIBS="-ltermcap $LIBS" 
    ;;
   esac
 
@@ -101404,32 +78730,34 @@
 
 
       PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap"
-
+    
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-
+  
 fi
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   "
-
+  
   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"
@@ -101440,20 +78768,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -101466,205 +78794,175 @@
     ;;
     -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 "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
-if test "${ac_cv_lib_readline_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+echo "configure:78841: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 78849 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char readline ();
-int
-main ()
-{
-readline ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_readline_readline=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_readline_readline=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
-if test $ac_cv_lib_readline_readline = yes; then
+    builtin and then its argument prototype would still apply.  */
+char readline();
+
+int main() {
+readline()
+; return 0; }
+EOF
+if { (eval echo configure:78860: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
     READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD"
     if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$READLINE_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_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 "$READLINE_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$READLINE_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case readline in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lreadline $LIBS"
+  *) 
+      LIBS="-lreadline $LIBS" 
    ;;
   esac
 
@@ -101674,41 +78972,40 @@
   fi
 
 
-
-
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_readline
-
-    { { echo "$as_me:$LINENO: error: readline library not found" >&5
-echo "$as_me: error: readline library not found" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: readline library not found" 1>&2; exit 1; }
+  
+  
 fi
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   "
-
+  
   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"
@@ -101719,20 +79016,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -101745,151 +79042,120 @@
     ;;
     -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 "$as_me:$LINENO: checking for rl_pending_input in -lreadline" >&5
-echo $ECHO_N "checking for rl_pending_input in -lreadline... $ECHO_C" >&6
-if test "${ac_cv_lib_readline_rl_pending_input+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6
+echo "configure:79089: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 79097 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char rl_pending_input ();
-int
-main ()
-{
-rl_pending_input ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_readline_rl_pending_input=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_readline_rl_pending_input=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_pending_input" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_rl_pending_input" >&6
-if test $ac_cv_lib_readline_rl_pending_input = yes; then
+    builtin and then its argument prototype would still apply.  */
+char rl_pending_input();
+
+int main() {
+rl_pending_input()
+; return 0; }
+EOF
+if { (eval echo configure:79108: \"$ac_link\") 1>&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
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_pending_input
-
-    { { echo "$as_me:$LINENO: error: invalid readline installation detected. Try --with-libedit instead." >&5
-echo "$as_me: error: invalid readline installation detected. Try --with-libedit instead." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; }
+  
+  
 fi
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   "
-
+  
   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"
@@ -101900,20 +79166,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -101926,138 +79192,107 @@
     ;;
     -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 "$as_me:$LINENO: checking for rl_callback_read_char in -lreadline" >&5
-echo $ECHO_N "checking for rl_callback_read_char in -lreadline... $ECHO_C" >&6
-if test "${ac_cv_lib_readline_rl_callback_read_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6
+echo "configure:79239: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 79247 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char rl_callback_read_char ();
-int
-main ()
-{
-rl_callback_read_char ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_readline_rl_callback_read_char=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_readline_rl_callback_read_char=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_read_char" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_rl_callback_read_char" >&6
-if test $ac_cv_lib_readline_rl_callback_read_char = yes; then
+    builtin and then its argument prototype would still apply.  */
+char rl_callback_read_char();
+
+int main() {
+rl_callback_read_char()
+; return 0; }
+EOF
+if { (eval echo configure:79258: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_RL_CALLBACK_READ_CHAR 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_callback_read_char
-
-
+    
+  
 fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBREADLINE 1
-_ACEOF
+EOF
 
 
 elif test "$PHP_LIBEDIT" != "no"; then
@@ -102067,123 +79302,91 @@
   done
 
   if test -z "$LIBEDIT_DIR"; then
-    { { echo "$as_me:$LINENO: error: Please reinstall libedit - I cannot find readline.h" >&5
-echo "$as_me: error: Please reinstall libedit - I cannot find readline.h" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; }
   fi
 
-
+  
   if test "$LIBEDIT_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$LIBEDIT_DIR/include
   else
-
+    
     ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`"
   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 "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
-echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6
-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
+echo "configure:79342: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 79350 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char tgetent ();
-int
-main ()
-{
-tgetent ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ncurses_tgetent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ncurses_tgetent=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6
-if test $ac_cv_lib_ncurses_tgetent = yes; then
-
+    builtin and then its argument prototype would still apply.  */
+char tgetent();
 
+int main() {
+tgetent()
+; return 0; }
+EOF
+if { (eval echo configure:79361: \"$ac_link\") 1>&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
+  
+    
+  
   case ncurses in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
+        READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" 
     else
-
-
+      
+  
   case ncurses in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lncurses $LIBS"
+  *) 
+      LIBS="-lncurses $LIBS" 
    ;;
   esac
 
@@ -102193,89 +79396,60 @@
   esac
 
 
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
+echo "configure:79405: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 79413 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char tgetent ();
-int
-main ()
-{
-tgetent ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_termcap_tgetent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_termcap_tgetent=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
-if test $ac_cv_lib_termcap_tgetent = yes; then
-
+    builtin and then its argument prototype would still apply.  */
+char tgetent();
 
+int main() {
+tgetent()
+; return 0; }
+EOF
+if { (eval echo configure:79424: \"$ac_link\") 1>&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
+  
+      
+  
   case termcap in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
+        READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" 
     else
-
-
+      
+  
   case termcap in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ltermcap $LIBS"
+  *) 
+      LIBS="-ltermcap $LIBS" 
    ;;
   esac
 
@@ -102285,32 +79459,34 @@
   esac
 
 
-
+    
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-
+  
 fi
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
-    -L$READLINE_DIR/$PHP_LIBDIR
+    -L$READLINE_DIR/$PHP_LIBDIR 
   "
-
+  
   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"
@@ -102321,20 +79497,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -102347,205 +79523,175 @@
     ;;
     -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 "$as_me:$LINENO: checking for readline in -ledit" >&5
-echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6
-if test "${ac_cv_lib_edit_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
+echo "configure:79570: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ledit  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 79578 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char readline ();
-int
-main ()
-{
-readline ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_edit_readline=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_edit_readline=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_edit_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_edit_readline" >&6
-if test $ac_cv_lib_edit_readline = yes; then
+    builtin and then its argument prototype would still apply.  */
+char readline();
+
+int main() {
+readline()
+; return 0; }
+EOF
+if { (eval echo configure:79589: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
     READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD"
     if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_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 "$LIBEDIT_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case edit in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ledit $LIBS"
+  *) 
+      LIBS="-ledit $LIBS" 
    ;;
   esac
 
@@ -102554,134 +79700,85 @@
 
   fi
 
-
-
-
+  
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_readline
-
-    { { echo "$as_me:$LINENO: error: edit library required by readline not found" >&5
-echo "$as_me: error: edit library required by readline not found" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; }
+  
+  
 fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBEDIT 1
-_ACEOF
+EOF
 
 fi
 
 if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
-
-for ac_func in rl_completion_matches
+  for ac_func in rl_completion_matches
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:79730: 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 79735 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:79758: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
-
+  
   ext_builddir=ext/readline
   ext_srcdir=$abs_srcdir/ext/readline
 
@@ -102689,15 +79786,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then
     PHP_READLINE_SHARED=no
-
-
+    
+  
   case ext/readline in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -102710,12 +79807,12 @@
 
   old_IFS=$IFS
   for ac_src in readline.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
@@ -102739,14 +79836,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_READLINE_SHARED=yes
-
+      
   case ext/readline in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -102759,12 +79856,12 @@
 
   old_IFS=$IFS
   for ac_src in readline.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -102782,7 +79879,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -102792,7 +79889,7 @@
       ;;
     *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_readline) -L$(top_builddir)/netware -lphp5lib $(READLINE_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_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -102805,7 +79902,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
 
   cat >>Makefile.objects<<EOF
@@ -102819,7 +79916,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -102829,7 +79926,7 @@
       ;;
     *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_readline) -L$(top_builddir)/netware -lphp5lib $(DLINE_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_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(READLINE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -102842,7 +79939,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/readline.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
 
   cat >>Makefile.objects<<EOF
@@ -102856,10 +79953,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_READLINE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -102868,15 +79964,15 @@
     PHP_READLINE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/readline in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -102889,12 +79985,12 @@
 
   old_IFS=$IFS
   for ac_src in readline.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
@@ -102914,15 +80010,15 @@
         EXT_STATIC="$EXT_STATIC readline"
         ;;
       *)
-
-
+        
+  
   case ext/readline in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -102935,13 +80031,13 @@
 
   old_IFS=$IFS
   for ac_src in readline.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -102961,20 +80057,20 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=readline
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST READLINE_SHARED_LIBADD"
 
 fi
@@ -102983,19 +80079,19 @@
 
 php_with_recode=no
 
-echo "$as_me:$LINENO: checking for recode support" >&5
-echo $ECHO_N "checking for recode support... $ECHO_C" >&6
-
+echo $ac_n "checking for recode support""... $ac_c" 1>&6
+echo "configure:80084: checking for recode support" >&5
 # Check whether --with-recode or --without-recode was given.
 if test "${with_recode+set}" = set; then
   withval="$with_recode"
   PHP_RECODE=$withval
 else
-
+  
   PHP_RECODE=no
   test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -103019,8 +80115,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -103048,30 +80143,28 @@
   done
 
   if test -z "$RECODE_DIR"; then
-    { { echo "$as_me:$LINENO: error: Can not find recode.h anywhere under $RECODE_LIST." >&5
-echo "$as_me: error: Can not find recode.h anywhere under $RECODE_LIST." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; }
   fi
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     -L$RECODE_DIR/$RECODE_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"
@@ -103082,20 +80175,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -103108,205 +80201,175 @@
     ;;
     -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 "$as_me:$LINENO: checking for recode_format_table in -lrecode" >&5
-echo $ECHO_N "checking for recode_format_table in -lrecode... $ECHO_C" >&6
-if test "${ac_cv_lib_recode_recode_format_table+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
+echo "configure:80248: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lrecode  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 80256 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char recode_format_table ();
-int
-main ()
-{
-recode_format_table ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_recode_recode_format_table=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_recode_recode_format_table=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_recode_recode_format_table" >&5
-echo "${ECHO_T}$ac_cv_lib_recode_recode_format_table" >&6
-if test $ac_cv_lib_recode_recode_format_table = yes; then
+    builtin and then its argument prototype would still apply.  */
+char recode_format_table();
+
+int main() {
+recode_format_table()
+; return 0; }
+EOF
+if { (eval echo configure:80267: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
     RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
     if test -n "$RECODE_DIR/$RECODE_LIB"; then
-
+      
   if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
-
+    
   if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
     ai_p=$RECODE_DIR/$RECODE_LIB
   else
-
+    
     ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_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 "$RECODE_DIR/$RECODE_LIB"; then
-
+    
   if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
-
+    
   if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
     ai_p=$RECODE_DIR/$RECODE_LIB
   else
-
+    
     ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
   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 recode in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lrecode $LIBS"
+  *) 
+      LIBS="-lrecode $LIBS" 
    ;;
   esac
 
@@ -103316,148 +80379,122 @@
   fi
 
 
-
-
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_recode_recode_format_table
-
+    
     old_LDFLAGS=$LDFLAGS
     old_LIBS=$LIBS
     LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
     LIBS="$LIBS -lrecode"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    cat > conftest.$ac_ext <<EOF
+#line 80397 "configure"
+#include "confdefs.h"
 
 char *program_name;
-
-int
-main ()
-{
+    
+int main() {
 
 recode_format_table();
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
+    
+; return 0; }
+EOF
+if { (eval echo configure:80408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+      
 
   if test "$ext_shared" = "yes"; then
     RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
     if test -n "$RECODE_DIR/$RECODE_LIB"; then
-
+      
   if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
-
+    
   if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
     ai_p=$RECODE_DIR/$RECODE_LIB
   else
-
+    
     ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_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 "$RECODE_DIR/$RECODE_LIB"; then
-
+    
   if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
-
+    
   if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
     ai_p=$RECODE_DIR/$RECODE_LIB
   else
-
+    
     ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
   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 recode in
   c|c_r|pthread*) ;;
-  *)
-      DLIBS="-lrecode $DLIBS"
+  *) 
+      DLIBS="-lrecode $DLIBS" 
    ;;
   esac
 
@@ -103467,221 +80504,106 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_BROKEN_RECODE 1
-_ACEOF
-
+EOF
 
+    
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-      { { echo "$as_me:$LINENO: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" >&5
-echo "$as_me: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" >&2;}
-   { (exit 1); exit 1; }; }
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+      { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; }
+    
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
     LIBS=$old_LIBS
     LDFLAGS=$old_LDFLAGS
-
-
+  
+  
 fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBRECODE 1
-_ACEOF
-
+EOF
 
+  
   if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then
-
+    
   if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then
     ai_p=$RECODE_DIR/$RECODE_INC
   else
-
+    
     ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`"
   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
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD"
 
-
-for ac_header in stdbool.h
+  for ac_hdr in stdbool.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:80571: 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 80576 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:80581: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
-
+  
   ext_builddir=ext/recode
   ext_srcdir=$abs_srcdir/ext/recode
 
@@ -103689,15 +80611,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_RECODE_SHARED=no
-
-
+    
+  
   case ext/recode in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -103710,12 +80632,12 @@
 
   old_IFS=$IFS
   for ac_src in recode.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
@@ -103739,14 +80661,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_RECODE_SHARED=yes
-
+      
   case ext/recode in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -103759,12 +80681,12 @@
 
   old_IFS=$IFS
   for ac_src in recode.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -103782,7 +80704,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -103792,7 +80714,7 @@
       ;;
     *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_recode) -L$(top_builddir)/netware -lphp5lib $(RECODE_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_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPRECODE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -103805,7 +80727,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
 
   cat >>Makefile.objects<<EOF
@@ -103819,7 +80741,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -103829,7 +80751,7 @@
       ;;
     *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_recode) -L$(top_builddir)/netware -lphp5lib $(ODE_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_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(RECODE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -103842,7 +80764,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/recode.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
 
   cat >>Makefile.objects<<EOF
@@ -103856,10 +80778,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_RECODE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -103868,15 +80789,15 @@
     PHP_RECODE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/recode in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -103889,12 +80810,12 @@
 
   old_IFS=$IFS
   for ac_src in recode.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
@@ -103914,15 +80835,15 @@
         EXT_STATIC="$EXT_STATIC recode"
         ;;
       *)
-
-
+        
+  
   case ext/recode in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -103935,13 +80856,13 @@
 
   old_IFS=$IFS
   for ac_src in recode.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -103961,15 +80882,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=recode
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -103977,10 +80898,9 @@
 fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+cat >> confdefs.h <<\EOF
 #define HAVE_REFLECTION 1
-_ACEOF
+EOF
 
 
   ext_builddir=ext/reflection
@@ -103990,15 +80910,15 @@
 
   if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
     PHP_REFLECTION_SHARED=no
-
-
+    
+  
   case ext/reflection in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -104011,12 +80931,12 @@
 
   old_IFS=$IFS
   for ac_src in php_reflection.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
@@ -104040,14 +80960,14 @@
   else
     if test "no" = "shared" || test "no" = "yes"; then
       PHP_REFLECTION_SHARED=yes
-
+      
   case ext/reflection in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -104060,12 +80980,12 @@
 
   old_IFS=$IFS
   for ac_src in php_reflection.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -104083,7 +81003,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -104093,7 +81013,7 @@
       ;;
     *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_reflection) -L$(top_builddir)/netware -lphp5lib $(REFLECTION_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_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -104106,7 +81026,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
 
   cat >>Makefile.objects<<EOF
@@ -104120,7 +81040,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -104130,7 +81050,7 @@
       ;;
     *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_reflection) -L$(top_builddir)/netware -lphp5lib $(LECTION_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_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(REFLECTION, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -104143,7 +81063,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/reflection.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
 
   cat >>Makefile.objects<<EOF
@@ -104157,10 +81077,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_REFLECTION 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -104169,15 +81088,15 @@
     PHP_REFLECTION_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/reflection in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -104190,12 +81109,12 @@
 
   old_IFS=$IFS
   for ac_src in php_reflection.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
@@ -104215,15 +81134,15 @@
         EXT_STATIC="$EXT_STATIC reflection"
         ;;
       *)
-
-
+        
+  
   case ext/reflection in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -104236,13 +81155,13 @@
 
   old_IFS=$IFS
   for ac_src in php_reflection.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -104262,15 +81181,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=reflection
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -104280,18 +81199,19 @@
 
 php_enable_session=yes
 
-echo "$as_me:$LINENO: checking whether to enable PHP sessions" >&5
-echo $ECHO_N "checking whether to enable PHP sessions... $ECHO_C" >&6
+echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
+echo "configure:81204: 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"
   PHP_SESSION=$enableval
 else
-
+  
   PHP_SESSION=yes
   test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -104315,8 +81235,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -104324,47 +81243,43 @@
 
 php_with_mm=no
 
-echo "$as_me:$LINENO: checking for mm support" >&5
-echo $ECHO_N "checking for mm support... $ECHO_C" >&6
-
+echo $ac_n "checking for mm support""... $ac_c" 1>&6
+echo "configure:81248: checking for mm support" >&5
 # Check whether --with-mm or --without-mm was given.
 if test "${with_mm+set}" = set; then
   withval="$with_mm"
   PHP_MM=$withval
 else
-
+  
   PHP_MM=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_MM
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_SESSION" != "no"; then
-
-  echo "$as_me:$LINENO: checking whether pwrite works" >&5
-echo $ECHO_N "checking whether pwrite works... $ECHO_C" >&6
-if test "${ac_cv_pwrite+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+  echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
+echo "configure:81270: checking whether pwrite works" >&5
+if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-
-
+  
+    
   if test "$cross_compiling" = yes; then
-
+  
     ac_cv_pwrite=no
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 81282 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -104382,48 +81297,35 @@
     exit(0);
     }
 
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:81303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     ac_cv_pwrite=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     ac_cv_pwrite=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
-    if test "$ac_cv_pwrite" = "no"; then
 
+    if test "$ac_cv_pwrite" = "no"; then
+      
   if test "$cross_compiling" = yes; then
-
+  
     ac_cv_pwrite=no
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 81328 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -104441,79 +81343,64 @@
     exit(0);
     }
 
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:81349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     ac_cv_pwrite=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     ac_cv_pwrite=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+
       if test "$ac_cv_pwrite" = "yes"; then
         ac_cv_pwrite=64
       fi
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_pwrite" >&5
-echo "${ECHO_T}$ac_cv_pwrite" >&6
 
-  if test "$ac_cv_pwrite" != "no"; then
+echo "$ac_t""$ac_cv_pwrite" 1>&6
 
-cat >>confdefs.h <<\_ACEOF
+  if test "$ac_cv_pwrite" != "no"; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_PWRITE 1
-_ACEOF
+EOF
 
     if test "$ac_cv_pwrite" = "64"; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define PHP_PWRITE_64 1
-_ACEOF
+EOF
 
     fi
-  fi
+  fi  
 
-
-  echo "$as_me:$LINENO: checking whether pread works" >&5
-echo $ECHO_N "checking whether pread works... $ECHO_C" >&6
-if test "${ac_cv_pread+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+  echo $ac_n "checking whether pread works""... $ac_c" 1>&6
+echo "configure:81390: checking whether pread works" >&5
+if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-
-
+  
+    
   echo test > conftest_in
   if test "$cross_compiling" = yes; then
-
+  
     ac_cv_pread=no
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 81403 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -104522,7 +81409,7 @@
 #include <errno.h>
 
     main() {
-    char buf[3];
+    char buf[3]; 
     int fd = open("conftest_in", O_RDONLY);
     if (fd < 0) exit(1);
     if (pread(fd, buf, 2, 0) != 2) exit(1);
@@ -104530,50 +81417,37 @@
     if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
     exit(0);
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:81423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     ac_cv_pread=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     ac_cv_pread=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
   rm -f conftest_in
 
     if test "$ac_cv_pread" = "no"; then
-
+      
   echo test > conftest_in
   if test "$cross_compiling" = yes; then
-
+  
     ac_cv_pread=no
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 81450 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -104582,7 +81456,7 @@
 #include <errno.h>
 ssize_t pread(int, void *, size_t, off64_t);
     main() {
-    char buf[3];
+    char buf[3]; 
     int fd = open("conftest_in", O_RDONLY);
     if (fd < 0) exit(1);
     if (pread(fd, buf, 2, 0) != 2) exit(1);
@@ -104590,61 +81464,49 @@
     if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
     exit(0);
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:81470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     ac_cv_pread=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     ac_cv_pread=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
   rm -f conftest_in
 
       if test "$ac_cv_pread" = "yes"; then
         ac_cv_pread=64
       fi
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_pread" >&5
-echo "${ECHO_T}$ac_cv_pread" >&6
 
-  if test "$ac_cv_pread" != "no"; then
+echo "$ac_t""$ac_cv_pread" 1>&6
 
-cat >>confdefs.h <<\_ACEOF
+  if test "$ac_cv_pread" != "no"; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_PREAD 1
-_ACEOF
+EOF
 
     if test "$ac_cv_pread" = "64"; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define PHP_PREAD_64 1
-_ACEOF
+EOF
 
     fi
-  fi
-
+  fi  
 
+  
   ext_builddir=ext/session
   ext_srcdir=$abs_srcdir/ext/session
 
@@ -104652,15 +81514,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SESSION_SHARED=no
-
-
+    
+  
   case ext/session in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -104673,12 +81535,12 @@
 
   old_IFS=$IFS
   for ac_src in session.c mod_files.c mod_mm.c mod_user.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
@@ -104702,14 +81564,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SESSION_SHARED=yes
-
+      
   case ext/session in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -104722,12 +81584,12 @@
 
   old_IFS=$IFS
   for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -104745,7 +81607,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -104755,7 +81617,7 @@
       ;;
     *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_session) -L$(top_builddir)/netware -lphp5lib $(SESSION_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_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSESSION, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -104768,7 +81630,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
 
   cat >>Makefile.objects<<EOF
@@ -104782,7 +81644,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -104792,7 +81654,7 @@
       ;;
     *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_session) -L$(top_builddir)/netware -lphp5lib $(SION_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_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SESSION, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -104805,7 +81667,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/session.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
 
   cat >>Makefile.objects<<EOF
@@ -104819,10 +81681,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SESSION 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -104831,15 +81692,15 @@
     PHP_SESSION_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/session in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -104852,12 +81713,12 @@
 
   old_IFS=$IFS
   for ac_src in session.c mod_files.c mod_mm.c mod_user.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
@@ -104877,15 +81738,15 @@
         EXT_STATIC="$EXT_STATIC session"
         ;;
       *)
-
-
+        
+  
   case ext/session in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -104898,13 +81759,13 @@
 
   old_IFS=$IFS
   for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -104924,108 +81785,83 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC session"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=session
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   am_i_shared=$PHP_SESSION_SHARED
   is_it_shared=$PHP_HASH_SHARED
   is_it_enabled=$PHP_HASH
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension session to build statically, but it
 depends on extension hash, which you've configured to build shared.
 You either need to build session shared or build hash statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension session to build statically, but it
-depends on extension hash, which you've configured to build shared.
-You either need to build session shared or build hash statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension session, which depends on extension hash,
 but you've either not enabled hash, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension session, which depends on extension hash,
-but you've either not enabled hash, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
   am_i_shared=$PHP_SESSION_SHARED
   is_it_shared=$PHP_SPL_SHARED
   is_it_enabled=$PHP_SPL
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension session to build statically, but it
 depends on extension spl, which you've configured to build shared.
 You either need to build session shared or build spl statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension session to build statically, but it
-depends on extension spl, which you've configured to build shared.
-You either need to build session shared or build spl statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension session, which depends on extension spl,
 but you've either not enabled spl, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension session, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD"
 
-
-
+  
+  
     header_path=ext/session
     for header_file in php_session.h mod_files.h mod_user.h; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_PHP_SESSION 1
-_ACEOF
+EOF
 
 fi
 
@@ -105035,99 +81871,97 @@
   done
 
   if test -z "$MM_DIR" ; then
-    { { echo "$as_me:$LINENO: error: cannot find mm library" >&5
-echo "$as_me: error: cannot find mm library" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: cannot find mm library" 1>&2; exit 1; }
   fi
-
-
+  
+  
 
   if test "$ext_shared" = "yes"; then
     SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD"
     if test -n "$MM_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$MM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_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 "$MM_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$MM_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case mm in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lmm $LIBS"
+  *) 
+      LIBS="-lmm $LIBS" 
    ;;
   esac
 
@@ -105137,77 +81971,77 @@
   fi
 
 
-
+  
   if test "$MM_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$MM_DIR/include
   else
-
+    
     ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`"
   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
 
-
-
+  
+  
     for header_file in ext/session/mod_mm.h; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_LIBMM 1
-_ACEOF
+EOF
 
 fi
 
 
 php_enable_shmop=no
 
-echo "$as_me:$LINENO: checking whether to enable shmop support" >&5
-echo $ECHO_N "checking whether to enable shmop support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
+echo "configure:82034: 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"
   PHP_SHMOP=$enableval
 else
-
+  
   PHP_SHMOP=no
   test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -105231,19 +82065,17 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_SHMOP" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_SHMOP 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/shmop
   ext_srcdir=$abs_srcdir/ext/shmop
 
@@ -105251,15 +82083,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SHMOP_SHARED=no
-
-
+    
+  
   case ext/shmop in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -105272,12 +82104,12 @@
 
   old_IFS=$IFS
   for ac_src in shmop.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
@@ -105301,14 +82133,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SHMOP_SHARED=yes
-
+      
   case ext/shmop in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -105321,12 +82153,12 @@
 
   old_IFS=$IFS
   for ac_src in shmop.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -105344,7 +82176,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -105354,7 +82186,7 @@
       ;;
     *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_shmop) -L$(top_builddir)/netware -lphp5lib $(SHMOP_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_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -105367,7 +82199,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
 
   cat >>Makefile.objects<<EOF
@@ -105381,7 +82213,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -105391,7 +82223,7 @@
       ;;
     *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_shmop) -L$(top_builddir)/netware -lphp5lib $(OP_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_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SHMOP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -105404,7 +82236,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/shmop.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
 
   cat >>Makefile.objects<<EOF
@@ -105418,10 +82250,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SHMOP 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -105430,15 +82261,15 @@
     PHP_SHMOP_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/shmop in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -105451,12 +82282,12 @@
 
   old_IFS=$IFS
   for ac_src in shmop.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
@@ -105476,15 +82307,15 @@
         EXT_STATIC="$EXT_STATIC shmop"
         ;;
       *)
-
-
+        
+  
   case ext/shmop in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -105497,13 +82328,13 @@
 
   old_IFS=$IFS
   for ac_src in shmop.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -105523,15 +82354,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=shmop
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -105542,18 +82373,19 @@
 
 php_enable_simplexml=yes
 
-echo "$as_me:$LINENO: checking whether to enable SimpleXML support" >&5
-echo $ECHO_N "checking whether to enable SimpleXML support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6
+echo "configure:82378: 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"
   PHP_SIMPLEXML=$enableval
 else
-
+  
   PHP_SIMPLEXML=yes
   test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -105577,33 +82409,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_LIBXML_DIR"; then
-
+  
 php_with_libxml_dir=no
 
-echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
+echo "configure:82423: 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"
   PHP_LIBXML_DIR=$withval
 else
-
+  
   PHP_LIBXML_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBXML_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -105611,19 +82441,17 @@
 
 if test "$PHP_SIMPLEXML" != "no"; then
 
-  if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+  if test "$PHP_LIBXML" = "no"; then   
+    { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }                
   fi
 
-
-echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
+echo "configure:82451: 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
-
+  
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
     if test -x "$i/bin/xml2-config"; then
       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
@@ -105632,8 +82460,8 @@
   done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6
+
+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -105646,17 +82474,17 @@
     if test "$LIBXML_VERSION" -ge "2006011"; then
       LIBXML_LIBS=`$XML2_CONFIG --libs`
       LIBXML_INCS=`$XML2_CONFIG --cflags`
-
+      
   for ac_i in $LIBXML_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -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"
@@ -105667,20 +82495,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii"
+        SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -105693,80 +82521,80 @@
     ;;
     -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
         SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $LIBXML_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -105776,92 +82604,74 @@
   done
 
 
-            echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
+echo "configure:82609: 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
-
-
+  
+        
   old_LIBS=$LIBS
   LIBS="
           $SIMPLEXML_SHARED_LIBADD
          $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 82625 "configure"
+#include "confdefs.h"
 
+    
     char xmlInitParser();
     int main() {
       xmlInitParser();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:82636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
+    
           php_cv_libxml_build_works=yes
-
-
+        
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
+        
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+      
 fi
-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6
-      if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_libxml_build_works" 1>&6
+      if test "$php_cv_libxml_build_works" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
+EOF
 
       fi
-
-
-cat >>confdefs.h <<\_ACEOF
+      
+    cat >> confdefs.h <<\EOF
 #define HAVE_SIMPLEXML 1
-_ACEOF
-
+EOF
 
+    
   ext_builddir=ext/simplexml
   ext_srcdir=$abs_srcdir/ext/simplexml
 
@@ -105869,15 +82679,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SIMPLEXML_SHARED=no
-
-
+    
+  
   case ext/simplexml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -105890,12 +82700,12 @@
 
   old_IFS=$IFS
   for ac_src in simplexml.c sxe.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
@@ -105919,14 +82729,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SIMPLEXML_SHARED=yes
-
+      
   case ext/simplexml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -105939,12 +82749,12 @@
 
   old_IFS=$IFS
   for ac_src in simplexml.c sxe.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -105962,7 +82772,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -105972,7 +82782,7 @@
       ;;
     *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_simplexml) -L$(top_builddir)/netware -lphp5lib $(SIMPLEXML_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_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSIMPLEXML, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -105985,7 +82795,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
 
   cat >>Makefile.objects<<EOF
@@ -105999,7 +82809,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -106009,7 +82819,7 @@
       ;;
     *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_simplexml) -L$(top_builddir)/netware -lphp5lib $(PLEXML_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_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SIMPLEXML, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -106022,7 +82832,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/simplexml.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
 
   cat >>Makefile.objects<<EOF
@@ -106036,10 +82846,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SIMPLEXML 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -106048,15 +82857,15 @@
     PHP_SIMPLEXML_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/simplexml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -106069,12 +82878,12 @@
 
   old_IFS=$IFS
   for ac_src in simplexml.c sxe.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
@@ -106094,15 +82903,15 @@
         EXT_STATIC="$EXT_STATIC simplexml"
         ;;
       *)
-
-
+        
+  
   case ext/simplexml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -106115,13 +82924,13 @@
 
   old_IFS=$IFS
   for ac_src in simplexml.c sxe.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -106141,116 +82950,88 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=simplexml
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST SIMPLEXML_SHARED_LIBADD"
 
-
+  
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
     fi
-else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
+  
   fi
 
-
+  
   am_i_shared=$PHP_SIMPLEXML_SHARED
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension simplexml to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build simplexml shared or build libxml statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension simplexml to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build simplexml shared or build libxml statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension simplexml, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension simplexml, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
   am_i_shared=$PHP_SIMPLEXML_SHARED
   is_it_shared=$PHP_SPL_SHARED
   is_it_enabled=$PHP_SPL
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension simplexml to build statically, but it
 depends on extension spl, which you've configured to build shared.
 You either need to build simplexml shared or build spl statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension simplexml to build statically, but it
-depends on extension spl, which you've configured to build shared.
-You either need to build simplexml shared or build spl statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension simplexml, which depends on extension spl,
 but you've either not enabled spl, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension simplexml, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
+  
 fi
 
 
 
 php_with_snmp=no
 
-echo "$as_me:$LINENO: checking for SNMP support" >&5
-echo $ECHO_N "checking for SNMP support... $ECHO_C" >&6
-
+echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
+echo "configure:83024: checking for SNMP support" >&5
 # Check whether --with-snmp or --without-snmp was given.
 if test "${with_snmp+set}" = set; then
   withval="$with_snmp"
   PHP_SNMP=$withval
 else
-
+  
   PHP_SNMP=no
   test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -106274,8 +83055,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -106283,23 +83063,22 @@
 
 php_with_openssl_dir=no
 
-echo "$as_me:$LINENO: checking OpenSSL dir for SNMP" >&5
-echo $ECHO_N "checking OpenSSL dir for SNMP... $ECHO_C" >&6
-
+echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
+echo "configure:83068: 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"
   PHP_OPENSSL_DIR=$withval
 else
-
+  
   PHP_OPENSSL_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_OPENSSL_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -106307,22 +83086,22 @@
 
 php_enable_ucd_snmp_hack=no
 
-echo "$as_me:$LINENO: checking whether to enable UCD SNMP hack" >&5
-echo $ECHO_N "checking whether to enable UCD SNMP hack... $ECHO_C" >&6
+echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
+echo "configure:83091: 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"
   PHP_UCD_SNMP_HACK=$enableval
 else
-
+  
   PHP_UCD_SNMP_HACK=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_UCD_SNMP_HACK
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -106332,42 +83111,37 @@
         if test "$PHP_SNMP" = "yes"; then
     # Extract the first word of "net-snmp-config", so it can be a program name with args.
 set dummy net-snmp-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:83116: 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
-  case $SNMP_CONFIG in
-  [\\/]* | ?:[\\/]*)
+  case "$SNMP_CONFIG" in
+  /*)
   ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="/usr/local/bin:$PATH"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="/usr/local/bin:$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   ;;
 esac
 fi
-SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
-
+SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG"
 if test -n "$SNMP_CONFIG"; then
-  echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5
-echo "${ECHO_T}$SNMP_CONFIG" >&6
+  echo "$ac_t""$SNMP_CONFIG" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   else
@@ -106380,48 +83154,48 @@
     SNMP_PREFIX=`$SNMP_CONFIG --prefix`
 
     if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-
+      
   if test "${SNMP_PREFIX}/include" != "/usr/include"; then
-
+    
   if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then
     ai_p=${SNMP_PREFIX}/include
   else
-
+    
     ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`"
   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
 
-
+      
   for ac_i in $SNMP_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -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"
@@ -106432,20 +83206,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
+        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -106458,62 +83232,59 @@
     ;;
     -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
         SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_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
 
     ;;
     esac
   done
 
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define HAVE_NET_SNMP 1
-_ACEOF
+EOF
 
       SNMP_LIBNAME=netsnmp
     else
-      { { echo "$as_me:$LINENO: error: Could not find the required paths. Please check your net-snmp installation." >&5
-echo "$as_me: error: Could not find the required paths. Please check your net-snmp installation." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; }
     fi
-  else
-
+  else 
 
+            
     if test "$PHP_SNMP" = "yes"; then
       for i in /usr/include /usr/local/include; do
         test -f $i/snmp.h                       && SNMP_INCDIR=$i
@@ -106531,215 +83302,95 @@
     fi
 
     if test -z "$SNMP_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: snmp.h not found. Check your SNMP installation." >&5
-echo "$as_me: error: snmp.h not found. Check your SNMP installation." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; }
     elif test -z "$SNMP_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: libsnmp not found. Check your SNMP installation." >&5
-echo "$as_me: error: libsnmp not found. Check your SNMP installation." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; }
     fi
 
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$SNMP_INCDIR
-
-for ac_header in default_store.h
+    for ac_hdr in default_store.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:83317: 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 83322 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:83327: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
     if test "$ac_cv_header_default_store_h" = "yes"; then
-      echo "$as_me:$LINENO: checking for OpenSSL support in SNMP libraries" >&5
-echo $ECHO_N "checking for OpenSSL support in SNMP libraries... $ECHO_C" >&6
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+      echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
+echo "configure:83355: checking for OpenSSL support in SNMP libraries" >&5
+      cat > conftest.$ac_ext <<EOF
+#line 83357 "configure"
+#include "confdefs.h"
 
 #include <ucd-snmp-config.h>
 #if USE_OPENSSL
         yes
 #endif
-
-_ACEOF
+      
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
         SNMP_SSL=yes
-
+      
 else
-
+  rm -rf conftest*
+  
         SNMP_SSL=no
-
+      
 fi
 rm -f conftest*
 
     fi
     CPPFLAGS=$old_CPPFLAGS
-    echo "$as_me:$LINENO: result: $SNMP_SSL" >&5
-echo "${ECHO_T}$SNMP_SSL" >&6
-
+    echo "$ac_t""$SNMP_SSL" 1>&6
+  
     if test "$SNMP_SSL" = "yes"; then
       if test "$PHP_OPENSSL_DIR" != "no"; then
         PHP_OPENSSL=$PHP_OPENSSL_DIR
       fi
-
+      
       if test "$PHP_OPENSSL" = "no"; then
-        { { echo "$as_me:$LINENO: error: The UCD-SNMP in this system is built with SSL support.
-
-        Add --with-openssl-dir=DIR to your configure line." >&5
-echo "$as_me: error: The UCD-SNMP in this system is built with SSL support.
+        { echo "configure: error: The UCD-SNMP in this system is built with SSL support. 
 
-        Add --with-openssl-dir=DIR to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+        Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; }
       else
-
+        
   found_openssl=no
   unset OPENSSL_INCDIR
   unset OPENSSL_LIBDIR
@@ -106756,42 +83407,38 @@
     if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:83412: 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
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
+  case "$PKG_CONFIG" in
+  /*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+  ;;
   *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  echo "$ac_t""$PKG_CONFIG" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   fi
@@ -106803,23 +83450,21 @@
       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
     else
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
     fi
 
     if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
-
+      
   for ac_i in $OPENSSL_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -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"
@@ -106830,20 +83475,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
+        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -106856,80 +83501,80 @@
     ;;
     -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
         SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $OPENSSL_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -106942,7 +83587,7 @@
   fi
 
     if test "$found_openssl" = "no"; then
-
+  
     if test "$PHP_OPENSSL_DIR" = "yes"; then
       PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
     fi
@@ -106958,102 +83603,94 @@
     done
 
     if test -z "$OPENSSL_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5
-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; }
     fi
 
     if test -z "$OPENSSL_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5
-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; }
     fi
 
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
-    echo "$as_me:$LINENO: checking for OpenSSL version" >&5
-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
+echo "configure:83617: checking for OpenSSL version" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 83619 "configure"
+#include "confdefs.h"
 
 #include <openssl/opensslv.h>
 #if OPENSSL_VERSION_NUMBER >= 0x0090600fL
   yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-      echo "$as_me:$LINENO: result: >= 0.9.6" >&5
-echo "${ECHO_T}>= 0.9.6" >&6
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
+      echo "$ac_t"">= 0.9.6" 1>&6
+    
 else
-
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
-
+  rm -rf conftest*
+  
+      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
+    
 fi
 rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
-
+    
   if test "$OPENSSL_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$OPENSSL_INCDIR
   else
-
+    
     ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OPENSSL_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
 
-
-
+  
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$OPENSSL_LIBDIR
     "
-
+  
   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"
@@ -107064,20 +83701,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -107090,131 +83727,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6
-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
+echo "configure:83774: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 83782 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char CRYPTO_free ();
-int
-main ()
-{
-CRYPTO_free ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypto_CRYPTO_free=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_crypto_CRYPTO_free=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6
-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then
+    builtin and then its argument prototype would still apply.  */
+char CRYPTO_free();
+
+int main() {
+CRYPTO_free()
+; return 0; }
+EOF
+if { (eval echo configure:83793: \"$ac_link\") 1>&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
-
-
-
+    
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD"
+        SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcrypto $LIBS"
+  *) 
+      LIBS="-lcrypto $LIBS" 
    ;;
   esac
 
@@ -107224,43 +83831,42 @@
   esac
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypto_CRYPTO_free
-
-      { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5
-echo "$as_me: error: libcrypto not found!" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: libcrypto not found!" 1>&2; exit 1; }
+    
+  
 fi
 
 
     old_LIBS=$LIBS
     LIBS="$LIBS -lcrypto"
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$OPENSSL_LIBDIR
     "
-
+  
   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"
@@ -107271,20 +83877,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -107297,148 +83903,117 @@
     ;;
     -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 "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6
-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
+echo "configure:83950: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 83958 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char SSL_CTX_set_ssl_version ();
-int
-main ()
-{
-SSL_CTX_set_ssl_version ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6
-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then
+    builtin and then its argument prototype would still apply.  */
+char SSL_CTX_set_ssl_version();
+
+int main() {
+SSL_CTX_set_ssl_version()
+; return 0; }
+EOF
+if { (eval echo configure:83969: \"$ac_link\") 1>&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
-
+    
       found_openssl=yes
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
-
-      { { echo "$as_me:$LINENO: error: libssl not found!" >&5
-echo "$as_me: error: libssl not found!" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: libssl not found!" 1>&2; exit 1; }
+    
+  
 fi
 
     LIBS=$old_LIBS
-
-
+    
+  
   case ssl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD"
+        SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case ssl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lssl $LIBS"
+  *) 
+      LIBS="-lssl $LIBS" 
    ;;
   esac
 
@@ -107448,20 +84023,20 @@
   esac
 
 
-
-
+    
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD"
+        SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case crypto in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcrypto $LIBS"
+  *) 
+      LIBS="-lcrypto $LIBS" 
    ;;
   esac
 
@@ -107472,140 +84047,108 @@
 
 
 
-
+    
   if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$OPENSSL_LIBDIR
   else
-
+    
     ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_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
 
   if test "$found_openssl" = "yes"; then
     OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
-
+  
 
 :
-else
-          { { echo "$as_me:$LINENO: error: SNMP: OpenSSL check failed. Please check config.log for more information." >&5
-echo "$as_me: error: SNMP: OpenSSL check failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+          { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; }
+        
   fi
 
       fi
     fi
 
-    echo "$as_me:$LINENO: checking for kstat_read in -lkstat" >&5
-echo $ECHO_N "checking for kstat_read in -lkstat... $ECHO_C" >&6
-if test "${ac_cv_lib_kstat_kstat_read+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
+echo "configure:84105: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lkstat  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 84113 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char kstat_read ();
-int
-main ()
-{
-kstat_read ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_kstat_kstat_read=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_kstat_kstat_read=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_read" >&5
-echo "${ECHO_T}$ac_cv_lib_kstat_kstat_read" >&6
-if test $ac_cv_lib_kstat_kstat_read = yes; then
+    builtin and then its argument prototype would still apply.  */
+char kstat_read();
 
+int main() {
+kstat_read()
+; return 0; }
+EOF
+if { (eval echo configure:84124: \"$ac_link\") 1>&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
+   
+  
   case kstat in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD"
+        SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" 
     else
-
-
+      
+  
   case kstat in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lkstat $LIBS"
+  *) 
+      LIBS="-lkstat $LIBS" 
    ;;
   esac
 
@@ -107614,128 +84157,130 @@
    ;;
   esac
 
-
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-
+    
   if test "$SNMP_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$SNMP_INCDIR
   else
-
+    
     ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SNMP_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
     SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD"
     if test -n "$SNMP_LIBDIR"; then
-
+      
   if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SNMP_LIBDIR
   else
-
+    
     ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_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 "$SNMP_LIBDIR"; then
-
+    
   if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SNMP_LIBDIR
   else
-
+    
     ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SNMP_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 snmp in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsnmp $LIBS"
+  *) 
+      LIBS="-lsnmp $LIBS" 
    ;;
   esac
 
@@ -107748,25 +84293,25 @@
     SNMP_LIBNAME=snmp
   fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $SNMP_SHARED_LIBADD
   "
-
+  
   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"
@@ -107777,20 +84322,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -107803,154 +84348,123 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$SNMP_LIBNAME''_snmp_parse_oid" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
-echo $ECHO_N "checking for snmp_parse_oid in -l$SNMP_LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
+echo "configure:84395: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$SNMP_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 84403 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char snmp_parse_oid ();
-int
-main ()
-{
-snmp_parse_oid ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char snmp_parse_oid();
 
+int main() {
+snmp_parse_oid()
+; return 0; }
+EOF
+if { (eval echo configure:84414: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_SNMP_PARSE_OID 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid
-
-
+    
+  
 fi
 
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
     $SNMP_SHARED_LIBADD
   "
-
+  
   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"
@@ -107961,20 +84475,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -107987,148 +84501,114 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$SNMP_LIBNAME''_init_snmp" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for init_snmp in -l$SNMP_LIBNAME" >&5
-echo $ECHO_N "checking for init_snmp in -l$SNMP_LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
+echo "configure:84548: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$SNMP_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 84556 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char init_snmp ();
-int
-main ()
-{
-init_snmp ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char init_snmp();
+
+int main() {
+init_snmp()
+; return 0; }
+EOF
+if { (eval echo configure:84567: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+    cat >> confdefs.h <<\EOF
 #define HAVE_SNMP 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_init_snmp
-
-    { { echo "$as_me:$LINENO: error: SNMP sanity check failed. Please check config.log for more information." >&5
-echo "$as_me: error: SNMP sanity check failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+    { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; }
+  
+  
 fi
 
 
   if test "$PHP_UCD_SNMP_HACK" = "yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define UCD_SNMP_HACK 1
-_ACEOF
+EOF
 
   fi
-
-
+  
+  
   ext_builddir=ext/snmp
   ext_srcdir=$abs_srcdir/ext/snmp
 
@@ -108136,15 +84616,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SNMP_SHARED=no
-
-
+    
+  
   case ext/snmp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -108157,12 +84637,12 @@
 
   old_IFS=$IFS
   for ac_src in snmp.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
@@ -108186,14 +84666,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SNMP_SHARED=yes
-
+      
   case ext/snmp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -108206,12 +84686,12 @@
 
   old_IFS=$IFS
   for ac_src in snmp.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -108229,7 +84709,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -108239,7 +84719,7 @@
       ;;
     *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_snmp) -L$(top_builddir)/netware -lphp5lib $(SNMP_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_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -108252,7 +84732,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
 
   cat >>Makefile.objects<<EOF
@@ -108266,7 +84746,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -108276,7 +84756,7 @@
       ;;
     *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_snmp) -L$(top_builddir)/netware -lphp5lib $(P_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_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SNMP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -108289,7 +84769,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/snmp.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
 
   cat >>Makefile.objects<<EOF
@@ -108303,10 +84783,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SNMP 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -108315,15 +84794,15 @@
     PHP_SNMP_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/snmp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -108336,12 +84815,12 @@
 
   old_IFS=$IFS
   for ac_src in snmp.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
@@ -108361,15 +84840,15 @@
         EXT_STATIC="$EXT_STATIC snmp"
         ;;
       *)
-
-
+        
+  
   case ext/snmp in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -108382,13 +84861,13 @@
 
   old_IFS=$IFS
   for ac_src in snmp.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -108408,20 +84887,20 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=snmp
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST SNMP_SHARED_LIBADD"
 
 fi
@@ -108430,18 +84909,19 @@
 
 php_enable_soap=no
 
-echo "$as_me:$LINENO: checking whether to enable SOAP support" >&5
-echo $ECHO_N "checking whether to enable SOAP support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6
+echo "configure:84914: 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"
   PHP_SOAP=$enableval
 else
-
+  
   PHP_SOAP=no
   test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -108465,33 +84945,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_LIBXML_DIR"; then
-
+  
 php_with_libxml_dir=no
 
-echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
+echo "configure:84959: 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"
   PHP_LIBXML_DIR=$withval
 else
-
+  
   PHP_LIBXML_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBXML_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -108499,19 +84977,17 @@
 
 if test "$PHP_SOAP" != "no"; then
 
-  if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: SOAP extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: SOAP extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+  if test "$PHP_LIBXML" = "no"; then   
+    { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }                
   fi
 
-
-echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
+echo "configure:84987: 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
-
+  
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
     if test -x "$i/bin/xml2-config"; then
       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
@@ -108520,8 +84996,8 @@
   done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6
+
+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -108534,17 +85010,17 @@
     if test "$LIBXML_VERSION" -ge "2006011"; then
       LIBXML_LIBS=`$XML2_CONFIG --libs`
       LIBXML_INCS=`$XML2_CONFIG --cflags`
-
+      
   for ac_i in $LIBXML_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -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"
@@ -108555,20 +85031,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii"
+        SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -108581,80 +85057,80 @@
     ;;
     -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
         SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $LIBXML_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -108664,92 +85140,74 @@
   done
 
 
-            echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
+echo "configure:85145: 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
-
-
+  
+        
   old_LIBS=$LIBS
   LIBS="
           $SOAP_SHARED_LIBADD
          $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 85161 "configure"
+#include "confdefs.h"
 
+    
     char xmlInitParser();
     int main() {
       xmlInitParser();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:85172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
+    
           php_cv_libxml_build_works=yes
-
-
+        
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
+        
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+      
 fi
-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6
-      if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_libxml_build_works" 1>&6
+      if test "$php_cv_libxml_build_works" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
+EOF
 
       fi
-
-
-cat >>confdefs.h <<\_ACEOF
+      
+    cat >> confdefs.h <<\EOF
 #define HAVE_SOAP 1
-_ACEOF
-
+EOF
 
+    
   ext_builddir=ext/soap
   ext_srcdir=$abs_srcdir/ext/soap
 
@@ -108757,15 +85215,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SOAP_SHARED=no
-
-
+    
+  
   case ext/soap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -108778,12 +85236,12 @@
 
   old_IFS=$IFS
   for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.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
@@ -108807,14 +85265,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SOAP_SHARED=yes
-
+      
   case ext/soap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -108827,12 +85285,12 @@
 
   old_IFS=$IFS
   for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -108850,7 +85308,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -108860,7 +85318,7 @@
       ;;
     *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_soap) -L$(top_builddir)/netware -lphp5lib $(SOAP_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_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOAP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -108873,7 +85331,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
 
   cat >>Makefile.objects<<EOF
@@ -108887,7 +85345,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -108897,7 +85355,7 @@
       ;;
     *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_soap) -L$(top_builddir)/netware -lphp5lib $(P_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_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOAP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -108910,7 +85368,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
 
   cat >>Makefile.objects<<EOF
@@ -108924,10 +85382,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SOAP 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -108936,15 +85393,15 @@
     PHP_SOAP_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/soap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -108957,12 +85414,12 @@
 
   old_IFS=$IFS
   for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.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
@@ -108982,15 +85439,15 @@
         EXT_STATIC="$EXT_STATIC soap"
         ;;
       *)
-
-
+        
+  
   case ext/soap in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -109003,13 +85460,13 @@
 
   old_IFS=$IFS
   for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -109029,33 +85486,29 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=soap
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD"
 
-
+  
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
     fi
-else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
+  
   fi
 
 fi
@@ -109064,18 +85517,19 @@
 
 php_enable_sockets=no
 
-echo "$as_me:$LINENO: checking whether to enable sockets support" >&5
-echo $ECHO_N "checking whether to enable sockets support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
+echo "configure:85522: 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"
   PHP_SOCKETS=$enableval
 else
-
+  
   PHP_SOCKETS=no
   test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -109099,395 +85553,175 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_SOCKETS" != "no"; then
-    echo "$as_me:$LINENO: checking for struct cmsghdr" >&5
-echo $ECHO_N "checking for struct cmsghdr... $ECHO_C" >&6
-if test "${ac_cv_cmsghdr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
+echo "configure:85564: 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 85570 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
-int
-main ()
-{
+int main() {
 struct cmsghdr s; s
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:85579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_cmsghdr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_cmsghdr=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_cmsghdr=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cmsghdr" >&5
-echo "${ECHO_T}$ac_cv_cmsghdr" >&6
 
-  if test "$ac_cv_cmsghdr" = yes; then
+echo "$ac_t""$ac_cv_cmsghdr" 1>&6
 
-cat >>confdefs.h <<\_ACEOF
+  if test "$ac_cv_cmsghdr" = yes; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_CMSGHDR 1
-_ACEOF
-
-  fi
-
+EOF
 
+  fi 
 
-for ac_func in hstrerror socketpair
+  for ac_func in hstrerror socketpair
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:85604: 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 85609 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:85632: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
-
-
-
-
-for ac_header in netdb.h netinet/tcp.h sys/un.h errno.h
+  for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:85660: 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 85665 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:85670: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 85697 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
-
-int
-main ()
-{
+  
+int main() {
 static struct msghdr tp; int n = (int) tp.msg_flags; return n
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:85707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-cat >>confdefs.h <<\_ACEOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
 #define MISSING_MSGHDR_MSGFLAGS 1
-_ACEOF
-
+EOF
 
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-cat >>confdefs.h <<\_ACEOF
+rm -f conftest*
+  cat >> confdefs.h <<\EOF
 #define HAVE_SOCKETS 1
-_ACEOF
-
+EOF
 
 
+  
   ext_builddir=ext/sockets
   ext_srcdir=$abs_srcdir/ext/sockets
 
@@ -109495,15 +85729,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SOCKETS_SHARED=no
-
-
+    
+  
   case ext/sockets in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -109516,12 +85750,12 @@
 
   old_IFS=$IFS
   for ac_src in sockets.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
@@ -109545,14 +85779,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SOCKETS_SHARED=yes
-
+      
   case ext/sockets in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -109565,12 +85799,12 @@
 
   old_IFS=$IFS
   for ac_src in sockets.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -109588,7 +85822,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -109598,7 +85832,7 @@
       ;;
     *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_sockets) -L$(top_builddir)/netware -lphp5lib $(SOCKETS_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_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOCKETS, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -109611,7 +85845,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
 
   cat >>Makefile.objects<<EOF
@@ -109625,7 +85859,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -109635,7 +85869,7 @@
       ;;
     *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_sockets) -L$(top_builddir)/netware -lphp5lib $(KETS_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_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOCKETS, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -109648,7 +85882,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
 
   cat >>Makefile.objects<<EOF
@@ -109662,10 +85896,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SOCKETS 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -109674,15 +85907,15 @@
     PHP_SOCKETS_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/sockets in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -109695,12 +85928,12 @@
 
   old_IFS=$IFS
   for ac_src in sockets.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
@@ -109720,15 +85953,15 @@
         EXT_STATIC="$EXT_STATIC sockets"
         ;;
       *)
-
-
+        
+  
   case ext/sockets in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -109741,13 +85974,13 @@
 
   old_IFS=$IFS
   for ac_src in sockets.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -109767,108 +86000,90 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=sockets
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+  
     header_path=ext/sockets/
     for header_file in php_sockets.h; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
+    done 
+  
 
 fi
 
 
-  echo "$as_me:$LINENO: checking whether zend_object_value is packed" >&5
-echo $ECHO_N "checking whether zend_object_value is packed... $ECHO_C" >&6
+  echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6
+echo "configure:86041: checking whether zend_object_value is packed" >&5
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
   if test "$cross_compiling" = yes; then
-
+  
     ac_result=0
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+    echo "$ac_t""no" 1>&6
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 86051 "configure"
+#include "confdefs.h"
 
 #include "Zend/zend_types.h"
 int main(int argc, char **argv) {
 	return ((sizeof(zend_object_handle) + sizeof(zend_object_handlers*)) == sizeof(zend_object_value)) ? 0 : 1;
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:86060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     ac_result=1
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+    echo "$ac_t""yes" 1>&6
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     ac_result=0
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+    echo "$ac_t""no" 1>&6
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
-  CPPFLAGS=$old_CPPFLAGS
 
-cat >>confdefs.h <<_ACEOF
+  CPPFLAGS=$old_CPPFLAGS
+  cat >> confdefs.h <<EOF
 #define HAVE_PACKED_OBJECT_VALUE $ac_result
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_SPL 1
-_ACEOF
-
-
+EOF
+ 
+  
   ext_builddir=ext/spl
   ext_srcdir=$abs_srcdir/ext/spl
 
@@ -109876,15 +86091,15 @@
 
   if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
     PHP_SPL_SHARED=no
-
-
+    
+  
   case ext/spl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -109897,12 +86112,12 @@
 
   old_IFS=$IFS
   for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.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
@@ -109926,14 +86141,14 @@
   else
     if test "no" = "shared" || test "no" = "yes"; then
       PHP_SPL_SHARED=yes
-
+      
   case ext/spl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -109946,12 +86161,12 @@
 
   old_IFS=$IFS
   for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -109969,7 +86184,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -109979,7 +86194,7 @@
       ;;
     *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_spl) -L$(top_builddir)/netware -lphp5lib $(SPL_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_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSPL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -109992,7 +86207,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
 
   cat >>Makefile.objects<<EOF
@@ -110006,7 +86221,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -110016,7 +86231,7 @@
       ;;
     *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_spl) -L$(top_builddir)/netware -lphp5lib $(_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_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -110029,7 +86244,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
 
   cat >>Makefile.objects<<EOF
@@ -110043,10 +86258,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SPL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -110055,15 +86269,15 @@
     PHP_SPL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/spl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -110076,12 +86290,12 @@
 
   old_IFS=$IFS
   for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.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
@@ -110101,15 +86315,15 @@
         EXT_STATIC="$EXT_STATIC spl"
         ;;
       *)
-
-
+        
+  
   case ext/spl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -110122,13 +86336,13 @@
 
   old_IFS=$IFS
   for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -110148,88 +86362,76 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=spl
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+  
     header_path=ext/spl
     for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do
       hp_hf="$header_path/$header_file"
-
-
+      
+  
   unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
+  
   am_i_shared=$PHP_SPL_SHARED
   is_it_shared=$PHP_PCRE_SHARED
   is_it_enabled=$PHP_PCRE
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension spl to build statically, but it
-depends on extension pcre, which you've configured to build shared.
-You either need to build spl shared or build pcre statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension spl to build statically, but it
 depends on extension pcre, which you've configured to build shared.
 You either need to build spl shared or build pcre statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension spl, which depends on extension pcre,
-but you've either not enabled pcre, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension spl, which depends on extension pcre,
 but you've either not enabled pcre, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
+  
 
 
 
 php_with_sqlite=yes
 
-echo "$as_me:$LINENO: checking for sqlite support" >&5
-echo $ECHO_N "checking for sqlite support... $ECHO_C" >&6
-
+echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
+echo "configure:86424: checking for sqlite support" >&5
 # Check whether --with-sqlite or --without-sqlite was given.
 if test "${with_sqlite+set}" = set; then
   withval="$with_sqlite"
   PHP_SQLITE=$withval
 else
-
+  
   PHP_SQLITE=yes
   test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -110253,8 +86455,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -110262,22 +86463,22 @@
 
 php_enable_sqlite_utf8=no
 
-echo "$as_me:$LINENO: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
-echo $ECHO_N "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)... $ECHO_C" >&6
+echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6
+echo "configure:86468: 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"
   PHP_SQLITE_UTF8=$enableval
 else
-
+  
   PHP_SQLITE_UTF8=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_SQLITE_UTF8
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -110289,15 +86490,15 @@
 
 if test "$PHP_SQLITE" != "no"; then
   if test "$PHP_PDO" != "no"; then
-
-  echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
-if test "${pdo_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6
+    
+  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
+echo "configure:86496: 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:86502: 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
@@ -110305,26 +86506,24 @@
     elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$prefix/include/php/ext
     fi
-
+  
 fi
-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5
-echo "${ECHO_T}$pdo_inc_path" >&6
+
+echo "$ac_t""$pdo_inc_path" 1>&6
   if test -n "$pdo_inc_path"; then
 :
   else
-{ echo "$as_me:$LINENO: WARNING: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: WARNING: Cannot find php_pdo_driver.h." >&2;}
+echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2
   fi
 
     if test -n "$pdo_inc_path"; then
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define PHP_SQLITE2_HAVE_PDO 1
-_ACEOF
+EOF
 
       pdo_inc_path="-I$pdo_inc_path"
     fi
-  fi
+  fi  
 
   if test "$PHP_SQLITE" != "yes"; then
     SEARCH_PATH="/usr/local /usr"
@@ -110332,44 +86531,40 @@
     if test -r $PHP_SQLITE/; then # path given as parameter
       SQLITE_DIR=$PHP_SQLITE
     else # search default path list
-      echo "$as_me:$LINENO: checking for sqlite files in default path" >&5
-echo $ECHO_N "checking for sqlite files in default path... $ECHO_C" >&6
+      echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
+echo "configure:86536: checking for sqlite files in default path" >&5
       for i in $SEARCH_PATH ; do
         if test -r $i/$SEARCH_FOR; then
           SQLITE_DIR=$i
-          echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6
+          echo "$ac_t""found in $i" 1>&6
         fi
       done
     fi
-
+  
     if test -z "$SQLITE_DIR"; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-      { { echo "$as_me:$LINENO: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&5
-echo "$as_me: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&2;}
-   { (exit 1); exit 1; }; }
+      echo "$ac_t""not found" 1>&6
+      { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; }
     fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
       -L$SQLITE_DIR/$PHP_LIBDIR -lm
     "
-
+  
   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"
@@ -110380,20 +86575,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -110406,205 +86601,175 @@
     ;;
     -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 "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5
-echo $ECHO_N "checking for sqlite_open in -lsqlite... $ECHO_C" >&6
-if test "${ac_cv_lib_sqlite_sqlite_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
+echo "configure:86648: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsqlite  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 86656 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char sqlite_open ();
-int
-main ()
-{
-sqlite_open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sqlite_sqlite_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sqlite_sqlite_open=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_open" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_open" >&6
-if test $ac_cv_lib_sqlite_sqlite_open = yes; then
+    builtin and then its argument prototype would still apply.  */
+char sqlite_open();
+
+int main() {
+sqlite_open()
+; return 0; }
+EOF
+if { (eval echo configure:86667: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
     SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD"
     if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SQLITE_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_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 "$SQLITE_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SQLITE_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case sqlite in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsqlite $LIBS"
+  *) 
+      LIBS="-lsqlite $LIBS" 
    ;;
   esac
 
@@ -110614,50 +86779,49 @@
   fi
 
 
-
+      
   if test "$SQLITE_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$SQLITE_DIR/include
   else
-
+    
     ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`"
   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
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite_sqlite_open
-
-      { { echo "$as_me:$LINENO: error: wrong sqlite lib version or lib not found" >&5
-echo "$as_me: error: wrong sqlite lib version or lib not found" >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+      { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
+    
+  
 fi
 
     SQLITE_MODULE_TYPE=external
@@ -110665,52 +86829,46 @@
     sqlite_extra_sources="libsqlite/src/encode.c"
   else
     # use bundled library
-
+    
   # we only support certain lemon versions
   lemon_version_list="1.0"
 
   # Extract the first word of "lemon", so it can be a program name with args.
 set dummy lemon; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_LEMON+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:86840: 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
   if test -n "$LEMON"; then
   ac_cv_prog_LEMON="$LEMON" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LEMON="lemon"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_LEMON="lemon"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-LEMON=$ac_cv_prog_LEMON
+LEMON="$ac_cv_prog_LEMON"
 if test -n "$LEMON"; then
-  echo "$as_me:$LINENO: result: $LEMON" >&5
-echo "${ECHO_T}$LEMON" >&6
+  echo "$ac_t""$LEMON" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   if test "$LEMON"; then
-    echo "$as_me:$LINENO: checking for lemon version" >&5
-echo $ECHO_N "checking for lemon version... $ECHO_C" >&6
-if test "${php_cv_lemon_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for lemon version""... $ac_c" 1>&6
+echo "configure:86868: 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
-
+  
       lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'`
       php_cv_lemon_version=invalid
       for lemon_check_version in $lemon_version_list; do
@@ -110718,22 +86876,21 @@
           php_cv_lemon_version="$lemon_check_version (ok)"
         fi
       done
-
+    
 fi
-echo "$as_me:$LINENO: result: $php_cv_lemon_version" >&5
-echo "${ECHO_T}$php_cv_lemon_version" >&6
+
+echo "$ac_t""$php_cv_lemon_version" 1>&6
   else
     lemon_version=none
   fi
   case $php_cv_lemon_version in
     ""|invalid)
       lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)."
-      { echo "$as_me:$LINENO: WARNING: $lemon_msg" >&5
-echo "$as_me: WARNING: $lemon_msg" >&2;}
+      echo "configure: warning: $lemon_msg" 1>&2
       LEMON="exit 0;"
       ;;
   esac
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON"
 
 
@@ -110753,8 +86910,8 @@
         libsqlite/src/vdbeaux.c libsqlite/src/date.c \
         libsqlite/src/where.c libsqlite/src/trigger.c"
   fi
-        sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources"
-
+        sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" 
+  
   ext_builddir=ext/sqlite
   ext_srcdir=$abs_srcdir/ext/sqlite
 
@@ -110762,15 +86919,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SQLITE_SHARED=no
-
-
+    
+  
   case ext/sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -110783,12 +86940,12 @@
 
   old_IFS=$IFS
   for ac_src in $sqlite_sources; 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
@@ -110812,14 +86969,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SQLITE_SHARED=yes
-
+      
   case ext/sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -110832,12 +86989,12 @@
 
   old_IFS=$IFS
   for ac_src in $sqlite_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -110855,7 +87012,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -110865,7 +87022,7 @@
       ;;
     *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_sqlite) -L$(top_builddir)/netware -lphp5lib $(SQLITE_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_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -110878,7 +87035,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
 
   cat >>Makefile.objects<<EOF
@@ -110892,7 +87049,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -110902,7 +87059,7 @@
       ;;
     *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_sqlite) -L$(top_builddir)/netware -lphp5lib $(ITE_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_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -110915,7 +87072,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
 
   cat >>Makefile.objects<<EOF
@@ -110929,10 +87086,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SQLITE 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -110941,15 +87097,15 @@
     PHP_SQLITE_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -110962,12 +87118,12 @@
 
   old_IFS=$IFS
   for ac_src in $sqlite_sources; 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
@@ -110987,15 +87143,15 @@
         EXT_STATIC="$EXT_STATIC sqlite"
         ;;
       *)
-
-
+        
+  
   case ext/sqlite in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -111008,13 +87164,13 @@
 
   old_IFS=$IFS
   for ac_src in $sqlite_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -111034,551 +87190,150 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=sqlite
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   am_i_shared=$PHP_SQLITE_SHARED
   is_it_shared=$PHP_SPL_SHARED
   is_it_enabled=$PHP_SPL
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension sqlite to build statically, but it
-depends on extension spl, which you've configured to build shared.
-You either need to build sqlite shared or build spl statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension sqlite to build statically, but it
 depends on extension spl, which you've configured to build shared.
 You either need to build sqlite shared or build spl statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension sqlite, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension sqlite, which depends on extension spl,
 but you've either not enabled spl, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
   am_i_shared=$PHP_SQLITE_SHARED
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension sqlite to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build sqlite shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension sqlite to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build sqlite shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension sqlite, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension sqlite, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
+  
 
-
-
+  
   src=$ext_srcdir/Makefile.frag
   ac_srcdir=$ext_srcdir
   ac_builddir=$ext_builddir
   test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD"
 
-
-
+  
+  
     for header_file in $ext_builddir/libsqlite/src/sqlite.h; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
+  
   if test "$SQLITE_MODULE_TYPE" = "builtin"; then
-
-
+    
+  
     $php_shtool mkdir -p $ext_builddir/libsqlite/src
+  
 
-
-    echo "$as_me:$LINENO: checking for char *" >&5
-echo $ECHO_N "checking for char *... $ECHO_C" >&6
-if test "${ac_cv_type_char_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((char * *) 0)
-  return 0;
-if (sizeof (char *))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_char_p=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_char_p=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-echo "${ECHO_T}$ac_cv_type_char_p" >&6
-
-echo "$as_me:$LINENO: checking size of char *" >&5
-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
-if test "${ac_cv_sizeof_char_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_char_p" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_char_p=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+    echo $ac_n "checking size of char *""... $ac_c" 1>&6
+echo "configure:87281: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (char *)); }
-unsigned long ulongval () { return (long) (sizeof (char *)); }
+  ac_cv_sizeof_char_p=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 87289 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (char *))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (char *))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (char *))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(char *));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_char_p=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:87300: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_char_p=0
 fi
+rm -fr conftest*
+fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
+cat >> confdefs.h <<EOF
 #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
-_ACEOF
-
+EOF
 
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define SQLITE_PTR_SZ SIZEOF_CHAR_P
-_ACEOF
+EOF
 
                 if test "$PHP_SQLITE_UTF8" = "yes"; then
       SQLITE_ENCODING="UTF8"
-
-cat >>confdefs.h <<\_ACEOF
+      cat >> confdefs.h <<\EOF
 #define SQLITE_UTF8 1
-_ACEOF
+EOF
 
     else
       SQLITE_ENCODING="ISO8859"
     fi
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING"
 
 
     SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION"
 
 
@@ -111589,7 +87344,7 @@
     else
       echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h
     fi
-
+    
     cat >> $ext_builddir/libsqlite/src/config.h <<EOF
 #if ZTS
 # define THREADSAFE 1
@@ -111599,280 +87354,120 @@
 #endif
 EOF
   fi
-
-
-
-for ac_func in usleep nanosleep
+  
+  for ac_func in usleep nanosleep
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:87362: 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 87367 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:87390: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
-
-for ac_header in time.h
+  for ac_hdr in time.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:87418: 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 87423 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:87428: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 fi
 
 
-echo "$as_me:$LINENO: checking whether flush should be called explicitly after a buffered io" >&5
-echo $ECHO_N "checking whether flush should be called explicitly after a buffered io... $ECHO_C" >&6
-if test "${ac_cv_flush_io+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
+echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
+echo "configure:87459: 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
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_flush_io=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 87470 "configure"
+#include "confdefs.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -111882,14 +87477,14 @@
 	char *filename = tmpnam(NULL);
 	char buffer[64];
 	int result = 0;
-
+	
 	FILE *fp = fopen(filename, "wb");
 	if (NULL == fp)
 		return 0;
 	fputs("line 1\n", fp);
 	fputs("line 2\n", fp);
 	fclose(fp);
-
+	
 	fp = fopen(filename, "rb+");
 	if (NULL == fp)
 		return 0;
@@ -111908,139 +87503,96 @@
 	exit(result);
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:87508: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_flush_io=yes
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_flush_io" >&5
-echo "${ECHO_T}$ac_cv_flush_io" >&6
-if test "$ac_cv_flush_io" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_flush_io" 1>&6
+if test "$ac_cv_flush_io" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_FLUSHIO 1
-_ACEOF
+EOF
 
 fi
 
 if test "$ac_cv_func_crypt" = "no"; then
-  echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+echo "configure:87536: 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
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 87544 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char crypt ();
-int
-main ()
-{
-crypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypt_crypt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_crypt_crypt=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-if test $ac_cv_lib_crypt_crypt = yes; then
+    builtin and then its argument prototype would still apply.  */
+char crypt();
 
-    LIBS="-lcrypt $LIBS -lcrypt"
+int main() {
+crypt()
+; return 0; }
+EOF
+if { (eval echo configure:87555: \"$ac_link\") 1>&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"
 
-cat >>confdefs.h <<\_ACEOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+    LIBS="-lcrypt $LIBS -lcrypt"
+    cat >> confdefs.h <<\EOF
 #define HAVE_CRYPT 1
-_ACEOF
-
+EOF
 
+  
+else
+  echo "$ac_t""no" 1>&6
 fi
 
 fi
-
-echo "$as_me:$LINENO: checking for standard DES crypt" >&5
-echo $ECHO_N "checking for standard DES crypt... $ECHO_C" >&6
-if test "${ac_cv_crypt_des+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
+echo "configure:87584: 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
-
+  
   if test "$cross_compiling" = yes; then
-
+  
   ac_cv_crypt_des=yes
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 87595 "configure"
+#include "confdefs.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -112057,54 +87609,41 @@
 	exit(0);
 #endif
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:87614: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_crypt_des=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_crypt_des" >&5
-echo "${ECHO_T}$ac_cv_crypt_des" >&6
 
-echo "$as_me:$LINENO: checking for extended DES crypt" >&5
-echo $ECHO_N "checking for extended DES crypt... $ECHO_C" >&6
-if test "${ac_cv_crypt_ext_des+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+echo "$ac_t""$ac_cv_crypt_des" 1>&6
 
+echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
+echo "configure:87635: 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
+  
   if test "$cross_compiling" = yes; then
-
+  
   ac_cv_crypt_ext_des=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 87646 "configure"
+#include "confdefs.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -112121,54 +87660,41 @@
   exit(0);
 #endif
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:87665: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_crypt_ext_des=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_crypt_ext_des" >&5
-echo "${ECHO_T}$ac_cv_crypt_ext_des" >&6
 
-echo "$as_me:$LINENO: checking for MD5 crypt" >&5
-echo $ECHO_N "checking for MD5 crypt... $ECHO_C" >&6
-if test "${ac_cv_crypt_md5+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6
 
+echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
+echo "configure:87686: 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
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_crypt_md5=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 87697 "configure"
+#include "confdefs.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -112182,7 +87708,7 @@
 #if HAVE_CRYPT
     char salt[15], answer[40];
 
-    salt[0]='$'; salt[1]='1'; salt[2]='$';
+    salt[0]='$'; salt[1]='1'; salt[2]='$'; 
     salt[3]='r'; salt[4]='a'; salt[5]='s';
     salt[6]='m'; salt[7]='u'; salt[8]='s';
     salt[9]='l'; salt[10]='e'; salt[11]='$';
@@ -112194,54 +87720,41 @@
 	exit(0);
 #endif
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:87725: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_crypt_md5=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_crypt_md5" >&5
-echo "${ECHO_T}$ac_cv_crypt_md5" >&6
 
-echo "$as_me:$LINENO: checking for Blowfish crypt" >&5
-echo $ECHO_N "checking for Blowfish crypt... $ECHO_C" >&6
-if test "${ac_cv_crypt_blowfish+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+echo "$ac_t""$ac_cv_crypt_md5" 1>&6
 
+echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
+echo "configure:87746: 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
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_crypt_blowfish=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 87757 "configure"
+#include "confdefs.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -112254,7 +87767,7 @@
 main() {
 #if HAVE_CRYPT
     char salt[30], answer[70];
-
+    
     salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
     strcat(salt,"rasmuslerd............");
     strcpy(answer,salt);
@@ -112264,54 +87777,41 @@
 	exit(0);
 #endif
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:87782: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_crypt_blowfish=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_crypt_blowfish" >&5
-echo "${ECHO_T}$ac_cv_crypt_blowfish" >&6
 
-echo "$as_me:$LINENO: checking for SHA512 crypt" >&5
-echo $ECHO_N "checking for SHA512 crypt... $ECHO_C" >&6
-if test "${ac_cv_crypt_SHA512+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6
 
+echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6
+echo "configure:87803: 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
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_crypt_SHA512=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 87814 "configure"
+#include "confdefs.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -112324,7 +87824,7 @@
 main() {
 #if HAVE_CRYPT
     char salt[30], answer[80];
-
+    
     salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0';
     strcpy(answer, salt);
     strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.");
@@ -112333,54 +87833,41 @@
 	exit(0);
 #endif
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:87838: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_crypt_SHA512=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_crypt_SHA512" >&5
-echo "${ECHO_T}$ac_cv_crypt_SHA512" >&6
 
-echo "$as_me:$LINENO: checking for SHA256 crypt" >&5
-echo $ECHO_N "checking for SHA256 crypt... $ECHO_C" >&6
-if test "${ac_cv_crypt_SHA256+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6
 
+echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6
+echo "configure:87859: 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
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_crypt_SHA256=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 87870 "configure"
+#include "confdefs.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -112393,7 +87880,7 @@
 main() {
 #if HAVE_CRYPT
     char salt[30], answer[80];
-    salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t';  salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0';
+    salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t';  salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0';    
     strcat(salt,"");
     strcpy(answer, salt);
     strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5");
@@ -112402,224 +87889,151 @@
 	exit(0);
 #endif
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:87894: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_crypt_SHA256=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_crypt_SHA256" >&5
-echo "${ECHO_T}$ac_cv_crypt_SHA256" >&6
+
+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 "$as_me:$LINENO: checking whether the compiler supports __alignof__" >&5
-echo $ECHO_N "checking whether the compiler supports __alignof__... $ECHO_C" >&6
-if test "${ac_cv_alignof_exists+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6
+echo "configure:87918: 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 87924 "configure"
+#include "confdefs.h"
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
+  
+int main() {
 
     int align = __alignof__(int);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+; return 0; }
+EOF
+if { (eval echo configure:87934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     ac_cv_alignof_exists=yes
-
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
     ac_cv_alignof_exists=no
-
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_alignof_exists" >&5
-echo "${ECHO_T}$ac_cv_alignof_exists" >&6
-  if test "$ac_cv_alignof_exists" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_alignof_exists" 1>&6
+  if test "$ac_cv_alignof_exists" = "yes"; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_ALIGNOF 1
-_ACEOF
+EOF
 
   fi
 
-        echo "$as_me:$LINENO: checking whether the compiler supports aligned attribute" >&5
-echo $ECHO_N "checking whether the compiler supports aligned attribute... $ECHO_C" >&6
-if test "${ac_cv_attribute_aligned+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6
+echo "configure:87959: 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 87965 "configure"
+#include "confdefs.h"
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
+  
+int main() {
 
     unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int))));
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+; return 0; }
+EOF
+if { (eval echo configure:87975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
     ac_cv_attribute_aligned=yes
-
+  
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
     ac_cv_attribute_aligned=no
-
+  
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_attribute_aligned" >&5
-echo "${ECHO_T}$ac_cv_attribute_aligned" >&6
-  if test "$ac_cv_attribute_aligned" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_attribute_aligned" 1>&6
+  if test "$ac_cv_attribute_aligned" = "yes"; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_ATTRIBUTE_ALIGNED 1
-_ACEOF
+EOF
 
   fi
+    
 
-
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_USE_PHP_CRYPT_R 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_STD_DES_CRYPT 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_BLOWFISH_CRYPT 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_EXT_DES_CRYPT 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_MD5_CRYPT 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_SHA512_CRYPT 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_SHA256_CRYPT 1
-_ACEOF
-
-
+EOF
 
 
+  
+  
   case ext/standard in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -112632,12 +88046,12 @@
 
   old_IFS=$IFS
   for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.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
@@ -112662,10 +88076,9 @@
     ac_result=0
     ac_crypt_des=0
   fi
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_STD_DES_CRYPT $ac_result
-_ACEOF
+EOF
 
 
   if test "$ac_cv_crypt_blowfish" = "yes"; then
@@ -112675,10 +88088,9 @@
     ac_result=0
     ac_crypt_blowfish=0
   fi
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_BLOWFISH_CRYPT $ac_result
-_ACEOF
+EOF
 
 
   if test "$ac_cv_crypt_ext_des" = "yes"; then
@@ -112688,10 +88100,9 @@
     ac_result=0
     ac_crypt_edes=0
   fi
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_EXT_DES_CRYPT $ac_result
-_ACEOF
+EOF
 
 
   if test "$ac_cv_crypt_md5" = "yes"; then
@@ -112701,12 +88112,11 @@
     ac_result=0
     ac_crypt_md5=0
   fi
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_MD5_CRYPT $ac_result
-_ACEOF
-
-
+EOF
+  
+  
   if test "$ac_cv_crypt_sha512" = "yes"; then
     ac_result=1
     ac_crypt_sha512=1
@@ -112714,10 +88124,9 @@
     ac_result=0
     ac_crypt_sha512=0
   fi
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_SHA512_CRYPT $ac_result
-_ACEOF
+EOF
 
 
   if test "$ac_cv_crypt_sha256" = "yes"; then
@@ -112727,338 +88136,188 @@
     ac_result=0
     ac_crypt_sha256=0
   fi
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_SHA256_CRYPT $ac_result
-_ACEOF
-
+EOF
 
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_USE_PHP_CRYPT_R 0
-_ACEOF
+EOF
 
 fi
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:88154: 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 88159 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:88182: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
-echo "$as_me:$LINENO: checking for working POSIX fnmatch" >&5
-echo $ECHO_N "checking for working POSIX fnmatch... $ECHO_C" >&6
-if test "${ac_cv_func_fnmatch_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Some versions of Solaris, SCO, and the GNU C Library
-   # have a broken or incompatible fnmatch.
-   # So we run a test program.  If we are cross-compiling, take no chance.
-   # Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
-   if test "$cross_compiling" = yes; then
-  ac_cv_func_fnmatch_works=cross
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <fnmatch.h>
-#	   define y(a, b, c) (fnmatch (a, b, c) == 0)
-#	   define n(a, b, c) (fnmatch (a, b, c) == FNM_NOMATCH)
-
-int
-main ()
-{
-exit
-	   (!(y ("a*", "abc", 0)
-	      && n ("d*/*1", "d/s/1", FNM_PATHNAME)
-	      && y ("a\\\\bc", "abc", 0)
-	      && n ("a\\\\bc", "abc", FNM_NOESCAPE)
-	      && y ("*x", ".x", 0)
-	      && n ("*x", ".x", FNM_PERIOD)
-	      && 1));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
+echo "configure:88207: 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
+  # Some versions of Solaris or SCO have a broken fnmatch function.
+# So we run a test program.  If we are cross-compiling, take no chance.
+# Thanks to John Oleynick and Franc,ois Pinard for this test.
+if test "$cross_compiling" = yes; then
+  ac_cv_func_fnmatch_works=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 88218 "configure"
+#include "confdefs.h"
+main() { exit (fnmatch ("a*", "abc", 0) != 0); }
+EOF
+if { (eval echo configure:88222: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_fnmatch_works=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_fnmatch_works=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fnmatch_works" >&5
-echo "${ECHO_T}$ac_cv_func_fnmatch_works" >&6
-if test $ac_cv_func_fnmatch_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6
+if test $ac_cv_func_fnmatch_works = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_FNMATCH 1
-_ACEOF
+EOF
 
 fi
-
-
-
-
+	
 
 
 for ac_func in fork CreateProcess
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:88249: 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 88254 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:88277: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
   php_can_support_proc_open=yes
   break
 
 else
-
-  php_can_support_proc_open=no
+  echo "$ac_t""no" 1>&6
+php_can_support_proc_open=no
 
 fi
 done
 
-echo "$as_me:$LINENO: checking if your OS can spawn processes with inherited handles" >&5
-echo $ECHO_N "checking if your OS can spawn processes with inherited handles... $ECHO_C" >&6
+echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6
+echo "configure:88307: checking if your OS can spawn processes with inherited handles" >&5
 if test "$php_can_support_proc_open" = "yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define PHP_CAN_SUPPORT_PROC_OPEN 1
-_ACEOF
+EOF
 
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define ENABLE_CHROOT_FUNC 1
-_ACEOF
+EOF
 
 fi
 
@@ -113066,353 +88325,200 @@
   unset ac_cv_func_res_nsearch
   unset ac_cv_func___res_nsearch
   unset found
-
-  echo "$as_me:$LINENO: checking for res_nsearch" >&5
-echo $ECHO_N "checking for res_nsearch... $ECHO_C" >&6
-if test "${ac_cv_func_res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define res_nsearch to an innocuous variant, in case <limits.h> declares res_nsearch.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define res_nsearch innocuous_res_nsearch
-
+  
+  echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6
+echo "configure:88331: 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 88336 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char res_nsearch (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef res_nsearch
-
+    which can conflict with char res_nsearch(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char res_nsearch ();
+    builtin and then its argument prototype would still apply.  */
+char res_nsearch();
+
+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_res_nsearch) || defined (__stub___res_nsearch)
 choke me
 #else
-char (*f) () = res_nsearch;
-#endif
-#ifdef __cplusplus
-}
+res_nsearch();
 #endif
 
-int
-main ()
-{
-return f != res_nsearch;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_res_nsearch=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_func_res_nsearch" >&6
-if test $ac_cv_func_res_nsearch = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:88359: \"$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
-   echo "$as_me:$LINENO: checking for __res_nsearch" >&5
-echo $ECHO_N "checking for __res_nsearch... $ECHO_C" >&6
-if test "${ac_cv_func___res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __res_nsearch to an innocuous variant, in case <limits.h> declares __res_nsearch.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __res_nsearch innocuous___res_nsearch
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_res_nsearch=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6
+echo "configure:88377: 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 88382 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __res_nsearch (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __res_nsearch
-
+    which can conflict with char __res_nsearch(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __res_nsearch ();
+    builtin and then its argument prototype would still apply.  */
+char __res_nsearch();
+
+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___res_nsearch) || defined (__stub_____res_nsearch)
 choke me
 #else
-char (*f) () = __res_nsearch;
-#endif
-#ifdef __cplusplus
-}
+__res_nsearch();
 #endif
 
-int
-main ()
-{
-return f != __res_nsearch;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___res_nsearch=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_func___res_nsearch" >&6
-if test $ac_cv_func___res_nsearch = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:88405: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___res_nsearch=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_RES_NSEARCH 1
-_ACEOF
+EOF
 
     ac_cv_func_res_nsearch=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_resolv_res_nsearch
   unset ac_cv_lib_resolv___res_nsearch
   unset found
-  echo "$as_me:$LINENO: checking for res_nsearch in -lresolv" >&5
-echo $ECHO_N "checking for res_nsearch in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv_res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6
+echo "configure:88443: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 88451 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char res_nsearch ();
-int
-main ()
-{
-res_nsearch ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv_res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv_res_nsearch=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_res_nsearch" >&6
-if test $ac_cv_lib_resolv_res_nsearch = yes; then
+    builtin and then its argument prototype would still apply.  */
+char res_nsearch();
+
+int main() {
+res_nsearch()
+; return 0; }
+EOF
+if { (eval echo configure:88462: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __res_nsearch in -lresolv" >&5
-echo $ECHO_N "checking for __res_nsearch in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv___res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6
+echo "configure:88482: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 88490 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __res_nsearch ();
-int
-main ()
-{
-__res_nsearch ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv___res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv___res_nsearch=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___res_nsearch" >&6
-if test $ac_cv_lib_resolv___res_nsearch = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __res_nsearch();
+
+int main() {
+__res_nsearch()
+; return 0; }
+EOF
+if { (eval echo configure:88501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -113422,206 +88528,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 88533 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:88537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case resolv in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lresolv $LIBS"
+  *) 
+      LIBS="-lresolv $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_RES_NSEARCH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBRESOLV 1
-_ACEOF
+EOF
 
     ac_cv_func_res_nsearch=yes
   else
-
-
+    
+  
   unset ac_cv_lib_bind_res_nsearch
   unset ac_cv_lib_bind___res_nsearch
   unset found
-  echo "$as_me:$LINENO: checking for res_nsearch in -lbind" >&5
-echo $ECHO_N "checking for res_nsearch in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6
+echo "configure:88579: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 88587 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char res_nsearch ();
-int
-main ()
-{
-res_nsearch ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind_res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_res_nsearch=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_res_nsearch" >&6
-if test $ac_cv_lib_bind_res_nsearch = yes; then
+    builtin and then its argument prototype would still apply.  */
+char res_nsearch();
+
+int main() {
+res_nsearch()
+; return 0; }
+EOF
+if { (eval echo configure:88598: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __res_nsearch in -lbind" >&5
-echo $ECHO_N "checking for __res_nsearch in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind___res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6
+echo "configure:88618: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 88626 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __res_nsearch ();
-int
-main ()
-{
-__res_nsearch ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind___res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind___res_nsearch=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___res_nsearch" >&6
-if test $ac_cv_lib_bind___res_nsearch = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __res_nsearch();
+
+int main() {
+__res_nsearch()
+; return 0; }
+EOF
+if { (eval echo configure:88637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -113631,206 +88664,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 88669 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:88673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case bind in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lbind $LIBS"
+  *) 
+      LIBS="-lbind $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_RES_NSEARCH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBBIND 1
-_ACEOF
+EOF
 
     ac_cv_func_res_nsearch=yes
   else
-
-
+    
+  
   unset ac_cv_lib_socket_res_nsearch
   unset ac_cv_lib_socket___res_nsearch
   unset found
-  echo "$as_me:$LINENO: checking for res_nsearch in -lsocket" >&5
-echo $ECHO_N "checking for res_nsearch in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6
+echo "configure:88715: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 88723 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char res_nsearch ();
-int
-main ()
-{
-res_nsearch ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_res_nsearch=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_res_nsearch" >&6
-if test $ac_cv_lib_socket_res_nsearch = yes; then
+    builtin and then its argument prototype would still apply.  */
+char res_nsearch();
+
+int main() {
+res_nsearch()
+; return 0; }
+EOF
+if { (eval echo configure:88734: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __res_nsearch in -lsocket" >&5
-echo $ECHO_N "checking for __res_nsearch in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket___res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6
+echo "configure:88754: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 88762 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __res_nsearch ();
-int
-main ()
-{
-__res_nsearch ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket___res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket___res_nsearch=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___res_nsearch" >&6
-if test $ac_cv_lib_socket___res_nsearch = yes; then
+    builtin and then its argument prototype would still apply.  */
+char __res_nsearch();
+
+int main() {
+__res_nsearch()
+; return 0; }
+EOF
+if { (eval echo configure:88773: \"$ac_link\") 1>&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
   found=yes
 else
-  found=no
+  echo "$ac_t""no" 1>&6
+found=no
 fi
 
-
+  
 fi
 
 
@@ -113840,428 +88800,260 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 88805 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:88809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case socket in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsocket $LIBS"
+  *) 
+      LIBS="-lsocket $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_RES_NSEARCH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBSOCKET 1
-_ACEOF
+EOF
 
     ac_cv_func_res_nsearch=yes
   else
-
+    
   :
 
   fi
-
+  
 
   fi
-
+  
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
   unset ac_cv_func_dns_search
   unset ac_cv_func___dns_search
   unset found
-
-  echo "$as_me:$LINENO: checking for dns_search" >&5
-echo $ECHO_N "checking for dns_search... $ECHO_C" >&6
-if test "${ac_cv_func_dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dns_search to an innocuous variant, in case <limits.h> declares dns_search.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dns_search innocuous_dns_search
-
+  
+  echo $ac_n "checking for dns_search""... $ac_c" 1>&6
+echo "configure:88866: 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 88871 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dns_search (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dns_search
-
+    which can conflict with char dns_search(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dns_search ();
+    builtin and then its argument prototype would still apply.  */
+char dns_search();
+
+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_dns_search) || defined (__stub___dns_search)
 choke me
 #else
-char (*f) () = dns_search;
-#endif
-#ifdef __cplusplus
-}
+dns_search();
 #endif
 
-int
-main ()
-{
-return f != dns_search;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dns_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dns_search" >&5
-echo "${ECHO_T}$ac_cv_func_dns_search" >&6
-if test $ac_cv_func_dns_search = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:88894: \"$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
-   echo "$as_me:$LINENO: checking for __dns_search" >&5
-echo $ECHO_N "checking for __dns_search... $ECHO_C" >&6
-if test "${ac_cv_func___dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __dns_search to an innocuous variant, in case <limits.h> declares __dns_search.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __dns_search innocuous___dns_search
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dns_search=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __dns_search""... $ac_c" 1>&6
+echo "configure:88912: 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 88917 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __dns_search (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __dns_search
-
+    which can conflict with char __dns_search(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dns_search ();
+    builtin and then its argument prototype would still apply.  */
+char __dns_search();
+
+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___dns_search) || defined (__stub_____dns_search)
 choke me
 #else
-char (*f) () = __dns_search;
-#endif
-#ifdef __cplusplus
-}
+__dns_search();
 #endif
 
-int
-main ()
-{
-return f != __dns_search;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___dns_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___dns_search" >&5
-echo "${ECHO_T}$ac_cv_func___dns_search" >&6
-if test $ac_cv_func___dns_search = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:88940: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___dns_search=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_DNS_SEARCH 1
-_ACEOF
+EOF
 
     ac_cv_func_dns_search=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_resolv_dns_search
   unset ac_cv_lib_resolv___dns_search
   unset found
-  echo "$as_me:$LINENO: checking for dns_search in -lresolv" >&5
-echo $ECHO_N "checking for dns_search in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv_dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6
+echo "configure:88978: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 88986 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dns_search ();
-int
-main ()
-{
-dns_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv_dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv_dns_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_dns_search" >&6
-if test $ac_cv_lib_resolv_dns_search = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dns_search();
+
+int main() {
+dns_search()
+; return 0; }
+EOF
+if { (eval echo configure:88997: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dns_search in -lresolv" >&5
-echo $ECHO_N "checking for __dns_search in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv___dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6
+echo "configure:89017: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89025 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dns_search ();
-int
-main ()
-{
-__dns_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv___dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv___dns_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___dns_search" >&6
-if test $ac_cv_lib_resolv___dns_search = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dns_search();
+
+int main() {
+__dns_search()
+; return 0; }
+EOF
+if { (eval echo configure:89036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -114271,206 +89063,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 89068 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:89072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case resolv in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lresolv $LIBS"
+  *) 
+      LIBS="-lresolv $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DNS_SEARCH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBRESOLV 1
-_ACEOF
+EOF
 
     ac_cv_func_dns_search=yes
   else
-
-
+    
+  
   unset ac_cv_lib_bind_dns_search
   unset ac_cv_lib_bind___dns_search
   unset found
-  echo "$as_me:$LINENO: checking for dns_search in -lbind" >&5
-echo $ECHO_N "checking for dns_search in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6
+echo "configure:89114: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89122 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dns_search ();
-int
-main ()
-{
-dns_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind_dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_dns_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_dns_search" >&6
-if test $ac_cv_lib_bind_dns_search = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dns_search();
+
+int main() {
+dns_search()
+; return 0; }
+EOF
+if { (eval echo configure:89133: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dns_search in -lbind" >&5
-echo $ECHO_N "checking for __dns_search in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind___dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6
+echo "configure:89153: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89161 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dns_search ();
-int
-main ()
-{
-__dns_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind___dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind___dns_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___dns_search" >&6
-if test $ac_cv_lib_bind___dns_search = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dns_search();
+
+int main() {
+__dns_search()
+; return 0; }
+EOF
+if { (eval echo configure:89172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -114480,206 +89199,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 89204 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:89208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case bind in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lbind $LIBS"
+  *) 
+      LIBS="-lbind $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DNS_SEARCH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBBIND 1
-_ACEOF
+EOF
 
     ac_cv_func_dns_search=yes
   else
-
-
+    
+  
   unset ac_cv_lib_socket_dns_search
   unset ac_cv_lib_socket___dns_search
   unset found
-  echo "$as_me:$LINENO: checking for dns_search in -lsocket" >&5
-echo $ECHO_N "checking for dns_search in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6
+echo "configure:89250: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89258 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dns_search ();
-int
-main ()
-{
-dns_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_dns_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_dns_search" >&6
-if test $ac_cv_lib_socket_dns_search = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dns_search();
+
+int main() {
+dns_search()
+; return 0; }
+EOF
+if { (eval echo configure:89269: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dns_search in -lsocket" >&5
-echo $ECHO_N "checking for __dns_search in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket___dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6
+echo "configure:89289: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89297 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dns_search ();
-int
-main ()
-{
-__dns_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket___dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket___dns_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___dns_search" >&6
-if test $ac_cv_lib_socket___dns_search = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dns_search();
+
+int main() {
+__dns_search()
+; return 0; }
+EOF
+if { (eval echo configure:89308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -114689,428 +89335,260 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 89340 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:89344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case socket in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsocket $LIBS"
+  *) 
+      LIBS="-lsocket $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DNS_SEARCH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBSOCKET 1
-_ACEOF
+EOF
 
     ac_cv_func_dns_search=yes
   else
-
+    
   :
 
   fi
-
+  
 
   fi
-
+  
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
   unset ac_cv_func_dn_expand
   unset ac_cv_func___dn_expand
   unset found
-
-  echo "$as_me:$LINENO: checking for dn_expand" >&5
-echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6
-if test "${ac_cv_func_dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dn_expand to an innocuous variant, in case <limits.h> declares dn_expand.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dn_expand innocuous_dn_expand
-
+  
+  echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
+echo "configure:89401: 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 89406 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dn_expand (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dn_expand
-
+    which can conflict with char dn_expand(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dn_expand ();
+    builtin and then its argument prototype would still apply.  */
+char dn_expand();
+
+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_dn_expand) || defined (__stub___dn_expand)
 choke me
 #else
-char (*f) () = dn_expand;
-#endif
-#ifdef __cplusplus
-}
+dn_expand();
 #endif
 
-int
-main ()
-{
-return f != dn_expand;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dn_expand=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dn_expand" >&5
-echo "${ECHO_T}$ac_cv_func_dn_expand" >&6
-if test $ac_cv_func_dn_expand = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:89429: \"$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
-   echo "$as_me:$LINENO: checking for __dn_expand" >&5
-echo $ECHO_N "checking for __dn_expand... $ECHO_C" >&6
-if test "${ac_cv_func___dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __dn_expand to an innocuous variant, in case <limits.h> declares __dn_expand.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __dn_expand innocuous___dn_expand
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dn_expand=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
+echo "configure:89447: 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 89452 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __dn_expand (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __dn_expand
-
+    which can conflict with char __dn_expand(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dn_expand ();
+    builtin and then its argument prototype would still apply.  */
+char __dn_expand();
+
+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___dn_expand) || defined (__stub_____dn_expand)
 choke me
 #else
-char (*f) () = __dn_expand;
-#endif
-#ifdef __cplusplus
-}
+__dn_expand();
 #endif
 
-int
-main ()
-{
-return f != __dn_expand;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___dn_expand=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___dn_expand" >&5
-echo "${ECHO_T}$ac_cv_func___dn_expand" >&6
-if test $ac_cv_func___dn_expand = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:89475: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___dn_expand=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_DN_EXPAND 1
-_ACEOF
+EOF
 
     ac_cv_func_dn_expand=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_resolv_dn_expand
   unset ac_cv_lib_resolv___dn_expand
   unset found
-  echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
-echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
+echo "configure:89513: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89521 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dn_expand ();
-int
-main ()
-{
-dn_expand ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv_dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv_dn_expand=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6
-if test $ac_cv_lib_resolv_dn_expand = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dn_expand();
+
+int main() {
+dn_expand()
+; return 0; }
+EOF
+if { (eval echo configure:89532: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
-echo $ECHO_N "checking for __dn_expand in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
+echo "configure:89552: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89560 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dn_expand ();
-int
-main ()
-{
-__dn_expand ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv___dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv___dn_expand=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___dn_expand" >&6
-if test $ac_cv_lib_resolv___dn_expand = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dn_expand();
+
+int main() {
+__dn_expand()
+; return 0; }
+EOF
+if { (eval echo configure:89571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -115120,206 +89598,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 89603 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:89607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case resolv in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lresolv $LIBS"
+  *) 
+      LIBS="-lresolv $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DN_EXPAND 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBRESOLV 1
-_ACEOF
+EOF
 
     ac_cv_func_dn_expand=yes
   else
-
-
+    
+  
   unset ac_cv_lib_bind_dn_expand
   unset ac_cv_lib_bind___dn_expand
   unset found
-  echo "$as_me:$LINENO: checking for dn_expand in -lbind" >&5
-echo $ECHO_N "checking for dn_expand in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6
+echo "configure:89649: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89657 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dn_expand ();
-int
-main ()
-{
-dn_expand ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind_dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_dn_expand=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_dn_expand" >&6
-if test $ac_cv_lib_bind_dn_expand = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dn_expand();
+
+int main() {
+dn_expand()
+; return 0; }
+EOF
+if { (eval echo configure:89668: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dn_expand in -lbind" >&5
-echo $ECHO_N "checking for __dn_expand in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind___dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6
+echo "configure:89688: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89696 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dn_expand ();
-int
-main ()
-{
-__dn_expand ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind___dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind___dn_expand=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___dn_expand" >&6
-if test $ac_cv_lib_bind___dn_expand = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dn_expand();
+
+int main() {
+__dn_expand()
+; return 0; }
+EOF
+if { (eval echo configure:89707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -115329,206 +89734,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 89739 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:89743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case bind in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lbind $LIBS"
+  *) 
+      LIBS="-lbind $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DN_EXPAND 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBBIND 1
-_ACEOF
+EOF
 
     ac_cv_func_dn_expand=yes
   else
-
-
+    
+  
   unset ac_cv_lib_socket_dn_expand
   unset ac_cv_lib_socket___dn_expand
   unset found
-  echo "$as_me:$LINENO: checking for dn_expand in -lsocket" >&5
-echo $ECHO_N "checking for dn_expand in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6
+echo "configure:89785: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89793 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dn_expand ();
-int
-main ()
-{
-dn_expand ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_dn_expand=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_dn_expand" >&6
-if test $ac_cv_lib_socket_dn_expand = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dn_expand();
+
+int main() {
+dn_expand()
+; return 0; }
+EOF
+if { (eval echo configure:89804: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dn_expand in -lsocket" >&5
-echo $ECHO_N "checking for __dn_expand in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket___dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6
+echo "configure:89824: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 89832 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dn_expand ();
-int
-main ()
-{
-__dn_expand ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket___dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket___dn_expand=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___dn_expand" >&6
-if test $ac_cv_lib_socket___dn_expand = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dn_expand();
+
+int main() {
+__dn_expand()
+; return 0; }
+EOF
+if { (eval echo configure:89843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -115538,428 +89870,260 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 89875 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:89879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case socket in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsocket $LIBS"
+  *) 
+      LIBS="-lsocket $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DN_EXPAND 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBSOCKET 1
-_ACEOF
+EOF
 
     ac_cv_func_dn_expand=yes
   else
-
+    
   :
 
   fi
-
+  
 
   fi
-
+  
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
   unset ac_cv_func_dn_skipname
   unset ac_cv_func___dn_skipname
   unset found
-
-  echo "$as_me:$LINENO: checking for dn_skipname" >&5
-echo $ECHO_N "checking for dn_skipname... $ECHO_C" >&6
-if test "${ac_cv_func_dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dn_skipname to an innocuous variant, in case <limits.h> declares dn_skipname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dn_skipname innocuous_dn_skipname
-
+  
+  echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
+echo "configure:89936: 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 89941 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dn_skipname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dn_skipname
-
+    which can conflict with char dn_skipname(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dn_skipname ();
+    builtin and then its argument prototype would still apply.  */
+char dn_skipname();
+
+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_dn_skipname) || defined (__stub___dn_skipname)
 choke me
 #else
-char (*f) () = dn_skipname;
-#endif
-#ifdef __cplusplus
-}
+dn_skipname();
 #endif
 
-int
-main ()
-{
-return f != dn_skipname;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dn_skipname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_func_dn_skipname" >&6
-if test $ac_cv_func_dn_skipname = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:89964: \"$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
-   echo "$as_me:$LINENO: checking for __dn_skipname" >&5
-echo $ECHO_N "checking for __dn_skipname... $ECHO_C" >&6
-if test "${ac_cv_func___dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __dn_skipname to an innocuous variant, in case <limits.h> declares __dn_skipname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __dn_skipname innocuous___dn_skipname
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dn_skipname=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
+echo "configure:89982: 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 89987 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __dn_skipname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __dn_skipname
-
+    which can conflict with char __dn_skipname(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dn_skipname ();
+    builtin and then its argument prototype would still apply.  */
+char __dn_skipname();
+
+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___dn_skipname) || defined (__stub_____dn_skipname)
 choke me
 #else
-char (*f) () = __dn_skipname;
-#endif
-#ifdef __cplusplus
-}
+__dn_skipname();
 #endif
 
-int
-main ()
-{
-return f != __dn_skipname;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___dn_skipname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_func___dn_skipname" >&6
-if test $ac_cv_func___dn_skipname = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:90010: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___dn_skipname=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_DN_SKIPNAME 1
-_ACEOF
+EOF
 
     ac_cv_func_dn_skipname=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_resolv_dn_skipname
   unset ac_cv_lib_resolv___dn_skipname
   unset found
-  echo "$as_me:$LINENO: checking for dn_skipname in -lresolv" >&5
-echo $ECHO_N "checking for dn_skipname in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv_dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
+echo "configure:90048: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90056 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dn_skipname ();
-int
-main ()
-{
-dn_skipname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv_dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv_dn_skipname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_dn_skipname" >&6
-if test $ac_cv_lib_resolv_dn_skipname = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dn_skipname();
+
+int main() {
+dn_skipname()
+; return 0; }
+EOF
+if { (eval echo configure:90067: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dn_skipname in -lresolv" >&5
-echo $ECHO_N "checking for __dn_skipname in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv___dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
+echo "configure:90087: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90095 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dn_skipname ();
-int
-main ()
-{
-__dn_skipname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv___dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv___dn_skipname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___dn_skipname" >&6
-if test $ac_cv_lib_resolv___dn_skipname = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dn_skipname();
+
+int main() {
+__dn_skipname()
+; return 0; }
+EOF
+if { (eval echo configure:90106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -115969,206 +90133,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 90138 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:90142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case resolv in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lresolv $LIBS"
+  *) 
+      LIBS="-lresolv $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DN_SKIPNAME 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBRESOLV 1
-_ACEOF
+EOF
 
     ac_cv_func_dn_skipname=yes
   else
-
-
+    
+  
   unset ac_cv_lib_bind_dn_skipname
   unset ac_cv_lib_bind___dn_skipname
   unset found
-  echo "$as_me:$LINENO: checking for dn_skipname in -lbind" >&5
-echo $ECHO_N "checking for dn_skipname in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
+echo "configure:90184: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90192 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dn_skipname ();
-int
-main ()
-{
-dn_skipname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind_dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_dn_skipname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_dn_skipname" >&6
-if test $ac_cv_lib_bind_dn_skipname = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dn_skipname();
+
+int main() {
+dn_skipname()
+; return 0; }
+EOF
+if { (eval echo configure:90203: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dn_skipname in -lbind" >&5
-echo $ECHO_N "checking for __dn_skipname in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind___dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
+echo "configure:90223: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90231 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dn_skipname ();
-int
-main ()
-{
-__dn_skipname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind___dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind___dn_skipname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___dn_skipname" >&6
-if test $ac_cv_lib_bind___dn_skipname = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dn_skipname();
+
+int main() {
+__dn_skipname()
+; return 0; }
+EOF
+if { (eval echo configure:90242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -116178,206 +90269,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 90274 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:90278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case bind in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lbind $LIBS"
+  *) 
+      LIBS="-lbind $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DN_SKIPNAME 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBBIND 1
-_ACEOF
+EOF
 
     ac_cv_func_dn_skipname=yes
   else
-
-
+    
+  
   unset ac_cv_lib_socket_dn_skipname
   unset ac_cv_lib_socket___dn_skipname
   unset found
-  echo "$as_me:$LINENO: checking for dn_skipname in -lsocket" >&5
-echo $ECHO_N "checking for dn_skipname in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6
+echo "configure:90320: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90328 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dn_skipname ();
-int
-main ()
-{
-dn_skipname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_dn_skipname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_dn_skipname" >&6
-if test $ac_cv_lib_socket_dn_skipname = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dn_skipname();
+
+int main() {
+dn_skipname()
+; return 0; }
+EOF
+if { (eval echo configure:90339: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __dn_skipname in -lsocket" >&5
-echo $ECHO_N "checking for __dn_skipname in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket___dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6
+echo "configure:90359: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90367 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __dn_skipname ();
-int
-main ()
-{
-__dn_skipname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket___dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket___dn_skipname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___dn_skipname" >&6
-if test $ac_cv_lib_socket___dn_skipname = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __dn_skipname();
+
+int main() {
+__dn_skipname()
+; return 0; }
+EOF
+if { (eval echo configure:90378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -116387,75 +90405,60 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 90410 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:90414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case socket in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsocket $LIBS"
+  *) 
+      LIBS="-lsocket $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_DN_SKIPNAME 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBSOCKET 1
-_ACEOF
+EOF
 
     ac_cv_func_dn_skipname=yes
   else
-
+    
   :
 
   fi
-
+  
 
   fi
-
+  
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
@@ -116464,353 +90467,200 @@
   unset ac_cv_func_res_search
   unset ac_cv_func___res_search
   unset found
-
-  echo "$as_me:$LINENO: checking for res_search" >&5
-echo $ECHO_N "checking for res_search... $ECHO_C" >&6
-if test "${ac_cv_func_res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define res_search to an innocuous variant, in case <limits.h> declares res_search.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define res_search innocuous_res_search
-
+  
+  echo $ac_n "checking for res_search""... $ac_c" 1>&6
+echo "configure:90473: 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 90478 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char res_search (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef res_search
-
+    which can conflict with char res_search(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char res_search ();
+    builtin and then its argument prototype would still apply.  */
+char res_search();
+
+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_res_search) || defined (__stub___res_search)
 choke me
 #else
-char (*f) () = res_search;
-#endif
-#ifdef __cplusplus
-}
+res_search();
 #endif
 
-int
-main ()
-{
-return f != res_search;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_res_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
-echo "${ECHO_T}$ac_cv_func_res_search" >&6
-if test $ac_cv_func_res_search = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:90501: \"$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
-   echo "$as_me:$LINENO: checking for __res_search" >&5
-echo $ECHO_N "checking for __res_search... $ECHO_C" >&6
-if test "${ac_cv_func___res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __res_search to an innocuous variant, in case <limits.h> declares __res_search.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __res_search innocuous___res_search
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_res_search=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __res_search""... $ac_c" 1>&6
+echo "configure:90519: 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 90524 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __res_search (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __res_search
-
+    which can conflict with char __res_search(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __res_search ();
+    builtin and then its argument prototype would still apply.  */
+char __res_search();
+
+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___res_search) || defined (__stub_____res_search)
 choke me
 #else
-char (*f) () = __res_search;
-#endif
-#ifdef __cplusplus
-}
+__res_search();
 #endif
 
-int
-main ()
-{
-return f != __res_search;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func___res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func___res_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func___res_search" >&5
-echo "${ECHO_T}$ac_cv_func___res_search" >&6
-if test $ac_cv_func___res_search = yes; then
-  found=yes
+; return 0; }
+EOF
+if { (eval echo configure:90547: \"$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
-  found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___res_search=no"
+fi
+rm -f conftest*
 fi
 
+if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
+ 
 fi
 
 
   case $found in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+  yes) 
+    cat >> confdefs.h <<\EOF
 #define HAVE_RES_SEARCH 1
-_ACEOF
+EOF
 
     ac_cv_func_res_search=yes
   ;;
-
-    *)
-
+  
+    *) 
+  
   unset ac_cv_lib_resolv_res_search
   unset ac_cv_lib_resolv___res_search
   unset found
-  echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv_res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
+echo "configure:90585: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90593 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char res_search ();
-int
-main ()
-{
-res_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv_res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv_res_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
-if test $ac_cv_lib_resolv_res_search = yes; then
+    builtin and then its argument prototype would still apply.  */
+char res_search();
+
+int main() {
+res_search()
+; return 0; }
+EOF
+if { (eval echo configure:90604: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __res_search in -lresolv" >&5
-echo $ECHO_N "checking for __res_search in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv___res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
+echo "configure:90624: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90632 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __res_search ();
-int
-main ()
-{
-__res_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv___res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_resolv___res_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___res_search" >&6
-if test $ac_cv_lib_resolv___res_search = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __res_search();
+
+int main() {
+__res_search()
+; return 0; }
+EOF
+if { (eval echo configure:90643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -116820,206 +90670,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 90675 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:90679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case resolv in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lresolv $LIBS"
+  *) 
+      LIBS="-lresolv $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_RES_SEARCH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBRESOLV 1
-_ACEOF
+EOF
 
     ac_cv_func_res_search=yes
   else
-
-
+    
+  
   unset ac_cv_lib_bind_res_search
   unset ac_cv_lib_bind___res_search
   unset found
-  echo "$as_me:$LINENO: checking for res_search in -lbind" >&5
-echo $ECHO_N "checking for res_search in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
+echo "configure:90721: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90729 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char res_search ();
-int
-main ()
-{
-res_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind_res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_res_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_res_search" >&6
-if test $ac_cv_lib_bind_res_search = yes; then
+    builtin and then its argument prototype would still apply.  */
+char res_search();
+
+int main() {
+res_search()
+; return 0; }
+EOF
+if { (eval echo configure:90740: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __res_search in -lbind" >&5
-echo $ECHO_N "checking for __res_search in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind___res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
+echo "configure:90760: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90768 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __res_search ();
-int
-main ()
-{
-__res_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind___res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind___res_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___res_search" >&6
-if test $ac_cv_lib_bind___res_search = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __res_search();
+
+int main() {
+__res_search()
+; return 0; }
+EOF
+if { (eval echo configure:90779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -117029,206 +90806,133 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 90811 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:90815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case bind in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lbind $LIBS"
+  *) 
+      LIBS="-lbind $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_RES_SEARCH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBBIND 1
-_ACEOF
+EOF
 
     ac_cv_func_res_search=yes
   else
-
-
+    
+  
   unset ac_cv_lib_socket_res_search
   unset ac_cv_lib_socket___res_search
   unset found
-  echo "$as_me:$LINENO: checking for res_search in -lsocket" >&5
-echo $ECHO_N "checking for res_search in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
+echo "configure:90857: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90865 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char res_search ();
-int
-main ()
-{
-res_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_res_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_res_search" >&6
-if test $ac_cv_lib_socket_res_search = yes; then
+    builtin and then its argument prototype would still apply.  */
+char res_search();
+
+int main() {
+res_search()
+; return 0; }
+EOF
+if { (eval echo configure:90876: \"$ac_link\") 1>&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
   found=yes
 else
+  echo "$ac_t""no" 1>&6
 
-    echo "$as_me:$LINENO: checking for __res_search in -lsocket" >&5
-echo $ECHO_N "checking for __res_search in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket___res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
+echo "configure:90896: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 90904 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __res_search ();
-int
-main ()
-{
-__res_search ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket___res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket___res_search=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___res_search" >&6
-if test $ac_cv_lib_socket___res_search = yes; then
-  found=yes
+    builtin and then its argument prototype would still apply.  */
+char __res_search();
+
+int main() {
+__res_search()
+; return 0; }
+EOF
+if { (eval echo configure:90915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  found=no
+  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
+  found=yes
+else
+  echo "$ac_t""no" 1>&6
+found=no
+fi
 
+  
 fi
 
 
@@ -117238,95 +90942,77 @@
     if test "$cross_compiling" = yes; then
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 90947 "configure"
+#include "confdefs.h"
 main() { return (0); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:90951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  found=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
     LIBS=$ac_libs
   fi
 
   if test "$found" = "yes"; then
-
-
+    
+  
   case socket in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsocket $LIBS"
+  *) 
+      LIBS="-lsocket $LIBS" 
    ;;
   esac
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_RES_SEARCH 1
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBSOCKET 1
-_ACEOF
+EOF
 
     ac_cv_func_res_search=yes
   else
-
+    
   :
 
   fi
-
+  
 
   fi
-
+  
 
   fi
-
+  
  ;;
-
+  
   esac
 
 
-echo "$as_me:$LINENO: checking whether atof() accepts NAN" >&5
-echo $ECHO_N "checking whether atof() accepts NAN... $ECHO_C" >&6
-if test "${ac_cv_atof_accept_nan+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
+echo "configure:91004: 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
-
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_atof_accept_nan=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 91015 "configure"
+#include "confdefs.h"
 
 #include <math.h>
 #include <stdlib.h>
@@ -117344,61 +91030,47 @@
 	return zend_isnan(atof("NAN")) ? 0 : 1;
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:91035: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_atof_accept_nan=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_atof_accept_nan" >&5
-echo "${ECHO_T}$ac_cv_atof_accept_nan" >&6
-if test "$ac_cv_atof_accept_nan" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6
+if test "$ac_cv_atof_accept_nan" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_ATOF_ACCEPTS_NAN 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether atof() accepts INF" >&5
-echo $ECHO_N "checking whether atof() accepts INF... $ECHO_C" >&6
-if test "${ac_cv_atof_accept_inf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
+echo "configure:91062: 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
-
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_atof_accept_inf=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 91073 "configure"
+#include "confdefs.h"
 
 #include <math.h>
 #include <stdlib.h>
@@ -117419,61 +91091,47 @@
 	return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1;
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+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
+  
   ac_cv_atof_accept_inf=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_atof_accept_inf=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_atof_accept_inf" >&5
-echo "${ECHO_T}$ac_cv_atof_accept_inf" >&6
-if test "$ac_cv_atof_accept_inf" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6
+if test "$ac_cv_atof_accept_inf" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_ATOF_ACCEPTS_INF 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether HUGE_VAL == INF" >&5
-echo $ECHO_N "checking whether HUGE_VAL == INF... $ECHO_C" >&6
-if test "${ac_cv_huge_val_inf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
+echo "configure:91123: 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
-
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_huge_val_inf=yes
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 91134 "configure"
+#include "confdefs.h"
 
 #include <math.h>
 #include <stdlib.h>
@@ -117494,61 +91152,47 @@
 	return zend_isinf(HUGE_VAL) ? 0 : 1;
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:91157: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_huge_val_inf=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_huge_val_inf" >&5
-echo "${ECHO_T}$ac_cv_huge_val_inf" >&6
-if test "$ac_cv_huge_val_inf" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_huge_val_inf" 1>&6
+if test "$ac_cv_huge_val_inf" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_HUGE_VAL_INF 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
-echo $ECHO_N "checking whether HUGE_VAL + -HUGEVAL == NAN... $ECHO_C" >&6
-if test "${ac_cv_huge_val_nan+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
+echo "configure:91184: 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
-
+  
 if test "$cross_compiling" = yes; then
-
+  
   ac_cv_huge_val_nan=yes
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 91195 "configure"
+#include "confdefs.h"
 
 #include <math.h>
 #include <stdlib.h>
@@ -117571,62 +91215,46 @@
 #endif
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:91220: \"$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
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   ac_cv_huge_val_nan=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_huge_val_nan" >&5
-echo "${ECHO_T}$ac_cv_huge_val_nan" >&6
-if test "$ac_cv_huge_val_nan" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_huge_val_nan" 1>&6
+if test "$ac_cv_huge_val_nan" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_HUGE_VAL_NAN 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether strptime() declaration fails" >&5
-echo $ECHO_N "checking whether strptime() declaration fails... $ECHO_C" >&6
-if test "${ac_cv_strptime_decl_fails+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6
+echo "configure:91247: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+cat > conftest.$ac_ext <<EOF
+#line 91253 "configure"
+#include "confdefs.h"
 
 #include <time.h>
 
-int
-main ()
-{
+int main() {
 
 #ifndef HAVE_STRPTIME
 #error no strptime() on this platform
@@ -117635,630 +91263,264 @@
 int strptime(const char *s, const char *format, struct tm *tm);
 #endif
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:91269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
   ac_cv_strptime_decl_fails=no
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
   ac_cv_strptime_decl_fails=yes
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_strptime_decl_fails" >&5
-echo "${ECHO_T}$ac_cv_strptime_decl_fails" >&6
-if test "$ac_cv_strptime_decl_fails" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6
+if test "$ac_cv_strptime_decl_fails" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_STRPTIME_DECL_FAILS 1
-_ACEOF
+EOF
 
 fi
 
-
-for ac_header in wchar.h
+for ac_hdr in wchar.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:91297: 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 91302 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:91307: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
-
 for ac_func in mblen
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:91336: 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 91341 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:91364: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
-
-
 for ac_func in mbrlen mbsinit
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:91391: 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 91396 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:91419: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
-echo "$as_me:$LINENO: checking for mbstate_t" >&5
-echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
-if test "${ac_cv_type_mbstate_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
+echo "configure:91444: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+cat > conftest.$ac_ext <<EOF
+#line 91450 "configure"
+#include "confdefs.h"
 
 #ifdef HAVE_WCHAR_H
 # include <wchar.h>
 #endif
 
-int
-main ()
-{
+int main() {
 
 int __tmp__() { mbstate_t a; }
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:91463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
   ac_cv_type_mbstate_t=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
   ac_cv_type_mbstate_t=no
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
-echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
-if test "$ac_cv_type_mbstate_t" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6
+if test "$ac_cv_type_mbstate_t" = "yes"; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_MBSTATE_T 1
-_ACEOF
+EOF
 
 fi
 
-
-for ac_header in atomic.h
+for ac_hdr in atomic.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:91491: 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 91496 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:91501: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 
@@ -118270,15 +91532,15 @@
 
   if test "" != "shared" && test "" != "yes" && test "" != "cli"; then
     PHP_STANDARD_SHARED=no
-
-
+    
+  
   case ext/standard in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -118301,12 +91563,12 @@
                             http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
                             var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
                             filters.c proc_open.c streamsfuncs.c http.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
@@ -118330,14 +91592,14 @@
   else
     if test "" = "shared" || test "" = "yes"; then
       PHP_STANDARD_SHARED=yes
-
+      
   case ext/standard in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -118360,12 +91622,12 @@
                             http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
                             var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
                             filters.c proc_open.c streamsfuncs.c http.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -118383,7 +91645,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -118393,7 +91655,7 @@
       ;;
     *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_standard) -L$(top_builddir)/netware -lphp5lib $(STANDARD_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_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -118406,7 +91668,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
 
   cat >>Makefile.objects<<EOF
@@ -118420,7 +91682,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -118430,7 +91692,7 @@
       ;;
     *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_standard) -L$(top_builddir)/netware -lphp5lib $(NDARD_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_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(STANDARD, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -118443,7 +91705,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
 
   cat >>Makefile.objects<<EOF
@@ -118457,10 +91719,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_STANDARD 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -118469,15 +91730,15 @@
     PHP_STANDARD_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/standard in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -118500,12 +91761,12 @@
                             http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
                             var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
                             filters.c proc_open.c streamsfuncs.c http.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
@@ -118525,15 +91786,15 @@
         EXT_STATIC="$EXT_STATIC standard"
         ;;
       *)
-
-
+        
+  
   case ext/standard in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -118556,13 +91817,13 @@
                             http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
                             var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
                             filters.c proc_open.c streamsfuncs.c http.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -118582,15 +91843,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=standard
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -118603,41 +91864,41 @@
   test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 
 
-
+  
     for header_file in ext/standard/; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
+    done 
+  
 
 
 
 
 php_with_sybase_ct=no
 
-echo "$as_me:$LINENO: checking for Sybase-CT support" >&5
-echo $ECHO_N "checking for Sybase-CT support... $ECHO_C" >&6
-
+echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
+echo "configure:91891: 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"
   PHP_SYBASE_CT=$withval
 else
-
+  
   PHP_SYBASE_CT=no
   test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -118661,8 +91922,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -118670,17 +91930,14 @@
 if test "$PHP_SYBASE_CT" != "no"; then
 
   if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: You can not use both --with-sybase and --with-sybase-ct in same build!" >&5
-echo "$as_me: error: You can not use both --with-sybase and --with-sybase-ct in same build!" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_SYBASE_CT 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/sybase_ct
   ext_srcdir=$abs_srcdir/ext/sybase_ct
 
@@ -118688,15 +91945,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SYBASE_CT_SHARED=no
-
-
+    
+  
   case ext/sybase_ct in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -118709,12 +91966,12 @@
 
   old_IFS=$IFS
   for ac_src in php_sybase_ct.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
@@ -118738,14 +91995,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SYBASE_CT_SHARED=yes
-
+      
   case ext/sybase_ct in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -118758,12 +92015,12 @@
 
   old_IFS=$IFS
   for ac_src in php_sybase_ct.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -118781,7 +92038,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -118791,7 +92048,7 @@
       ;;
     *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_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(SYBASE_CT_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_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -118804,7 +92061,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
 
   cat >>Makefile.objects<<EOF
@@ -118818,7 +92075,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -118828,7 +92085,7 @@
       ;;
     *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_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(ASE_CT_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_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYBASE_CT, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -118841,7 +92098,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
 
   cat >>Makefile.objects<<EOF
@@ -118855,10 +92112,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SYBASE_CT 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -118867,15 +92123,15 @@
     PHP_SYBASE_CT_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/sybase_ct in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -118888,12 +92144,12 @@
 
   old_IFS=$IFS
   for ac_src in php_sybase_ct.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
@@ -118913,15 +92169,15 @@
         EXT_STATIC="$EXT_STATIC sybase_ct"
         ;;
       *)
-
-
+        
+  
   case ext/sybase_ct in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -118934,13 +92190,13 @@
 
   old_IFS=$IFS
   for ac_src in php_sybase_ct.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -118960,23 +92216,23 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=sybase_ct
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD"
 
-
+ 
   if test "$PHP_SYBASE_CT" = "yes"; then
     SYBASE_CT_INCDIR=/home/sybase/include
     SYBASE_CT_LIBDIR=/home/sybase/lib
@@ -118985,536 +92241,155 @@
     SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
   fi
 
-    echo "$as_me:$LINENO: checking for long int" >&5
-echo $ECHO_N "checking for long int... $ECHO_C" >&6
-if test "${ac_cv_type_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long int *) 0)
-  return 0;
-if (sizeof (long int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_int" >&6
-
-echo "$as_me:$LINENO: checking size of long int" >&5
-echo $ECHO_N "checking size of long int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+    echo $ac_n "checking size of long int""... $ac_c" 1>&6
+echo "configure:92246: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long int)); }
-unsigned long ulongval () { return (long) (sizeof (long int)); }
+  ac_cv_sizeof_long_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 92254 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:92265: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long_int=0
 fi
+rm -fr conftest*
+fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
+cat >> confdefs.h <<EOF
 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
-_ACEOF
+EOF
 
 
-  echo "$as_me:$LINENO: checking checking if we're on a 64-bit platform" >&5
-echo $ECHO_N "checking checking if we're on a 64-bit platform... $ECHO_C" >&6
+  echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
+echo "configure:92285: checking checking if we're on a 64-bit platform" >&5
   if test "$ac_cv_sizeof_long_int" = "4"; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
     PHP_SYBASE_64=no
   else
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
     PHP_SYBASE_64=yes
   fi
 
 
-  echo "$as_me:$LINENO: checking Checking for ctpublic.h" >&5
-echo $ECHO_N "checking Checking for ctpublic.h... $ECHO_C" >&6
+  echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6
+echo "configure:92296: checking Checking for ctpublic.h" >&5
   if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
-    echo "$as_me:$LINENO: result: found in $SYBASE_CT_INCDIR" >&5
-echo "${ECHO_T}found in $SYBASE_CT_INCDIR" >&6
-
+    echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6
+    
   if test "$SYBASE_CT_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$SYBASE_CT_INCDIR
   else
-
+    
     ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SYBASE_CT_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
 
   else
-    { { echo "$as_me:$LINENO: error: ctpublic.h missing!" >&5
-echo "$as_me: error: ctpublic.h missing!" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; }
   fi
+ 
+  echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6
+echo "configure:92335: checking Checking Sybase libdir" >&5
+  echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6
+ 
+  echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6
+echo "configure:92339: checking Checking for Sybase platform libraries" >&5
 
-  echo "$as_me:$LINENO: checking Checking Sybase libdir" >&5
-echo $ECHO_N "checking Checking Sybase libdir... $ECHO_C" >&6
-  echo "$as_me:$LINENO: result: Have $SYBASE_CT_LIBDIR" >&5
-echo "${ECHO_T}Have $SYBASE_CT_LIBDIR" >&6
-
-  echo "$as_me:$LINENO: checking Checking for Sybase platform libraries" >&5
-echo $ECHO_N "checking Checking for Sybase platform libraries... $ECHO_C" >&6
-
-
+  
   if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SYBASE_CT_LIBDIR
   else
-
+    
     ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_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
 
   if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
-
-
+    
+  
   case ct in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case ct in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lct $LIBS"
+  *) 
+      LIBS="-lct $LIBS" 
    ;;
   esac
 
@@ -119525,23 +92400,22 @@
 
 
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-    echo "$as_me:$LINENO: result: FreeTDS: $SYBASE_CT_LIBS" >&5
-echo "${ECHO_T}FreeTDS: $SYBASE_CT_LIBS" >&6
+    echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6
   elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then
-
-
+    
+  
   case sybcs64 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybcs64 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybcs64 $LIBS"
+  *) 
+      LIBS="-lsybcs64 $LIBS" 
    ;;
   esac
 
@@ -119551,20 +92425,20 @@
   esac
 
 
-
-
+    
+  
   case sybct64 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybct64 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybct64 $LIBS"
+  *) 
+      LIBS="-lsybct64 $LIBS" 
    ;;
   esac
 
@@ -119574,20 +92448,20 @@
   esac
 
 
-
-
+    
+  
   case sybcomn64 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybcomn64 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybcomn64 $LIBS"
+  *) 
+      LIBS="-lsybcomn64 $LIBS" 
    ;;
   esac
 
@@ -119597,20 +92471,20 @@
   esac
 
 
-
-
+    
+  
   case sybintl64 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybintl64 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybintl64 $LIBS"
+  *) 
+      LIBS="-lsybintl64 $LIBS" 
    ;;
   esac
 
@@ -119624,31 +92498,30 @@
     ac_solid_uname_s=`uname -s 2>/dev/null`
     case $ac_solid_uname_s in
       *OSF*)                            ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define
-      *) CFLAGS="${CFLAGS} -DSYB_LP64"  ;; #
+      *) CFLAGS="${CFLAGS} -DSYB_LP64"  ;; # 
     esac
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64"
-    echo "$as_me:$LINENO: result: Sybase64: $SYBASE_CT_LIBS" >&5
-echo "${ECHO_T}Sybase64: $SYBASE_CT_LIBS" >&6
-
-
+    echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6
+  
+    
   save_old_LDFLAGS=$LDFLAGS
-  ac_stuff="
-      $SYBASE_CT_LIBS
+  ac_stuff=" 
+      $SYBASE_CT_LIBS 
     "
-
+  
   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"
@@ -119659,20 +92532,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -119685,131 +92558,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for netg_errstr in -lsybtcl64" >&5
-echo $ECHO_N "checking for netg_errstr in -lsybtcl64... $ECHO_C" >&6
-if test "${ac_cv_lib_sybtcl64_netg_errstr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6
+echo "configure:92605: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsybtcl64  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 92613 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char netg_errstr ();
-int
-main ()
-{
-netg_errstr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sybtcl64_netg_errstr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sybtcl64_netg_errstr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sybtcl64_netg_errstr" >&5
-echo "${ECHO_T}$ac_cv_lib_sybtcl64_netg_errstr" >&6
-if test $ac_cv_lib_sybtcl64_netg_errstr = yes; then
+    builtin and then its argument prototype would still apply.  */
+char netg_errstr();
 
+int main() {
+netg_errstr()
+; return 0; }
+EOF
+if { (eval echo configure:92624: \"$ac_link\") 1>&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
-
-
-
+    
+      
+  
   case sybtcl64 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybtcl64 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybtcl64 $LIBS"
+  *) 
+      LIBS="-lsybtcl64 $LIBS" 
    ;;
   esac
 
@@ -119819,28 +92662,29 @@
   esac
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sybtcl64_netg_errstr
-
-
-
+     
+      
+  
   case sybtcl64 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybtcl64 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybtcl64 $LIBS"
+  *) 
+      LIBS="-lsybtcl64 $LIBS" 
    ;;
   esac
 
@@ -119850,28 +92694,28 @@
   esac
 
 
-
-
+    
+  
 fi
 
-
-
+  
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$SYBASE_CT_LIBDIR"
-
+  
   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"
@@ -119882,20 +92726,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -119908,130 +92752,100 @@
     ;;
     -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 "$as_me:$LINENO: checking for insck__getVdate in -linsck64" >&5
-echo $ECHO_N "checking for insck__getVdate in -linsck64... $ECHO_C" >&6
-if test "${ac_cv_lib_insck64_insck__getVdate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6
+echo "configure:92799: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-linsck64  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 92807 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char insck__getVdate ();
-int
-main ()
-{
-insck__getVdate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_insck64_insck__getVdate=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_insck64_insck__getVdate=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_insck64_insck__getVdate" >&5
-echo "${ECHO_T}$ac_cv_lib_insck64_insck__getVdate" >&6
-if test $ac_cv_lib_insck64_insck__getVdate = yes; then
+    builtin and then its argument prototype would still apply.  */
+char insck__getVdate();
+
+int main() {
+insck__getVdate()
+; return 0; }
+EOF
+if { (eval echo configure:92818: \"$ac_link\") 1>&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
-
-
+    
+  
   case insck64 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case insck64 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-linsck64 $LIBS"
+  *) 
+      LIBS="-linsck64 $LIBS" 
    ;;
   esac
 
@@ -120041,33 +92855,34 @@
   esac
 
 
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_insck64_insck__getVdate
-
-
+    
+  
 fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$SYBASE_CT_LIBDIR"
-
+  
   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"
@@ -120078,20 +92893,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -120104,130 +92919,100 @@
     ;;
     -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 "$as_me:$LINENO: checking for bsd_tcp in -linsck64" >&5
-echo $ECHO_N "checking for bsd_tcp in -linsck64... $ECHO_C" >&6
-if test "${ac_cv_lib_insck64_bsd_tcp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6
+echo "configure:92966: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-linsck64  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 92974 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char bsd_tcp ();
-int
-main ()
-{
-bsd_tcp ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_insck64_bsd_tcp=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_insck64_bsd_tcp=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_insck64_bsd_tcp" >&5
-echo "${ECHO_T}$ac_cv_lib_insck64_bsd_tcp" >&6
-if test $ac_cv_lib_insck64_bsd_tcp = yes; then
+    builtin and then its argument prototype would still apply.  */
+char bsd_tcp();
+
+int main() {
+bsd_tcp()
+; return 0; }
+EOF
+if { (eval echo configure:92985: \"$ac_link\") 1>&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
-
-
+    
+  
   case insck64 in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case insck64 in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-linsck64 $LIBS"
+  *) 
+      LIBS="-linsck64 $LIBS" 
    ;;
   esac
 
@@ -120237,31 +93022,32 @@
   esac
 
 
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_insck64_bsd_tcp
-
-
+    
+  
 fi
 
   elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then
-
-
+    
+  
   case sybcs in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybcs in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybcs $LIBS"
+  *) 
+      LIBS="-lsybcs $LIBS" 
    ;;
   esac
 
@@ -120271,20 +93057,20 @@
   esac
 
 
-
-
+    
+  
   case sybct in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybct in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybct $LIBS"
+  *) 
+      LIBS="-lsybct $LIBS" 
    ;;
   esac
 
@@ -120294,20 +93080,20 @@
   esac
 
 
-
-
+    
+  
   case sybcomn in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybcomn in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybcomn $LIBS"
+  *) 
+      LIBS="-lsybcomn $LIBS" 
    ;;
   esac
 
@@ -120317,20 +93103,20 @@
   esac
 
 
-
-
+    
+  
   case sybintl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybintl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybintl $LIBS"
+  *) 
+      LIBS="-lsybintl $LIBS" 
    ;;
   esac
 
@@ -120340,30 +93126,29 @@
   esac
 
 
-
+  
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl"
-    echo "$as_me:$LINENO: result: Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&5
-echo "${ECHO_T}Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&6
-
-
+    echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6
+  
+    
   save_old_LDFLAGS=$LDFLAGS
-  ac_stuff="
-      $SYBASE_CT_LIBS
+  ac_stuff=" 
+      $SYBASE_CT_LIBS 
     "
-
+  
   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"
@@ -120374,20 +93159,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -120400,131 +93185,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for netg_errstr in -lsybtcl" >&5
-echo $ECHO_N "checking for netg_errstr in -lsybtcl... $ECHO_C" >&6
-if test "${ac_cv_lib_sybtcl_netg_errstr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6
+echo "configure:93232: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsybtcl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 93240 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char netg_errstr ();
-int
-main ()
-{
-netg_errstr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sybtcl_netg_errstr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sybtcl_netg_errstr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sybtcl_netg_errstr" >&5
-echo "${ECHO_T}$ac_cv_lib_sybtcl_netg_errstr" >&6
-if test $ac_cv_lib_sybtcl_netg_errstr = yes; then
+    builtin and then its argument prototype would still apply.  */
+char netg_errstr();
+
+int main() {
+netg_errstr()
+; return 0; }
+EOF
+if { (eval echo configure:93251: \"$ac_link\") 1>&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
-
-
-
+    
+      
+  
   case sybtcl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybtcl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybtcl $LIBS"
+  *) 
+      LIBS="-lsybtcl $LIBS" 
    ;;
   esac
 
@@ -120534,28 +93289,29 @@
   esac
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sybtcl_netg_errstr
-
-
-
+     
+      
+  
   case sybtcl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybtcl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybtcl $LIBS"
+  *) 
+      LIBS="-lsybtcl $LIBS" 
    ;;
   esac
 
@@ -120565,28 +93321,28 @@
   esac
 
 
-
-
+    
+  
 fi
 
-
-
+  
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$SYBASE_CT_LIBDIR"
-
+  
   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"
@@ -120597,20 +93353,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -120623,130 +93379,100 @@
     ;;
     -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 "$as_me:$LINENO: checking for insck__getVdate in -linsck" >&5
-echo $ECHO_N "checking for insck__getVdate in -linsck... $ECHO_C" >&6
-if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
+echo "configure:93426: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-linsck  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 93434 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char insck__getVdate ();
-int
-main ()
-{
-insck__getVdate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_insck_insck__getVdate=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_insck_insck__getVdate=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_insck_insck__getVdate" >&5
-echo "${ECHO_T}$ac_cv_lib_insck_insck__getVdate" >&6
-if test $ac_cv_lib_insck_insck__getVdate = yes; then
+    builtin and then its argument prototype would still apply.  */
+char insck__getVdate();
+
+int main() {
+insck__getVdate()
+; return 0; }
+EOF
+if { (eval echo configure:93445: \"$ac_link\") 1>&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
-
-
+    
+  
   case insck in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case insck in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-linsck $LIBS"
+  *) 
+      LIBS="-linsck $LIBS" 
    ;;
   esac
 
@@ -120756,33 +93482,34 @@
   esac
 
 
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_insck_insck__getVdate
-
-
+    
+  
 fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$SYBASE_CT_LIBDIR"
-
+  
   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"
@@ -120793,20 +93520,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -120819,130 +93546,100 @@
     ;;
     -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 "$as_me:$LINENO: checking for bsd_tcp in -linsck" >&5
-echo $ECHO_N "checking for bsd_tcp in -linsck... $ECHO_C" >&6
-if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
+echo "configure:93593: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-linsck  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 93601 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char bsd_tcp ();
-int
-main ()
-{
-bsd_tcp ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_insck_bsd_tcp=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_insck_bsd_tcp=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_insck_bsd_tcp" >&5
-echo "${ECHO_T}$ac_cv_lib_insck_bsd_tcp" >&6
-if test $ac_cv_lib_insck_bsd_tcp = yes; then
+    builtin and then its argument prototype would still apply.  */
+char bsd_tcp();
+
+int main() {
+bsd_tcp()
+; return 0; }
+EOF
+if { (eval echo configure:93612: \"$ac_link\") 1>&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
-
-
+    
+  
   case insck in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case insck in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-linsck $LIBS"
+  *) 
+      LIBS="-linsck $LIBS" 
    ;;
   esac
 
@@ -120952,31 +93649,32 @@
   esac
 
 
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_insck_bsd_tcp
-
-
+    
+  
 fi
 
   else
-
-
+    
+  
   case cs in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case cs in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcs $LIBS"
+  *) 
+      LIBS="-lcs $LIBS" 
    ;;
   esac
 
@@ -120986,20 +93684,20 @@
   esac
 
 
-
-
+    
+  
   case ct in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case ct in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lct $LIBS"
+  *) 
+      LIBS="-lct $LIBS" 
    ;;
   esac
 
@@ -121009,20 +93707,20 @@
   esac
 
 
-
-
+    
+  
   case comn in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case comn in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lcomn $LIBS"
+  *) 
+      LIBS="-lcomn $LIBS" 
    ;;
   esac
 
@@ -121032,20 +93730,20 @@
   esac
 
 
-
-
+    
+  
   case intl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case intl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lintl $LIBS"
+  *) 
+      LIBS="-lintl $LIBS" 
    ;;
   esac
 
@@ -121055,30 +93753,29 @@
   esac
 
 
-
+  
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
-    echo "$as_me:$LINENO: result: Sybase32 default: $SYBASE_CT_LIBS" >&5
-echo "${ECHO_T}Sybase32 default: $SYBASE_CT_LIBS" >&6
-
-
+    echo "$ac_t""Sybase32 default: $SYBASE_CT_LIBS" 1>&6
+  
+    
   save_old_LDFLAGS=$LDFLAGS
-  ac_stuff="
-      $SYBASE_CT_LIBS
+  ac_stuff=" 
+      $SYBASE_CT_LIBS 
     "
-
+  
   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"
@@ -121089,20 +93786,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -121115,131 +93812,101 @@
     ;;
     -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 "$as_me:$LINENO: checking for netg_errstr in -ltcl" >&5
-echo $ECHO_N "checking for netg_errstr in -ltcl... $ECHO_C" >&6
-if test "${ac_cv_lib_tcl_netg_errstr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
+echo "configure:93859: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ltcl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 93867 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char netg_errstr ();
-int
-main ()
-{
-netg_errstr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_tcl_netg_errstr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_tcl_netg_errstr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_tcl_netg_errstr" >&5
-echo "${ECHO_T}$ac_cv_lib_tcl_netg_errstr" >&6
-if test $ac_cv_lib_tcl_netg_errstr = yes; then
+    builtin and then its argument prototype would still apply.  */
+char netg_errstr();
+
+int main() {
+netg_errstr()
+; return 0; }
+EOF
+if { (eval echo configure:93878: \"$ac_link\") 1>&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
-
-
-
+    
+      
+  
   case tcl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case tcl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ltcl $LIBS"
+  *) 
+      LIBS="-ltcl $LIBS" 
    ;;
   esac
 
@@ -121249,28 +93916,29 @@
   esac
 
 
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_tcl_netg_errstr
-
-
-
+     
+      
+  
   case sybtcl in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case sybtcl in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lsybtcl $LIBS"
+  *) 
+      LIBS="-lsybtcl $LIBS" 
    ;;
   esac
 
@@ -121280,28 +93948,28 @@
   esac
 
 
-
-
+    
+  
 fi
 
-
-
+  
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$SYBASE_CT_LIBDIR"
-
+  
   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"
@@ -121312,20 +93980,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -121338,130 +94006,100 @@
     ;;
     -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 "$as_me:$LINENO: checking for insck__getVdate in -linsck" >&5
-echo $ECHO_N "checking for insck__getVdate in -linsck... $ECHO_C" >&6
-if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
+echo "configure:94053: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-linsck  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 94061 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char insck__getVdate ();
-int
-main ()
-{
-insck__getVdate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_insck_insck__getVdate=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_insck_insck__getVdate=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_insck_insck__getVdate" >&5
-echo "${ECHO_T}$ac_cv_lib_insck_insck__getVdate" >&6
-if test $ac_cv_lib_insck_insck__getVdate = yes; then
+    builtin and then its argument prototype would still apply.  */
+char insck__getVdate();
+
+int main() {
+insck__getVdate()
+; return 0; }
+EOF
+if { (eval echo configure:94072: \"$ac_link\") 1>&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
-
-
+    
+  
   case insck in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case insck in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-linsck $LIBS"
+  *) 
+      LIBS="-linsck $LIBS" 
    ;;
   esac
 
@@ -121471,33 +94109,34 @@
   esac
 
 
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_insck_insck__getVdate
-
-
+    
+  
 fi
 
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="-L$SYBASE_CT_LIBDIR"
-
+  
   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"
@@ -121508,20 +94147,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -121534,130 +94173,100 @@
     ;;
     -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 "$as_me:$LINENO: checking for bsd_tcp in -linsck" >&5
-echo $ECHO_N "checking for bsd_tcp in -linsck... $ECHO_C" >&6
-if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
+echo "configure:94220: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-linsck  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 94228 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char bsd_tcp ();
-int
-main ()
-{
-bsd_tcp ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_insck_bsd_tcp=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_insck_bsd_tcp=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_insck_bsd_tcp" >&5
-echo "${ECHO_T}$ac_cv_lib_insck_bsd_tcp" >&6
-if test $ac_cv_lib_insck_bsd_tcp = yes; then
+    builtin and then its argument prototype would still apply.  */
+char bsd_tcp();
+
+int main() {
+bsd_tcp()
+; return 0; }
+EOF
+if { (eval echo configure:94239: \"$ac_link\") 1>&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
-
-
+    
+  
   case insck in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
+        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 
     else
-
-
+      
+  
   case insck in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-linsck $LIBS"
+  *) 
+      LIBS="-linsck $LIBS" 
    ;;
   esac
 
@@ -121667,14 +94276,15 @@
   esac
 
 
-
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_insck_bsd_tcp
-
-
+    
+  
 fi
 
   fi
@@ -121684,18 +94294,19 @@
 
 php_enable_sysvmsg=no
 
-echo "$as_me:$LINENO: checking whether to enable System V IPC support" >&5
-echo $ECHO_N "checking whether to enable System V IPC support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
+echo "configure:94299: 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"
   PHP_SYSVMSG=$enableval
 else
-
+  
   PHP_SYSVMSG=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -121719,167 +94330,53 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_SYSVMSG" != "no"; then
-  if test "${ac_cv_header_sys_msg_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for sys/msg.h" >&5
-echo $ECHO_N "checking for sys/msg.h... $ECHO_C" >&6
-if test "${ac_cv_header_sys_msg_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_msg_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_msg_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking sys/msg.h usability" >&5
-echo $ECHO_N "checking sys/msg.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sys/msg.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking sys/msg.h presence" >&5
-echo $ECHO_N "checking sys/msg.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
+echo "configure:94342: 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 94347 "configure"
+#include "confdefs.h"
 #include <sys/msg.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/msg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/msg.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/msg.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/msg.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/msg.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/msg.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/msg.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/msg.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for sys/msg.h" >&5
-echo $ECHO_N "checking for sys/msg.h... $ECHO_C" >&6
-if test "${ac_cv_header_sys_msg_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:94352: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  ac_cv_header_sys_msg_h=$ac_header_preproc
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_msg_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_msg_h" >&6
-
+rm -f conftest*
 fi
-if test $ac_cv_header_sys_msg_h = yes; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   :
 else
-  { { echo "$as_me:$LINENO: error: Cannot enable System V IPC support, sys/msg.h is missing" >&5
-echo "$as_me: error: Cannot enable System V IPC support, sys/msg.h is missing" >&2;}
-   { (exit 1); exit 1; }; }
-
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; }
+  
 fi
 
 
-
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_SYSVMSG 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/sysvmsg
   ext_srcdir=$abs_srcdir/ext/sysvmsg
 
@@ -121887,15 +94384,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SYSVMSG_SHARED=no
-
-
+    
+  
   case ext/sysvmsg in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -121908,12 +94405,12 @@
 
   old_IFS=$IFS
   for ac_src in sysvmsg.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
@@ -121937,14 +94434,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SYSVMSG_SHARED=yes
-
+      
   case ext/sysvmsg in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -121957,12 +94454,12 @@
 
   old_IFS=$IFS
   for ac_src in sysvmsg.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -121980,7 +94477,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -121990,7 +94487,7 @@
       ;;
     *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_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(SYSVMSG_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_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVMSG, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -122003,7 +94500,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
 
   cat >>Makefile.objects<<EOF
@@ -122017,7 +94514,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -122027,7 +94524,7 @@
       ;;
     *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_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(VMSG_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_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVMSG, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -122040,7 +94537,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
 
   cat >>Makefile.objects<<EOF
@@ -122054,10 +94551,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SYSVMSG 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -122066,15 +94562,15 @@
     PHP_SYSVMSG_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/sysvmsg in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -122087,12 +94583,12 @@
 
   old_IFS=$IFS
   for ac_src in sysvmsg.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
@@ -122112,15 +94608,15 @@
         EXT_STATIC="$EXT_STATIC sysvmsg"
         ;;
       *)
-
-
+        
+  
   case ext/sysvmsg in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -122133,13 +94629,13 @@
 
   old_IFS=$IFS
   for ac_src in sysvmsg.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -122159,15 +94655,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=sysvmsg
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -122178,18 +94674,19 @@
 
 php_enable_sysvsem=no
 
-echo "$as_me:$LINENO: checking whether to enable System V semaphore support" >&5
-echo $ECHO_N "checking whether to enable System V semaphore support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
+echo "configure:94679: 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"
   PHP_SYSVSEM=$enableval
 else
-
+  
   PHP_SYSVSEM=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -122213,14 +94710,13 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_SYSVSEM" != "no"; then
-
+ 
   ext_builddir=ext/sysvsem
   ext_srcdir=$abs_srcdir/ext/sysvsem
 
@@ -122228,15 +94724,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SYSVSEM_SHARED=no
-
-
+    
+  
   case ext/sysvsem in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -122249,12 +94745,12 @@
 
   old_IFS=$IFS
   for ac_src in sysvsem.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
@@ -122278,14 +94774,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SYSVSEM_SHARED=yes
-
+      
   case ext/sysvsem in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -122298,12 +94794,12 @@
 
   old_IFS=$IFS
   for ac_src in sysvsem.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -122321,7 +94817,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -122331,7 +94827,7 @@
       ;;
     *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_sysvsem) -L$(top_builddir)/netware -lphp5lib $(SYSVSEM_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_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -122344,7 +94840,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
 
   cat >>Makefile.objects<<EOF
@@ -122358,7 +94854,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -122368,7 +94864,7 @@
       ;;
     *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_sysvsem) -L$(top_builddir)/netware -lphp5lib $(VSEM_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_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSEM, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -122381,7 +94877,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
 
   cat >>Makefile.objects<<EOF
@@ -122395,10 +94891,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SYSVSEM 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -122407,15 +94902,15 @@
     PHP_SYSVSEM_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/sysvsem in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -122428,12 +94923,12 @@
 
   old_IFS=$IFS
   for ac_src in sysvsem.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
@@ -122453,15 +94948,15 @@
         EXT_STATIC="$EXT_STATIC sysvsem"
         ;;
       *)
-
-
+        
+  
   case ext/sysvsem in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -122474,13 +94969,13 @@
 
   old_IFS=$IFS
   for ac_src in sysvsem.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -122500,97 +94995,67 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=sysvsem
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_SYSVSEM 1
-_ACEOF
+EOF
 
- echo "$as_me:$LINENO: checking for union semun" >&5
-echo $ECHO_N "checking for union semun... $ECHO_C" >&6
-if test "${php_cv_semun+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+ echo $ac_n "checking for union semun""... $ac_c" 1>&6
+echo "configure:95017: 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 95022 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
-
-int
-main ()
-{
+   
+int main() {
 union semun x;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:95033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
      php_cv_semun=yes
-
+   
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
      php_cv_semun=no
-
+   
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+ 
 fi
-echo "$as_me:$LINENO: result: $php_cv_semun" >&5
-echo "${ECHO_T}$php_cv_semun" >&6
- if test "$php_cv_semun" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_semun" 1>&6
+ if test "$php_cv_semun" = "yes"; then
+   cat >> confdefs.h <<\EOF
 #define HAVE_SEMUN 1
-_ACEOF
+EOF
 
  else
-
-cat >>confdefs.h <<\_ACEOF
+   cat >> confdefs.h <<\EOF
 #define HAVE_SEMUN 0
-_ACEOF
+EOF
 
  fi
 fi
@@ -122599,18 +95064,19 @@
 
 php_enable_sysvshm=no
 
-echo "$as_me:$LINENO: checking whether to enable System V shared memory support" >&5
-echo $ECHO_N "checking whether to enable System V shared memory support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
+echo "configure:95069: 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"
   PHP_SYSVSHM=$enableval
 else
-
+  
   PHP_SYSVSHM=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -122634,19 +95100,17 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_SYSVSHM" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_SYSVSHM 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/sysvshm
   ext_srcdir=$abs_srcdir/ext/sysvshm
 
@@ -122654,15 +95118,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_SYSVSHM_SHARED=no
-
-
+    
+  
   case ext/sysvshm in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -122675,12 +95139,12 @@
 
   old_IFS=$IFS
   for ac_src in sysvshm.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
@@ -122704,14 +95168,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_SYSVSHM_SHARED=yes
-
+      
   case ext/sysvshm in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -122724,12 +95188,12 @@
 
   old_IFS=$IFS
   for ac_src in sysvshm.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -122747,7 +95211,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -122757,7 +95221,7 @@
       ;;
     *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_sysvshm) -L$(top_builddir)/netware -lphp5lib $(SYSVSHM_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_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -122770,7 +95234,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
 
   cat >>Makefile.objects<<EOF
@@ -122784,7 +95248,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -122794,7 +95258,7 @@
       ;;
     *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_sysvshm) -L$(top_builddir)/netware -lphp5lib $(VSHM_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_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSHM, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -122807,7 +95271,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvshm.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
 
   cat >>Makefile.objects<<EOF
@@ -122821,10 +95285,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_SYSVSHM 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -122833,15 +95296,15 @@
     PHP_SYSVSHM_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/sysvshm in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -122854,12 +95317,12 @@
 
   old_IFS=$IFS
   for ac_src in sysvshm.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
@@ -122879,15 +95342,15 @@
         EXT_STATIC="$EXT_STATIC sysvshm"
         ;;
       *)
-
-
+        
+  
   case ext/sysvshm in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -122900,13 +95363,13 @@
 
   old_IFS=$IFS
   for ac_src in sysvshm.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -122926,15 +95389,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=sysvshm
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -122945,19 +95408,19 @@
 
 php_with_tidy=no
 
-echo "$as_me:$LINENO: checking for TIDY support" >&5
-echo $ECHO_N "checking for TIDY support... $ECHO_C" >&6
-
+echo $ac_n "checking for TIDY support""... $ac_c" 1>&6
+echo "configure:95413: checking for TIDY support" >&5
 # Check whether --with-tidy or --without-tidy was given.
 if test "${with_tidy+set}" = set; then
   withval="$with_tidy"
   PHP_TIDY=$withval
 else
-
+  
   PHP_TIDY=no
   test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -122981,8 +95444,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -123006,101 +95468,99 @@
   done
 
   if test -z "$TIDY_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libtidy" >&5
-echo "$as_me: error: Cannot find libtidy" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; }
   fi
 
   TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
 
-
+  
 
   if test "$ext_shared" = "yes"; then
     TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD"
     if test -n "$TIDY_LIBDIR"; then
-
+      
   if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$TIDY_LIBDIR
   else
-
+    
     ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_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 "$TIDY_LIBDIR"; then
-
+    
   if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$TIDY_LIBDIR
   else
-
+    
     ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$TIDY_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 tidy in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-ltidy $LIBS"
+  *) 
+      LIBS="-ltidy $LIBS" 
    ;;
   esac
 
@@ -123110,55 +95570,55 @@
   fi
 
 
-
+  
   if test "$TIDY_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$TIDY_INCDIR
   else
-
+    
     ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$TIDY_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
 
 
-
+  
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=""
-
+  
   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"
@@ -123169,20 +95629,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -123195,136 +95655,106 @@
     ;;
     -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 "$as_me:$LINENO: checking for tidyOptGetDoc in -ltidy" >&5
-echo $ECHO_N "checking for tidyOptGetDoc in -ltidy... $ECHO_C" >&6
-if test "${ac_cv_lib_tidy_tidyOptGetDoc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6
+echo "configure:95702: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ltidy  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 95710 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char tidyOptGetDoc ();
-int
-main ()
-{
-tidyOptGetDoc ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_tidy_tidyOptGetDoc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_tidy_tidyOptGetDoc=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_tidy_tidyOptGetDoc" >&5
-echo "${ECHO_T}$ac_cv_lib_tidy_tidyOptGetDoc" >&6
-if test $ac_cv_lib_tidy_tidyOptGetDoc = yes; then
+    builtin and then its argument prototype would still apply.  */
+char tidyOptGetDoc();
+
+int main() {
+tidyOptGetDoc()
+; return 0; }
+EOF
+if { (eval echo configure:95721: \"$ac_link\") 1>&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
-
-
-cat >>confdefs.h <<\_ACEOF
+    
+  cat >> confdefs.h <<\EOF
 #define HAVE_TIDYOPTGETDOC 1
-_ACEOF
-
-
+EOF
 
+  
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_tidy_tidyOptGetDoc
-
-
+    
+  
 fi
 
 
 
-
+  
   ext_builddir=ext/tidy
   ext_srcdir=$abs_srcdir/ext/tidy
 
@@ -123332,15 +95762,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_TIDY_SHARED=no
-
-
+    
+  
   case ext/tidy in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -123353,12 +95783,12 @@
 
   old_IFS=$IFS
   for ac_src in tidy.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
@@ -123382,14 +95812,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_TIDY_SHARED=yes
-
+      
   case ext/tidy in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -123402,12 +95832,12 @@
 
   old_IFS=$IFS
   for ac_src in tidy.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -123425,7 +95855,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -123435,7 +95865,7 @@
       ;;
     *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_tidy) -L$(top_builddir)/netware -lphp5lib $(TIDY_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_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -123448,7 +95878,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
 
   cat >>Makefile.objects<<EOF
@@ -123462,7 +95892,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -123472,7 +95902,7 @@
       ;;
     *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_tidy) -L$(top_builddir)/netware -lphp5lib $(Y_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_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TIDY, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -123485,7 +95915,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
 
   cat >>Makefile.objects<<EOF
@@ -123499,10 +95929,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_TIDY 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -123511,15 +95940,15 @@
     PHP_TIDY_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/tidy in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -123532,12 +95961,12 @@
 
   old_IFS=$IFS
   for ac_src in tidy.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
@@ -123557,15 +95986,15 @@
         EXT_STATIC="$EXT_STATIC tidy"
         ;;
       *)
-
-
+        
+  
   case ext/tidy in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -123578,13 +96007,13 @@
 
   old_IFS=$IFS
   for ac_src in tidy.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -123604,26 +96033,25 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=tidy
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD"
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_TIDY 1
-_ACEOF
+EOF
 
 fi
 
@@ -123632,18 +96060,19 @@
 
 php_enable_tokenizer=yes
 
-echo "$as_me:$LINENO: checking whether to enable tokenizer support" >&5
-echo $ECHO_N "checking whether to enable tokenizer support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
+echo "configure:96065: 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"
   PHP_TOKENIZER=$enableval
 else
-
+  
   PHP_TOKENIZER=yes
   test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -123667,14 +96096,13 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_TOKENIZER" != "no"; then
-
+  
   ext_builddir=ext/tokenizer
   ext_srcdir=$abs_srcdir/ext/tokenizer
 
@@ -123682,15 +96110,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_TOKENIZER_SHARED=no
-
-
+    
+  
   case ext/tokenizer in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -123703,12 +96131,12 @@
 
   old_IFS=$IFS
   for ac_src in tokenizer.c tokenizer_data.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
@@ -123732,14 +96160,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_TOKENIZER_SHARED=yes
-
+      
   case ext/tokenizer in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -123752,12 +96180,12 @@
 
   old_IFS=$IFS
   for ac_src in tokenizer.c tokenizer_data.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -123775,7 +96203,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -123785,7 +96213,7 @@
       ;;
     *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_tokenizer) -L$(top_builddir)/netware -lphp5lib $(TOKENIZER_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_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -123798,7 +96226,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
 
   cat >>Makefile.objects<<EOF
@@ -123812,7 +96240,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -123822,7 +96250,7 @@
       ;;
     *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_tokenizer) -L$(top_builddir)/netware -lphp5lib $(ENIZER_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_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TOKENIZER, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -123835,7 +96263,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
 
   cat >>Makefile.objects<<EOF
@@ -123849,10 +96277,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_TOKENIZER 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -123861,15 +96288,15 @@
     PHP_TOKENIZER_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/tokenizer in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -123882,12 +96309,12 @@
 
   old_IFS=$IFS
   for ac_src in tokenizer.c tokenizer_data.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
@@ -123907,15 +96334,15 @@
         EXT_STATIC="$EXT_STATIC tokenizer"
         ;;
       *)
-
-
+        
+  
   case ext/tokenizer in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -123928,13 +96355,13 @@
 
   old_IFS=$IFS
   for ac_src in tokenizer.c tokenizer_data.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -123954,20 +96381,20 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=tokenizer
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   src=$ext_srcdir/Makefile.frag
   ac_srcdir=$ext_srcdir
   ac_builddir=$ext_builddir
@@ -123979,18 +96406,19 @@
 
 php_enable_wddx=no
 
-echo "$as_me:$LINENO: checking whether to enable WDDX support" >&5
-echo $ECHO_N "checking whether to enable WDDX support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
+echo "configure:96411: 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"
   PHP_WDDX=$enableval
 else
-
+  
   PHP_WDDX=no
   test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -124014,33 +96442,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_LIBXML_DIR"; then
-
+  
 php_with_libxml_dir=no
 
-echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
+echo "configure:96456: 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"
   PHP_LIBXML_DIR=$withval
 else
-
+  
   PHP_LIBXML_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBXML_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -124049,23 +96475,22 @@
 
 php_with_libexpat_dir=no
 
-echo "$as_me:$LINENO: checking libexpat dir for WDDX" >&5
-echo $ECHO_N "checking libexpat dir for WDDX... $ECHO_C" >&6
-
+echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6
+echo "configure:96480: 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"
   PHP_LIBEXPAT_DIR=$withval
 else
-
+  
   PHP_LIBEXPAT_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBEXPAT_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -124074,18 +96499,16 @@
 
         if test "$PHP_LIBEXPAT_DIR" = "no"; then
     if test "$PHP_LIBXML" = "no"; then
-      { { echo "$as_me:$LINENO: error: WDDX extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: WDDX extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
     fi
 
-
-echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    
+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
+echo "configure:96508: 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
-
+  
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
     if test -x "$i/bin/xml2-config"; then
       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
@@ -124094,8 +96517,8 @@
   done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6
+
+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -124108,17 +96531,17 @@
     if test "$LIBXML_VERSION" -ge "2006011"; then
       LIBXML_LIBS=`$XML2_CONFIG --libs`
       LIBXML_INCS=`$XML2_CONFIG --cflags`
-
+      
   for ac_i in $LIBXML_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -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"
@@ -124129,20 +96552,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii"
+        WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -124155,80 +96578,80 @@
     ;;
     -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
         WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $LIBXML_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -124238,96 +96661,79 @@
   done
 
 
-            echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
+echo "configure:96666: 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
-
-
+  
+        
   old_LIBS=$LIBS
   LIBS="
           $WDDX_SHARED_LIBADD
          $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 96682 "configure"
+#include "confdefs.h"
 
+    
     char xmlInitParser();
     int main() {
       xmlInitParser();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:96693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
+    
           php_cv_libxml_build_works=yes
-
-
+        
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
+        
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+      
 fi
-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6
-      if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_libxml_build_works" 1>&6
+      if test "$php_cv_libxml_build_works" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
+EOF
 
       fi
-
+      
       if test "$PHP_XML" = "no"; then
-
-
+        
+  
   case ext/xml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -124340,12 +96746,12 @@
 
   old_IFS=$IFS
   for ac_src in compat.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
@@ -124362,23 +96768,19 @@
   done
 
 
-
-
+        
+  
     BUILD_DIR="$BUILD_DIR ext/xml"
-
+  
 
       fi
-
+    
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
     fi
-else
-      { { echo "$as_me:$LINENO: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&5
-echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+      { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
+    
   fi
 
   fi
@@ -124392,130 +96794,128 @@
     done
 
     if test -z "$EXPAT_DIR"; then
-      { { echo "$as_me:$LINENO: error: not found. Please reinstall the expat distribution." >&5
-echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
     fi
 
-
+    
   if test "$EXPAT_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$EXPAT_DIR/include
   else
-
+    
     ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
   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
     WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD"
     if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$EXPAT_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_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 "$EXPAT_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$EXPAT_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case expat in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lexpat $LIBS"
+  *) 
+      LIBS="-lexpat $LIBS" 
    ;;
   esac
 
@@ -124525,19 +96925,17 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBEXPAT 1
-_ACEOF
+EOF
 
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_WDDX 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/wddx
   ext_srcdir=$abs_srcdir/ext/wddx
 
@@ -124545,15 +96943,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_WDDX_SHARED=no
-
-
+    
+  
   case ext/wddx in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -124566,12 +96964,12 @@
 
   old_IFS=$IFS
   for ac_src in wddx.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
@@ -124595,14 +96993,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_WDDX_SHARED=yes
-
+      
   case ext/wddx in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -124615,12 +97013,12 @@
 
   old_IFS=$IFS
   for ac_src in wddx.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -124638,7 +97036,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -124648,7 +97046,7 @@
       ;;
     *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_wddx) -L$(top_builddir)/netware -lphp5lib $(WDDX_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_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPWDDX, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -124661,7 +97059,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
 
   cat >>Makefile.objects<<EOF
@@ -124675,7 +97073,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -124685,7 +97083,7 @@
       ;;
     *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_wddx) -L$(top_builddir)/netware -lphp5lib $(X_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_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(WDDX, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -124698,7 +97096,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/wddx.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
 
   cat >>Makefile.objects<<EOF
@@ -124712,10 +97110,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_WDDX 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -124724,15 +97121,15 @@
     PHP_WDDX_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/wddx in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -124745,12 +97142,12 @@
 
   old_IFS=$IFS
   for ac_src in wddx.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
@@ -124770,15 +97167,15 @@
         EXT_STATIC="$EXT_STATIC wddx"
         ;;
       *)
-
-
+        
+  
   case ext/wddx in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -124791,13 +97188,13 @@
 
   old_IFS=$IFS
   for ac_src in wddx.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -124817,51 +97214,39 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=wddx
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   am_i_shared=$PHP_WDDX_SHARED
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension wddx to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build wddx shared or build libxml statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension wddx to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build wddx shared or build libxml statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    { echo "configure: error: 
 You've configured extension wddx, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension wddx, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
 
 fi
@@ -124870,18 +97255,19 @@
 
 php_enable_xml=yes
 
-echo "$as_me:$LINENO: checking whether to enable XML support" >&5
-echo $ECHO_N "checking whether to enable XML support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
+echo "configure:97260: 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"
   PHP_XML=$enableval
 else
-
+  
   PHP_XML=yes
   test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -124905,33 +97291,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_LIBXML_DIR"; then
-
+  
 php_with_libxml_dir=no
 
-echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
+echo "configure:97305: 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"
   PHP_LIBXML_DIR=$withval
 else
-
+  
   PHP_LIBXML_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBXML_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -124940,23 +97324,22 @@
 
 php_with_libexpat_dir=no
 
-echo "$as_me:$LINENO: checking libexpat install dir" >&5
-echo $ECHO_N "checking libexpat install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6
+echo "configure:97329: 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"
   PHP_LIBEXPAT_DIR=$withval
 else
-
+  
   PHP_LIBEXPAT_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBEXPAT_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -124966,18 +97349,16 @@
         if test "$PHP_LIBEXPAT_DIR" = "no"; then
 
     if test "$PHP_LIBXML" = "no"; then
-      { { echo "$as_me:$LINENO: error: XML extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XML extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
     fi
 
-
-echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    
+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
+echo "configure:97358: 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
-
+  
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
     if test -x "$i/bin/xml2-config"; then
       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
@@ -124986,8 +97367,8 @@
   done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6
+
+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -125000,17 +97381,17 @@
     if test "$LIBXML_VERSION" -ge "2006011"; then
       LIBXML_LIBS=`$XML2_CONFIG --libs`
       LIBXML_INCS=`$XML2_CONFIG --cflags`
-
+      
   for ac_i in $LIBXML_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         XML_SHARED_LIBADD="$XML_SHARED_LIBADD -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"
@@ -125021,20 +97402,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii"
+        XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -125047,80 +97428,80 @@
     ;;
     -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
         XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $LIBXML_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -125130,133 +97511,100 @@
   done
 
 
-            echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
+echo "configure:97516: 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
-
-
+  
+        
   old_LIBS=$LIBS
   LIBS="
           $XML_SHARED_LIBADD
          $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 97532 "configure"
+#include "confdefs.h"
 
+    
     char xmlInitParser();
     int main() {
       xmlInitParser();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:97543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
+    
           php_cv_libxml_build_works=yes
-
-
+        
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
+        
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+      
 fi
-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6
-      if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_libxml_build_works" 1>&6
+      if test "$php_cv_libxml_build_works" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
+EOF
 
       fi
-
+      
       xml_extra_sources="compat.c"
-
+      
   am_i_shared=$PHP_XML_SHARED
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xml to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build xml shared or build libxml statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension xml to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build xml shared or build libxml statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xml, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension xml, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+    
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
     fi
-else
-      { { echo "$as_me:$LINENO: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&5
-echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+      { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
+    
   fi
 
   fi
-
+  
         if test "$PHP_LIBEXPAT_DIR" != "no"; then
     for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
       if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
@@ -125266,130 +97614,128 @@
     done
 
     if test -z "$EXPAT_DIR"; then
-      { { echo "$as_me:$LINENO: error: not found. Please reinstall the expat distribution." >&5
-echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
     fi
 
-
+    
   if test "$EXPAT_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$EXPAT_DIR/include
   else
-
+    
     ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
   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
     XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD"
     if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$EXPAT_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_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 "$EXPAT_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$EXPAT_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case expat in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lexpat $LIBS"
+  *) 
+      LIBS="-lexpat $LIBS" 
    ;;
   esac
 
@@ -125399,14 +97745,13 @@
   fi
 
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_LIBEXPAT 1
-_ACEOF
+EOF
 
   fi
 
-
+  
   ext_builddir=ext/xml
   ext_srcdir=$abs_srcdir/ext/xml
 
@@ -125414,15 +97759,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_XML_SHARED=no
-
-
+    
+  
   case ext/xml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -125435,12 +97780,12 @@
 
   old_IFS=$IFS
   for ac_src in xml.c $xml_extra_sources; 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
@@ -125464,14 +97809,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_XML_SHARED=yes
-
+      
   case ext/xml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -125484,12 +97829,12 @@
 
   old_IFS=$IFS
   for ac_src in xml.c $xml_extra_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -125507,7 +97852,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -125517,7 +97862,7 @@
       ;;
     *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_xml) -L$(top_builddir)/netware -lphp5lib $(XML_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_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -125530,7 +97875,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
 
   cat >>Makefile.objects<<EOF
@@ -125544,7 +97889,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -125554,7 +97899,7 @@
       ;;
     *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_xml) -L$(top_builddir)/netware -lphp5lib $(_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_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XML, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -125567,7 +97912,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/xml.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
 
   cat >>Makefile.objects<<EOF
@@ -125581,10 +97926,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_XML 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -125593,15 +97937,15 @@
     PHP_XML_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/xml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -125614,12 +97958,12 @@
 
   old_IFS=$IFS
   for ac_src in xml.c $xml_extra_sources; 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
@@ -125639,15 +97983,15 @@
         EXT_STATIC="$EXT_STATIC xml"
         ;;
       *)
-
-
+        
+  
   case ext/xml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -125660,13 +98004,13 @@
 
   old_IFS=$IFS
   for ac_src in xml.c $xml_extra_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -125686,44 +98030,43 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=xml
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD"
 
-
-
+  
+  
     for header_file in ext/xml/; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_XML 1
-_ACEOF
+EOF
 
 fi
 
@@ -125731,18 +98074,19 @@
 
 php_enable_xmlreader=yes
 
-echo "$as_me:$LINENO: checking whether to enable XMLReader support" >&5
-echo $ECHO_N "checking whether to enable XMLReader support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6
+echo "configure:98079: 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"
   PHP_XMLREADER=$enableval
 else
-
+  
   PHP_XMLREADER=yes
   test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -125766,33 +98110,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_LIBXML_DIR"; then
-
+  
 php_with_libxml_dir=no
 
-echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
+echo "configure:98124: 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"
   PHP_LIBXML_DIR=$withval
 else
-
+  
   PHP_LIBXML_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBXML_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -125801,18 +98143,16 @@
 if test "$PHP_XMLREADER" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: XMLReader extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XMLReader extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
   fi
 
-
-echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
+echo "configure:98152: 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
-
+  
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
     if test -x "$i/bin/xml2-config"; then
       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
@@ -125821,8 +98161,8 @@
   done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6
+
+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -125835,17 +98175,17 @@
     if test "$LIBXML_VERSION" -ge "2006011"; then
       LIBXML_LIBS=`$XML2_CONFIG --libs`
       LIBXML_INCS=`$XML2_CONFIG --cflags`
-
+      
   for ac_i in $LIBXML_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -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"
@@ -125856,20 +98196,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii"
+        XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -125882,80 +98222,80 @@
     ;;
     -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
         XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $LIBXML_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -125965,92 +98305,74 @@
   done
 
 
-            echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
+echo "configure:98310: 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
-
-
+  
+        
   old_LIBS=$LIBS
   LIBS="
           $XMLREADER_SHARED_LIBADD
          $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 98326 "configure"
+#include "confdefs.h"
 
+    
     char xmlInitParser();
     int main() {
       xmlInitParser();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:98337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
+    
           php_cv_libxml_build_works=yes
-
-
+        
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
+        
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+      
 fi
-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6
-      if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_libxml_build_works" 1>&6
+      if test "$php_cv_libxml_build_works" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
+EOF
 
       fi
-
-
-cat >>confdefs.h <<\_ACEOF
+      
+    cat >> confdefs.h <<\EOF
 #define HAVE_XMLREADER 1
-_ACEOF
-
+EOF
 
+    
   ext_builddir=ext/xmlreader
   ext_srcdir=$abs_srcdir/ext/xmlreader
 
@@ -126058,15 +98380,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_XMLREADER_SHARED=no
-
-
+    
+  
   case ext/xmlreader in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -126079,12 +98401,12 @@
 
   old_IFS=$IFS
   for ac_src in php_xmlreader.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
@@ -126108,14 +98430,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_XMLREADER_SHARED=yes
-
+      
   case ext/xmlreader in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -126128,12 +98450,12 @@
 
   old_IFS=$IFS
   for ac_src in php_xmlreader.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -126151,7 +98473,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -126161,7 +98483,7 @@
       ;;
     *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_xmlreader) -L$(top_builddir)/netware -lphp5lib $(XMLREADER_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_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -126174,7 +98496,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
 
   cat >>Makefile.objects<<EOF
@@ -126188,7 +98510,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -126198,7 +98520,7 @@
       ;;
     *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_xmlreader) -L$(top_builddir)/netware -lphp5lib $(READER_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_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLREADER, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -126211,7 +98533,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlreader.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
 
   cat >>Makefile.objects<<EOF
@@ -126225,10 +98547,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_XMLREADER 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -126237,15 +98558,15 @@
     PHP_XMLREADER_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/xmlreader in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -126258,12 +98579,12 @@
 
   old_IFS=$IFS
   for ac_src in php_xmlreader.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
@@ -126283,15 +98604,15 @@
         EXT_STATIC="$EXT_STATIC xmlreader"
         ;;
       *)
-
-
+        
+  
   case ext/xmlreader in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -126304,13 +98625,13 @@
 
   old_IFS=$IFS
   for ac_src in php_xmlreader.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -126330,64 +98651,48 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=xmlreader
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+    
   am_i_shared=$PHP_XMLREADER_SHARED
   is_it_shared=$PHP_DOM_SHARED
   is_it_enabled=$PHP_DOM
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xmlreader to build statically, but it
-depends on extension dom, which you've configured to build shared.
-You either need to build xmlreader shared or build dom statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension xmlreader to build statically, but it
 depends on extension dom, which you've configured to build shared.
 You either need to build xmlreader shared or build dom statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xmlreader, which depends on extension dom,
-but you've either not enabled dom, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension xmlreader, which depends on extension dom,
 but you've either not enabled dom, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD"
 
-
+  
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
     fi
-else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
+  
   fi
 
 fi
@@ -126409,19 +98714,19 @@
 
 php_with_xmlrpc=no
 
-echo "$as_me:$LINENO: checking for XMLRPC-EPI support" >&5
-echo $ECHO_N "checking for XMLRPC-EPI support... $ECHO_C" >&6
-
+echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
+echo "configure:98719: 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"
   PHP_XMLRPC=$withval
 else
-
+  
   PHP_XMLRPC=no
   test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -126445,33 +98750,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_LIBXML_DIR"; then
-
+  
 php_with_libxml_dir=no
 
-echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
+echo "configure:98764: 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"
   PHP_LIBXML_DIR=$withval
 else
-
+  
   PHP_LIBXML_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBXML_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -126480,23 +98783,22 @@
 
 php_with_libexpat_dir=no
 
-echo "$as_me:$LINENO: checking libexpat dir for XMLRPC-EPI" >&5
-echo $ECHO_N "checking libexpat dir for XMLRPC-EPI... $ECHO_C" >&6
-
+echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
+echo "configure:98788: 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"
   PHP_LIBEXPAT_DIR=$withval
 else
-
+  
   PHP_LIBEXPAT_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBEXPAT_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -126504,84 +98806,68 @@
 
 php_with_iconv_dir=no
 
-echo "$as_me:$LINENO: checking iconv dir for XMLRPC-EPI" >&5
-echo $ECHO_N "checking iconv dir for XMLRPC-EPI... $ECHO_C" >&6
-
+echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
+echo "configure:98811: 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"
   PHP_ICONV_DIR=$withval
 else
-
+  
   PHP_ICONV_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ICONV_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test "$PHP_XMLRPC" != "no"; then
 
-
+  
   am_i_shared=$PHP_XMLRPC_SHARED
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xmlrpc to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build xmlrpc shared or build libxml statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension xmlrpc to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build xmlrpc shared or build libxml statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xmlrpc, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension xmlrpc, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
-
+  
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_XMLRPC 1
-_ACEOF
+EOF
 
 
         if test "$PHP_LIBEXPAT_DIR" = "no"; then
 
     if test "$PHP_LIBXML" = "no"; then
-      { { echo "$as_me:$LINENO: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
     fi
 
-
-echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    
+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
+echo "configure:98867: 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
-
+  
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
     if test -x "$i/bin/xml2-config"; then
       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
@@ -126590,8 +98876,8 @@
   done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6
+
+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -126604,17 +98890,17 @@
     if test "$LIBXML_VERSION" -ge "2006011"; then
       LIBXML_LIBS=`$XML2_CONFIG --libs`
       LIBXML_INCS=`$XML2_CONFIG --cflags`
-
+      
   for ac_i in $LIBXML_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -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"
@@ -126625,20 +98911,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii"
+        XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -126651,80 +98937,80 @@
     ;;
     -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
         XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $LIBXML_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -126734,96 +99020,79 @@
   done
 
 
-            echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
+echo "configure:99025: 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
-
-
+  
+        
   old_LIBS=$LIBS
   LIBS="
           $XMLRPC_SHARED_LIBADD
          $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 99041 "configure"
+#include "confdefs.h"
 
+    
     char xmlInitParser();
     int main() {
       xmlInitParser();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:99052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
+    
           php_cv_libxml_build_works=yes
-
-
+        
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
+        
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+      
 fi
-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6
-      if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_libxml_build_works" 1>&6
+      if test "$php_cv_libxml_build_works" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
+EOF
 
       fi
-
+      
       if test "$PHP_XML" = "no"; then
-
-
+        
+  
   case ext/xml in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -126836,12 +99105,12 @@
 
   old_IFS=$IFS
   for ac_src in compat.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
@@ -126858,122 +99127,117 @@
   done
 
 
-
-
+        
+  
     BUILD_DIR="$BUILD_DIR ext/xml"
-
+  
 
       fi
-
+    
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
     fi
-else
-      { { echo "$as_me:$LINENO: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&5
-echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+      { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
+    
   fi
 
   else
     testval=no
     for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
       if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBEXPAT 1
-_ACEOF
-
+EOF
 
+        
 
   if test "$ext_shared" = "yes"; then
     XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD"
     if test -n "$i/$PHP_LIBDIR"; then
-
+      
   if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$i/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_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 "$i/$PHP_LIBDIR"; then
-
+    
   if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$i/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case expat in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lexpat $LIBS"
+  *) 
+      LIBS="-lexpat $LIBS" 
    ;;
   esac
 
@@ -126983,33 +99247,33 @@
   fi
 
 
-
+        
   if test "$i/include" != "/usr/include"; then
-
+    
   if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then
     ai_p=$i/include
   else
-
+    
     ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$i/include\"`"
   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
@@ -127020,9 +99284,7 @@
     done
 
     if test "$testval" = "no"; then
-      { { echo "$as_me:$LINENO: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" >&5
-echo "$as_me: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" 1>&2; exit 1; }
     fi
   fi
 
@@ -127031,12 +99293,12 @@
     if test "$PHP_ICONV_DIR" != "no"; then
       PHP_ICONV=$PHP_ICONV_DIR
     fi
-
+  
     if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
       PHP_ICONV=yes
     fi
-
-
+  
+    
   found_iconv=no
   unset ICONV_DIR
 
@@ -127053,211 +99315,117 @@
   echo > ext/iconv/php_php_iconv_h_path.h
   echo > ext/iconv/php_iconv_supports_errno.h
 
-
+      
   if test "$PHP_ICONV" = "yes"; then
             LIBS_save="$LIBS"
     LIBS=
-    echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-if test "${ac_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define iconv to an innocuous variant, in case <limits.h> declares iconv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define iconv innocuous_iconv
-
+    echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:99324: 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 99329 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char iconv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef iconv
-
+    which can conflict with char iconv(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char iconv ();
+    builtin and then its argument prototype would still apply.  */
+char iconv();
+
+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_iconv) || defined (__stub___iconv)
 choke me
 #else
-char (*f) () = iconv;
-#endif
-#ifdef __cplusplus
-}
+iconv();
 #endif
 
-int
-main ()
-{
-return f != iconv;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_iconv=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_iconv" >&5
-echo "${ECHO_T}$ac_cv_func_iconv" >&6
-if test $ac_cv_func_iconv = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:99352: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_iconv=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
       found_iconv=yes
-
+    
 else
+  echo "$ac_t""no" 1>&6
 
-      echo "$as_me:$LINENO: checking for libiconv" >&5
-echo $ECHO_N "checking for libiconv... $ECHO_C" >&6
-if test "${ac_cv_func_libiconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define libiconv to an innocuous variant, in case <limits.h> declares libiconv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define libiconv innocuous_libiconv
-
+      echo $ac_n "checking for libiconv""... $ac_c" 1>&6
+echo "configure:99373: 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 99378 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char libiconv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef libiconv
-
+    which can conflict with char libiconv(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char libiconv ();
+    builtin and then its argument prototype would still apply.  */
+char libiconv();
+
+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_libiconv) || defined (__stub___libiconv)
 choke me
 #else
-char (*f) () = libiconv;
+libiconv();
 #endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != libiconv;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_libiconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_libiconv=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_libiconv" >&5
-echo "${ECHO_T}$ac_cv_func_libiconv" >&6
-if test $ac_cv_func_libiconv = yes; then
 
+; return 0; }
+EOF
+if { (eval echo configure:99401: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_libiconv=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+        
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBICONV 1
-_ACEOF
+EOF
 
         found_iconv=yes
-
+      
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-
+    
 fi
 
     LIBS="$LIBS_save"
@@ -127267,10 +99435,9 @@
 
     for i in $PHP_ICONV /usr/local /usr; do
       if test -r $i/include/giconv.h; then
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_GICONV_H 1
-_ACEOF
+EOF
 
         ICONV_DIR=$i
         iconv_lib_name=giconv
@@ -127283,33 +99450,31 @@
     done
 
     if test -z "$ICONV_DIR"; then
-      { { echo "$as_me:$LINENO: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&5
-echo "$as_me: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
     fi
-
+  
     if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
        test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
     then
-
+      
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
         -L$ICONV_DIR/$PHP_LIBDIR
       "
-
+  
   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"
@@ -127320,20 +99485,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -127346,162 +99511,130 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for libiconv in -l$iconv_lib_name" >&5
-echo $ECHO_N "checking for libiconv in -l$iconv_lib_name... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
+echo "configure:99558: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 99566 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char libiconv ();
-int
-main ()
-{
-libiconv ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char libiconv();
+
+int main() {
+libiconv()
+; return 0; }
+EOF
+if { (eval echo configure:99577: \"$ac_link\") 1>&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
-
+    
         found_iconv=yes
-
+        
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBICONV 1
-_ACEOF
-
+EOF
 
+        
   echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define ICONV_ALIASED_LIBICONV 1
-_ACEOF
-
-
+EOF
 
+      
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$iconv_lib_name_libiconv
-
-
+    
+        
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
           -L$ICONV_DIR/$PHP_LIBDIR
         "
-
+  
   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"
@@ -127512,20 +99645,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -127538,235 +99671,204 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for iconv in -l$iconv_lib_name" >&5
-echo $ECHO_N "checking for iconv in -l$iconv_lib_name... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
+echo "configure:99718: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 99726 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char iconv ();
-int
-main ()
-{
-iconv ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char iconv();
+
+int main() {
+iconv()
+; return 0; }
+EOF
+if { (eval echo configure:99737: \"$ac_link\") 1>&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
-
+    
           found_iconv=yes
-
-
+        
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$iconv_lib_name_iconv
-
-
+    
+  
 fi
 
-
-
+      
+  
 fi
 
     fi
   fi
 
   if test "$found_iconv" = "yes"; then
-
+    
   echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h
 
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_ICONV 1
-_ACEOF
+EOF
 
     if test -n "$ICONV_DIR"; then
-
+      
 
   if test "$ext_shared" = "yes"; then
     XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD"
     if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ICONV_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_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 "$ICONV_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ICONV_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case $iconv_lib_name in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-l$iconv_lib_name $LIBS"
+  *) 
+      LIBS="-l$iconv_lib_name $LIBS" 
    ;;
   esac
 
@@ -127776,284 +99878,170 @@
   fi
 
 
-
+      
   if test "$ICONV_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$ICONV_DIR/include
   else
-
+    
     ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`"
   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
 
     fi
-
-else
-      { { echo "$as_me:$LINENO: error: iconv not found, in order to build xmlrpc you need the iconv library" >&5
-echo "$as_me: error: iconv not found, in order to build xmlrpc you need the iconv library" >&2;}
-   { (exit 1); exit 1; }; }
-
+    
+else 
+      { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; }
+    
   fi
 
   fi
 fi
 
 if test "$PHP_XMLRPC" = "yes"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  # 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:99927: 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
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
 fi
 fi
-RANLIB=$ac_cv_prog_RANLIB
+RANLIB="$ac_cv_prog_RANLIB"
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  echo "$ac_t""$RANLIB" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:99955: checking for inline" >&5
+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  cat > conftest.$ac_ext <<EOF
+#line 99962 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
+EOF
+if { (eval echo configure:99969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-
 
-case $ac_cv_c_inline in
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
   inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
+  no) cat >> confdefs.h <<\EOF
+#define inline 
+EOF
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+ ;;
 esac
 
+	
 
 
 
 
 
-
-
-cat >>confdefs.h <<\_ACEOF
-#define UNDEF_THREADS_HACK
-_ACEOF
+cat >> confdefs.h <<\EOF
+#define UNDEF_THREADS_HACK 
+EOF
 
 
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:100007: 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 100012 "configure"
+#include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:100020: \"$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_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+cat > conftest.$ac_ext <<EOF
+#line 100037 "configure"
+#include "confdefs.h"
 #include <string.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
+  egrep "memchr" >/dev/null 2>&1; then
   :
 else
+  rm -rf conftest*
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
@@ -128062,19 +100050,16 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+cat > conftest.$ac_ext <<EOF
+#line 100055 "configure"
+#include "confdefs.h"
 #include <stdlib.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
+  egrep "free" >/dev/null 2>&1; then
   :
 else
+  rm -rf conftest*
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
@@ -128083,225 +100068,82 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 100076 "configure"
+#include "confdefs.h"
 #include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:100087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  cat >> confdefs.h <<\EOF
 #define STDC_HEADERS 1
-_ACEOF
+EOF
 
 fi
 
-
-
-
-
-
-for ac_header in xmlparse.h xmltok.h stdlib.h strings.h string.h
+for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:100114: 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 100119 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:100124: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 
@@ -128309,1829 +100151,262 @@
 
 
 
-echo "$as_me:$LINENO: checking for char" >&5
-echo $ECHO_N "checking for char... $ECHO_C" >&6
-if test "${ac_cv_type_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((char *) 0)
-  return 0;
-if (sizeof (char))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_char=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_char=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
-echo "${ECHO_T}$ac_cv_type_char" >&6
-
-echo "$as_me:$LINENO: checking size of char" >&5
-echo $ECHO_N "checking size of char... $ECHO_C" >&6
-if test "${ac_cv_sizeof_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_char" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_char=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+echo $ac_n "checking size of char""... $ac_c" 1>&6
+echo "configure:100156: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (char)); }
-unsigned long ulongval () { return (long) (sizeof (char)); }
+  ac_cv_sizeof_char=1
+else
+  cat > conftest.$ac_ext <<EOF
+#line 100164 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (char))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (char))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (char))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(char));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_char=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:100175: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_char=0
 fi
+rm -fr conftest*
+fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_char" 1>&6
+cat >> confdefs.h <<EOF
 #define SIZEOF_CHAR $ac_cv_sizeof_char
-_ACEOF
-
-
-
-echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((int *) 0)
-  return 0;
-if (sizeof (int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:100196: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
+  ac_cv_sizeof_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 100204 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:100215: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_int=0
 fi
+rm -fr conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
 
-echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:100235: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
+  ac_cv_sizeof_long=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 100243 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:100254: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long=0
 fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long long *) 0)
-  return 0;
-if (sizeof (long long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
-
-echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -fr conftest*
+fi
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+
+
+echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:100274: 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
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long long)); }
-unsigned long ulongval () { return (long) (sizeof (long long)); }
+  ac_cv_sizeof_long_long=8
+else
+  cat > conftest.$ac_ext <<EOF
+#line 100282 "configure"
+#include "confdefs.h"
 #include <stdio.h>
-#include <stdlib.h>
-int
-main ()
+main()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:100293: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_sizeof_long_long=0
 fi
+rm -fr conftest*
+fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
+EOF
 
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:100313: 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 100318 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_type_size_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  rm -rf conftest*
+  ac_cv_type_size_t=no
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
-  :
-else
+rm -f conftest*
 
-cat >>confdefs.h <<_ACEOF
+fi
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+  cat >> confdefs.h <<\EOF
 #define size_t unsigned
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+echo "configure:100346: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 100351 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+struct tm *tp;
+; return 0; }
+EOF
+if { (eval echo configure:100360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_header_time=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_time=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_time=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
-if test $ac_cv_header_time = yes; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_header_time" 1>&6
+if test $ac_cv_header_time = yes; then
+  cat >> confdefs.h <<\EOF
 #define TIME_WITH_SYS_TIME 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+echo "configure:100381: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 100386 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
-
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
+  egrep "uid_t" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_type_uid_t=yes
 else
+  rm -rf conftest*
   ac_cv_type_uid_t=no
 fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
-if test $ac_cv_type_uid_t = no; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
+if test $ac_cv_type_uid_t = no; then
+  cat >> confdefs.h <<\EOF
 #define uid_t int
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define gid_t int
-_ACEOF
+EOF
 
 fi
 
@@ -130141,122 +100416,68 @@
 
 
 # Standard XMLRPC list
-
-
-
-
-
-
-
-
 for ac_func in \
  strtoul strtoull snprintf \
  strstr strpbrk strerror\
  memcpy memmove
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:100426: 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 100431 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:100454: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
 
 
 
-
+  
   ext_builddir=ext/xmlrpc
   ext_srcdir=$abs_srcdir/ext/xmlrpc
 
@@ -130264,15 +100485,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_XMLRPC_SHARED=no
-
-
+    
+  
   case ext/xmlrpc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -130290,12 +100511,12 @@
           libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
           libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
           libxmlrpc/xml_to_soap.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
@@ -130319,14 +100540,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_XMLRPC_SHARED=yes
-
+      
   case ext/xmlrpc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -130344,12 +100565,12 @@
           libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
           libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
           libxmlrpc/xml_to_soap.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -130367,7 +100588,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -130377,7 +100598,7 @@
       ;;
     *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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(XMLRPC_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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -130390,7 +100611,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
 
   cat >>Makefile.objects<<EOF
@@ -130404,7 +100625,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -130414,7 +100635,7 @@
       ;;
     *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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(RPC_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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -130427,7 +100648,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
 
   cat >>Makefile.objects<<EOF
@@ -130441,10 +100662,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_XMLRPC 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -130453,15 +100673,15 @@
     PHP_XMLRPC_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/xmlrpc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -130479,12 +100699,12 @@
           libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
           libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
           libxmlrpc/xml_to_soap.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
@@ -130504,15 +100724,15 @@
         EXT_STATIC="$EXT_STATIC xmlrpc"
         ;;
       *)
-
-
+        
+  
   case ext/xmlrpc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -130530,13 +100750,13 @@
           libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
           libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
           libxmlrpc/xml_to_soap.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -130556,23 +100776,23 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=xmlrpc
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc"
-
+  
 
   XMLRPC_MODULE_TYPE=builtin
 
@@ -130583,145 +100803,141 @@
   elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then
     XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
   else
-    echo "$as_me:$LINENO: checking for XMLRPC-EPI in default path" >&5
-echo $ECHO_N "checking for XMLRPC-EPI in default path... $ECHO_C" >&6
+    echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
+echo "configure:100808: 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
-        echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6
+        echo "$ac_t""found in $i" 1>&6
         break
       fi
     done
   fi
 
   if test -z "$XMLRPC_DIR"; then
-    echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-    { { echo "$as_me:$LINENO: error: Please reinstall the XMLRPC-EPI distribution" >&5
-echo "$as_me: error: Please reinstall the XMLRPC-EPI distribution" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "$ac_t""not found" 1>&6
+    { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; }
   fi
 
-
+  
   if test "$XMLRPC_DIR" != "/usr/include"; then
-
+    
   if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then
     ai_p=$XMLRPC_DIR
   else
-
+    
     ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`"
   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
     XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD"
     if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$XMLRPC_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_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 "$XMLRPC_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$XMLRPC_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
   fi
 
-
-
-
-
+    
+      
+  
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "LIBPATH$unique=set"
-
+    
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
     LDFLAGS="$LDFLAGS -L$ai_p"
     PHP_RPATHS="$PHP_RPATHS $ai_p"
-
+  
   fi
 
 
-
+    
   fi
 
   fi
-
-
+  
+  
   case xmlrpc in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lxmlrpc $LIBS"
+  *) 
+      LIBS="-lxmlrpc $LIBS" 
    ;;
   esac
 
@@ -130731,7 +100947,7 @@
   fi
 
 
-
+  
   ext_builddir=ext/xmlrpc
   ext_srcdir=$abs_srcdir/ext/xmlrpc
 
@@ -130739,15 +100955,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_XMLRPC_SHARED=no
-
-
+    
+  
   case ext/xmlrpc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -130760,12 +100976,12 @@
 
   old_IFS=$IFS
   for ac_src in xmlrpc-epi-php.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
@@ -130789,14 +101005,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_XMLRPC_SHARED=yes
-
+      
   case ext/xmlrpc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -130809,12 +101025,12 @@
 
   old_IFS=$IFS
   for ac_src in xmlrpc-epi-php.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -130832,7 +101048,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -130842,7 +101058,7 @@
       ;;
     *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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(XMLRPC_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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -130855,7 +101071,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
 
   cat >>Makefile.objects<<EOF
@@ -130869,7 +101085,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -130879,7 +101095,7 @@
       ;;
     *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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(RPC_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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -130892,7 +101108,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
 
   cat >>Makefile.objects<<EOF
@@ -130906,10 +101122,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_XMLRPC 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -130918,15 +101133,15 @@
     PHP_XMLRPC_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/xmlrpc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -130939,12 +101154,12 @@
 
   old_IFS=$IFS
   for ac_src in xmlrpc-epi-php.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
@@ -130964,15 +101179,15 @@
         EXT_STATIC="$EXT_STATIC xmlrpc"
         ;;
       *)
-
-
+        
+  
   case ext/xmlrpc in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -130985,13 +101200,13 @@
 
   old_IFS=$IFS
   for ac_src in xmlrpc-epi-php.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -131011,15 +101226,15 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=xmlrpc
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
@@ -131031,18 +101246,19 @@
 
 php_enable_xmlwriter=yes
 
-echo "$as_me:$LINENO: checking whether to enable XMLWriter support" >&5
-echo $ECHO_N "checking whether to enable XMLWriter support... $ECHO_C" >&6
+echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6
+echo "configure:101251: 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"
   PHP_XMLWRITER=$enableval
 else
-
+  
   PHP_XMLWRITER=yes
   test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -131066,33 +101282,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_LIBXML_DIR"; then
-
+  
 php_with_libxml_dir=no
 
-echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6
-
+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
+echo "configure:101296: 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"
   PHP_LIBXML_DIR=$withval
 else
-
+  
   PHP_LIBXML_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_LIBXML_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -131101,18 +101315,16 @@
 if test "$PHP_XMLWRITER" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
   fi
 
-
-echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
+echo "configure:101324: 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
-
+  
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
     if test -x "$i/bin/xml2-config"; then
       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
@@ -131121,8 +101333,8 @@
   done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6
+
+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -131135,17 +101347,17 @@
     if test "$LIBXML_VERSION" -ge "2006011"; then
       LIBXML_LIBS=`$XML2_CONFIG --libs`
       LIBXML_INCS=`$XML2_CONFIG --cflags`
-
+      
   for ac_i in $LIBXML_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -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"
@@ -131156,20 +101368,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii"
+        XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -131182,80 +101394,80 @@
     ;;
     -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
         XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $LIBXML_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -131265,92 +101477,74 @@
   done
 
 
-            echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
+echo "configure:101482: 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
-
-
+  
+        
   old_LIBS=$LIBS
   LIBS="
           $XMLWRITER_SHARED_LIBADD
          $LIBS"
   if test "$cross_compiling" = yes; then
-
+  
     LIBS=$old_LIBS
-
+  
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  cat > conftest.$ac_ext <<EOF
+#line 101498 "configure"
+#include "confdefs.h"
 
+    
     char xmlInitParser();
     int main() {
       xmlInitParser();
       return 0;
     }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:101509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
     LIBS=$old_LIBS
-
+    
           php_cv_libxml_build_works=yes
-
-
+        
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     LIBS=$old_LIBS
-
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
-
-
+    
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
+        
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
+      
 fi
-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6
-      if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$php_cv_libxml_build_works" 1>&6
+      if test "$php_cv_libxml_build_works" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define HAVE_LIBXML 1
-_ACEOF
+EOF
 
       fi
-
-
-cat >>confdefs.h <<\_ACEOF
+      
+    cat >> confdefs.h <<\EOF
 #define HAVE_XMLWRITER 1
-_ACEOF
-
+EOF
 
+    
   ext_builddir=ext/xmlwriter
   ext_srcdir=$abs_srcdir/ext/xmlwriter
 
@@ -131358,15 +101552,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_XMLWRITER_SHARED=no
-
-
+    
+  
   case ext/xmlwriter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -131379,12 +101573,12 @@
 
   old_IFS=$IFS
   for ac_src in php_xmlwriter.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
@@ -131408,14 +101602,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_XMLWRITER_SHARED=yes
-
+      
   case ext/xmlwriter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -131428,12 +101622,12 @@
 
   old_IFS=$IFS
   for ac_src in php_xmlwriter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -131451,7 +101645,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -131461,7 +101655,7 @@
       ;;
     *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_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(XMLWRITER_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_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -131474,7 +101668,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
 
   cat >>Makefile.objects<<EOF
@@ -131488,7 +101682,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -131498,7 +101692,7 @@
       ;;
     *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_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(WRITER_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_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLWRITER, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -131511,7 +101705,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlwriter.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
 
   cat >>Makefile.objects<<EOF
@@ -131525,10 +101719,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_XMLWRITER 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -131537,15 +101730,15 @@
     PHP_XMLWRITER_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/xmlwriter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -131558,12 +101751,12 @@
 
   old_IFS=$IFS
   for ac_src in php_xmlwriter.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
@@ -131583,15 +101776,15 @@
         EXT_STATIC="$EXT_STATIC xmlwriter"
         ;;
       *)
-
-
+        
+  
   case ext/xmlwriter in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -131604,13 +101797,13 @@
 
   old_IFS=$IFS
   for ac_src in php_xmlwriter.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -131630,33 +101823,29 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=xmlwriter
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD"
 
-
+  
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
     fi
-else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
-
+else 
+    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
+  
   fi
 
 fi
@@ -131665,19 +101854,19 @@
 
 php_with_xsl=no
 
-echo "$as_me:$LINENO: checking for XSL support" >&5
-echo $ECHO_N "checking for XSL support... $ECHO_C" >&6
-
+echo $ac_n "checking for XSL support""... $ac_c" 1>&6
+echo "configure:101859: checking for XSL support" >&5
 # Check whether --with-xsl or --without-xsl was given.
 if test "${with_xsl+set}" = set; then
   withval="$with_xsl"
   PHP_XSL=$withval
 else
-
+  
   PHP_XSL=no
   test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -131701,8 +101890,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -131710,15 +101898,11 @@
 if test "$PHP_XSL" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: XSL extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XSL extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
   fi
-
+  
   if test "$PHP_DOM" = "no"; then
-    { { echo "$as_me:$LINENO: error: XSL extension requires DOM extension, add --enable-dom" >&5
-echo "$as_me: error: XSL extension requires DOM extension, add --enable-dom" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; }
   fi
 
   for i in $PHP_XSL /usr/local /usr; do
@@ -131729,9 +101913,7 @@
   done
 
   if test -z "$XSLT_CONFIG"; then
-    { { echo "$as_me:$LINENO: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" >&5
-echo "$as_me: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; }
   else
     libxslt_full_version=`$XSLT_CONFIG --version`
     ac_IFS=$IFS
@@ -131742,17 +101924,17 @@
     if test "$LIBXSLT_VERSION" -ge "1001000"; then
       XSL_LIBS=`$XSLT_CONFIG --libs`
       XSL_INCS=`$XSLT_CONFIG --cflags`
-
+      
   for ac_i in $XSL_LIBS; do
     case $ac_i in
     -pthread)
       if test "$ext_shared" = "yes"; then
         XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -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"
@@ -131763,20 +101945,20 @@
     ;;
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
+  *) 
     if test "$ext_shared" = "yes"; then
-        XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii"
+        XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -131789,80 +101971,80 @@
     ;;
     -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
         XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_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
 
     ;;
     esac
   done
 
-
+      
   for ac_i in $XSL_INCS; do
     case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
-
+      
   if test "$ac_ii" != "/usr/include"; then
-
+    
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
   else
-
+    
     ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$ac_ii\"`"
   fi
 
-
-
+    
+  
   unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INCLUDEPATH$unique=set"
-
+    
       if test ""; then
         INCLUDES="-I$ai_p $INCLUDES"
       else
         INCLUDES="$INCLUDES -I$ai_p"
       fi
-
+    
   fi
 
   fi
@@ -131871,9 +102053,9 @@
     esac
   done
 
-
-      echo "$as_me:$LINENO: checking for EXSLT support" >&5
-echo $ECHO_N "checking for EXSLT support... $ECHO_C" >&6
+      
+      echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6
+echo "configure:102059: 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
@@ -131881,99 +102063,97 @@
         fi
       done
       if test -z "$PHP_XSL_EXSL_DIR"; then
-        echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-      else
-        echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-
+        echo "$ac_t""not found" 1>&6
+      else 
+        echo "$ac_t""found" 1>&6
+        
 
   if test "$ext_shared" = "yes"; then
     XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD"
     if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_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 "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
   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 exslt in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lexslt $LIBS"
+  *) 
+      LIBS="-lexslt $LIBS" 
    ;;
   esac
 
@@ -131983,58 +102163,54 @@
   fi
 
 
-
+        
   if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then
-
+    
   if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then
     ai_p=$PHP_XSL_EXSL_DIR/include
   else
-
+    
     ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`"
   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
 
-
-cat >>confdefs.h <<\_ACEOF
+        cat >> confdefs.h <<\EOF
 #define HAVE_XSL_EXSLT 1
-_ACEOF
+EOF
 
       fi
     else
-      { { echo "$as_me:$LINENO: error: libxslt version 1.1.0 or greater required." >&5
-echo "$as_me: error: libxslt version 1.1.0 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; }
     fi
-
-
+    
+  
   fi
-
-
-cat >>confdefs.h <<\_ACEOF
+  
+  cat >> confdefs.h <<\EOF
 #define HAVE_XSL 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/xsl
   ext_srcdir=$abs_srcdir/ext/xsl
 
@@ -132042,15 +102218,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_XSL_SHARED=no
-
-
+    
+  
   case ext/xsl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -132063,12 +102239,12 @@
 
   old_IFS=$IFS
   for ac_src in php_xsl.c xsltprocessor.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
@@ -132092,14 +102268,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_XSL_SHARED=yes
-
+      
   case ext/xsl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -132112,12 +102288,12 @@
 
   old_IFS=$IFS
   for ac_src in php_xsl.c xsltprocessor.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_xsl="$shared_objects_xsl $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -132135,7 +102311,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -132145,7 +102321,7 @@
       ;;
     *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_xsl) -L$(top_builddir)/netware -lphp5lib $(XSL_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_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXSL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -132158,7 +102334,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
 
   cat >>Makefile.objects<<EOF
@@ -132172,7 +102348,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -132182,7 +102358,7 @@
       ;;
     *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_xsl) -L$(top_builddir)/netware -lphp5lib $(_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_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XSL, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -132195,7 +102371,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/xsl.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
 
   cat >>Makefile.objects<<EOF
@@ -132209,10 +102385,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_XSL 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -132221,15 +102396,15 @@
     PHP_XSL_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/xsl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -132242,12 +102417,12 @@
 
   old_IFS=$IFS
   for ac_src in php_xsl.c xsltprocessor.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
@@ -132267,15 +102442,15 @@
         EXT_STATIC="$EXT_STATIC xsl"
         ;;
       *)
-
-
+        
+  
   case ext/xsl in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -132288,13 +102463,13 @@
 
   old_IFS=$IFS
   for ac_src in php_xsl.c xsltprocessor.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -132314,71 +102489,60 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=xsl
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST XSL_SHARED_LIBADD"
 
-
+  
   am_i_shared=$PHP_XSL_SHARED
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xsl to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build xsl shared or build libxml statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension xsl to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build xsl shared or build libxml statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xsl, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
+    { echo "configure: error: 
 You've configured extension xsl, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" 1>&2; exit 1; }
   fi
-
+  
 fi
 
 
 
 php_enable_zip=no
 
-echo "$as_me:$LINENO: checking for zip archive read/writesupport" >&5
-echo $ECHO_N "checking for zip archive read/writesupport... $ECHO_C" >&6
+echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6
+echo "configure:102535: 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"
   PHP_ZIP=$enableval
 else
-
+  
   PHP_ZIP=no
   test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -132402,33 +102566,31 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_ZLIB_DIR"; then
-
+  
 php_with_zlib_dir=no
 
-echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6
-
+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
+echo "configure:102580: 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"
   PHP_ZLIB_DIR=$withval
 else
-
+  
   PHP_ZLIB_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ZLIB_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -132437,23 +102599,22 @@
 
 php_with_pcre_dir=no
 
-echo "$as_me:$LINENO: checking pcre install prefix" >&5
-echo $ECHO_N "checking pcre install prefix... $ECHO_C" >&6
-
+echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
+echo "configure:102604: 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"
   PHP_PCRE_DIR=$withval
 else
-
+  
   PHP_PCRE_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_PCRE_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -132468,9 +102629,7 @@
       PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
       PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
     else
-      { { echo "$as_me:$LINENO: error: Can not find zlib headers under \"$PHP_ZLIB_DIR\"" >&5
-echo "$as_me: error: Can not find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; }
     fi
   else
     for i in /usr/local /usr; do
@@ -132484,103 +102643,100 @@
     done
   fi
 
-    echo "$as_me:$LINENO: checking for the location of zlib" >&5
-echo $ECHO_N "checking for the location of zlib... $ECHO_C" >&6
+    echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
+echo "configure:102648: checking for the location of zlib" >&5
   if test "$PHP_ZLIB_DIR" = "no"; then
-    { { echo "$as_me:$LINENO: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" >&5
-echo "$as_me: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" >&2;}
-   { (exit 1); exit 1; }; }
+    { 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
-    echo "$as_me:$LINENO: result: $PHP_ZLIB_DIR" >&5
-echo "${ECHO_T}$PHP_ZLIB_DIR" >&6
-
+    echo "$ac_t""$PHP_ZLIB_DIR" 1>&6
+    
 
   if test "$ext_shared" = "yes"; then
     ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD"
     if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
-
+      
   if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
   fi
 
-
+    
       if test "$ext_shared" = "yes"; then
         ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD"
         test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_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 "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
-
+    
   if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
+    
   if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
   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 z in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="-lz $LIBS"
+  *) 
+      LIBS="-lz $LIBS" 
    ;;
   esac
 
@@ -132590,33 +102746,33 @@
   fi
 
 
-
+    
   if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then
-
+    
   if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_INCDIR
   else
-
+    
     ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
+    
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     ai_p="$ep_realdir/`basename \"$PHP_ZLIB_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
@@ -132625,52 +102781,50 @@
 
     old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=$INCLUDES
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 102786 "configure"
+#include "confdefs.h"
 
 #include <main/php_config.h>
 #if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
 yes
 #endif
-
-_ACEOF
+  
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
     PHP_PCRE_REGEX=yes
-
+  
 else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  rm -rf conftest*
+  
+    cat > conftest.$ac_ext <<EOF
+#line 102805 "configure"
+#include "confdefs.h"
 
 #include <main/php_config.h>
 #if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
 yes
 #endif
-
-_ACEOF
+    
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  
       PHP_PCRE_REGEX=pecl
-
+    
 else
-
+  rm -rf conftest*
+  
       PHP_PCRE_REGEX=no
-
+    
 fi
 rm -f conftest*
 
-
+  
 fi
 rm -f conftest*
 
@@ -132703,12 +102857,11 @@
 						 lib/zip_source_open.c lib/zip_source_pkware.c lib/zip_source_pop.c \
 						 lib/zip_source_read.c lib/zip_source_stat.c"
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_ZIP 1
-_ACEOF
-
+EOF
 
+  
   ext_builddir=ext/zip
   ext_srcdir=$abs_srcdir/ext/zip
 
@@ -132716,15 +102869,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_ZIP_SHARED=no
-
-
+    
+  
   case ext/zip in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -132737,12 +102890,12 @@
 
   old_IFS=$IFS
   for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; 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
@@ -132766,14 +102919,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_ZIP_SHARED=yes
-
+      
   case ext/zip in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -132786,12 +102939,12 @@
 
   old_IFS=$IFS
   for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -132809,7 +102962,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -132819,7 +102972,7 @@
       ;;
     *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_zip) -L$(top_builddir)/netware -lphp5lib $(ZIP_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_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZIP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -132832,7 +102985,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
 
   cat >>Makefile.objects<<EOF
@@ -132846,7 +102999,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -132856,7 +103009,7 @@
       ;;
     *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_zip) -L$(top_builddir)/netware -lphp5lib $(_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_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ZIP, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -132869,7 +103022,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/zip.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
 
   cat >>Makefile.objects<<EOF
@@ -132883,10 +103036,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_ZIP 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -132895,15 +103047,15 @@
     PHP_ZIP_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/zip in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -132916,12 +103068,12 @@
 
   old_IFS=$IFS
   for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; 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
@@ -132941,15 +103093,15 @@
         EXT_STATIC="$EXT_STATIC zip"
         ;;
       *)
-
-
+        
+  
   case ext/zip in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -132962,13 +103114,13 @@
 
   old_IFS=$IFS
   for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -132988,29 +103140,29 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=zip
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+  
     $php_shtool mkdir -p $ext_builddir/lib
+  
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD"
 
 
-
+    
   src=$ext_srcdir/Makefile.frag
   ac_srcdir=$ext_srcdir
   ac_builddir=$ext_builddir
@@ -133022,18 +103174,19 @@
 
 php_enable_mysqlnd=no
 
-echo "$as_me:$LINENO: checking whether to enable mysqlnd" >&5
-echo $ECHO_N "checking whether to enable mysqlnd... $ECHO_C" >&6
+echo $ac_n "checking whether to enable mysqlnd""... $ac_c" 1>&6
+echo "configure:103179: checking whether to enable mysqlnd" >&5
 # Check whether --enable-mysqlnd or --disable-mysqlnd was given.
 if test "${enable_mysqlnd+set}" = set; then
   enableval="$enable_mysqlnd"
   PHP_MYSQLND=$enableval
 else
-
+  
   PHP_MYSQLND=no
   test "$PHP_ENABLE_ALL" && PHP_MYSQLND=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -133057,8 +103210,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -133066,47 +103218,46 @@
 
 php_enable_mysqlnd_compression_support=yes
 
-echo "$as_me:$LINENO: checking whether to disable compressed protocol support in mysqlnd" >&5
-echo $ECHO_N "checking whether to disable compressed protocol support in mysqlnd... $ECHO_C" >&6
+echo $ac_n "checking whether to disable compressed protocol support in mysqlnd""... $ac_c" 1>&6
+echo "configure:103223: checking whether to disable compressed protocol support in mysqlnd" >&5
 # Check whether --enable-mysqlnd_compression_support or --disable-mysqlnd_compression_support was given.
 if test "${enable_mysqlnd_compression_support+set}" = set; then
   enableval="$enable_mysqlnd_compression_support"
   PHP_MYSQLND_COMPRESSION_SUPPORT=$enableval
 else
-
+  
   PHP_MYSQLND_COMPRESSION_SUPPORT=yes
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_MYSQLND_COMPRESSION_SUPPORT
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
 
 if test -z "$PHP_ZLIB_DIR"; then
-
+  
 php_with_zlib_dir=no
 
-echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6
-
+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
+echo "configure:103247: 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"
   PHP_ZLIB_DIR=$withval
 else
-
+  
   PHP_ZLIB_DIR=no
+  
 
+fi
 
-fi;
 
 ext_output=$PHP_ZLIB_DIR
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -133121,20 +103272,18 @@
 
 
   if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define MYSQLND_COMPRESSION_WANTED 1
-_ACEOF
+EOF
 
   fi
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define MYSQLND_SSL_SUPPORTED 1
-_ACEOF
+EOF
 
 
   mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
-
+  
   ext_builddir=ext/mysqlnd
   ext_srcdir=$abs_srcdir/ext/mysqlnd
 
@@ -133142,15 +103291,15 @@
 
   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
     PHP_MYSQLND_SHARED=no
-
-
+    
+  
   case ext/mysqlnd in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -133163,12 +103312,12 @@
 
   old_IFS=$IFS
   for ac_src in $mysqlnd_sources; 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
@@ -133192,14 +103341,14 @@
   else
     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
       PHP_MYSQLND_SHARED=yes
-
+      
   case ext/mysqlnd in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$shared_c_pre
   b_cxx_pre=$shared_cxx_pre
@@ -133212,12 +103361,12 @@
 
   old_IFS=$IFS
   for ac_src in $mysqlnd_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       shared_objects_mysqlnd="$shared_objects_mysqlnd $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -133235,7 +103384,7 @@
 
       case $host_alias in
         *netware*)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -133245,7 +103394,7 @@
       ;;
     *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_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(MYSQLND_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_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLND, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -133258,7 +103407,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqlnd.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqlnd"
 
   cat >>Makefile.objects<<EOF
@@ -133272,7 +103421,7 @@
 
           ;;
         *)
-
+          
   install_modules="install-modules"
 
   case $host_alias in
@@ -133282,7 +103431,7 @@
       ;;
     *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_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(QLND_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_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQLND, 3)_SHARED_LIBADD)'
       ;;
     *)
       suffix=la
@@ -133295,7 +103444,7 @@
   else
     PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysqlnd.$suffix"
   fi
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqlnd"
 
   cat >>Makefile.objects<<EOF
@@ -133309,10 +103458,9 @@
 
           ;;
       esac
-
-cat >>confdefs.h <<_ACEOF
+      cat >> confdefs.h <<EOF
 #define COMPILE_DL_MYSQLND 1
-_ACEOF
+EOF
 
     fi
   fi
@@ -133321,15 +103469,15 @@
     PHP_MYSQLND_SHARED=no
     case "$PHP_SAPI" in
       cgi|embed)
-
-
+        
+  
   case ext/mysqlnd in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -133342,12 +103490,12 @@
 
   old_IFS=$IFS
   for ac_src in $mysqlnd_sources; 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
@@ -133367,15 +103515,15 @@
         EXT_STATIC="$EXT_STATIC mysqlnd"
         ;;
       *)
-
-
+        
+  
   case ext/mysqlnd in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -133388,13 +103536,13 @@
 
   old_IFS=$IFS
   for ac_src in $mysqlnd_sources; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      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" ;;
@@ -133414,76 +103562,73 @@
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC mysqlnd"
   fi
-
-
+  
+  
     BUILD_DIR="$BUILD_DIR $ext_builddir"
-
+  
 
 
   if test "$ext_builddir" = "."; then
     PHP_PECL_EXTENSION=mysqlnd
-
+    
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 
   fi
 
-
-
+  
+  
     $php_shtool mkdir -p ext/mysqlnd
+  
 
-
-
-
+  
+  
     for header_file in ext/mysqlnd/; do
-
-
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
+    done 
+  
 
 fi
 
 if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
-
-
+  
+  
     $php_shtool mkdir -p ext/mysqlnd
+  
 
 
-
-
+    
   for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do
-    echo "$as_me:$LINENO: checking whether $php_typename exists" >&5
-echo $ECHO_N "checking whether $php_typename exists... $ECHO_C" >&6
-
+    echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6
+echo "configure:103614: checking whether $php_typename exists" >&5
+    
   php_cache_value=php_cv_sizeof_$php_typename
-  if eval "test \"\${php_cv_sizeof_$php_typename+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-
+  
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
     if test "$cross_compiling" = yes; then
-
+  
     eval $php_cache_value=0
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 103631 "configure"
+#include "confdefs.h"
 #include <stdio.h>
 #if STDC_HEADERS
 #include <stdlib.h>
@@ -133501,7 +103646,7 @@
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-
+  
 
 int main()
 {
@@ -133510,34 +103655,24 @@
 	fprintf(fp, "%d\n", sizeof($php_typename));
 	return(0);
 }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+  
+EOF
+if { (eval echo configure:103661: \"$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`
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
     eval $php_cache_value=0
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -133545,18 +103680,16 @@
 
   if eval test "\$$php_cache_value" != "0"; then
 
-
+      
   php_def_have_what=HAVE_`echo $php_typename | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_' `
   echo "#define $php_def_have_what 1" >> ext/mysqlnd/php_mysqlnd_config.h
+  
 
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-else
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
+      echo "$ac_t""yes" 1>&6
+    
+else 
+      echo "$ac_t""no" 1>&6
+    
   fi
 
   done
@@ -133568,23 +103701,23 @@
   test "$PHP_IMAP"  != "no" && recode_conflict="$recode_conflict imap"
 
   if test -n "$MYSQL_LIBNAME"; then
-
+    
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff=""
-
+  
   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"
@@ -133595,20 +103728,20 @@
     ;;
     -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"
+        LDFLAGS="$LDFLAGS -l$ac_ii" 
     else
-
-
+      
+  
   case $ac_ii in
   c|c_r|pthread*) ;;
-  *)
-      LIBS="$LIBS -l$ac_ii"
+  *) 
+      LIBS="$LIBS -l$ac_ii" 
    ;;
   esac
 
@@ -133621,136 +103754,104 @@
     ;;
     -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
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_hash_insert" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for hash_insert in -l$MYSQL_LIBNAME... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
+echo "configure:103801: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-l$MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 103809 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char hash_insert ();
-int
-main ()
-{
-hash_insert ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+    builtin and then its argument prototype would still apply.  */
+char hash_insert();
+
+int main() {
+hash_insert()
+; return 0; }
+EOF
+if { (eval echo configure:103820: \"$ac_link\") 1>&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
-
+    
       recode_conflict="$recode_conflict mysql"
-
-
+    
+  
 else
+  echo "$ac_t""no" 1>&6
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIBNAME_hash_insert
-
-
+    
+  
 fi
 
   fi
 
   if test -n "$recode_conflict"; then
-    { { echo "$as_me:$LINENO: error: recode extension can not be configured together with:$recode_conflict" >&5
-echo "$as_me: error: recode extension can not be configured together with:$recode_conflict" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: recode extension can not be configured together with:$recode_conflict" 1>&2; exit 1; }
   fi
 fi
 
@@ -133760,13 +103861,7 @@
 enable_shared=yes
 enable_static=yes
 
-case $php_build_target in
-  program|static)
-    standard_libtool_flag='-prefer-non-pic -static'
-    if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
-        enable_shared=no
-    fi
-    ;;
+case $php_sapi_module in
   shared)
     enable_static=no
     case $with_pic in
@@ -133779,6 +103874,12 @@
     esac
     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
     ;;
+  *)
+    standard_libtool_flag='-prefer-non-pic -static'
+    if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
+      enable_shared=no
+    fi
+    ;;
 esac
 
 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
@@ -133794,14 +103895,13 @@
 # Check whether --enable- or --disable- was given.
 if test "${enable_+set}" = set; then
   enableval="$enable_"
+  :
+fi
 
-fi;
 
 
-  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  echo "$as_me:$LINENO: result: ${T_MD}Configuring PEAR${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring PEAR${T_ME}" >&6
+  echo "$ac_t""" 1>&6
+  echo "$ac_t""${T_MD}Configuring PEAR${T_ME}" 1>&6
 
 
 # compatibility
@@ -133817,19 +103917,19 @@
 
 php_with_pear=DEFAULT
 
-echo "$as_me:$LINENO: checking whether to install PEAR" >&5
-echo $ECHO_N "checking whether to install PEAR... $ECHO_C" >&6
-
+echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6
+echo "configure:103922: 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"
   PHP_PEAR=$withval
 else
-
+  
   PHP_PEAR=DEFAULT
   test "$PHP_ENABLE_ALL" && PHP_PEAR=$PHP_ENABLE_ALL
 
-fi;
+fi
+
 
 
 ext_output="yes, shared"
@@ -133853,8 +103953,7 @@
 
 
 
-echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6
+echo "$ac_t""$ext_output" 1>&6
 
 
 
@@ -133862,15 +103961,13 @@
 if test "$PHP_PEAR" != "no"; then
 
         if test "$PHP_XML" = "no"; then
-    pear_error_msg="$pear_error_msg
+    pear_error_msg="$pear_error_msg 
                     PEAR requires XML to be enabled.     Add --enable-xml to the configure line. (or --without-pear)"
   fi
 
 
   if test "$pear_error_msg"; then
-    { { echo "$as_me:$LINENO: error: $pear_error_msg" >&5
-echo "$as_me: error: $pear_error_msg" >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: $pear_error_msg" 1>&2; exit 1; }
   fi
 
   install_pear="install-pear"
@@ -133883,7 +103980,7 @@
     esac
   fi
 
-
+  
   src=$abs_srcdir/pear/Makefile.frag
   ac_srcdir=$abs_srcdir/pear
   ac_builddir=pear
@@ -133897,14 +103994,13 @@
 # Check whether --enable- or --disable- was given.
 if test "${enable_+set}" = set; then
   enableval="$enable_"
+  :
+fi
 
-fi;
 
 
-  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  echo "$as_me:$LINENO: result: ${T_MD}Configuring Zend${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring Zend${T_ME}" >&6
+  echo "$ac_t""" 1>&6
+  echo "$ac_t""${T_MD}Configuring Zend${T_ME}" 1>&6
 
 
 
@@ -133923,12 +104019,12 @@
 
   bison_version=none
   if test "$YACC"; then
-    echo "$as_me:$LINENO: checking for bison version" >&5
-echo $ECHO_N "checking for bison version... $ECHO_C" >&6
-if test "${php_cv_bison_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for bison version""... $ac_c" 1>&6
+echo "configure:104024: 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
-
+  
       bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
       php_cv_bison_version=invalid
       if test -n "$bison_version_vars"; then
@@ -133941,16 +104037,15 @@
           fi
         done
       fi
-
+    
 fi
-echo "$as_me:$LINENO: result: $php_cv_bison_version" >&5
-echo "${ECHO_T}$php_cv_bison_version" >&6
+
+echo "$ac_t""$php_cv_bison_version" 1>&6
   fi
   case $php_cv_bison_version in
     ""|invalid)
       bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)."
-      { echo "$as_me:$LINENO: WARNING: $bison_msg" >&5
-echo "$as_me: WARNING: $bison_msg" >&2;}
+      echo "configure: warning: $bison_msg" 1>&2
       YACC="exit 0;"
       ;;
   esac
@@ -133961,24 +104056,11 @@
 	CFLAGS=`echo $CFLAGS | sed -e 's/-g//'`
 fi
 
-if test "$ac_cv_c_compiler_gnu" = "yes" -a "`uname -s`" = "Rhapsody"; then
+if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then
         CPPFLAGS="$CPPFLAGS -traditional-cpp"
 fi
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in inttypes.h \
+for ac_hdr in inttypes.h \
 stdint.h \
 limits.h \
 malloc.h \
@@ -133992,235 +104074,90 @@
 stdlib.h \
 dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:104080: 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 104085 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:104090: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:104118: 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 104123 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_type_size_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  rm -rf conftest*
+  ac_cv_type_size_t=no
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
-  :
-else
+rm -f conftest*
 
-cat >>confdefs.h <<_ACEOF
+fi
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+  cat >> confdefs.h <<\EOF
 #define size_t unsigned
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+echo "configure:104151: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 104156 "configure"
+#include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 #ifdef signal
-# undef signal
+#undef signal
 #endif
 #ifdef __cplusplus
 extern "C" void (*signal (int, void (*)(int)))(int);
@@ -134228,51 +104165,26 @@
 void (*signal ()) ();
 #endif
 
-int
-main ()
-{
+int main() {
 int i;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:104173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_type_signal=void
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_signal=int
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_type_signal=int
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
 
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_type_signal" 1>&6
+cat >> confdefs.h <<EOF
 #define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
+EOF
 
 
 
@@ -134280,637 +104192,339 @@
 
 
 
-echo "$as_me:$LINENO: checking for uint" >&5
-echo $ECHO_N "checking for uint... $ECHO_C" >&6
-if test "${ac_cv_type_uint+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for uint""... $ac_c" 1>&6
+echo "configure:104197: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((uint *) 0)
-  return 0;
-if (sizeof (uint))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  cat > conftest.$ac_ext <<EOF
+#line 104202 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])uint[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_type_uint=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_uint=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  rm -rf conftest*
+  ac_cv_type_uint=no
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uint" >&5
-echo "${ECHO_T}$ac_cv_type_uint" >&6
-if test $ac_cv_type_uint = yes; then
-  :
-else
+rm -f conftest*
 
-cat >>confdefs.h <<_ACEOF
-#define uint unsigned int
-_ACEOF
+fi
+echo "$ac_t""$ac_cv_type_uint" 1>&6
+if test $ac_cv_type_uint = no; then
+  cat >> confdefs.h <<\EOF
+#define uint unsigned int 
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking for ulong" >&5
-echo $ECHO_N "checking for ulong... $ECHO_C" >&6
-if test "${ac_cv_type_ulong+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((ulong *) 0)
-  return 0;
-if (sizeof (ulong))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+echo $ac_n "checking for ulong""... $ac_c" 1>&6
+echo "configure:104230: 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 104235 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])ulong[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_type_ulong=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_ulong=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  rm -rf conftest*
+  ac_cv_type_ulong=no
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_ulong" >&5
-echo "${ECHO_T}$ac_cv_type_ulong" >&6
-if test $ac_cv_type_ulong = yes; then
-  :
-else
+rm -f conftest*
 
-cat >>confdefs.h <<_ACEOF
-#define ulong unsigned long
-_ACEOF
+fi
+echo "$ac_t""$ac_cv_type_ulong" 1>&6
+if test $ac_cv_type_ulong = no; then
+  cat >> confdefs.h <<\EOF
+#define ulong unsigned long 
+EOF
 
 fi
 
 
 
-echo "$as_me:$LINENO: checking for int32_t" >&5
-echo $ECHO_N "checking for int32_t... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for int32_t""... $ac_c" 1>&6
+echo "configure:104265: checking for int32_t" >&5
+cat > conftest.$ac_ext <<EOF
+#line 104267 "configure"
+#include "confdefs.h"
 
-#if HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H  
 #include <sys/types.h>
 #endif
-#if HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H  
 #include <inttypes.h>
 #elif HAVE_STDINT_H
 #include <stdint.h>
 #endif
-int
-main ()
-{
+int main() {
 if ((int32_t *) 0)
   return 0;
 if (sizeof (int32_t))
   return 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:104286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+  cat >> confdefs.h <<EOF
 #define HAVE_INT32_T 1
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 
-echo "$as_me:$LINENO: checking for uint32_t" >&5
-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
+echo "configure:104305: checking for uint32_t" >&5
+cat > conftest.$ac_ext <<EOF
+#line 104307 "configure"
+#include "confdefs.h"
 
-#if HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H  
 #include <sys/types.h>
 #endif
-#if HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H  
 #include <inttypes.h>
 #elif HAVE_STDINT_H
 #include <stdint.h>
 #endif
-int
-main ()
-{
+int main() {
 if ((uint32_t *) 0)
   return 0;
 if (sizeof (uint32_t))
   return 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:104326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+  cat >> confdefs.h <<EOF
 #define HAVE_UINT32_T 1
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
+rm -f conftest*
 
+echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+echo "configure:104345: 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 104350 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char vprintf(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char vprintf();
+
+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_$ac_func) || defined (__stub___$ac_func)
+#if defined (__stub_vprintf) || defined (__stub___vprintf)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+vprintf();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+; return 0; }
+EOF
+if { (eval echo configure:104373: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_vprintf=no"
+fi
+rm -f conftest*
+fi
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_VPRINTF 1
+EOF
 
-#undef _doprnt
+else
+  echo "$ac_t""no" 1>&6
+fi
 
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+echo "configure:104397: 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 104402 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char _doprnt(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char _doprnt ();
+    builtin and then its argument prototype would still apply.  */
+char _doprnt();
+
+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__doprnt) || defined (__stub____doprnt)
 choke me
 #else
-char (*f) () = _doprnt;
-#endif
-#ifdef __cplusplus
-}
+_doprnt();
 #endif
 
-int
-main ()
-{
-return f != _doprnt;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func__doprnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func__doprnt=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-if test $ac_cv_func__doprnt = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:104425: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=no"
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define HAVE_DOPRNT 1
-_ACEOF
+EOF
 
+else
+  echo "$ac_t""no" 1>&6
 fi
 
 fi
-done
-
 
-echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
-if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+echo "configure:104450: 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
   if test "$cross_compiling" = yes; then
-  ac_cv_func_memcmp_working=no
+  ac_cv_func_memcmp_clean=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
+  cat > conftest.$ac_ext <<EOF
+#line 104458 "configure"
+#include "confdefs.h"
 
-  /* Some versions of memcmp are not 8-bit clean.  */
+main()
+{
   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-    exit (1);
+  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+}
 
-  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-     or more and with at least one buffer not starting on a 4-byte boundary.
-     William Lewis provided this test program.   */
-  {
-    char foo[21];
-    char bar[21];
-    int i;
-    for (i = 0; i < 4; i++)
-      {
-	char *a = foo + i;
-	char *b = bar + i;
-	strcpy (a, "--------01111111");
-	strcpy (b, "--------10000000");
-	if (memcmp (a, b, 16) >= 0)
-	  exit (1);
-      }
-    exit (0);
-  }
+EOF
+if { (eval echo configure:104468: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_memcmp_clean=no
+fi
+rm -fr conftest*
+fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_memcmp_working=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
-test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
-    "memcmp.$ac_objext"   | \
-  *" memcmp.$ac_objext"   | \
-    "memcmp.$ac_objext "* | \
-  *" memcmp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
-esac
+fi
 
+echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
+test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+echo "configure:104488: 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 104493 "configure"
+#include "confdefs.h"
 #include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_working_alloca_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_working_alloca_h=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-if test $ac_cv_working_alloca_h = yes; then
+int main() {
+char *p = alloca(2 * sizeof(int));
+; return 0; }
+EOF
+if { (eval echo configure:104500: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_alloca_h=no
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
+if test $ac_cv_header_alloca_h = yes; then
+  cat >> confdefs.h <<\EOF
 #define HAVE_ALLOCA_H 1
-_ACEOF
+EOF
 
 fi
 
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for alloca""... $ac_c" 1>&6
+echo "configure:104521: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 104526 "configure"
+#include "confdefs.h"
+
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
@@ -134932,217 +104546,137 @@
 # endif
 #endif
 
-int
-main ()
-{
-char *p = (char *) alloca (1);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+char *p = (char *) alloca(1);
+; return 0; }
+EOF
+if { (eval echo configure:104554: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_alloca_works=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_alloca_works=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
 if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_ALLOCA 1
-_ACEOF
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
+EOF
 
-ALLOCA=alloca.$ac_objext
+fi
 
-cat >>confdefs.h <<\_ACEOF
+if test $ac_cv_func_alloca_works = no; then
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+  # that cause trouble.  Some versions do not even contain alloca or
+  # contain a buggy version.  If you still want to use their alloca,
+  # use ar to extract alloca.o from them instead of compiling alloca.c.
+  ALLOCA=alloca.${ac_objext}
+  cat >> confdefs.h <<\EOF
 #define C_ALLOCA 1
-_ACEOF
+EOF
 
 
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+echo "configure:104586: 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 104591 "configure"
+#include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 #else
 wenotbecray
 #endif
 
-_ACEOF
+EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  egrep "webecray" >/dev/null 2>&1; then
+  rm -rf conftest*
   ac_cv_os_cray=yes
 else
+  rm -rf conftest*
   ac_cv_os_cray=no
 fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
 
+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:104616: 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 104621 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:104644: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
 
-cat >>confdefs.h <<_ACEOF
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<EOF
 #define CRAY_STACKSEG_END $ac_func
-_ACEOF
+EOF
 
-    break
+  break
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  done
+done
 fi
 
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+echo "configure:104671: 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
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
+  cat > conftest.$ac_ext <<EOF
+#line 104679 "configure"
+#include "confdefs.h"
 find_stack_direction ()
 {
   static char *addr = 0;
@@ -135155,411 +104689,245 @@
   else
     return (&dummy > addr) ? 1 : -1;
 }
-
-int
 main ()
 {
-  exit (find_stack_direction () < 0);
+  exit (find_stack_direction() < 0);
 }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:104698: \"$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
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
+cat >> confdefs.h <<EOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
+EOF
 
 fi
 
-
-
-
-
-
-
-
-
-
 for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:104722: 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 104727 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:104750: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
 
-  echo "$as_me:$LINENO: checking whether sprintf is broken" >&5
-echo $ECHO_N "checking whether sprintf is broken... $ECHO_C" >&6
-if test "${ac_cv_broken_sprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6
+echo "configure:104776: 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
-
+  
     if test "$cross_compiling" = yes; then
-
+  
       ac_cv_broken_sprintf=no
-
+    
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 104787 "configure"
+#include "confdefs.h"
 main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:104791: \"$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
-
+    
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
       ac_cv_broken_sprintf=yes
-
+    
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+  
 fi
-echo "$as_me:$LINENO: result: $ac_cv_broken_sprintf" >&5
-echo "${ECHO_T}$ac_cv_broken_sprintf" >&6
+
+echo "$ac_t""$ac_cv_broken_sprintf" 1>&6
   if test "$ac_cv_broken_sprintf" = "yes"; then
     ac_result=1
   else
     ac_result=0
   fi
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define ZEND_BROKEN_SPRINTF $ac_result
-_ACEOF
-
-
-
-
+EOF
 
 
 
 for ac_func in finite isfinite isinf isnan
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:104825: 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 104830 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:104853: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
 
 
-  echo "$as_me:$LINENO: checking whether fp_except is defined" >&5
-echo $ECHO_N "checking whether fp_except is defined... $ECHO_C" >&6
-if test "${ac_cv_type_fp_except+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6
+echo "configure:104880: 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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+    cat > conftest.$ac_ext <<EOF
+#line 104886 "configure"
+#include "confdefs.h"
 
 #include <floatingpoint.h>
 
-int
-main ()
-{
+int main() {
 
 fp_except x = (fp_except) 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+; return 0; }
+EOF
+if { (eval echo configure:104897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
      ac_cv_type_fp_except=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
      ac_cv_type_fp_except=no
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_fp_except" >&5
-echo "${ECHO_T}$ac_cv_type_fp_except" >&6
-  if test "$ac_cv_type_fp_except" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_type_fp_except" 1>&6
+  if test "$ac_cv_type_fp_except" = "yes"; then
+    cat >> confdefs.h <<\EOF
 #define HAVE_FP_EXCEPT 1
-_ACEOF
+EOF
 
   fi
 
 
 
-  echo "$as_me:$LINENO: checking for usable _FPU_SETCW" >&5
-echo $ECHO_N "checking for usable _FPU_SETCW... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6
+echo "configure:104924: checking for usable _FPU_SETCW" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 104926 "configure"
+#include "confdefs.h"
 
     #include <fpu_control.h>
-
-int
-main ()
-{
+  
+int main() {
 
     fpu_control_t fpu_oldcw, fpu_cw;
     volatile double result;
@@ -135571,69 +104939,38 @@
     _FPU_SETCW(fpu_cw);
     result = a / b;
     _FPU_SETCW(fpu_oldcw);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  
+; return 0; }
+EOF
+if { (eval echo configure:104946: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cfp_have__fpu_setcw=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cfp_have__fpu_setcw=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
   if test "$ac_cfp_have__fpu_setcw" = "yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE__FPU_SETCW 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
-
-  echo "$as_me:$LINENO: checking for usable fpsetprec" >&5
-echo $ECHO_N "checking for usable fpsetprec... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  
+  echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6
+echo "configure:104967: checking for usable fpsetprec" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 104969 "configure"
+#include "confdefs.h"
 
     #include <machine/ieeefp.h>
-
-int
-main ()
-{
+  
+int main() {
 
     fp_prec_t fpu_oldprec;
     volatile double result;
@@ -135644,69 +104981,38 @@
     fpsetprec(FP_PD);
     result = a / b;
     fpsetprec(fpu_oldprec);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  
+; return 0; }
+EOF
+if { (eval echo configure:104988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
   ac_cfp_have_fpsetprec=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cfp_have_fpsetprec=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cfp_have_fpsetprec=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
   if test "$ac_cfp_have_fpsetprec" = "yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_FPSETPREC 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-  echo "$as_me:$LINENO: checking for usable _controlfp" >&5
-echo $ECHO_N "checking for usable _controlfp... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6
+echo "configure:105009: checking for usable _controlfp" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 105011 "configure"
+#include "confdefs.h"
 
     #include <float.h>
-
-int
-main ()
-{
+  
+int main() {
 
     unsigned int fpu_oldcw;
     volatile double result;
@@ -135717,69 +105023,38 @@
     _controlfp(_PC_53, _MCW_PC);
     result = a / b;
     _controlfp(fpu_oldcw, _MCW_PC);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  
+; return 0; }
+EOF
+if { (eval echo configure:105030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
   ac_cfp_have__controlfp=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cfp_have__controlfp=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cfp_have__controlfp=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
   if test "$ac_cfp_have__controlfp" = "yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE__CONTROLFP 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-  echo "$as_me:$LINENO: checking for usable _controlfp_s" >&5
-echo $ECHO_N "checking for usable _controlfp_s... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6
+echo "configure:105051: checking for usable _controlfp_s" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 105053 "configure"
+#include "confdefs.h"
 
    #include <float.h>
-
-int
-main ()
-{
+  
+int main() {
 
     unsigned int fpu_oldcw, fpu_cw;
     volatile double result;
@@ -135791,69 +105066,38 @@
     _controlfp_s(&fpu_cw, _PC_53, _MCW_PC);
     result = a / b;
     _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  
+; return 0; }
+EOF
+if { (eval echo configure:105073: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cfp_have__controlfp_s=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cfp_have__controlfp_s=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
   if test "$ac_cfp_have__controlfp_s" = "yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE__CONTROLFP_S 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
-  echo "$as_me:$LINENO: checking whether FPU control word can be manipulated by inline assembler" >&5
-echo $ECHO_N "checking whether FPU control word can be manipulated by inline assembler... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6
+echo "configure:105094: checking whether FPU control word can be manipulated by inline assembler" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 105096 "configure"
+#include "confdefs.h"
 
     /* nothing */
-
-int
-main ()
-{
+  
+int main() {
 
     unsigned int oldcw, cw;
     volatile double result;
@@ -135867,71 +105111,41 @@
     result = a / b;
 
     __asm__ __volatile__ ("fldcw %0" : : "m" (*&oldcw));
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  
+; return 0; }
+EOF
+if { (eval echo configure:105118: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cfp_have_fpu_inline_asm_x86=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cfp_have_fpu_inline_asm_x86=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
   if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define HAVE_FPU_INLINE_ASM_X86 1
-_ACEOF
+EOF
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    echo "$ac_t""yes" 1>&6
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    echo "$ac_t""no" 1>&6
   fi
 
 
-echo "$as_me:$LINENO: checking whether double cast to long preserves least significant bits" >&5
-echo $ECHO_N "checking whether double cast to long preserves least significant bits... $ECHO_C" >&6
+echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6
+echo "configure:105140: checking whether double cast to long preserves least significant bits" >&5
 
 if test "$cross_compiling" = yes; then
-
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  
+  echo "$ac_t""no" 1>&6
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 105148 "configure"
+#include "confdefs.h"
 
 #include <limits.h>
 
@@ -135953,202 +105167,79 @@
 	exit(1);
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+EOF
+if { (eval echo configure:105172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
+  cat >> confdefs.h <<\EOF
 #define ZEND_DVAL_TO_LVAL_CAST_OK 1
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+  echo "$ac_t""no" 1>&6
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
+	
 
-
-for ac_header in dlfcn.h
+for ac_hdr in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:105198: 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 105203 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:105208: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 
-echo "$as_me:$LINENO: checking whether dlsym() requires a leading underscore in symbol names" >&5
-echo $ECHO_N "checking whether dlsym() requires a leading underscore in symbol names... $ECHO_C" >&6
+echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6
+echo "configure:105236: checking whether dlsym() requires a leading underscore in symbol names" >&5
 if test "$cross_compiling" = yes; then :
-
+  
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 136148 "configure"
+#line 105243 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -136211,37 +105302,28 @@
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo configure:105306: \"$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
-      x$lt_dlno_uscore)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+      x$lt_dlno_uscore) 
+  echo "$ac_t""no" 1>&6
  ;;
-      x$lt_dlneed_uscore)
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+      x$lt_dlneed_uscore) 
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define DLSYM_NEEDS_UNDERSCORE 1
-_ACEOF
+EOF
 
  ;;
-      x$lt_dlunknown|x*)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+      x$lt_dlunknown|x*) 
+  echo "$ac_t""no" 1>&6
  ;;
     esac
   else :
     # compilation failed
-
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    
+  echo "$ac_t""no" 1>&6
 
   fi
 fi
@@ -136250,110 +105332,104 @@
 
 
 
-
 # Check whether --with-zend-vm or --without-zend-vm was given.
 if test "${with_zend_vm+set}" = set; then
   withval="$with_zend_vm"
-
+  
   PHP_ZEND_VM=$withval
 
 else
-
+  
   PHP_ZEND_VM=CALL
 
-fi;
+fi
+
 
 # Check whether --enable-maintainer-zts or --disable-maintainer-zts was given.
 if test "${enable_maintainer_zts+set}" = set; then
   enableval="$enable_maintainer_zts"
-
+  
   ZEND_MAINTAINER_ZTS=$enableval
 
 else
-
+  
   ZEND_MAINTAINER_ZTS=no
 
-fi;
+fi
+  
 
 # Check whether --enable-inline-optimization or --disable-inline-optimization was given.
 if test "${enable_inline_optimization+set}" = set; then
   enableval="$enable_inline_optimization"
-
+  
   ZEND_INLINE_OPTIMIZATION=$enableval
 
 else
-
+  
   ZEND_INLINE_OPTIMIZATION=yes
 
-fi;
+fi
+
 
 # Check whether --enable-zend-multibyte or --disable-zend-multibyte was given.
 if test "${enable_zend_multibyte+set}" = set; then
   enableval="$enable_zend_multibyte"
-
+  
   ZEND_MULTIBYTE=$enableval
 
 else
-
+  
   ZEND_MULTIBYTE=no
 
-fi;
+fi
+
 
-echo "$as_me:$LINENO: checking virtual machine dispatch method" >&5
-echo $ECHO_N "checking virtual machine dispatch method... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $PHP_ZEND_VM" >&5
-echo "${ECHO_T}$PHP_ZEND_VM" >&6
-
-echo "$as_me:$LINENO: checking whether to enable thread-safety" >&5
-echo $ECHO_N "checking whether to enable thread-safety... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $ZEND_MAINTAINER_ZTS" >&5
-echo "${ECHO_T}$ZEND_MAINTAINER_ZTS" >&6
-
-echo "$as_me:$LINENO: checking whether to enable inline optimization for GCC" >&5
-echo $ECHO_N "checking whether to enable inline optimization for GCC... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $ZEND_INLINE_OPTIMIZATION" >&5
-echo "${ECHO_T}$ZEND_INLINE_OPTIMIZATION" >&6
-
-echo "$as_me:$LINENO: checking whether to enable Zend debugging" >&5
-echo $ECHO_N "checking whether to enable Zend debugging... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $ZEND_DEBUG" >&5
-echo "${ECHO_T}$ZEND_DEBUG" >&6
-
-echo "$as_me:$LINENO: checking whether to enable Zend multibyte" >&5
-echo $ECHO_N "checking whether to enable Zend multibyte... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $ZEND_MULTIBYTE" >&5
-echo "${ECHO_T}$ZEND_MULTIBYTE" >&6
+echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6
+echo "configure:105389: 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:105393: 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:105397: 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:105401: 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:105405: checking whether to enable Zend multibyte" >&5
+echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
 
 case $PHP_ZEND_VM in
   SWITCH)
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define ZEND_VM_KIND ZEND_VM_KIND_SWITCH
-_ACEOF
+EOF
 
     ;;
   GOTO)
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define ZEND_VM_KIND ZEND_VM_KIND_GOTO
-_ACEOF
+EOF
 
     ;;
   *)
     PHP_ZEND_VM=CALL
-
-cat >>confdefs.h <<\_ACEOF
+    cat >> confdefs.h <<\EOF
 #define ZEND_VM_KIND ZEND_VM_KIND_CALL
-_ACEOF
+EOF
 
     ;;
 esac
 
 if test "$ZEND_DEBUG" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define ZEND_DEBUG 1
-_ACEOF
+EOF
 
   echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
   if test "$CFLAGS" = "-g -O2"; then
@@ -136363,32 +105439,29 @@
   test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \
     DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
 else
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define ZEND_DEBUG 0
-_ACEOF
+EOF
 
 fi
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define ZTS 1
-_ACEOF
+EOF
 
   CFLAGS="$CFLAGS -DZTS"
+  
 
 
-
-fi
+fi  
 
 if test "$ZEND_MULTIBYTE" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define ZEND_MULTIBYTE 1
-_ACEOF
+EOF
 
 fi
 
@@ -136400,109 +105473,72 @@
 fi
 
 
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:105478: checking for inline" >&5
+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  cat > conftest.$ac_ext <<EOF
+#line 105485 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
+EOF
+if { (eval echo configure:105492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
 done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
 
-
-case $ac_cv_c_inline in
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
   inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
+  no) cat >> confdefs.h <<\EOF
+#define inline 
+EOF
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+ ;;
 esac
 
 
 
 
-echo "$as_me:$LINENO: checking target system is Darwin" >&5
-echo $ECHO_N "checking target system is Darwin... $ECHO_C" >&6
+echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6
+echo "configure:105521: checking target system is Darwin" >&5
 if echo "$target" | grep "darwin" > /dev/null; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define DARWIN 1
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-echo "$as_me:$LINENO: checking for MM alignment and log values" >&5
-echo $ECHO_N "checking for MM alignment and log values... $ECHO_C" >&6
+echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6
+echo "configure:105533: checking for MM alignment and log values" >&5
 
 if test "$cross_compiling" = yes; then
-
+  
     LIBZEND_MM_ALIGN=8
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 105541 "configure"
+#include "confdefs.h"
 
 #include <stdio.h>
 
@@ -136530,65 +105566,48 @@
   }
 
   fp = fopen("conftest.zend", "w");
-  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);
+  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);  
   fclose(fp);
 
   exit(0);
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+EOF
+if { (eval echo configure:105577: \"$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`
   LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define ZEND_MM_ALIGNMENT $LIBZEND_MM_ALIGN
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define ZEND_MM_ALIGNMENT_LOG2 $LIBZEND_MM_ALIGN_LOG2
-_ACEOF
-
+EOF
+ 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
-echo "$as_me:$LINENO: result: done" >&5
-echo "${ECHO_T}done" >&6
 
-echo "$as_me:$LINENO: checking for memory allocation using mmap(MAP_ANON)" >&5
-echo $ECHO_N "checking for memory allocation using mmap(MAP_ANON)... $ECHO_C" >&6
+echo "$ac_t""done" 1>&6
 
-if test "$cross_compiling" = yes; then
+echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6
+echo "configure:105602: checking for memory allocation using mmap(MAP_ANON)" >&5
 
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+if test "$cross_compiling" = yes; then
+  
+    echo "$ac_t""no" 1>&6
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 105610 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -136622,56 +105641,39 @@
 	return 0;
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+EOF
+if { (eval echo configure:105646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
+  cat >> confdefs.h <<\EOF
 #define HAVE_MEM_MMAP_ANON 1
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+  echo "$ac_t""no" 1>&6
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
-echo "$as_me:$LINENO: checking for memory allocation using mmap(\"/dev/zero\")" >&5
-echo $ECHO_N "checking for memory allocation using mmap(\"/dev/zero\")... $ECHO_C" >&6
 
-if test "$cross_compiling" = yes; then
+echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6
+echo "configure:105668: checking for memory allocation using mmap("/dev/zero")" >&5
 
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+if test "$cross_compiling" = yes; then
+  
+    echo "$ac_t""no" 1>&6
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 105676 "configure"
+#include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -136715,140 +105717,80 @@
 	return 0;
 }
 
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-
-cat >>confdefs.h <<\_ACEOF
+EOF
+if { (eval echo configure:105722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
+  cat >> confdefs.h <<\EOF
 #define HAVE_MEM_MMAP_ZERO 1
-_ACEOF
+EOF
 
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
+  echo "$ac_t""no" 1>&6
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
 
 
 for ac_func in mremap
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:105746: 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 105751 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* 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 ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+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_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+$ac_func();
 #endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+; return 0; }
+EOF
+if { (eval echo configure:105774: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+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'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
 done
 
@@ -136856,10 +105798,9 @@
 
 
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define ZTS 1
-_ACEOF
+EOF
 
   PHP_THREAD_SAFETY=yes
 else
@@ -136881,241 +105822,127 @@
 # Check whether --enable- or --disable- was given.
 if test "${enable_+set}" = set; then
   enableval="$enable_"
-
-fi;
+  :
+fi
 
 
-  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  echo "$as_me:$LINENO: result: ${T_MD}Configuring TSRM${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring TSRM${T_ME}" >&6
 
+  echo "$ac_t""" 1>&6
+  echo "$ac_t""${T_MD}Configuring TSRM${T_ME}" 1>&6
 
 
 
 
-for ac_header in stdarg.h
+for ac_hdr in stdarg.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:105841: 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 105846 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:105851: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
-
 done
 
 
 
 if test "$PHP_THREAD_SAFETY" = "yes"; then
-
-
+  
 
 
 # Check whether --with-tsrm-pth or --without-tsrm-pth was given.
 if test "${with_tsrm_pth+set}" = set; then
   withval="$with_tsrm_pth"
-
+  
   TSRM_PTH=$withval
 
 else
-
+  
   TSRM_PTH=no
 
-fi;
+fi
 
 
 # Check whether --with-tsrm-st or --without-tsrm-st was given.
 if test "${with_tsrm_st+set}" = set; then
   withval="$with_tsrm_st"
-
+  
   TSRM_ST=$withval
 
 else
-
+  
   TSRM_ST=no
 
-fi;
+fi
 
 
 # Check whether --with-tsrm-pthreads or --without-tsrm-pthreads was given.
 if test "${with_tsrm_pthreads+set}" = set; then
   withval="$with_tsrm_pthreads"
-
+  
   TSRM_PTHREADS=$withval
 
 else
-
+  
   TSRM_PTHREADS=yes
 
-fi;
+fi
+
 
 test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config
 
 if test "$TSRM_PTH" != "no"; then
+  
 
-
-echo "$as_me:$LINENO: checking for GNU Pth" >&5
-echo $ECHO_N "checking for GNU Pth... $ECHO_C" >&6
+echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6
+echo "configure:105928: checking for GNU Pth" >&5
 PTH_PREFIX="`$TSRM_PTH --prefix`"
 if test -z "$PTH_PREFIX"; then
-  echo "$as_me:$LINENO: result: Please check your Pth installation" >&5
-echo "${ECHO_T}Please check your Pth installation" >&6
+  echo "$ac_t""Please check your Pth installation" 1>&6
 fi
 
 CPPFLAGS="$CPPFLAGS `$TSRM_PTH --cflags`"
 LDFLAGS="$LDFLAGS `$TSRM_PTH --ldflags`"
 LIBS="$LIBS `$TSRM_PTH --libs`"
 
-
-cat >>confdefs.h <<\_ACEOF
+cat >> confdefs.h <<\EOF
 #define GNUPTH 1
-_ACEOF
+EOF
 
-echo "$as_me:$LINENO: result: yes - installed in $PTH_PREFIX" >&5
-echo "${ECHO_T}yes - installed in $PTH_PREFIX" >&6
+echo "$ac_t""yes - installed in $PTH_PREFIX" 1>&6
 
 
 elif test "$TSRM_ST" != "no"; then
-
+  
   if test -r "$TSRM_ST/include/st.h"; then
     CPPFLAGS="$CPPFLAGS -I$TSRM_ST/include"
     LDFLAGS="$LDFLAGS -L$TSRM_ST/lib"
@@ -137123,176 +105950,60 @@
     CPPFLAGS="$CPPFLAGS -I$TSRM_ST"
     LDFLAGS="$LDFLAGS -L$TSRM_ST"
   fi
-
-for ac_header in st.h
+  for ac_hdr in st.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:105958: 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 105963 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:105968: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest*
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-
-    { { echo "$as_me:$LINENO: error: Sorry, I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix" >&5
-echo "$as_me: error: Sorry, I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix" >&2;}
-   { (exit 1); exit 1; }; }
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Sorry, I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix" 1>&2; exit 1; }
+  
 fi
-
 done
 
   LIBS="$LIBS -lst"
-  echo "$as_me:$LINENO: checking for SGI's State Threads" >&5
-echo $ECHO_N "checking for SGI's State Threads... $ECHO_C" >&6
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
+  echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6
+echo "configure:105998: checking for SGI's State Threads" >&5
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
 #define TSRM_ST 1
-_ACEOF
-
-
-elif test "$TSRM_PTHREADS" != "no"; then
+EOF
 
 
+elif test "$TSRM_PTHREADS" != "no"; then
+  
+		
 
 
 if test "$beos_threads" = "1"; then
@@ -137301,7 +106012,7 @@
 else
   save_CFLAGS=$CFLAGS
   save_LIBS=$LIBS
-
+  
 if test -n "$ac_cv_pthreads_lib"; then
   LIBS="$LIBS -l$ac_cv_pthreads_lib"
 fi
@@ -137310,9 +106021,9 @@
   CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
 fi
 
-
+  
 if test "$cross_compiling" = yes; then
-
+  
     pthreads_working=no
   case $host_alias in
   *netware*)
@@ -137321,12 +106032,9 @@
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 106037 "configure"
+#include "confdefs.h"
 
 #include <pthread.h>
 #include <stddef.h>
@@ -137341,51 +106049,41 @@
     int data = 1;
     pthread_mutexattr_init(&mattr);
     return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+} 
+EOF
+if { (eval echo configure:106055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
   pthreads_working=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   pthreads_working=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+  
   LIBS=$save_LIBS
   CFLAGS=$save_CFLAGS
 
-  echo "$as_me:$LINENO: checking for pthreads_cflags" >&5
-echo $ECHO_N "checking for pthreads_cflags... $ECHO_C" >&6
-if test "${ac_cv_pthreads_cflags+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
+echo "configure:106075: 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
-
+  
   ac_cv_pthreads_cflags=
   if test "$pthreads_working" != "yes"; then
-    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
+    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
       ac_save=$CFLAGS
       CFLAGS="$CFLAGS $flag"
-
+      
 if test "$cross_compiling" = yes; then
-
+  
     pthreads_working=no
   case $host_alias in
   *netware*)
@@ -137394,12 +106092,9 @@
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 106097 "configure"
+#include "confdefs.h"
 
 #include <pthread.h>
 #include <stddef.h>
@@ -137414,34 +106109,24 @@
     int data = 1;
     pthread_mutexattr_init(&mattr);
     return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+} 
+EOF
+if { (eval echo configure:106115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
   pthreads_working=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   pthreads_working=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+  
       CFLAGS=$ac_save
       if test "$pthreads_working" = "yes"; then
         ac_cv_pthreads_cflags=$flag
@@ -137452,23 +106137,23 @@
 fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_pthreads_cflags" >&5
-echo "${ECHO_T}$ac_cv_pthreads_cflags" >&6
 
-echo "$as_me:$LINENO: checking for pthreads_lib" >&5
-echo $ECHO_N "checking for pthreads_lib... $ECHO_C" >&6
-if test "${ac_cv_pthreads_lib+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
 
+echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
+echo "configure:106145: 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
+  
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
   for lib in pthread pthreads c_r; do
     ac_save=$LIBS
     LIBS="$LIBS -l$lib"
-
+    
 if test "$cross_compiling" = yes; then
-
+  
     pthreads_working=no
   case $host_alias in
   *netware*)
@@ -137477,12 +106162,9 @@
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  cat > conftest.$ac_ext <<EOF
+#line 106167 "configure"
+#include "confdefs.h"
 
 #include <pthread.h>
 #include <stddef.h>
@@ -137497,34 +106179,24 @@
     int data = 1;
     pthread_mutexattr_init(&mattr);
     return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+} 
+EOF
+if { (eval echo configure:106185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
   pthreads_working=yes
-
+  
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  
   pthreads_working=no
-
+  
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
 fi
+  
     LIBS=$ac_save
     if test "$pthreads_working" = "yes"; then
       ac_cv_pthreads_lib=$lib
@@ -137534,8 +106206,8 @@
 fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_pthreads_lib" >&5
-echo "${ECHO_T}$ac_cv_pthreads_lib" >&6
+
+echo "$ac_t""$ac_cv_pthreads_lib" 1>&6
 
 if test "$pthreads_working" = "yes"; then
   threads_result="POSIX-Threads found"
@@ -137544,29 +106216,24 @@
 fi
 
 
-if test "$beos_threads" = "1"; then
-
-cat >>confdefs.h <<\_ACEOF
+if test "$beos_threads" = "1"; then 
+  cat >> confdefs.h <<\EOF
 #define BETHREADS 1
-_ACEOF
+EOF
 
-else
+else		
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: Your system seems to lack POSIX threads." >&5
-echo "$as_me: error: Your system seems to lack POSIX threads." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: Your system seems to lack POSIX threads." 1>&2; exit 1; }
   fi
 
-
-cat >>confdefs.h <<\_ACEOF
+  cat >> confdefs.h <<\EOF
 #define PTHREADS 1
-_ACEOF
+EOF
 
 
-  echo "$as_me:$LINENO: checking for POSIX threads" >&5
-echo $ECHO_N "checking for POSIX threads... $ECHO_C" >&6
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
+echo "configure:106236: checking for POSIX threads" >&5
+  echo "$ac_t""yes" 1>&6
 fi
 
 fi
@@ -137628,7 +106295,7 @@
     if test "$enable_maintainer_zts" = "yes"; then
       extbasedir=$extbasedir-zts
     fi
-
+    
     if test "$PHP_DEBUG" = "1"; then
       extbasedir=$extbasedir-debug
     fi
@@ -137696,7 +106363,7 @@
 
 
 if test -z "$php_ldflags_add_usr_lib"; then
-
+  
   unset ac_new_flags
   for i in $PHP_LDFLAGS; do
     case $i in
@@ -137706,7 +106373,7 @@
   done
   PHP_LDFLAGS=$ac_new_flags
 
-
+  
   unset ac_new_flags
   for i in $LDFLAGS; do
     case $i in
@@ -137722,119 +106389,63 @@
 EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
 
 PHP_BUILD_DATE=`date '+%Y-%m-%d'`
-
-cat >>confdefs.h <<_ACEOF
+cat >> confdefs.h <<EOF
 #define PHP_BUILD_DATE "$PHP_BUILD_DATE"
-_ACEOF
+EOF
 
 
 case $host_alias in
 *netware*)
   PHP_OS="NetWare"
   PHP_UNAME="NetWare"
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_OS "$PHP_OS"
-_ACEOF
-
+EOF
 
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_UNAME "$PHP_UNAME"
-_ACEOF
+EOF
 
   ;;
 *)
   PHP_UNAME=`uname -a | xargs`
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_UNAME "$PHP_UNAME"
-_ACEOF
+EOF
 
   PHP_OS=`uname | xargs`
-
-cat >>confdefs.h <<_ACEOF
+  cat >> confdefs.h <<EOF
 #define PHP_OS "$PHP_OS"
-_ACEOF
+EOF
 
   ;;
 esac
 
-if test "$PHP_CLI" != "no"; then
-  PHP_CLI_TARGET="\$(SAPI_CLI_PATH)"
-  PHP_INSTALL_CLI_TARGET="install-cli"
-
-
-  case sapi/cli in
-  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
-  /*) ac_srcdir=`echo "sapi/cli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
-  *) ac_srcdir="$abs_srcdir/sapi/cli/"; ac_bdir="sapi/cli/"; 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 php_cli.c php_cli_readline.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_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_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_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_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
-
-
-  PHP_INSTALLED_SAPIS="cli $PHP_SAPI"
-  PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
-else
-  PHP_INSTALLED_SAPIS="$PHP_SAPI"
-fi
-
-
 
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_INSTALLED_SAPIS"
 
-
+  
 
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_EXECUTABLE"
 
 
-  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CLI_TARGET"
-
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_SAPI_OBJS"
 
 
-  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CLI_OBJS"
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_BINARY_OBJS"
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_GLOBAL_OBJS"
 
 
 
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_BINARIES"
+
+
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MODULES"
 
 
@@ -137846,28 +106457,28 @@
 
 
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST abs_builddir"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST abs_srcdir"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST php_abs_top_builddir"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST php_abs_top_srcdir"
 
-
+  
 
 
 
@@ -137880,16 +106491,16 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST exec_prefix"
 
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST program_prefix"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST program_suffix"
 
-
+  
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST includedir"
@@ -137950,64 +106561,64 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST CXXFLAGS_CLEAN"
 
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST DEBUG_CFLAGS"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST EXTENSION_DIR"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_LDFLAGS"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_LDFLAGS_PROGRAM"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_LIBS"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST ZEND_EXTRA_LIBS"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST INCLUDES"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_INCLUDES"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST INCLUDE_PATH"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST INSTALL_IT"
 
-
+  
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST LFLAGS"
@@ -138019,31 +106630,31 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST LN_S"
 
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST NATIVE_RPATHS"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PEAR_INSTALLDIR"
 
-
+  
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_BUILD_DATE"
 
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_LDFLAGS"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_LIBS"
 
-
+  
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST OVERALL_TARGET"
@@ -138055,16 +106666,16 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_SAPI"
 
 
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_VERSION"
 
+  
 
 
-
-
+  
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_VERSION_ID"
 
-
+  
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST SHELL"
@@ -138112,14 +106723,13 @@
 # Check whether --enable- or --disable- was given.
 if test "${enable_+set}" = set; then
   enableval="$enable_"
+  :
+fi
 
-fi;
 
 
-  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  echo "$as_me:$LINENO: result: ${T_MD}Configuring libtool${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring libtool${T_ME}" >&6
+  echo "$ac_t""" 1>&6
+  echo "$ac_t""${T_MD}Configuring libtool${T_ME}" 1>&6
 
 
 LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"
@@ -138153,7 +106763,8 @@
     esac
 else
   enable_shared=yes
-fi;
+fi
+
 
 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
@@ -138177,7 +106788,8 @@
     esac
 else
   enable_static=yes
-fi;
+fi
+
 
 # Check whether --enable-fast-install or --disable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then
@@ -138201,8 +106813,26 @@
     esac
 else
   enable_fast_install=yes
-fi;
+fi
+
 
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:106821: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -138210,12 +106840,13 @@
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi;
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+  echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
+echo "configure:106850: checking for ld used by $CC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -138244,14 +106875,14 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
+echo "configure:106880: checking for GNU ld" >&5
 else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+echo "configure:106883: checking for non-GNU ld" >&5
 fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -138281,19 +106912,15 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  echo "$ac_t""$LD" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+test -z "$LD" && { 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:106922: 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
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -138305,20 +106932,20 @@
   ;;
 esac
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+
+echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
+echo "configure:106942: 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
   lt_cv_ld_reload_flag='-r'
 fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+
+echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -138335,10 +106962,10 @@
     ;;
 esac
 
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
+echo "configure:106967: 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
   if test -n "$NM"; then
   # Let the user override the test.
@@ -138384,14 +107011,14 @@
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
+
+echo "$ac_t""$lt_cv_path_NM" 1>&6
 NM="$lt_cv_path_NM"
 
-echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6
+echo "configure:107020: 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
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -138574,13 +107201,68 @@
 esac
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+
+echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
+echo $ac_n "checking for object suffix""... $ac_c" 1>&6
+echo "configure:107212: 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:107218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  for ac_file in conftest.*; do
+    case $ac_file in
+    *.c) ;;
+    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
+    esac
+  done
+else
+  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_objext" 1>&6
+OBJEXT=$ac_cv_objext
+ac_objext=$ac_cv_objext
+
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:107238: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+  ac_cv_exeext=.exe
+else
+  rm -f conftest*
+  echo 'int main () { return 0; }' > conftest.$ac_ext
+  ac_cv_exeext=
+  if { (eval echo configure:107248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+    for file in conftest.*; do
+      case $file in
+      *.c | *.o | *.obj) ;;
+      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+      esac
+    done
+  else
+    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+  fi
+  rm -f conftest*
+  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
 
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+ac_exeext=$EXEEXT
 
 
 # If no C compiler was specified, use CC.
@@ -138592,6 +107274,12 @@
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
+if test $host != $build; then
+  ac_tool_prefix=${host_alias}-
+else
+  ac_tool_prefix=
+fi
+
 #AC_ARG_ENABLE([libtool-lock],
 #[  --disable-libtool-lock  avoid locking (might break parallel builds)])
 #test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
@@ -138602,11 +107290,7 @@
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  if { (eval echo configure:107294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -138620,12 +107304,8 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 138620 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo '#line 107308 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:107309: \"$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*)
@@ -138659,11 +107339,7 @@
 s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  if { (eval echo configure:107343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
@@ -138712,74 +107388,47 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
+echo "configure:107393: 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
-
-
+  
      ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
-int
-main ()
-{
+     cat > conftest.$ac_ext <<EOF
+#line 107406 "configure"
+#include "confdefs.h"
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:107413: \"$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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-lt_cv_cc_needs_belf=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  lt_cv_cc_needs_belf=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
      ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+
+echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -138788,11 +107437,7 @@
 sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  if { (eval echo configure:107441: \"$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
@@ -138820,245 +107465,58 @@
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+  echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+echo "configure:107470: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
+if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+  CXXCPP="${CXX-g++} -E"
+  cat > conftest.$ac_ext <<EOF
+#line 107483 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:107488: \"$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
   :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CXXCPP=/lib/cpp
 fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
+rm -f conftest*
+  ac_cv_prog_CXXCPP="$CXXCPP"
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
 fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
 fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+CXXCPP="$ac_cv_prog_CXXCPP"
+echo "$ac_t""$CXXCPP" 1>&6
 
 fi
 
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 # find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6
+echo "configure:107518: 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
     i=0
   teststring="ABCD"
@@ -139167,11 +107625,9 @@
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
+  echo "$ac_t""$lt_cv_sys_max_cmd_len" 1>&6
 else
-  echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+  echo "$ac_t""none" 1>&6
 fi
 
 
@@ -139179,12 +107635,12 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6
+echo "configure:107640: 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
-
+  
 # These are sane defaults that work on at least a few old systems.
 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
@@ -139284,18 +107740,10 @@
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  if { (eval echo configure:107744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
+    if { (eval echo configure:107747: \"$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"
@@ -139346,11 +107794,7 @@
 	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+	  if { (eval echo configure:107798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$lt_save_LIBS"
@@ -139384,17 +107828,15 @@
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
+  echo "$ac_t""failed" 1>&6
 else
-  echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+  echo "$ac_t""ok" 1>&6
 fi
 
-echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for objdir""... $ac_c" 1>&6
+echo "configure:107838: checking for objdir" >&5
+if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -139406,8 +107848,8 @@
 fi
 rmdir .libs 2>/dev/null
 fi
-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6
+
+echo "$ac_t""$lt_cv_objdir" 1>&6
 objdir=$lt_cv_objdir
 
 
@@ -139455,244 +107897,205 @@
 ofile="$default_ofile"
 with_gnu_ld="$lt_cv_prog_gnu_ld"
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:107904: 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
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AR="${ac_tool_prefix}ar"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-AR=$ac_cv_prog_AR
+AR="$ac_cv_prog_AR"
 if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+  echo "$ac_t""$AR" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-fi
+
 if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
+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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:107936: 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
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AR="ar"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="false"
 fi
 fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+AR="$ac_cv_prog_AR"
+if test -n "$AR"; then
+  echo "$ac_t""$AR" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-  AR=$ac_ct_AR
 else
-  AR="$ac_cv_prog_AR"
+  AR="false"
+fi
 fi
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:107971: 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
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-RANLIB=$ac_cv_prog_RANLIB
+RANLIB="$ac_cv_prog_RANLIB"
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  echo "$ac_t""$RANLIB" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-fi
+
 if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
+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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:108003: 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
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
 fi
 fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-  RANLIB=$ac_ct_RANLIB
 else
-  RANLIB="$ac_cv_prog_RANLIB"
+  RANLIB=":"
+fi
 fi
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:108038: 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
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-STRIP=$ac_cv_prog_STRIP
+STRIP="$ac_cv_prog_STRIP"
 if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  echo "$ac_t""$STRIP" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-fi
+
 if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
+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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:108070: 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
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_STRIP="strip"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
 fi
 fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+STRIP="$ac_cv_prog_STRIP"
+if test -n "$STRIP"; then
+  echo "$ac_t""$STRIP" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-  STRIP=$ac_ct_STRIP
 else
-  STRIP="$ac_cv_prog_STRIP"
+  STRIP=":"
+fi
 fi
 
 
@@ -139749,10 +108152,10 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
+echo "configure:108157: 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
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -139802,19 +108205,17 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+  echo "$ac_t""$MAGIC_CMD" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for file""... $ac_c" 1>&6
+echo "configure:108217: 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
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -139864,11 +108265,9 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+  echo "$ac_t""$MAGIC_CMD" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
   else
@@ -139883,171 +108282,145 @@
 
   case $host_os in
     rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+    # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:108289: 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
   if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
+DSYMUTIL="$ac_cv_prog_DSYMUTIL"
 if test -n "$DSYMUTIL"; then
-  echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-echo "${ECHO_T}$DSYMUTIL" >&6
+  echo "$ac_t""$DSYMUTIL" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-fi
+
 if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
+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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:108321: 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
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_DSYMUTIL" && ac_cv_prog_ac_ct_DSYMUTIL=":"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_DSYMUTIL="dsymutil"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_DSYMUTIL" && ac_cv_prog_DSYMUTIL=":"
 fi
 fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6
+DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+if test -n "$DSYMUTIL"; then
+  echo "$ac_t""$DSYMUTIL" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-  DSYMUTIL=$ac_ct_DSYMUTIL
 else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+  DSYMUTIL=":"
+fi
 fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+    # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:108356: 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
   if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
 fi
 fi
-NMEDIT=$ac_cv_prog_NMEDIT
+NMEDIT="$ac_cv_prog_NMEDIT"
 if test -n "$NMEDIT"; then
-  echo "$as_me:$LINENO: result: $NMEDIT" >&5
-echo "${ECHO_T}$NMEDIT" >&6
+  echo "$ac_t""$NMEDIT" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-fi
+
 if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
+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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:108388: 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
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_NMEDIT" && ac_cv_prog_ac_ct_NMEDIT=":"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_NMEDIT="nmedit"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_NMEDIT" && ac_cv_prog_NMEDIT=":"
 fi
 fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-echo "${ECHO_T}$ac_ct_NMEDIT" >&6
+NMEDIT="$ac_cv_prog_NMEDIT"
+if test -n "$NMEDIT"; then
+  echo "$ac_t""$NMEDIT" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
 
-  NMEDIT=$ac_ct_NMEDIT
 else
-  NMEDIT="$ac_cv_prog_NMEDIT"
+  NMEDIT=":"
+fi
 fi
 
 
-    echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6
+echo "configure:108422: 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
   lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
@@ -140065,29 +108438,25 @@
    rm conftest.c
       fi
 fi
-echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6
-    echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+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:108445: 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
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-
+      
 cat > conftest.$ac_ext <<EOF
-#line 140078 "configure"
+#line 108455 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:108460: \"$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
@@ -140098,10 +108467,10 @@
 fi
 rm -f conftest*
    LDFLAGS="$save_LDFLAGS"
-
+    
 fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6
+
+echo "$ac_t""$lt_cv_ld_exported_symbols_list" 1>&6
     case $host_os in
     rhapsody* | darwin1.[0123])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -140144,30 +108513,31 @@
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
   enableval="$enable_libtool_lock"
+  :
+fi
 
-fi;
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
-
 # Check whether --with-pic or --without-pic was given.
 if test "${with_pic+set}" = set; then
   withval="$with_pic"
   pic_mode="$withval"
 else
   pic_mode=default
-fi;
+fi
+
 test -z "$pic_mode" && pic_mode=default
 
 # Use C for the default configuration in the libtool script
 tagname=
 lt_save_CC="$CC"
 
-
 ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 
 # Source file extension for C test sources.
@@ -140218,11 +108588,11 @@
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
+echo "configure:108594: 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
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
@@ -140237,11 +108607,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:140237: $lt_compile\"" >&5)
+   (eval echo "\"configure:108611: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:140241: \$? = $ac_status" >&5
+   echo "configure:108615: \$? = $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.
@@ -140254,8 +108624,8 @@
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+
+echo "$ac_t""$lt_cv_prog_compiler_rtti_exceptions" 1>&6
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -140269,9 +108639,9 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
+echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
+echo "configure:108644: checking for $compiler option to produce PIC" >&5
+ 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
     lt_prog_compiler_static='-static'
@@ -140509,18 +108879,17 @@
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
+echo "$ac_t""$lt_prog_compiler_pic" 1>&6
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6
+echo "configure:108891: 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
   lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
@@ -140535,11 +108904,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:140535: $lt_compile\"" >&5)
+   (eval echo "\"configure:108908: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:140539: \$? = $ac_status" >&5
+   echo "configure:108912: \$? = $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.
@@ -140552,8 +108921,8 @@
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6
+
+echo "$ac_t""$lt_cv_prog_compiler_pic_works" 1>&6
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -140580,10 +108949,10 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
+echo "configure:108954: 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
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
@@ -140608,8 +108977,8 @@
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6
+
+echo "$ac_t""$lt_cv_prog_compiler_static_works" 1>&6
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
@@ -140618,10 +108987,10 @@
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
+echo "configure:108992: 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
   lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
@@ -140639,11 +109008,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:140639: $lt_compile\"" >&5)
+   (eval echo "\"configure:109012: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:140643: \$? = $ac_status" >&5
+   echo "configure:109016: \$? = $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
@@ -140665,34 +109034,32 @@
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
+
+echo "$ac_t""$lt_cv_prog_compiler_c_o" 1>&6
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
+echo "configure:109046: 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
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  echo "$ac_t""$hard_links" 1>&6
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
+echo "configure:109063: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 
   runpath_var=
   allow_undefined_flag=
@@ -141101,19 +109468,15 @@
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
-
+       
 cat > conftest.$ac_ext <<EOF
-#line 141103 "configure"
+#line 109474 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-
+if { (eval echo configure:109479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
 	/^0/ {
@@ -141143,19 +109506,15 @@
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
-
+	 
 cat > conftest.$ac_ext <<EOF
-#line 141145 "configure"
+#line 109512 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-
+if { (eval echo configure:109517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
 	/^0/ {
@@ -141623,8 +109982,7 @@
     esac
   fi
 
-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6
+echo "$ac_t""$ld_shlibs" 1>&6
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -141644,16 +110002,12 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
+echo "configure:110007: checking whether -lc should be explicitly linked in" >&5
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
+      if { (eval echo configure:110011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -141667,11 +110021,7 @@
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag
         allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+        if { (eval echo configure:110025: \"$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
@@ -141682,16 +110032,15 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6
+      echo "$ac_t""$archive_cmds_need_lc" 1>&6
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
+echo "configure:110044: checking dynamic linker characteristics" >&5
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -141913,8 +110262,8 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -142292,19 +110641,18 @@
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+echo "$ac_t""$dynamic_linker" 1>&6
 test "$dynamic_linker" = no && can_build_shared=no
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'lt_cv_sys_lib_search_path_spec'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'lt_cv_sys_lib_dlsearch_path_spec'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -142316,8 +110664,8 @@
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
+echo "configure:110669: checking how to hardcode library paths into programs" >&5
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -142341,8 +110689,7 @@
   # directories.
   hardcode_action=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
+echo "$ac_t""$hardcode_action" 1>&6
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -142355,13 +110702,12 @@
 
 striplib=
 old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
+echo "configure:110707: 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"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
@@ -142369,16 +110715,13 @@
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
          old_striplib="$STRIP -S"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+         echo "$ac_t""yes" 1>&6
        else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
        ;;
    *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
     ;;
   esac
 fi
@@ -142410,551 +110753,313 @@
 
   darwin*)
   # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:110758: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 110766 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:110777: \"$ac_link\") 1>&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
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
+  echo "$ac_t""no" 1>&6
 
     lt_cv_dlopen="dyld"
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
-
+    
 fi
 
    ;;
 
   *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
+    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
+echo "configure:110806: 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 110811 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
+    which can conflict with char shl_load(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
+    builtin and then its argument prototype would still apply.  */
+char shl_load();
+
+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_shl_load) || defined (__stub___shl_load)
 choke me
 #else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
+shl_load();
 #endif
 
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:110834: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_shl_load=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   lt_cv_dlopen="shl_load"
 else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+echo "configure:110852: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 110860 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+    builtin and then its argument prototype would still apply.  */
+char shl_load();
+
+int main() {
+shl_load()
+; return 0; }
+EOF
+if { (eval echo configure:110871: \"$ac_link\") 1>&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 "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
+  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
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+echo "configure:110890: 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 110895 "configure"
+#include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
+    which can conflict with char dlopen(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+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_dlopen) || defined (__stub___dlopen)
 choke me
 #else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
+dlopen();
 #endif
 
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:110918: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dlopen=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   lt_cv_dlopen="dlopen"
 else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:110936: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 110944 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:110955: \"$ac_link\") 1>&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
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
+echo "configure:110974: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 110982 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:110993: \"$ac_link\") 1>&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
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
+echo "configure:111012: 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
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+cat > conftest.$ac_ext <<EOF
+#line 111020 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 /* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
+    builtin and then its argument prototype would still apply.  */
+char dld_link();
 
+int main() {
+dld_link()
+; return 0; }
+EOF
+if { (eval echo configure:111031: \"$ac_link\") 1>&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
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-
+	      
 fi
 
+	    
+fi
 
+	  
 fi
 
+	
+fi
 
+      
 fi
 
     ;;
@@ -142977,10 +111082,10 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
+echo "configure:111087: 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
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -142988,7 +111093,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 142988 "configure"
+#line 111097 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -143051,11 +111156,7 @@
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo configure:111160: \"$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
@@ -143070,17 +111171,17 @@
 fi
 rm -fr conftest*
 
-
+    
 fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+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 "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
+echo "configure:111183: 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
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -143088,7 +111189,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 143088 "configure"
+#line 111193 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -143151,11 +111252,7 @@
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo configure:111256: \"$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
@@ -143170,10 +111267,10 @@
 fi
 rm -fr conftest*
 
-
+      
 fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+
+echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -143195,13 +111292,12 @@
 
 
 # Report which library types will actually be built
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
+echo "configure:111297: checking if libtool supports shared libraries" >&5
+echo "$ac_t""$can_build_shared" 1>&6
 
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
+echo "configure:111301: 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
@@ -143221,15 +111317,13 @@
   fi
     ;;
 esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
+echo "$ac_t""$enable_shared" 1>&6
 
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
+echo "configure:111324: 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 "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
+echo "$ac_t""$enable_static" 1>&6
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -143322,10 +111416,8 @@
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  echo "$as_me:$LINENO: result:
-creating $ofile" >&5
-echo "${ECHO_T}
-creating $ofile" >&6
+  echo "$ac_t""
+creating $ofile" 1>&6
 
   cat <<__EOF__ >> "$cfgfile"
 #! $SHELL
@@ -143721,34 +111813,32 @@
 
 
 ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 CC="$lt_save_CC"
 
-
 # Check whether --with-tags or --without-tags was given.
 if test "${with_tags+set}" = set; then
   withval="$with_tags"
   tagnames="$withval"
-fi;
+fi
+
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+    echo "configure: warning: output file \`$ofile' does not exist" 1>&2
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+      echo "configure: warning: output file \`$ofile' does not look like a libtool script" 1>&2
     else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+      echo "configure: warning: using \`LTCC=$LTCC', extracted from \`$ofile'" 1>&2
     fi
   fi
   if test -z "$LTCFLAGS"; then
@@ -143765,17 +111855,13 @@
     # Check whether tagname contains only valid characters
     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
     "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
+    *)  { echo "configure: error: invalid tag name: $tagname" 1>&2; exit 1; }
 	;;
     esac
 
     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
     then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
+      { echo "configure: error: tag name \"$tagname\" already exists" 1>&2; exit 1; }
     fi
 
     # Update the list of available tags.
@@ -143787,13 +111873,13 @@
 	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 	    (test "X$CXX" != "Xg++"))) ; then
-
-
-ac_ext=cc
+	  
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
 
 
 
@@ -143908,19 +111994,19 @@
 if test "$GXX" = yes; then
   # Set up default GNU C++ configuration
 
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+  # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
   withval="$with_gnu_ld"
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi;
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+  echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
+echo "configure:112010: checking for ld used by $CC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -143949,14 +112035,14 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
+echo "configure:112040: checking for GNU ld" >&5
 else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+echo "configure:112043: checking for non-GNU ld" >&5
 fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -143986,19 +112072,15 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  echo "$ac_t""$LD" 1>&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&6
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+test -z "$LD" && { 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:112082: 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
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -144010,8 +112092,8 @@
   ;;
 esac
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+
+echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -144061,8 +112143,8 @@
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
+echo "configure:112148: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -144158,19 +112240,15 @@
       # -berok will link without error, but may produce a broken library.
       allow_undefined_flag_CXX='-berok'
       # Determine the default libpath from the value encoded in an empty executable.
-
+      
 cat > conftest.$ac_ext <<EOF
-#line 144160 "configure"
+#line 112246 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-
+if { (eval echo configure:112251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
 	/^0/ {
@@ -144201,19 +112279,15 @@
 	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
-
+	
 cat > conftest.$ac_ext <<EOF
-#line 144203 "configure"
+#line 112285 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-
+if { (eval echo configure:112290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
 	/^0/ {
@@ -144959,8 +113033,7 @@
     ld_shlibs_CXX=no
     ;;
 esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+echo "$ac_t""$ld_shlibs_CXX" 1>&6
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -144980,11 +113053,7 @@
 };
 EOF
 
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+if { (eval echo configure:113057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
 
@@ -145139,9 +113208,9 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
+echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
+echo "configure:113213: checking for $compiler option to produce PIC" >&5
+ 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
     lt_prog_compiler_wl_CXX='-Wl,'
@@ -145429,18 +113498,17 @@
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
+echo "$ac_t""$lt_prog_compiler_pic_CXX" 1>&6
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  
+echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6
+echo "configure:113510: 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
   lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
@@ -145455,11 +113523,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:145455: $lt_compile\"" >&5)
+   (eval echo "\"configure:113527: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:145459: \$? = $ac_status" >&5
+   echo "configure:113531: \$? = $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.
@@ -145472,8 +113540,8 @@
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6
+
+echo "$ac_t""$lt_cv_prog_compiler_pic_works_CXX" 1>&6
 
 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -145500,10 +113568,10 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
+echo "configure:113573: 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
   lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
@@ -145528,8 +113596,8 @@
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6
+
+echo "$ac_t""$lt_cv_prog_compiler_static_works_CXX" 1>&6
 
 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
@@ -145538,10 +113606,10 @@
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
+echo "configure:113611: 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
   lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
@@ -145559,11 +113627,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:145559: $lt_compile\"" >&5)
+   (eval echo "\"configure:113631: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:145563: \$? = $ac_status" >&5
+   echo "configure:113635: \$? = $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
@@ -145585,34 +113653,32 @@
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
+
+echo "$ac_t""$lt_cv_prog_compiler_c_o_CXX" 1>&6
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
+echo "configure:113665: 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
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  echo "$ac_t""$hard_links" 1>&6
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
+echo "configure:113682: 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
@@ -145637,8 +113703,7 @@
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+echo "$ac_t""$ld_shlibs_CXX" 1>&6
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -145658,16 +113723,12 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
+echo "configure:113728: checking whether -lc should be explicitly linked in" >&5
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
+      if { (eval echo configure:113732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -145681,11 +113742,7 @@
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
         allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+        if { (eval echo configure:113746: \"$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
@@ -145696,16 +113753,15 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
+      echo "$ac_t""$archive_cmds_need_lc_CXX" 1>&6
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
+echo "configure:113765: checking dynamic linker characteristics" >&5
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -145876,7 +113932,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
+   
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -146254,19 +114310,18 @@
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+echo "$ac_t""$dynamic_linker" 1>&6
 test "$dynamic_linker" = no && can_build_shared=no
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'lt_cv_sys_lib_search_path_spec'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'lt_cv_sys_lib_dlsearch_path_spec'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -146278,8 +114333,8 @@
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
+echo "configure:114338: 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" || \
@@ -146303,8 +114358,7 @@
   # directories.
   hardcode_action_CXX=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
+echo "$ac_t""$hardcode_action_CXX" 1>&6
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -146731,10 +114785,11 @@
 
 
 ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 CC=$lt_save_CC
 LDCXX=$LD
@@ -146753,9 +114808,7 @@
 	;;
 
       *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
+	{ echo "configure: error: Unsupported tag name: $tagname" 1>&2; exit 1; }
 	;;
       esac
 
@@ -146773,9 +114826,7 @@
     chmod +x "$ofile"
   else
     rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: unable to update list of available tagged configurations." 1>&2; exit 1; }
   fi
 fi
 
@@ -146795,12 +114846,12 @@
 
 
 
-
+  
 
 
 
 if test "$enable_debug" != "yes"; then
-
+  
   if test -z "$LIBTOOL"; then
     LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
   else
@@ -146824,10 +114875,8 @@
 CC=$old_CC
 
 
-  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  echo "$as_me:$LINENO: result: ${T_MD}Generating files${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Generating files${T_ME}" >&6
+  echo "$ac_t""" 1>&6
+  echo "$ac_t""${T_MD}Generating files${T_ME}" 1>&6
 
 
 CXXFLAGS_CLEAN=$CXXFLAGS
@@ -146844,17 +114893,8 @@
   pharcmd_install=
 fi;
 
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
-
-case $PHP_SAPI in
-  cli)
-    install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-    ;;
-  *)
-    install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
-    ;;
-esac
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
+install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets"
@@ -146863,34 +114903,37 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST install_targets"
 
 
+  PHP_VAR_SUBST="$PHP_VAR_SUBST install_binary_targets"
 
 
-    for header_file in Zend/ TSRM/ include/ main/ main/streams/; do
-
 
+  
+    for header_file in Zend/ TSRM/ include/ main/ main/streams/; do
+      
+  
   unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
+  
   cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "INSTALLHEADERS$unique=set"
-
+    
         INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-
+      
   fi
 
-    done
-
-
+    done 
+  
 
 
 
+  
   case TSRM in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "TSRM"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/TSRM/"; ac_bdir="TSRM/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -146903,12 +114946,12 @@
 
   old_IFS=$IFS
   for ac_src in TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.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
@@ -146927,14 +114970,14 @@
 
 
 
-
+  
   case main in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/main/"; ac_bdir="main/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -146952,12 +114995,12 @@
        strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
        network.c php_open_temporary_file.c php_logos.c \
        output.c getopt.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
@@ -146976,14 +115019,14 @@
 
 
 
-
+  
   case main/streams in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "main/streams"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/main/streams/"; ac_bdir="main/streams/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -146998,12 +115041,12 @@
   for ac_src in streams.c cast.c memory.c filter.c \
        plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \
        glob_wrapper.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
@@ -147022,14 +115065,14 @@
 
 
 
-
+  
   case /main in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "/main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir//main/"; ac_bdir="/main/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -147042,12 +115085,12 @@
 
   old_IFS=$IFS
   for ac_src in internal_functions.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
+      
       PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
@@ -147067,27 +115110,26 @@
 
 case $host_alias in
   *netware*)
-
-
+    
+  
     BUILD_DIR="$BUILD_DIR win32"
+  
 
-
-
-
+    
+  
     BUILD_DIR="$BUILD_DIR netware"
-
+  
 
     ;;
   *)
-
-
+    
   case /main in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "/main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir//main/"; ac_bdir="/main/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -147100,13 +115142,13 @@
 
   old_IFS=$IFS
   for ac_src in internal_functions_cli.c; do
-
+  
       IFS=.
       set $ac_src
       ac_obj=$1
       IFS=$old_IFS
-
-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+      
+      PHP_BINARY_OBJS="$PHP_BINARY_OBJS $ac_bdir$ac_obj.lo"
 
       case $ac_src in
         *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -147121,19 +115163,18 @@
 EOF
   done
 
-
     ;;
 esac
 
 
-
+  
   case Zend in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "Zend"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/Zend/"; ac_bdir="Zend/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -147156,12 +115197,12 @@
     zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
     zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
     zend_closures.c zend_float.c zend_canary.c zend_alloc_canary.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
@@ -147180,15 +115221,15 @@
 
 
 if test -r "$abs_srcdir/Zend/zend_objects.c"; then
-
-
+  
+  
   case Zend in
   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
   /*) ac_srcdir=`echo "Zend"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/Zend/"; ac_bdir="Zend/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -147201,12 +115242,12 @@
 
   old_IFS=$IFS
   for ac_src in zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.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
@@ -147237,8 +115278,8 @@
   /*) ac_srcdir=`echo "Zend"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
   *) ac_srcdir="$abs_srcdir/Zend/"; ac_bdir="Zend/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
   esac
-
-
+  
+  
 
   b_c_pre=$php_c_pre
   b_cxx_pre=$php_cxx_pre
@@ -147251,12 +115292,12 @@
 
   old_IFS=$IFS
   for ac_src in zend_execute.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
@@ -147274,24 +115315,19 @@
 
 
 
-
+  
     BUILD_DIR="$BUILD_DIR main main/streams"
+  
 
 
-
-
-    BUILD_DIR="$BUILD_DIR sapi/$PHP_SAPI sapi/cli"
-
-
-
-
+  
     BUILD_DIR="$BUILD_DIR TSRM"
+  
 
 
-
-
+  
     BUILD_DIR="$BUILD_DIR Zend"
-
+  
 
 
 
@@ -147330,10 +115366,9 @@
   cat $abs_srcdir/Makefile.global Makefile.fragments Makefile.objects >> Makefile
 
 
-
-cat >>confdefs.h <<\_ACEOF
+cat >> confdefs.h <<\EOF
 #define HAVE_BUILD_DEFS_H 1
-_ACEOF
+EOF
 
 
 $php_shtool mkdir -p pear/scripts
@@ -147384,7 +115419,7 @@
         if test "$PHP_MAJOR_VERSION" -lt "6"; then
           case $arg_name in
             enable-zend-multibyte) continue;;
-          esac
+          esac 
         fi
 
         is_arg_set=php_`echo $arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'`
@@ -147397,531 +115432,445 @@
   done
 
 
-          ac_config_files="$ac_config_files $ALL_OUTPUT_FILES"
-          ac_config_commands="$ac_config_commands default"
-cat >confcache <<\_ACEOF
+trap '' 1 2 15
+cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
 #
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
+EOF
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
   if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
 fi
 
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 
+DEFS=-DHAVE_CONFIG_H
 
+# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
 # Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
 # Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
+# configure, is in ./config.log if it exists.
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
 done
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
+ac_given_srcdir=$srcdir
 
+trap 'rm -fr `echo "$ALL_OUTPUT_FILES main/php_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+$ac_vpsub
+$extrasub
+s%@SHELL@%$SHELL%g
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
+s%@EGREP@%$EGREP%g
+s%@SED@%$SED%g
+s%@CONFIGURE_COMMAND@%$CONFIGURE_COMMAND%g
+s%@CONFIGURE_OPTIONS@%$CONFIGURE_OPTIONS%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@target@%$target%g
+s%@target_alias@%$target_alias%g
+s%@target_cpu@%$target_cpu%g
+s%@target_vendor@%$target_vendor%g
+s%@target_os@%$target_os%g
+s%@CC@%$CC%g
+s%@CPP@%$CPP%g
+s%@LN_S@%$LN_S%g
+s%@AWK@%$AWK%g
+s%@YACC@%$YACC%g
+s%@RE2C@%$RE2C%g
+s%@SHLIB_SUFFIX_NAME@%$SHLIB_SUFFIX_NAME%g
+s%@SHLIB_DL_SUFFIX_NAME@%$SHLIB_DL_SUFFIX_NAME%g
+s%@php_fpm_user@%$php_fpm_user%g
+s%@php_fpm_group@%$php_fpm_group%g
+s%@php_fpm_sysconfdir@%$php_fpm_sysconfdir%g
+s%@php_fpm_localstatedir@%$php_fpm_localstatedir%g
+s%@php_fpm_prefix@%$php_fpm_prefix%g
+s%@PROG_SENDMAIL@%$PROG_SENDMAIL%g
+s%@LIBOBJS@%$LIBOBJS%g
+s%@ALLOCA@%$ALLOCA%g
+s%@LTP@%$LTP%g
+s%@LTP_GENHTML@%$LTP_GENHTML%g
+s%@KRB5_CONFIG@%$KRB5_CONFIG%g
+s%@PKG_CONFIG@%$PKG_CONFIG%g
+s%@OPENSSL_INCDIR_OPT@%$OPENSSL_INCDIR_OPT%g
+s%@ICU_CONFIG@%$ICU_CONFIG%g
+s%@CXX@%$CXX%g
+s%@CXXCPP@%$CXXCPP%g
+s%@MYSQL_MODULE_TYPE@%$MYSQL_MODULE_TYPE%g
+s%@MYSQL_LIBS@%$MYSQL_LIBS%g
+s%@MYSQL_INCLUDE@%$MYSQL_INCLUDE%g
+s%@OCI8_SHARED_LIBADD@%$OCI8_SHARED_LIBADD%g
+s%@OCI8_DIR@%$OCI8_DIR%g
+s%@OCI8_ORACLE_VERSION@%$OCI8_ORACLE_VERSION%g
+s%@ODBC_INCLUDE@%$ODBC_INCLUDE%g
+s%@ODBC_LIBS@%$ODBC_LIBS%g
+s%@ODBC_LFLAGS@%$ODBC_LFLAGS%g
+s%@ODBC_TYPE@%$ODBC_TYPE%g
+s%@PDO_MYSQL_MODULE_TYPE@%$PDO_MYSQL_MODULE_TYPE%g
+s%@PDO_OCI_SHARED_LIBADD@%$PDO_OCI_SHARED_LIBADD%g
+s%@PDO_OCI_DIR@%$PDO_OCI_DIR%g
+s%@PDO_OCI_VERSION@%$PDO_OCI_VERSION%g
+s%@SNMP_CONFIG@%$SNMP_CONFIG%g
+s%@LEMON@%$LEMON%g
+s%@RANLIB@%$RANLIB%g
+s%@INLINE_CFLAGS@%$INLINE_CFLAGS%g
+s%@INCLUDE_PATH@%$INCLUDE_PATH%g
+s%@EXPANDED_PEAR_INSTALLDIR@%$EXPANDED_PEAR_INSTALLDIR%g
+s%@EXPANDED_EXTENSION_DIR@%$EXPANDED_EXTENSION_DIR%g
+s%@EXPANDED_BINDIR@%$EXPANDED_BINDIR%g
+s%@EXPANDED_SBINDIR@%$EXPANDED_SBINDIR%g
+s%@EXPANDED_MANDIR@%$EXPANDED_MANDIR%g
+s%@EXPANDED_LIBDIR@%$EXPANDED_LIBDIR%g
+s%@EXPANDED_DATADIR@%$EXPANDED_DATADIR%g
+s%@EXPANDED_SYSCONFDIR@%$EXPANDED_SYSCONFDIR%g
+s%@EXPANDED_LOCALSTATEDIR@%$EXPANDED_LOCALSTATEDIR%g
+s%@EXPANDED_PHP_CONFIG_FILE_PATH@%$EXPANDED_PHP_CONFIG_FILE_PATH%g
+s%@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@%$EXPANDED_PHP_CONFIG_FILE_SCAN_DIR%g
+s%@PHP_INSTALLED_SAPIS@%$PHP_INSTALLED_SAPIS%g
+s%@abs_builddir@%$abs_builddir%g
+s%@abs_srcdir@%$abs_srcdir%g
+s%@php_abs_top_builddir@%$php_abs_top_builddir%g
+s%@php_abs_top_srcdir@%$php_abs_top_srcdir%g
+s%@program_prefix@%$program_prefix%g
+s%@program_suffix@%$program_suffix%g
+s%@DEBUG_CFLAGS@%$DEBUG_CFLAGS%g
+s%@EXTENSION_DIR@%$EXTENSION_DIR%g
+s%@EXTRA_LDFLAGS@%$EXTRA_LDFLAGS%g
+s%@EXTRA_LDFLAGS_PROGRAM@%$EXTRA_LDFLAGS_PROGRAM%g
+s%@EXTRA_LIBS@%$EXTRA_LIBS%g
+s%@ZEND_EXTRA_LIBS@%$ZEND_EXTRA_LIBS%g
+s%@INCLUDES@%$INCLUDES%g
+s%@EXTRA_INCLUDES@%$EXTRA_INCLUDES%g
+s%@INSTALL_IT@%$INSTALL_IT%g
+s%@NATIVE_RPATHS@%$NATIVE_RPATHS%g
+s%@PEAR_INSTALLDIR@%$PEAR_INSTALLDIR%g
+s%@PHP_LDFLAGS@%$PHP_LDFLAGS%g
+s%@PHP_LIBS@%$PHP_LIBS%g
+s%@PHP_VERSION@%$PHP_VERSION%g
+s%@PHP_VERSION_ID@%$PHP_VERSION_ID%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
+s%@OBJEXT@%$OBJEXT%g
+s%@EXEEXT@%$EXEEXT%g
+s%@ECHO@%$ECHO%g
+s%@AR@%$AR%g
+s%@STRIP@%$STRIP%g
+s%@DSYMUTIL@%$DSYMUTIL%g
+s%@NMEDIT@%$NMEDIT%g
+s%@LIBTOOL@%$LIBTOOL%g
 
+CEOF
+EOF
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+cat >> $CONFIG_STATUS <<\EOF
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
   else
-    PATH_SEPARATOR=:
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
   fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
   else
-    as_ln_s='ln -s'
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
   fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
 fi
+EOF
 
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
+cat >> $CONFIG_STATUS <<EOF
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
+CONFIG_FILES=\${CONFIG_FILES-"$ALL_OUTPUT_FILES"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
 
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
 
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
 
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
+ac_dC='\3'
+ac_dD='%g'
+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
+ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_uB='\([ 	]\)%\1#\2define\3'
+ac_uC=' '
+ac_uD='\4%g'
+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_eB='$%\1#\2define\3'
+ac_eC=' '
+ac_eD='%g'
 
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+if test "${CONFIG_HEADERS+set}" != set; then
+EOF
+cat >> $CONFIG_STATUS <<EOF
+  CONFIG_HEADERS="main/php_config.h"
+EOF
+cat >> $CONFIG_STATUS <<\EOF
 fi
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  echo creating $ac_file
+
+  rm -f conftest.frag conftest.in conftest.out
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  cat $ac_file_inputs > conftest.in
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
+EOF
 
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
+# Transform confdefs.h into a sed script conftest.vals that substitutes
+# the proper values into config.h.in to produce config.h.  And first:
+# Protect against being on the right side of a sed subst in config.status.
+# Protect against being in an unquoted here document in config.status.
+rm -f conftest.vals
+cat > conftest.hdr <<\EOF
+s/[\\&%]/\\&/g
+s%[\\$`]%\\&%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
+s%ac_d%ac_u%gp
+s%ac_u%ac_e%gp
+EOF
+sed -n -f conftest.hdr confdefs.h > conftest.vals
+rm -f conftest.hdr
 
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+# This sed command replaces #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+cat >> conftest.vals <<\EOF
+s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+EOF
 
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
+# Break up conftest.vals because some shells have a limit on
+# the size of here documents, and old seds have small limits too.
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
+rm -f conftest.tail
+while :
 do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
+  ac_lines=`grep -c . conftest.vals`
+  # grep -c gives empty output for an empty file on some AIX systems.
+  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
+  # Write a limited-size here document to conftest.frag.
+  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
+  echo 'CEOF
+  sed -f conftest.frag conftest.in > conftest.out
+  rm -f conftest.in
+  mv conftest.out conftest.in
+' >> $CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
+  rm -f conftest.vals
+  mv conftest.tail conftest.vals
+done
+rm -f conftest.vals
+
+cat >> $CONFIG_STATUS <<\EOF
+  rm -f conftest.frag conftest.h
+  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
+  cat conftest.in >> conftest.h
+  rm -f conftest.in
+  if cmp -s $ac_file conftest.h 2>/dev/null; then
+    echo "$ac_file is unchanged"
+    rm -f conftest.h
+  else
+    # Remove last slash and all that follows it.  Not all systems have dirname.
+      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+      # The file is in a subdirectory.
+      test ! -d "$ac_dir" && mkdir "$ac_dir"
+    fi
+    rm -f $ac_file
+    mv conftest.h $ac_file
+  fi
+fi; done
 
+EOF
+cat >> $CONFIG_STATUS <<EOF
 
 
 if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then
@@ -148061,815 +116010,13 @@
 
 fi
 
+EOF
+cat >> $CONFIG_STATUS <<\EOF
 
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "$ALL_OUTPUT_FILES" ) CONFIG_FILES="$CONFIG_FILES $ALL_OUTPUT_FILES" ;;
-  "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-  "main/php_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS main/php_config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@EGREP@,$EGREP,;t t
-s,@SED@,$SED,;t t
-s,@CONFIGURE_COMMAND@,$CONFIGURE_COMMAND,;t t
-s,@CONFIGURE_OPTIONS@,$CONFIGURE_OPTIONS,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CPP@,$CPP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@AWK@,$AWK,;t t
-s,@YACC@,$YACC,;t t
-s,@RE2C@,$RE2C,;t t
-s,@SHLIB_SUFFIX_NAME@,$SHLIB_SUFFIX_NAME,;t t
-s,@SHLIB_DL_SUFFIX_NAME@,$SHLIB_DL_SUFFIX_NAME,;t t
-s,@php_fpm_user@,$php_fpm_user,;t t
-s,@php_fpm_group@,$php_fpm_group,;t t
-s,@php_fpm_sysconfdir@,$php_fpm_sysconfdir,;t t
-s,@php_fpm_localstatedir@,$php_fpm_localstatedir,;t t
-s,@php_fpm_prefix@,$php_fpm_prefix,;t t
-s,@PROG_SENDMAIL@,$PROG_SENDMAIL,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@ALLOCA@,$ALLOCA,;t t
-s,@LTP@,$LTP,;t t
-s,@LTP_GENHTML@,$LTP_GENHTML,;t t
-s,@KRB5_CONFIG@,$KRB5_CONFIG,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@OPENSSL_INCDIR_OPT@,$OPENSSL_INCDIR_OPT,;t t
-s,@ICU_CONFIG@,$ICU_CONFIG,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@MYSQL_MODULE_TYPE@,$MYSQL_MODULE_TYPE,;t t
-s,@MYSQL_LIBS@,$MYSQL_LIBS,;t t
-s,@MYSQL_INCLUDE@,$MYSQL_INCLUDE,;t t
-s,@OCI8_SHARED_LIBADD@,$OCI8_SHARED_LIBADD,;t t
-s,@OCI8_DIR@,$OCI8_DIR,;t t
-s,@OCI8_ORACLE_VERSION@,$OCI8_ORACLE_VERSION,;t t
-s,@ODBC_INCLUDE@,$ODBC_INCLUDE,;t t
-s,@ODBC_LIBS@,$ODBC_LIBS,;t t
-s,@ODBC_LFLAGS@,$ODBC_LFLAGS,;t t
-s,@ODBC_TYPE@,$ODBC_TYPE,;t t
-s,@PDO_MYSQL_MODULE_TYPE@,$PDO_MYSQL_MODULE_TYPE,;t t
-s,@PDO_OCI_SHARED_LIBADD@,$PDO_OCI_SHARED_LIBADD,;t t
-s,@PDO_OCI_DIR@,$PDO_OCI_DIR,;t t
-s,@PDO_OCI_VERSION@,$PDO_OCI_VERSION,;t t
-s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
-s,@LEMON@,$LEMON,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@INLINE_CFLAGS@,$INLINE_CFLAGS,;t t
-s,@INCLUDE_PATH@,$INCLUDE_PATH,;t t
-s,@EXPANDED_PEAR_INSTALLDIR@,$EXPANDED_PEAR_INSTALLDIR,;t t
-s,@EXPANDED_EXTENSION_DIR@,$EXPANDED_EXTENSION_DIR,;t t
-s,@EXPANDED_BINDIR@,$EXPANDED_BINDIR,;t t
-s,@EXPANDED_SBINDIR@,$EXPANDED_SBINDIR,;t t
-s,@EXPANDED_MANDIR@,$EXPANDED_MANDIR,;t t
-s,@EXPANDED_LIBDIR@,$EXPANDED_LIBDIR,;t t
-s,@EXPANDED_DATADIR@,$EXPANDED_DATADIR,;t t
-s,@EXPANDED_SYSCONFDIR@,$EXPANDED_SYSCONFDIR,;t t
-s,@EXPANDED_LOCALSTATEDIR@,$EXPANDED_LOCALSTATEDIR,;t t
-s,@EXPANDED_PHP_CONFIG_FILE_PATH@,$EXPANDED_PHP_CONFIG_FILE_PATH,;t t
-s,@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@,$EXPANDED_PHP_CONFIG_FILE_SCAN_DIR,;t t
-s,@PHP_INSTALLED_SAPIS@,$PHP_INSTALLED_SAPIS,;t t
-s,@abs_builddir@,$abs_builddir,;t t
-s,@abs_srcdir@,$abs_srcdir,;t t
-s,@php_abs_top_builddir@,$php_abs_top_builddir,;t t
-s,@php_abs_top_srcdir@,$php_abs_top_srcdir,;t t
-s,@program_prefix@,$program_prefix,;t t
-s,@program_suffix@,$program_suffix,;t t
-s,@DEBUG_CFLAGS@,$DEBUG_CFLAGS,;t t
-s,@EXTENSION_DIR@,$EXTENSION_DIR,;t t
-s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
-s,@EXTRA_LDFLAGS_PROGRAM@,$EXTRA_LDFLAGS_PROGRAM,;t t
-s,@EXTRA_LIBS@,$EXTRA_LIBS,;t t
-s,@ZEND_EXTRA_LIBS@,$ZEND_EXTRA_LIBS,;t t
-s,@INCLUDES@,$INCLUDES,;t t
-s,@EXTRA_INCLUDES@,$EXTRA_INCLUDES,;t t
-s,@INSTALL_IT@,$INSTALL_IT,;t t
-s,@NATIVE_RPATHS@,$NATIVE_RPATHS,;t t
-s,@PEAR_INSTALLDIR@,$PEAR_INSTALLDIR,;t t
-s,@PHP_LDFLAGS@,$PHP_LDFLAGS,;t t
-s,@PHP_LIBS@,$PHP_LIBS,;t t
-s,@PHP_VERSION@,$PHP_VERSION,;t t
-s,@PHP_VERSION_ID@,$PHP_VERSION_ID,;t t
-s,@ECHO@,$ECHO,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@DSYMUTIL@,$DSYMUTIL,;t t
-s,@ac_ct_DSYMUTIL@,$ac_ct_DSYMUTIL,;t t
-s,@NMEDIT@,$NMEDIT,;t t
-s,@ac_ct_NMEDIT@,$ac_ct_NMEDIT,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
+exit 0
+EOF
 chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 
diff -Naur php-5.3.23-patch1/configure.in php-5.3.23-patch2/configure.in
--- php-5.3.23-patch1/configure.in	2013-04-04 21:27:40.000000000 -0700
+++ php-5.3.23-patch2/configure.in	2013-04-04 21:36:54.000000000 -0700
@@ -305,8 +305,8 @@
 PTHREADS_CHECK
 PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAMES
-PHP_SAPI=default
 PHP_BUILD_PROGRAM
+PHP_SAPI=none
 
 
 dnl SAPI configuration.
@@ -325,6 +325,20 @@
 AC_MSG_CHECKING([for chosen SAPI module])
 AC_MSG_RESULT([$PHP_SAPI])
 
+dnl Show which binaries were selected
+AC_MSG_CHECKING([for executable SAPI binaries])
+if test "$PHP_BINARIES"; then
+  AC_MSG_RESULT([$PHP_BINARIES])
+else
+  AC_MSG_RESULT([none])
+fi
+
+dnl Exit early
+if test -z "$PHP_INSTALLED_SAPIS"; then
+  AC_MSG_ERROR([Nothing to build.])
+fi
+
+dnl force ZTS
 if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_ASSIGN_VARS
   PTHREADS_FLAGS
@@ -966,14 +980,8 @@
 enable_shared=yes
 enable_static=yes
 
-case $php_build_target in
-  program|static)
-    standard_libtool_flag='-prefer-non-pic -static'
-    if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
-        enable_shared=no
-    fi
-    ;;
-  shared)
+case $php_sapi_module in
+  shared[)]
     enable_static=no
     case $with_pic in
       yes)
@@ -985,6 +993,12 @@
     esac
     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
     ;;
+  *[)]
+    standard_libtool_flag='-prefer-non-pic -static'
+    if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
+      enable_shared=no
+    fi
+    ;;
 esac
 
 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
@@ -1222,24 +1236,15 @@
   ;;
 esac
 
-if test "$PHP_CLI" != "no"; then
-  PHP_CLI_TARGET="\$(SAPI_CLI_PATH)"
-  PHP_INSTALL_CLI_TARGET="install-cli"
-  PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c,, cli)
-  PHP_INSTALLED_SAPIS="cli $PHP_SAPI"
-  PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
-else
-  PHP_INSTALLED_SAPIS="$PHP_SAPI"
-fi
-
 PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
 
 PHP_SUBST(PHP_EXECUTABLE)
-PHP_SUBST(PHP_CLI_TARGET)
+
 PHP_SUBST(PHP_SAPI_OBJS)
-PHP_SUBST(PHP_CLI_OBJS)
+PHP_SUBST(PHP_BINARY_OBJS)
 PHP_SUBST(PHP_GLOBAL_OBJS)
 
+PHP_SUBST(PHP_BINARIES)
 PHP_SUBST(PHP_MODULES)
 PHP_SUBST(PHP_ZEND_EX)
 
@@ -1383,20 +1388,12 @@
   pharcmd_install=
 fi;
 
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
-
-case $PHP_SAPI in
-  cli)
-    install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-    ;;
-  *)
-    install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
-    ;;
-esac
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
+install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
 
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
+PHP_SUBST(install_binary_targets)
 
 PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
 
@@ -1421,7 +1418,7 @@
     PHP_ADD_BUILD_DIR(netware)
     ;;
   *)
-    PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
+    PHP_ADD_SOURCES_X(/main, internal_functions_cli.c,, PHP_BINARY_OBJS)
     ;;
 esac
 
@@ -1452,7 +1449,6 @@
 PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)
 
 PHP_ADD_BUILD_DIR(main main/streams)
-PHP_ADD_BUILD_DIR(sapi/$PHP_SAPI sapi/cli)
 PHP_ADD_BUILD_DIR(TSRM)
 PHP_ADD_BUILD_DIR(Zend)
 
diff -Naur php-5.3.23-patch1/generated_lists php-5.3.23-patch2/generated_lists
--- php-5.3.23-patch1/generated_lists	2013-04-04 21:27:15.000000000 -0700
+++ php-5.3.23-patch2/generated_lists	2013-04-04 21:38:06.000000000 -0700
@@ -1,3 +1,3 @@
 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_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/pdo/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_hooks/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/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/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
diff -Naur php-5.3.23-patch1/main/php_config.h.in php-5.3.23-patch2/main/php_config.h.in
--- php-5.3.23-patch1/main/php_config.h.in	2013-04-04 21:28:22.000000000 -0700
+++ php-5.3.23-patch2/main/php_config.h.in	2013-04-04 21:38:11.000000000 -0700
@@ -1,4 +1,4 @@
-/* main/php_config.h.in.  Generated from configure.in by autoheader.  */
+/* main/php_config.h.in.  Generated automatically from configure.in by autoheader.  */
 /* Leave this file alone */
 /*
    +----------------------------------------------------------------------+
@@ -21,8 +21,6 @@
 
 /* $Id$ */
 
-#ifndef ZEND_API
-
 #if defined(__GNUC__) && __GNUC__ >= 4
 # define ZEND_API __attribute__ ((visibility("default")))
 # define ZEND_DLEXPORT __attribute__ ((visibility("default")))
@@ -34,2424 +32,2922 @@
 #define ZEND_DLIMPORT
 
 
-#undef uint
-#undef ulong
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+#undef _ALL_SOURCE
+#endif
 
-/* Define if you want to enable memory limit support */
-#define MEMORY_LIMIT 0
+/* Define if using alloca.c.  */
+#undef C_ALLOCA
 
+/* Define to empty if the keyword does not work.  */
+#undef const
 
-/* */
-#undef AIX
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+#undef CRAY_STACKSEG_END
 
-/* Whether to use native BeOS threads */
-#undef BETHREADS
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef gid_t
 
-/* */
-#undef CDB_INCLUDE_FILE
+/* Define if you have alloca, as a function or macro.  */
+#undef HAVE_ALLOCA
 
-/* Define if system uses EBCDIC */
-#undef CHARSET_EBCDIC
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+#undef HAVE_ALLOCA_H
 
-/* Whether to build bcmath as dynamic module */
-#undef COMPILE_DL_BCMATH
+/* Define if you don't have vprintf but do have _doprnt.  */
+#undef HAVE_DOPRNT
 
-/* Whether to build bz2 as dynamic module */
-#undef COMPILE_DL_BZ2
+/* Define if your system has a working fnmatch function.  */
+#undef HAVE_FNMATCH
 
-/* Whether to build calendar as dynamic module */
-#undef COMPILE_DL_CALENDAR
+/* Define if your struct stat has st_blksize.  */
+#undef HAVE_ST_BLKSIZE
 
-/* Whether to build ctype as dynamic module */
-#undef COMPILE_DL_CTYPE
+/* Define if your struct stat has st_blocks.  */
+#undef HAVE_ST_BLOCKS
 
-/* Whether to build curl as dynamic module */
-#undef COMPILE_DL_CURL
+/* Define if your struct stat has st_rdev.  */
+#undef HAVE_ST_RDEV
 
-/* Whether to build date as dynamic module */
-#undef COMPILE_DL_DATE
+/* Define if your struct tm has tm_zone.  */
+#undef HAVE_TM_ZONE
 
-/* Whether to build dba as dynamic module */
-#undef COMPILE_DL_DBA
+/* Define if you don't have tm_zone but do have the external array
+   tzname.  */
+#undef HAVE_TZNAME
 
-/* Whether to build dom as dynamic module */
-#undef COMPILE_DL_DOM
+/* Define if utime(file, NULL) sets file's timestamp to the present.  */
+#undef HAVE_UTIME_NULL
 
-/* Whether to build enchant as dynamic module */
-#undef COMPILE_DL_ENCHANT
+/* Define if you have the vprintf function.  */
+#undef HAVE_VPRINTF
 
-/* Whether to build ereg as dynamic module */
-#undef COMPILE_DL_EREG
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
 
-/* Whether to build exif as dynamic module */
-#undef COMPILE_DL_EXIF
+/* Define if your C compiler doesn't accept -c and -o together.  */
+#undef NO_MINUS_C_MINUS_O
 
-/* Whether to build fileinfo as dynamic module */
-#undef COMPILE_DL_FILEINFO
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
 
-/* Whether to build filter as dynamic module */
-#undef COMPILE_DL_FILTER
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
 
-/* Whether to build ftp as dynamic module */
-#undef COMPILE_DL_FTP
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
 
-/* Whether to build gd as dynamic module */
-#undef COMPILE_DL_GD
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
 
-/* Whether to build gettext as dynamic module */
-#undef COMPILE_DL_GETTEXT
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+#undef TIME_WITH_SYS_TIME
 
-/* Whether to build gmp as dynamic module */
-#undef COMPILE_DL_GMP
+/* Define if your <sys/time.h> declares struct tm.  */
+#undef TM_IN_SYS_TIME
 
-/* Whether to build hash as dynamic module */
-#undef COMPILE_DL_HASH
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef uid_t
 
-/* Whether to build iconv as dynamic module */
-#undef COMPILE_DL_ICONV
+#undef uint
+#undef ulong
 
-/* Whether to build imap as dynamic module */
-#undef COMPILE_DL_IMAP
+/* The number of bytes in a char.  */
+#undef SIZEOF_CHAR
 
-/* Whether to build interbase as dynamic module */
-#undef COMPILE_DL_INTERBASE
+/* The number of bytes in a char *.  */
+#undef SIZEOF_CHAR_P
 
-/* Whether to build intl as dynamic module */
-#undef COMPILE_DL_INTL
+/* The number of bytes in a int.  */
+#undef SIZEOF_INT
 
-/* Whether to build json as dynamic module */
-#undef COMPILE_DL_JSON
+/* The number of bytes in a long.  */
+#undef SIZEOF_LONG
 
-/* Whether to build ldap as dynamic module */
-#undef COMPILE_DL_LDAP
+/* The number of bytes in a long int.  */
+#undef SIZEOF_LONG_INT
 
-/* Whether to build libxml as dynamic module */
-#undef COMPILE_DL_LIBXML
+/* The number of bytes in a long long.  */
+#undef SIZEOF_LONG_LONG
 
-/* Whether to build mbstring as dynamic module */
-#undef COMPILE_DL_MBSTRING
+/* The number of bytes in a long long int.  */
+#undef SIZEOF_LONG_LONG_INT
 
-/* Whether to build mcrypt as dynamic module */
-#undef COMPILE_DL_MCRYPT
+/* The number of bytes in a short.  */
+#undef SIZEOF_SHORT
 
-/* Whether to build mssql as dynamic module */
-#undef COMPILE_DL_MSSQL
+/* The number of bytes in a size_t.  */
+#undef SIZEOF_SIZE_T
 
-/* Whether to build mysql as dynamic module */
-#undef COMPILE_DL_MYSQL
+/* Define if you have the CreateProcess function.  */
+#undef HAVE_CREATEPROCESS
 
-/* Whether to build mysqli as dynamic module */
-#undef COMPILE_DL_MYSQLI
+/* Define if you have the acosh function.  */
+#undef HAVE_ACOSH
 
-/* Whether to build mysqlnd as dynamic module */
-#undef COMPILE_DL_MYSQLND
+/* Define if you have the alphasort function.  */
+#undef HAVE_ALPHASORT
 
-/* Whether to build oci8 as dynamic module */
-#undef COMPILE_DL_OCI8
+/* Define if you have the asctime_r function.  */
+#undef HAVE_ASCTIME_R
 
-/* Whether to build odbc as dynamic module */
-#undef COMPILE_DL_ODBC
+/* Define if you have the asinh function.  */
+#undef HAVE_ASINH
 
-/* Whether to build openssl as dynamic module */
-#undef COMPILE_DL_OPENSSL
+/* Define if you have the asprintf function.  */
+#undef HAVE_ASPRINTF
 
-/* Whether to build pcntl as dynamic module */
-#undef COMPILE_DL_PCNTL
+/* Define if you have the atanh function.  */
+#undef HAVE_ATANH
 
-/* Whether to build pcre as dynamic module */
-#undef COMPILE_DL_PCRE
+/* Define if you have the atoll function.  */
+#undef HAVE_ATOLL
 
-/* Whether to build pdo as dynamic module */
-#undef COMPILE_DL_PDO
+/* Define if you have the chroot function.  */
+#undef HAVE_CHROOT
 
-/* Whether to build pdo_dblib as dynamic module */
-#undef COMPILE_DL_PDO_DBLIB
+/* Define if you have the clearenv function.  */
+#undef HAVE_CLEARENV
 
-/* Whether to build pdo_firebird as dynamic module */
-#undef COMPILE_DL_PDO_FIREBIRD
+/* Define if you have the crypt function.  */
+#undef HAVE_CRYPT
 
-/* Whether to build pdo_mysql as dynamic module */
-#undef COMPILE_DL_PDO_MYSQL
+/* Define if you have the crypt_r function.  */
+#undef HAVE_CRYPT_R
 
-/* Whether to build pdo_oci as dynamic module */
-#undef COMPILE_DL_PDO_OCI
+/* Define if you have the ctermid function.  */
+#undef HAVE_CTERMID
 
-/* Whether to build pdo_odbc as dynamic module */
-#undef COMPILE_DL_PDO_ODBC
+/* Define if you have the ctime_r function.  */
+#undef HAVE_CTIME_R
 
-/* Whether to build pdo_pgsql as dynamic module */
-#undef COMPILE_DL_PDO_PGSQL
+/* Define if you have the cuserid function.  */
+#undef HAVE_CUSERID
 
-/* Whether to build pdo_sqlite as dynamic module */
-#undef COMPILE_DL_PDO_SQLITE
+/* Define if you have the fabsf function.  */
+#undef HAVE_FABSF
 
-/* Whether to build pgsql as dynamic module */
-#undef COMPILE_DL_PGSQL
+/* Define if you have the finite function.  */
+#undef HAVE_FINITE
 
-/* Whether to build phar as dynamic module */
-#undef COMPILE_DL_PHAR
+/* Define if you have the flock function.  */
+#undef HAVE_FLOCK
 
-/* Whether to build posix as dynamic module */
-#undef COMPILE_DL_POSIX
+/* Define if you have the floorf function.  */
+#undef HAVE_FLOORF
 
-/* Whether to build pspell as dynamic module */
-#undef COMPILE_DL_PSPELL
+/* Define if you have the fork function.  */
+#undef HAVE_FORK
 
-/* Whether to build readline as dynamic module */
-#undef COMPILE_DL_READLINE
+/* Define if you have the fpclass function.  */
+#undef HAVE_FPCLASS
 
-/* Whether to build recode as dynamic module */
-#undef COMPILE_DL_RECODE
+/* Define if you have the ftok function.  */
+#undef HAVE_FTOK
 
-/* Whether to build reflection as dynamic module */
-#undef COMPILE_DL_REFLECTION
+/* Define if you have the funopen function.  */
+#undef HAVE_FUNOPEN
 
-/* Whether to build session as dynamic module */
-#undef COMPILE_DL_SESSION
+/* Define if you have the gai_strerror function.  */
+#undef HAVE_GAI_STRERROR
 
-/* Whether to build shmop as dynamic module */
-#undef COMPILE_DL_SHMOP
+/* Define if you have the gcvt function.  */
+#undef HAVE_GCVT
 
-/* Whether to build simplexml as dynamic module */
-#undef COMPILE_DL_SIMPLEXML
+/* Define if you have the getcwd function.  */
+#undef HAVE_GETCWD
 
-/* Whether to build snmp as dynamic module */
-#undef COMPILE_DL_SNMP
+/* Define if you have the getgrgid_r function.  */
+#undef HAVE_GETGRGID_R
 
-/* Whether to build soap as dynamic module */
-#undef COMPILE_DL_SOAP
+/* Define if you have the getgrnam_r function.  */
+#undef HAVE_GETGRNAM_R
 
-/* Whether to build sockets as dynamic module */
-#undef COMPILE_DL_SOCKETS
+/* Define if you have the getgroups function.  */
+#undef HAVE_GETGROUPS
 
-/* Whether to build spl as dynamic module */
-#undef COMPILE_DL_SPL
+/* Define if you have the gethostname function.  */
+#undef HAVE_GETHOSTNAME
 
-/* Whether to build sqlite as dynamic module */
-#undef COMPILE_DL_SQLITE
+/* Define if you have the getloadavg function.  */
+#undef HAVE_GETLOADAVG
 
-/* Whether to build sqlite3 as dynamic module */
-#undef COMPILE_DL_SQLITE3
+/* Define if you have the getlogin function.  */
+#undef HAVE_GETLOGIN
 
-/* Whether to build standard as dynamic module */
-#undef COMPILE_DL_STANDARD
+/* Define if you have the getopt function.  */
+#undef HAVE_GETOPT
 
-/* Whether to build sybase_ct as dynamic module */
-#undef COMPILE_DL_SYBASE_CT
+/* Define if you have the getpgid function.  */
+#undef HAVE_GETPGID
 
-/* Whether to build sysvmsg as dynamic module */
-#undef COMPILE_DL_SYSVMSG
+/* Define if you have the getpid function.  */
+#undef HAVE_GETPID
 
-/* Whether to build sysvsem as dynamic module */
-#undef COMPILE_DL_SYSVSEM
+/* Define if you have the getpriority function.  */
+#undef HAVE_GETPRIORITY
 
-/* Whether to build sysvshm as dynamic module */
-#undef COMPILE_DL_SYSVSHM
+/* Define if you have the getprotobyname function.  */
+#undef HAVE_GETPROTOBYNAME
 
-/* Whether to build tidy as dynamic module */
-#undef COMPILE_DL_TIDY
+/* Define if you have the getprotobynumber function.  */
+#undef HAVE_GETPROTOBYNUMBER
 
-/* Whether to build tokenizer as dynamic module */
-#undef COMPILE_DL_TOKENIZER
+/* Define if you have the getpwnam_r function.  */
+#undef HAVE_GETPWNAM_R
 
-/* Whether to build wddx as dynamic module */
-#undef COMPILE_DL_WDDX
+/* Define if you have the getpwuid_r function.  */
+#undef HAVE_GETPWUID_R
 
-/* Whether to build xml as dynamic module */
-#undef COMPILE_DL_XML
+/* Define if you have the getrlimit function.  */
+#undef HAVE_GETRLIMIT
 
-/* Whether to build xmlreader as dynamic module */
-#undef COMPILE_DL_XMLREADER
+/* Define if you have the getrusage function.  */
+#undef HAVE_GETRUSAGE
 
-/* Whether to build xmlrpc as dynamic module */
-#undef COMPILE_DL_XMLRPC
+/* Define if you have the getservbyname function.  */
+#undef HAVE_GETSERVBYNAME
 
-/* Whether to build xmlwriter as dynamic module */
-#undef COMPILE_DL_XMLWRITER
+/* Define if you have the getservbyport function.  */
+#undef HAVE_GETSERVBYPORT
 
-/* Whether to build xsl as dynamic module */
-#undef COMPILE_DL_XSL
+/* Define if you have the getsid function.  */
+#undef HAVE_GETSID
 
-/* Whether to build zip as dynamic module */
-#undef COMPILE_DL_ZIP
+/* Define if you have the gettimeofday function.  */
+#undef HAVE_GETTIMEOFDAY
 
-/* Whether to build zlib as dynamic module */
-#undef COMPILE_DL_ZLIB
+/* Define if you have the getwd function.  */
+#undef HAVE_GETWD
 
-/* */
-#undef COOKIE_IO_FUNCTIONS_T
+/* Define if you have the glob function.  */
+#undef HAVE_GLOB
 
-/* */
-#undef COOKIE_SEEKER_USES_OFF64_T
+/* Define if you have the gmtime_r function.  */
+#undef HAVE_GMTIME_R
 
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
+/* Define if you have the grantpt function.  */
+#undef HAVE_GRANTPT
 
-/* Define if crypt_r has uses CRYPTD */
-#undef CRYPT_R_CRYPTD
+/* Define if you have the hstrerror function.  */
+#undef HAVE_HSTRERROR
 
-/* Define if struct crypt_data requires _GNU_SOURCE */
-#undef CRYPT_R_GNU_SOURCE
+/* Define if you have the hypot function.  */
+#undef HAVE_HYPOT
 
-/* Define if crypt_r uses struct crypt_data */
-#undef CRYPT_R_STRUCT_CRYPT_DATA
+/* Define if you have the inet_ntoa function.  */
+#undef HAVE_INET_NTOA
 
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
+/* Define if you have the inet_ntop function.  */
+#undef HAVE_INET_NTOP
 
-/* Define if the target system is darwin */
-#undef DARWIN
+/* Define if you have the inet_pton function.  */
+#undef HAVE_INET_PTON
 
-/* */
-#undef DB1_INCLUDE_FILE
+/* Define if you have the initgroups function.  */
+#undef HAVE_INITGROUPS
 
-/* */
-#undef DB1_VERSION
+/* Define if you have the isascii function.  */
+#undef HAVE_ISASCII
 
-/* */
-#undef DB2_INCLUDE_FILE
+/* Define if you have the isfinite function.  */
+#undef HAVE_ISFINITE
 
-/* */
-#undef DB3_INCLUDE_FILE
+/* Define if you have the isinf function.  */
+#undef HAVE_ISINF
 
-/* */
-#undef DB4_INCLUDE_FILE
+/* Define if you have the isnan function.  */
+#undef HAVE_ISNAN
 
-/* */
-#undef DBA_CDB
+/* Define if you have the kill function.  */
+#undef HAVE_KILL
 
-/* */
-#undef DBA_CDB_BUILTIN
+/* Define if you have the lchown function.  */
+#undef HAVE_LCHOWN
 
-/* */
-#undef DBA_CDB_MAKE
+/* Define if you have the ldap_parse_reference function.  */
+#undef HAVE_LDAP_PARSE_REFERENCE
 
-/* */
-#undef DBA_DB1
+/* Define if you have the ldap_parse_result function.  */
+#undef HAVE_LDAP_PARSE_RESULT
 
-/* */
-#undef DBA_DB2
+/* Define if you have the ldap_start_tls_s function.  */
+#undef HAVE_LDAP_START_TLS_S
 
-/* */
-#undef DBA_DB3
+/* Define if you have the link function.  */
+#undef HAVE_LINK
 
-/* */
-#undef DBA_DB4
+/* Define if you have the localeconv function.  */
+#undef HAVE_LOCALECONV
 
-/* */
-#undef DBA_DBM
+/* Define if you have the localtime_r function.  */
+#undef HAVE_LOCALTIME_R
 
-/* */
-#undef DBA_FLATFILE
+/* Define if you have the lockf function.  */
+#undef HAVE_LOCKF
 
-/* */
-#undef DBA_GDBM
+/* Define if you have the log1p function.  */
+#undef HAVE_LOG1P
 
-/* */
-#undef DBA_INIFILE
+/* Define if you have the lrand48 function.  */
+#undef HAVE_LRAND48
 
-/* */
-#undef DBA_NDBM
+/* Define if you have the makedev function.  */
+#undef HAVE_MAKEDEV
 
-/* */
-#undef DBA_QDBM
+/* Define if you have the mblen function.  */
+#undef HAVE_MBLEN
 
-/* */
-#undef DBM_INCLUDE_FILE
+/* Define if you have the mbrlen function.  */
+#undef HAVE_MBRLEN
 
-/* */
-#undef DBM_VERSION
+/* Define if you have the mbsinit function.  */
+#undef HAVE_MBSINIT
 
-/* */
-#undef DEFAULT_SHORT_OPEN_TAG
+/* Define if you have the memcpy function.  */
+#undef HAVE_MEMCPY
 
-/* Define if dlsym() requires a leading underscore in symbol names. */
-#undef DLSYM_NEEDS_UNDERSCORE
+/* Define if you have the memmove function.  */
+#undef HAVE_MEMMOVE
 
-/* Whether to enable chroot() function */
-#undef ENABLE_CHROOT_FUNC
+/* Define if you have the mempcpy function.  */
+#undef HAVE_MEMPCPY
 
-/* */
-#undef ENABLE_GD_TTF
+/* Define if you have the mkfifo function.  */
+#undef HAVE_MKFIFO
 
-/* */
-#undef ENCHANT_VERSION_STRING
+/* Define if you have the mknod function.  */
+#undef HAVE_MKNOD
 
-/* */
-#undef GDBM_INCLUDE_FILE
+/* Define if you have the mkstemp function.  */
+#undef HAVE_MKSTEMP
 
-/* Whether you use GNU Pth */
-#undef GNUPTH
+/* Define if you have the mmap function.  */
+#undef HAVE_MMAP
 
-/* Whether 3 arg set_rebind_proc() */
-#undef HAVE_3ARG_SETREBINDPROC
+/* Define if you have the mremap function.  */
+#undef HAVE_MREMAP
 
-/* Define to 1 if you have the `acosh' function. */
-#undef HAVE_ACOSH
+/* Define if you have the mysql_commit function.  */
+#undef HAVE_MYSQL_COMMIT
 
-/* */
-#undef HAVE_ADABAS
+/* Define if you have the mysql_next_result function.  */
+#undef HAVE_MYSQL_NEXT_RESULT
 
-/* whether the compiler supports __alignof__ */
-#undef HAVE_ALIGNOF
+/* Define if you have the mysql_sqlstate function.  */
+#undef HAVE_MYSQL_SQLSTATE
 
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
+/* Define if you have the mysql_stmt_prepare function.  */
+#undef HAVE_MYSQL_STMT_PREPARE
 
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
+/* Define if you have the nanosleep function.  */
+#undef HAVE_NANOSLEEP
 
-/* Define to 1 if you have the `alphasort' function. */
-#undef HAVE_ALPHASORT
+/* Define if you have the nice function.  */
+#undef HAVE_NICE
 
-/* Suhosin-Patch for PHP */
-#undef SUHOSIN_PATCH
+/* Define if you have the nl_langinfo function.  */
+#undef HAVE_NL_LANGINFO
 
-/* Whether you have AOLserver */
-#undef HAVE_AOLSERVER
+/* Define if you have the perror function.  */
+#undef HAVE_PERROR
 
-/* */
-#undef HAVE_APACHE
+/* Define if you have the poll function.  */
+#undef HAVE_POLL
 
-/* */
-#undef HAVE_APACHE_HOOKS
+/* Define if you have the ptsname function.  */
+#undef HAVE_PTSNAME
 
-/* Define to 1 if you have the <ApplicationServices/ApplicationServices.h>
-   header file. */
-#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
+/* Define if you have the putenv function.  */
+#undef HAVE_PUTENV
 
-/* */
-#undef HAVE_AP_COMPAT_H
+/* Define if you have the rand_r function.  */
+#undef HAVE_RAND_R
 
-/* */
-#undef HAVE_AP_CONFIG_H
+/* Define if you have the random function.  */
+#undef HAVE_RANDOM
 
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
+/* Define if you have the realpath function.  */
+#undef HAVE_REALPATH
 
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-#undef HAVE_ARPA_NAMESER_H
+/* Define if you have the rl_completion_matches function.  */
+#undef HAVE_RL_COMPLETION_MATCHES
 
-/* Define to 1 if you have the `asctime_r' function. */
-#undef HAVE_ASCTIME_R
+/* Define if you have the scandir function.  */
+#undef HAVE_SCANDIR
 
-/* Define to 1 if you have the `asinh' function. */
-#undef HAVE_ASINH
+/* Define if you have the setegid function.  */
+#undef HAVE_SETEGID
 
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
 
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define if you have the seteuid function.  */
+#undef HAVE_SETEUID
 
-/* Define to 1 if you have the `atanh' function. */
-#undef HAVE_ATANH
+/* Define if you have the setitimer function.  */
+#undef HAVE_SETITIMER
 
-/* whether atof() accepts INF */
-#undef HAVE_ATOF_ACCEPTS_INF
+/* Define if you have the setlocale function.  */
+#undef HAVE_SETLOCALE
 
-/* whether atof() accepts NAN */
-#undef HAVE_ATOF_ACCEPTS_NAN
+/* Define if you have the setpgid function.  */
+#undef HAVE_SETPGID
 
-/* Define to 1 if you have the `atoll' function. */
-#undef HAVE_ATOLL
+/* Define if you have the setpriority function.  */
+#undef HAVE_SETPRIORITY
 
-/* Define to 1 if you have the <atomic.h> header file. */
-#undef HAVE_ATOMIC_H
+/* Define if you have the setproctitle function.  */
+#undef HAVE_SETPROCTITLE
 
-/* whether the compiler supports __attribute__ ((__aligned__)) */
-#undef HAVE_ATTRIBUTE_ALIGNED
+/* Define if you have the setsid function.  */
+#undef HAVE_SETSID
 
-/* Whether you have bcmath */
-#undef HAVE_BCMATH
+/* Define if you have the setsockopt function.  */
+#undef HAVE_SETSOCKOPT
 
-/* */
-#undef HAVE_BIND_TEXTDOMAIN_CODESET
+/* Define if you have the setvbuf function.  */
+#undef HAVE_SETVBUF
 
-/* */
-#undef HAVE_BIRDSTEP
+/* Define if you have the shutdown function.  */
+#undef HAVE_SHUTDOWN
 
-/* Define if system has broken getcwd */
-#undef HAVE_BROKEN_GETCWD
+/* Define if you have the sigaction function.  */
+#undef HAVE_SIGACTION
 
-/* Define if your glibc borks on fopen with mode a+ */
-#undef HAVE_BROKEN_GLIBC_FOPEN_APPEND
+/* Define if you have the sigprocmask function.  */
+#undef HAVE_SIGPROCMASK
 
-/* Whether we have librecode 3.5 */
-#undef HAVE_BROKEN_RECODE
+/* Define if you have the sigsetjmp function.  */
+#undef HAVE_SIGSETJMP
 
-/* Konstantin Chuguev's iconv implementation */
-#undef HAVE_BSD_ICONV
+/* Define if you have the sigtimedwait function.  */
+#undef HAVE_SIGTIMEDWAIT
 
-/* */
-#undef HAVE_BUILD_DEFS_H
+/* Define if you have the sigwaitinfo function.  */
+#undef HAVE_SIGWAITINFO
 
-/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */
-#undef HAVE_BUILTIN_ATOMIC
+/* Define if you have the sin function.  */
+#undef HAVE_SIN
 
-/* */
-#undef HAVE_BUNDLED_PCRE
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
 
-/* */
-#undef HAVE_BZ2
+/* Define if you have the socketpair function.  */
+#undef HAVE_SOCKETPAIR
 
-/* */
-#undef HAVE_CALENDAR
+/* Define if you have the srand48 function.  */
+#undef HAVE_SRAND48
 
-/* Whether to compile with Caudium support */
-#undef HAVE_CAUDIUM
+/* Define if you have the srandom function.  */
+#undef HAVE_SRANDOM
 
-/* Define to 1 if you have the `chroot' function. */
-#undef HAVE_CHROOT
+/* Define if you have the statfs function.  */
+#undef HAVE_STATFS
 
-/* Define to 1 if you have the `clearenv' function. */
-#undef HAVE_CLEARENV
+/* Define if you have the statvfs function.  */
+#undef HAVE_STATVFS
 
-/* */
-#undef HAVE_CLI0CLI_H
+/* Define if you have the std_syslog function.  */
+#undef HAVE_STD_SYSLOG
 
-/* */
-#undef HAVE_CLI0CORE_H
+/* Define if you have the strcasecmp function.  */
+#undef HAVE_STRCASECMP
 
-/* */
-#undef HAVE_CLI0DEFS_H
+/* Define if you have the strcoll function.  */
+#undef HAVE_STRCOLL
 
-/* */
-#undef HAVE_CLI0ENV_H
+/* Define if you have the strdup function.  */
+#undef HAVE_STRDUP
 
-/* */
-#undef HAVE_CLI0EXT_H
+/* Define if you have the strerror function.  */
+#undef HAVE_STRERROR
 
-/* do we have clock_gettime? */
-#undef HAVE_CLOCK_GETTIME
+/* Define if you have the strfmon function.  */
+#undef HAVE_STRFMON
 
-/* do we have clock_get_time? */
-#undef HAVE_CLOCK_GET_TIME
+/* Define if you have the strftime function.  */
+#undef HAVE_STRFTIME
 
-/* Whether you have struct cmsghdr */
-#undef HAVE_CMSGHDR
+/* Define if you have the strlcat function.  */
+#undef HAVE_STRLCAT
 
-/* */
-#undef HAVE_CODBC
+/* Define if you have the strlcpy function.  */
+#undef HAVE_STRLCPY
 
-/* */
-#undef HAVE_COLORCLOSESTHWB
+/* Define if you have the strndup function.  */
+#undef HAVE_STRNDUP
 
-/* Whether you have a Continuity Server */
-#undef HAVE_CONTINUITY
+/* Define if you have the strnlen function.  */
+#undef HAVE_STRNLEN
 
-/* Define to 1 if you have the `CreateProcess' function. */
-#undef HAVE_CREATEPROCESS
+/* Define if you have the strpbrk function.  */
+#undef HAVE_STRPBRK
 
-/* */
-#undef HAVE_CRYPT
+/* Define if you have the strpncpy function.  */
+#undef HAVE_STRPNCPY
 
-/* Define to 1 if you have the <crypt.h> header file. */
-#undef HAVE_CRYPT_H
+/* Define if you have the strptime function.  */
+#undef HAVE_STRPTIME
 
-/* Define to 1 if you have the `crypt_r' function. */
-#undef HAVE_CRYPT_R
+/* Define if you have the strstr function.  */
+#undef HAVE_STRSTR
 
-/* Define to 1 if you have the `ctermid' function. */
-#undef HAVE_CTERMID
+/* Define if you have the strtod function.  */
+#undef HAVE_STRTOD
 
-/* Define to 1 if you have the `ctime_r' function. */
-#undef HAVE_CTIME_R
+/* Define if you have the strtok_r function.  */
+#undef HAVE_STRTOK_R
 
-/* */
-#undef HAVE_CTYPE
+/* Define if you have the strtol function.  */
+#undef HAVE_STRTOL
 
-/* */
-#undef HAVE_CURL
+/* Define if you have the strtoll function.  */
+#undef HAVE_STRTOLL
 
-/* */
-#undef HAVE_CURL_EASY_STRERROR
+/* Define if you have the strtoul function.  */
+#undef HAVE_STRTOUL
 
-/* Have cURL with GnuTLS support */
-#undef HAVE_CURL_GNUTLS
+/* Define if you have the strtoull function.  */
+#undef HAVE_STRTOULL
 
-/* */
-#undef HAVE_CURL_MULTI_STRERROR
+/* Define if you have the symlink function.  */
+#undef HAVE_SYMLINK
 
-/* Have cURL with OpenSSL support */
-#undef HAVE_CURL_OPENSSL
+/* Define if you have the tempnam function.  */
+#undef HAVE_TEMPNAM
 
-/* Have cURL with SSL support */
-#undef HAVE_CURL_SSL
+/* Define if you have the tzset function.  */
+#undef HAVE_TZSET
 
-/* */
-#undef HAVE_CURL_VERSION_INFO
+/* Define if you have the unlockpt function.  */
+#undef HAVE_UNLOCKPT
 
-/* Define to 1 if you have the `cuserid' function. */
-#undef HAVE_CUSERID
+/* Define if you have the unsetenv function.  */
+#undef HAVE_UNSETENV
 
-/* */
-#undef HAVE_DBA
+/* Define if you have the usleep function.  */
+#undef HAVE_USLEEP
 
-/* Whether you want DBMaker */
-#undef HAVE_DBMAKER
+/* Define if you have the utime function.  */
+#undef HAVE_UTIME
 
-/* */
-#undef HAVE_DCNGETTEXT
+/* Define if you have the utimes function.  */
+#undef HAVE_UTIMES
 
-/* Whether system headers declare timezone */
-#undef HAVE_DECLARED_TIMEZONE
+/* Define if you have the vasprintf function.  */
+#undef HAVE_VASPRINTF
 
-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-   */
-#undef HAVE_DECL_TZNAME
+/* Define if you have the vsnprintf function.  */
+#undef HAVE_VSNPRINTF
 
-/* Define to 1 if you have the <default_store.h> header file. */
-#undef HAVE_DEFAULT_STORE_H
+/* Define if you have the wait3 function.  */
+#undef HAVE_WAIT3
 
-/* do we have /dev/poll? */
-#undef HAVE_DEVPOLL
+/* Define if you have the waitpid function.  */
+#undef HAVE_WAITPID
 
-/* Define if the target system has /dev/urandom device */
-#undef HAVE_DEV_URANDOM
+/* Define if you have the </nsapi.h> header file.  */
+#undef HAVE__NSAPI_H
 
-/* Define to 1 if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define if you have the <ApplicationServices/ApplicationServices.h> header file.  */
+#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+/* Define if you have the <alloca.h> header file.  */
+#undef HAVE_ALLOCA_H
 
-/* */
-#undef HAVE_DLOPEN
+/* Define if you have the <arpa/inet.h> header file.  */
+#undef HAVE_ARPA_INET_H
 
-/* Whether you have dmalloc */
-#undef HAVE_DMALLOC
+/* Define if you have the <arpa/nameser.h> header file.  */
+#undef HAVE_ARPA_NAMESER_H
 
-/* */
-#undef HAVE_DNGETTEXT
+/* Define if you have the <assert.h> header file.  */
+#undef HAVE_ASSERT_H
 
-/* Define to 1 if you have the <dns.h> header file. */
-#undef HAVE_DNS_H
+/* Define if you have the <atomic.h> header file.  */
+#undef HAVE_ATOMIC_H
 
-/* */
-#undef HAVE_DNS_SEARCH
+/* Define if you have the <crypt.h> header file.  */
+#undef HAVE_CRYPT_H
 
-/* */
-#undef HAVE_DN_EXPAND
+/* Define if you have the <default_store.h> header file.  */
+#undef HAVE_DEFAULT_STORE_H
 
-/* */
-#undef HAVE_DN_SKIPNAME
+/* Define if you have the <dirent.h> header file.  */
+#undef HAVE_DIRENT_H
 
-/* */
-#undef HAVE_DOM
+/* Define if you have the <dlfcn.h> header file.  */
+#undef HAVE_DLFCN_H
 
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
+/* Define if you have the <dns.h> header file.  */
+#undef HAVE_DNS_H
 
-/* OpenSSL 0.9.7 or later */
-#undef HAVE_DSA_DEFAULT_METHOD
+/* Define if you have the <errno.h> header file.  */
+#undef HAVE_ERRNO_H
 
-/* embedded MySQL support enabled */
-#undef HAVE_EMBEDDED_MYSQLI
+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
 
-/* */
-#undef HAVE_EMPRESS
+/* Define if you have the <grp.h> header file.  */
+#undef HAVE_GRP_H
 
-/* */
-#undef HAVE_ENCHANT
+/* Define if you have the <ieeefp.h> header file.  */
+#undef HAVE_IEEEFP_H
 
-/* */
-#undef HAVE_ENCHANT_BROKER_SET_PARAM
+/* Define if you have the <inttypes.h> header file.  */
+#undef HAVE_INTTYPES_H
 
-/* do we have epoll? */
-#undef HAVE_EPOLL
+/* Define if you have the <langinfo.h> header file.  */
+#undef HAVE_LANGINFO_H
 
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
+/* Define if you have the <limits.h> header file.  */
+#undef HAVE_LIMITS_H
 
-/* */
-#undef HAVE_ESOOB
+/* Define if you have the <locale.h> header file.  */
+#undef HAVE_LOCALE_H
 
-/* Whether you want EXIF (metadata from images) support */
-#undef HAVE_EXIF
+/* Define if you have the <malloc.h> header file.  */
+#undef HAVE_MALLOC_H
 
-/* Define to 1 if you have the `fabsf' function. */
-#undef HAVE_FABSF
+/* Define if you have the <monetary.h> header file.  */
+#undef HAVE_MONETARY_H
 
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
+/* Define if you have the <ndir.h> header file.  */
+#undef HAVE_NDIR_H
 
-/* Define to 1 if you have the `finite' function. */
-#undef HAVE_FINITE
+/* Define if you have the <netdb.h> header file.  */
+#undef HAVE_NETDB_H
 
-/* Define to 1 if you have the `flock' function. */
-#undef HAVE_FLOCK
+/* Define if you have the <netinet/in.h> header file.  */
+#undef HAVE_NETINET_IN_H
 
-/* Define to 1 if you have the `floorf' function. */
-#undef HAVE_FLOORF
+/* Define if you have the <netinet/tcp.h> header file.  */
+#undef HAVE_NETINET_TCP_H
 
-/* Define if flush should be called explicitly after a buffered io. */
-#undef HAVE_FLUSHIO
+/* Define if you have the <openssl/crypto.h> header file.  */
+#undef HAVE_OPENSSL_CRYPTO_H
 
-/* Define to 1 if your system has a working POSIX `fnmatch' function. */
-#undef HAVE_FNMATCH
+/* Define if you have the <pwd.h> header file.  */
+#undef HAVE_PWD_H
 
-/* */
-#undef HAVE_FOPENCOOKIE
+/* Define if you have the <resolv.h> header file.  */
+#undef HAVE_RESOLV_H
 
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
+/* Define if you have the <signal.h> header file.  */
+#undef HAVE_SIGNAL_H
 
-/* Define to 1 if you have the `fpclass' function. */
-#undef HAVE_FPCLASS
+/* Define if you have the <st.h> header file.  */
+#undef HAVE_ST_H
 
-/* whether fpsetprec is present and usable */
-#undef HAVE_FPSETPREC
+/* Define if you have the <stdarg.h> header file.  */
+#undef HAVE_STDARG_H
 
-/* whether FPU control word can be manipulated by inline assembler */
-#undef HAVE_FPU_INLINE_ASM_X86
+/* Define if you have the <stdbool.h> header file.  */
+#undef HAVE_STDBOOL_H
 
-/* whether floatingpoint.h defines fp_except */
-#undef HAVE_FP_EXCEPT
+/* Define if you have the <stdint.h> header file.  */
+#undef HAVE_STDINT_H
 
-/* */
-#undef HAVE_FREETDS
+/* Define if you have the <stdio.h> header file.  */
+#undef HAVE_STDIO_H
 
-/* Define to 1 if you have the `ftok' function. */
-#undef HAVE_FTOK
+/* Define if you have the <stdlib.h> header file.  */
+#undef HAVE_STDLIB_H
 
-/* Whether you want FTP support */
-#undef HAVE_FTP
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
 
-/* Define to 1 if you have the `funopen' function. */
-#undef HAVE_FUNOPEN
+/* Define if you have the <strings.h> header file.  */
+#undef HAVE_STRINGS_H
 
-/* Define to 1 if you have the `gai_strerror' function. */
-#undef HAVE_GAI_STRERROR
+/* Define if you have the <sys/dir.h> header file.  */
+#undef HAVE_SYS_DIR_H
 
-/* Whether you have gcov */
-#undef HAVE_GCOV
+/* Define if you have the <sys/file.h> header file.  */
+#undef HAVE_SYS_FILE_H
 
-/* Define to 1 if you have the `gcvt' function. */
-#undef HAVE_GCVT
+/* Define if you have the <sys/ioctl.h> header file.  */
+#undef HAVE_SYS_IOCTL_H
 
-/* */
-#undef HAVE_GDIMAGECOLORRESOLVE
+/* Define if you have the <sys/ipc.h> header file.  */
+#undef HAVE_SYS_IPC_H
 
-/* */
-#undef HAVE_GD_BUNDLED
+/* Define if you have the <sys/loadavg.h> header file.  */
+#undef HAVE_SYS_LOADAVG_H
 
-/* */
-#undef HAVE_GD_CACHE_CREATE
+/* Define if you have the <sys/mkdev.h> header file.  */
+#undef HAVE_SYS_MKDEV_H
 
-/* */
-#undef HAVE_GD_DYNAMIC_CTX_EX
+/* Define if you have the <sys/mman.h> header file.  */
+#undef HAVE_SYS_MMAN_H
 
-/* */
-#undef HAVE_GD_FONTCACHESHUTDOWN
+/* Define if you have the <sys/mount.h> header file.  */
+#undef HAVE_SYS_MOUNT_H
 
-/* */
-#undef HAVE_GD_FONTMUTEX
+/* Define if you have the <sys/ndir.h> header file.  */
+#undef HAVE_SYS_NDIR_H
 
-/* */
-#undef HAVE_GD_FREEFONTCACHE
+/* Define if you have the <sys/param.h> header file.  */
+#undef HAVE_SYS_PARAM_H
 
-/* */
-#undef HAVE_GD_GD2
+/* Define if you have the <sys/poll.h> header file.  */
+#undef HAVE_SYS_POLL_H
 
-/* */
-#undef HAVE_GD_GIF_CREATE
+/* Define if you have the <sys/resource.h> header file.  */
+#undef HAVE_SYS_RESOURCE_H
 
-/* */
-#undef HAVE_GD_GIF_CTX
+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
 
-/* */
-#undef HAVE_GD_GIF_READ
+/* Define if you have the <sys/socket.h> header file.  */
+#undef HAVE_SYS_SOCKET_H
 
-/* */
-#undef HAVE_GD_IMAGEELLIPSE
+/* Define if you have the <sys/stat.h> header file.  */
+#undef HAVE_SYS_STAT_H
 
-/* */
-#undef HAVE_GD_IMAGESETBRUSH
+/* Define if you have the <sys/statfs.h> header file.  */
+#undef HAVE_SYS_STATFS_H
 
-/* */
-#undef HAVE_GD_IMAGESETTILE
+/* Define if you have the <sys/statvfs.h> header file.  */
+#undef HAVE_SYS_STATVFS_H
 
-/* */
-#undef HAVE_GD_JPG
+/* Define if you have the <sys/sysexits.h> header file.  */
+#undef HAVE_SYS_SYSEXITS_H
 
-/* */
-#undef HAVE_GD_PNG
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
 
-/* */
-#undef HAVE_GD_STRINGFT
+/* Define if you have the <sys/times.h> header file.  */
+#undef HAVE_SYS_TIMES_H
 
-/* */
-#undef HAVE_GD_STRINGFTEX
+/* Define if you have the <sys/types.h> header file.  */
+#undef HAVE_SYS_TYPES_H
 
-/* */
-#undef HAVE_GD_STRINGTTF
+/* Define if you have the <sys/uio.h> header file.  */
+#undef HAVE_SYS_UIO_H
 
-/* */
-#undef HAVE_GD_WBMP
+/* Define if you have the <sys/un.h> header file.  */
+#undef HAVE_SYS_UN_H
 
-/* */
-#undef HAVE_GD_XBM
+/* Define if you have the <sys/utsname.h> header file.  */
+#undef HAVE_SYS_UTSNAME_H
 
-/* */
-#undef HAVE_GD_XPM
+/* Define if you have the <sys/varargs.h> header file.  */
+#undef HAVE_SYS_VARARGS_H
 
-/* Define if you have the getaddrinfo function */
-#undef HAVE_GETADDRINFO
+/* Define if you have the <sys/vfs.h> header file.  */
+#undef HAVE_SYS_VFS_H
 
-/* Define to 1 if you have the `getcwd' function. */
-#undef HAVE_GETCWD
+/* Define if you have the <sys/wait.h> header file.  */
+#undef HAVE_SYS_WAIT_H
 
-/* Define to 1 if you have the `getgrgid_r' function. */
-#undef HAVE_GETGRGID_R
+/* Define if you have the <sysexits.h> header file.  */
+#undef HAVE_SYSEXITS_H
 
-/* Define to 1 if you have the `getgrnam_r' function. */
-#undef HAVE_GETGRNAM_R
+/* Define if you have the <syslog.h> header file.  */
+#undef HAVE_SYSLOG_H
 
-/* Define to 1 if you have the `getgroups' function. */
-#undef HAVE_GETGROUPS
+/* Define if you have the <termios.h> header file.  */
+#undef HAVE_TERMIOS_H
 
-/* */
-#undef HAVE_GETHOSTBYADDR
+/* Define if you have the <time.h> header file.  */
+#undef HAVE_TIME_H
 
-/* Define to 1 if you have the `gethostname' function. */
-#undef HAVE_GETHOSTNAME
+/* Define if you have the <tuxmodule.h> header file.  */
+#undef HAVE_TUXMODULE_H
 
-/* Define to 1 if you have the `getloadavg' function. */
-#undef HAVE_GETLOADAVG
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
 
-/* Define to 1 if you have the `getlogin' function. */
-#undef HAVE_GETLOGIN
+/* Define if you have the <unix.h> header file.  */
+#undef HAVE_UNIX_H
 
-/* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT
+/* Define if you have the <utime.h> header file.  */
+#undef HAVE_UTIME_H
 
-/* Define to 1 if you have the `getpgid' function. */
-#undef HAVE_GETPGID
+/* Define if you have the <wchar.h> header file.  */
+#undef HAVE_WCHAR_H
 
-/* Define to 1 if you have the `getpid' function. */
-#undef HAVE_GETPID
+/* Define if you have the <xmlparse.h> header file.  */
+#undef HAVE_XMLPARSE_H
 
-/* Define to 1 if you have the `getpriority' function. */
-#undef HAVE_GETPRIORITY
+/* Define if you have the <xmltok.h> header file.  */
+#undef HAVE_XMLTOK_H
 
-/* Define to 1 if you have the `getprotobyname' function. */
-#undef HAVE_GETPROTOBYNAME
+/* Define if you have the m library (-lm).  */
+#undef HAVE_LIBM
 
-/* Define to 1 if you have the `getprotobynumber' function. */
-#undef HAVE_GETPROTOBYNUMBER
+/* Define if the target system has /dev/urandom device */
+#undef HAVE_DEV_URANDOM
 
-/* Define to 1 if you have the `getpwnam_r' function. */
-#undef HAVE_GETPWNAM_R
+/* Suhosin Patch */
+#undef SUHOSIN_PATCH
 
-/* Define to 1 if you have the `getpwuid_r' function. */
-#undef HAVE_GETPWUID_R
+/* Whether you have AOLserver */
+#undef HAVE_AOLSERVER
 
-/* Define to 1 if you have the `getrlimit' function. */
-#undef HAVE_GETRLIMIT
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* Define to 1 if you have the `getrusage' function. */
-#undef HAVE_GETRUSAGE
+/*   */
+#undef HAVE_AP_COMPAT_H
 
-/* Define to 1 if you have the `getservbyname' function. */
-#undef HAVE_GETSERVBYNAME
+/*   */
+#undef HAVE_APACHE
 
-/* Define to 1 if you have the `getservbyport' function. */
-#undef HAVE_GETSERVBYPORT
+/*   */
+#undef HAVE_APACHE
 
-/* Define to 1 if you have the `getsid' function. */
-#undef HAVE_GETSID
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* Define to 1 if you have the `getwd' function. */
-#undef HAVE_GETWD
+/*   */
+#undef HAVE_AP_COMPAT_H
 
-/* */
-#undef HAVE_GICONV_H
+/*   */
+#undef HAVE_OLD_COMPAT_H
 
-/* glibc's iconv implementation */
-#undef HAVE_GLIBC_ICONV
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* Define to 1 if you have the `glob' function. */
-#undef HAVE_GLOB
+/*   */
+#undef HAVE_AP_COMPAT_H
 
-/* */
-#undef HAVE_GMP
+/*   */
+#undef HAVE_OLD_COMPAT_H
 
-/* Define to 1 if you have the `gmtime_r' function. */
-#undef HAVE_GMTIME_R
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* Define to 1 if you have the `grantpt' function. */
-#undef HAVE_GRANTPT
+/*   */
+#undef HAVE_AP_COMPAT_H
 
-/* Define to 1 if you have the <grp.h> header file. */
-#undef HAVE_GRP_H
+/*   */
+#undef HAVE_OLD_COMPAT_H
 
-/* Have HASH Extension */
-#undef HAVE_HASH_EXT
+/*   */
+#undef USE_TRANSFER_TABLES
 
-/* Define to 1 if you have the `hstrerror' function. */
-#undef HAVE_HSTRERROR
+/*   */
+#undef PHP_APACHE_HAVE_CLIENT_FD
 
-/* */
-#undef HAVE_HTONL
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* whether HUGE_VAL == INF */
-#undef HAVE_HUGE_VAL_INF
+/*   */
+#undef HAVE_AP_COMPAT_H
 
-/* whether HUGE_VAL + -HUGEVAL == NAN */
-#undef HAVE_HUGE_VAL_NAN
+/*   */
+#undef HAVE_APACHE_HOOKS
 
-/* Define to 1 if you have the `hypot' function. */
-#undef HAVE_HYPOT
+/*   */
+#undef HAVE_APACHE
 
-/* */
-#undef HAVE_IBASE
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* */
-#undef HAVE_IBMDB2
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* IBM iconv implementation */
-#undef HAVE_IBM_ICONV
+/*   */
+#undef HAVE_AP_COMPAT_H
 
-/* */
-#undef HAVE_ICONV
+/*   */
+#undef HAVE_OLD_COMPAT_H
 
-/* Define to 1 if you have the <ieeefp.h> header file. */
-#undef HAVE_IEEEFP_H
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* */
-#undef HAVE_IMAP
+/*   */
+#undef HAVE_AP_COMPAT_H
 
-/* */
-#undef HAVE_IMAP2000
+/*   */
+#undef HAVE_OLD_COMPAT_H
 
-/* */
-#undef HAVE_IMAP2001
+/*   */
+#undef HAVE_AP_CONFIG_H
 
-/* */
-#undef HAVE_IMAP2004
+/*   */
+#undef HAVE_AP_COMPAT_H
 
-/* */
-#undef HAVE_IMAP_AUTH_GSS
+/*   */
+#undef HAVE_OLD_COMPAT_H
 
-/* */
-#undef HAVE_IMAP_KRB
+/*   */
+#undef USE_TRANSFER_TABLES
 
-/* */
-#undef HAVE_IMAP_MUTF7
+/*   */
+#undef PHP_APACHE_HAVE_CLIENT_FD
 
-/* */
-#undef HAVE_IMAP_SSL
+/* Whether to compile with Caudium support */
+#undef HAVE_CAUDIUM
 
-/* */
-#undef HAVE_INET_ATON
+/* Whether you have a Continuity Server */
+#undef HAVE_CONTINUITY
 
-/* Define to 1 if you have the `inet_ntoa' function. */
-#undef HAVE_INET_NTOA
+/* do we have prctl? */
+#undef HAVE_PRCTL
 
-/* Define to 1 if you have the `inet_ntop' function. */
-#undef HAVE_INET_NTOP
+/* do we have clock_gettime? */
+#undef HAVE_CLOCK_GETTIME
 
-/* Define to 1 if you have the `inet_pton' function. */
-#undef HAVE_INET_PTON
+/* do we have clock_get_time? */
+#undef HAVE_CLOCK_GET_TIME
 
-/* Define to 1 if you have the `initgroups' function. */
-#undef HAVE_INITGROUPS
+/* do we have ptrace? */
+#undef HAVE_PTRACE
 
-/* Define if int32_t type is present. */
-#undef HAVE_INT32_T
+/* do we have mach_vm_read? */
+#undef HAVE_MACH_VM_READ
 
-/* Whether intmax_t is available */
-#undef HAVE_INTMAX_T
+/* /proc/pid/mem interface */
+#undef PROC_MEM_FILE
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
+/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */
+#undef HAVE_BUILTIN_ATOMIC
 
-/* */
-#undef HAVE_IODBC
+/* do we have TCP_INFO? */
+#undef HAVE_LQ_TCP_INFO
 
-/* */
-#undef HAVE_IODBC_H
+/* do we have SO_LISTENQxxx? */
+#undef HAVE_LQ_SO_LISTENQ
 
-/* Whether to enable IPv6 support */
-#undef HAVE_IPV6
+/* do we have sysconf? */
+#undef HAVE_SYSCONF
 
-/* Define to 1 if you have the `isascii' function. */
-#undef HAVE_ISASCII
+/* do we have times? */
+#undef HAVE_TIMES
 
-/* Define to 1 if you have the `isfinite' function. */
-#undef HAVE_ISFINITE
+/* do we have kqueue? */
+#undef HAVE_KQUEUE
 
-/* Define to 1 if you have the `isinf' function. */
-#undef HAVE_ISINF
+/* do we have port framework? */
+#undef HAVE_PORT
 
-/* Define to 1 if you have the `isnan' function. */
-#undef HAVE_ISNAN
+/* do we have /dev/poll? */
+#undef HAVE_DEVPOLL
 
-/* */
-#undef HAVE_ISQLEXT_H
+/* do we have epoll? */
+#undef HAVE_EPOLL
 
-/* */
-#undef HAVE_ISQL_H
+/* do we have poll? */
+#undef HAVE_POLL
 
-/* whether to enable JavaScript Object Serialization support */
-#undef HAVE_JSON
+/* do we have select? */
+#undef HAVE_SELECT
 
-/* Define to 1 if you have the `kill' function. */
-#undef HAVE_KILL
+/* fpm user name */
+#undef PHP_FPM_USER
 
-/* do we have kqueue? */
-#undef HAVE_KQUEUE
+/* fpm group name */
+#undef PHP_FPM_GROUP
 
-/* Define to 1 if you have the <langinfo.h> header file. */
-#undef HAVE_LANGINFO_H
+/*   */
+#undef WITH_ZEUS
 
-/* Define to 1 if you have the `lchown' function. */
-#undef HAVE_LCHOWN
+/* Whether you have a Netscape/iPlanet/Sun Webserver */
+#undef HAVE_NSAPI
 
-/* */
-#undef HAVE_LDAP
+/* Whether you have phttpd */
+#undef HAVE_PHTTPD
 
-/* Define to 1 if you have the `ldap_parse_reference' function. */
-#undef HAVE_LDAP_PARSE_REFERENCE
+/* whether you want Pi3Web support */
+#undef WITH_PI3WEB
 
-/* Define to 1 if you have the `ldap_parse_result' function. */
-#undef HAVE_LDAP_PARSE_RESULT
+/* Whether you use Roxen */
+#undef HAVE_ROXEN
 
-/* LDAP SASL support */
-#undef HAVE_LDAP_SASL
+/* Whether to use Roxen in ZTS mode */
+#undef ROXEN_USE_ZTS
 
-/* */
-#undef HAVE_LDAP_SASL_H
+/* Define if the socklen_t typedef is in sys/socket.h */
+#undef HAVE_SOCKLEN_T
 
-/* */
-#undef HAVE_LDAP_SASL_SASL_H
+/* Define if sockaddr_un in sys/un.h contains a sun_len component */
+#undef HAVE_SOCKADDR_UN_SUN_LEN
 
-/* Define to 1 if you have the `ldap_start_tls_s' function. */
-#undef HAVE_LDAP_START_TLS_S
+/* Define if cross-process locking is required by accept() */
+#undef USE_LOCKING
 
-/* */
-#undef HAVE_LIBBIND
+/* Define if system uses EBCDIC */
+#undef CHARSET_EBCDIC
 
-/* */
-#undef HAVE_LIBCRYPT
+/* Define if processor uses big-endian word */
+#undef WORDS_BIGENDIAN
 
-/* */
-#undef HAVE_LIBDL
+/* whether write(2) works */
+#undef PHP_WRITE_STDOUT
 
-/* */
-#undef HAVE_LIBDNET_STUB
+/*   */
+#undef HAVE_SOCKET
 
-/* */
-#undef HAVE_LIBEDIT
+/*   */
+#undef HAVE_SOCKET
 
-/* */
-#undef HAVE_LIBEXPAT
+/*   */
+#undef HAVE_LIBSOCKET
 
-/* */
-#undef HAVE_LIBFREETYPE
+/*   */
+#undef HAVE_SOCKETPAIR
 
-/* */
-#undef HAVE_LIBGD
+/*   */
+#undef HAVE_SOCKETPAIR
 
-/* */
-#undef HAVE_LIBGD13
+/*   */
+#undef HAVE_LIBSOCKET
 
-/* */
-#undef HAVE_LIBGD15
+/*   */
+#undef HAVE_HTONL
 
-/* */
-#undef HAVE_LIBGD20
+/*   */
+#undef HAVE_HTONL
 
-/* */
-#undef HAVE_LIBGD204
+/*   */
+#undef HAVE_LIBSOCKET
 
-/* */
-#undef HAVE_LIBICONV
+/*   */
+#undef HAVE_GETHOSTNAME
 
-/* */
-#undef HAVE_LIBINTL
+/*   */
+#undef HAVE_GETHOSTNAME
 
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
+/*   */
+#undef HAVE_LIBNSL
 
-/* */
-#undef HAVE_LIBMCRYPT
+/*   */
+#undef HAVE_GETHOSTBYADDR
 
-/* Whether you have libmm */
-#undef HAVE_LIBMM
+/*   */
+#undef HAVE_GETHOSTBYADDR
 
-/* */
+/*   */
 #undef HAVE_LIBNSL
 
-/* */
-#undef HAVE_LIBPAM
+/*   */
+#undef HAVE_YP_GET_DEFAULT_DOMAIN
 
-/* */
-#undef HAVE_LIBRARYMANAGER_H
+/*   */
+#undef HAVE_YP_GET_DEFAULT_DOMAIN
 
-/* */
-#undef HAVE_LIBREADLINE
+/*   */
+#undef HAVE_LIBNSL
 
-/* Whether we have librecode 3.5 or higher */
-#undef HAVE_LIBRECODE
+/*   */
+#undef HAVE_DLOPEN
 
-/* */
-#undef HAVE_LIBRESOLV
+/*   */
+#undef HAVE_DLOPEN
 
-/* */
-#undef HAVE_LIBRT
+/*   */
+#undef HAVE_LIBDL
 
-/* */
-#undef HAVE_LIBSOCKET
+/*   */
+#undef HAVE_LIBDL
 
-/* */
-#undef HAVE_LIBT1
+/*   */
+#undef HAVE_INET_ATON
 
-/* */
-#undef HAVE_LIBXML
+/*   */
+#undef HAVE_INET_ATON
 
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+/*   */
+#undef HAVE_LIBRESOLV
 
-/* Define to 1 if you have the `link' function. */
-#undef HAVE_LINK
+/*   */
+#undef HAVE_INET_ATON
 
-/* Define to 1 if you have the `localeconv' function. */
-#undef HAVE_LOCALECONV
+/*   */
+#undef HAVE_LIBBIND
 
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
+/*   */
+#undef HAVE_FOPENCOOKIE
 
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
+/*   */
+#undef COOKIE_IO_FUNCTIONS_T
 
-/* Define to 1 if you have the `lockf' function. */
-#undef HAVE_LOCKF
+/*   */
+#undef COOKIE_SEEKER_USES_OFF64_T
 
-/* Define to 1 if you have the `log1p' function. */
-#undef HAVE_LOG1P
+/* Define if system has broken getcwd */
+#undef HAVE_BROKEN_GETCWD
 
-/* do we have SO_LISTENQxxx? */
-#undef HAVE_LQ_SO_LISTENQ
+/* Define if your glibc borks on fopen with mode a+ */
+#undef HAVE_BROKEN_GLIBC_FOPEN_APPEND
 
-/* do we have TCP_INFO? */
-#undef HAVE_LQ_TCP_INFO
+/* Whether localtime_r is declared */
+#undef MISSING_LOCALTIME_R_DECL
 
-/* Define to 1 if you have the `lrand48' function. */
-#undef HAVE_LRAND48
+/* Whether gmtime_r is declared */
+#undef MISSING_GMTIME_R_DECL
 
-/* do we have mach_vm_read? */
-#undef HAVE_MACH_VM_READ
+/* Whether asctime_r is declared */
+#undef MISSING_ASCTIME_R_DECL
 
-/* Define to 1 if you have the `makedev' function. */
-#undef HAVE_MAKEDEV
+/* Whether ctime_r is declared */
+#undef MISSING_CTIME_R_DECL
 
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
+/* Whether strtok_r is declared */
+#undef MISSING_STRTOK_R_DECL
 
-/* Define to 1 if you have the `mblen' function. */
-#undef HAVE_MBLEN
+/*   */
+#undef MISSING_FCLOSE_DECL
 
-/* whether to have multibyte regex support */
-#undef HAVE_MBREGEX
+/*   */
+#undef MISSING_FCLOSE_DECL
 
-/* Define to 1 if you have the `mbrlen' function. */
-#undef HAVE_MBRLEN
+/* whether you have tm_gmtoff in struct tm */
+#undef HAVE_TM_GMTOFF
 
-/* Define to 1 if you have the `mbsinit' function. */
-#undef HAVE_MBSINIT
+/* whether you have struct flock */
+#undef HAVE_STRUCT_FLOCK
 
-/* Define if your system has mbstate_t in wchar.h */
-#undef HAVE_MBSTATE_T
+/* Whether you have socklen_t */
+#undef HAVE_SOCKLEN_T
 
-/* whether to have multibyte string support */
-#undef HAVE_MBSTRING
+/* Size of intmax_t */
+#undef SIZEOF_INTMAX_T
 
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
+/* Whether intmax_t is available */
+#undef HAVE_INTMAX_T
 
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
+/* Size of ssize_t */
+#undef SIZEOF_SSIZE_T
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Whether ssize_t is available */
+#undef HAVE_SSIZE_T
 
-/* Define to 1 if you have the `mempcpy' function. */
-#undef HAVE_MEMPCPY
+/* Size of ptrdiff_t */
+#undef SIZEOF_PTRDIFF_T
 
-/* Define if the target system has support for memory allocation using
-   mmap(MAP_ANON) */
-#undef HAVE_MEM_MMAP_ANON
+/* Whether ptrdiff_t is available */
+#undef HAVE_PTRDIFF_T
 
-/* Define if the target system has support for memory allocation using
-   mmap("/dev/zero") */
-#undef HAVE_MEM_MMAP_ZERO
+/* Whether you have struct sockaddr_storage */
+#undef HAVE_SOCKADDR_STORAGE
 
-/* Define to 1 if you have the `mkfifo' function. */
-#undef HAVE_MKFIFO
+/* Whether struct sockaddr has field sa_len */
+#undef HAVE_SOCKADDR_SA_LEN
 
-/* Define to 1 if you have the `mknod' function. */
-#undef HAVE_MKNOD
+/*   */
+#undef HAVE_NANOSLEEP
 
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
+/*   */
+#undef HAVE_LIBRT
 
-/* Define to 1 if you have the `mmap' function. */
-#undef HAVE_MMAP
+/* Define if you have the getaddrinfo function */
+#undef HAVE_GETADDRINFO
 
-/* Define to 1 if you have the <monetary.h> header file. */
-#undef HAVE_MONETARY_H
+/* Define if you have the __sync_fetch_and_add function */
+#undef HAVE_SYNC_FETCH_AND_ADD
 
-/* Define to 1 if you have the `mremap' function. */
-#undef HAVE_MREMAP
+/* Whether system headers declare timezone */
+#undef HAVE_DECLARED_TIMEZONE
 
-/* */
-#undef HAVE_MSSQL
+/* Whether you have HP-UX 10.x */
+#undef PHP_HPUX_TIME_R
 
-/* Whether you have MySQL */
-#undef HAVE_MYSQL
+/* Whether you have IRIX-style functions */
+#undef PHP_IRIX_TIME_R
 
-/* */
-#undef HAVE_MYSQLILIB
+/* whether you have POSIX readdir_r */
+#undef HAVE_POSIX_READDIR_R
 
-/* Define to 1 if you have the `mysql_commit' function. */
-#undef HAVE_MYSQL_COMMIT
+/* whether you have old-style readdir_r */
+#undef HAVE_OLD_READDIR_R
 
-/* Define to 1 if you have the `mysql_next_result' function. */
-#undef HAVE_MYSQL_NEXT_RESULT
+/*   */
+#undef in_addr_t
 
-/* Define to 1 if you have the `mysql_sqlstate' function. */
-#undef HAVE_MYSQL_SQLSTATE
+/* Define if crypt_r has uses CRYPTD */
+#undef CRYPT_R_CRYPTD
 
-/* Define to 1 if you have the `mysql_stmt_prepare' function. */
-#undef HAVE_MYSQL_STMT_PREPARE
+/* Define if crypt_r uses struct crypt_data */
+#undef CRYPT_R_STRUCT_CRYPT_DATA
 
-/* Define to 1 if you have the `nanosleep' function. */
-#undef HAVE_NANOSLEEP
+/* Define if struct crypt_data requires _GNU_SOURCE */
+#undef CRYPT_R_GNU_SOURCE
 
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
+/* Whether you have gcov */
+#undef HAVE_GCOV
 
-/* Define to 1 if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
+/*   */
+#undef PHP_SAFE_MODE
 
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
+/*   */
+#undef PHP_SAFE_MODE
 
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#undef HAVE_NETINET_TCP_H
+/*   */
+#undef PHP_SAFE_MODE_EXEC_DIR
 
-/* */
-#undef HAVE_NET_SNMP
+/*   */
+#undef PHP_SAFE_MODE_EXEC_DIR
 
-/* Whether utf8_mime2text() has new signature */
-#undef HAVE_NEW_MIME2TEXT
+/*   */
+#undef PHP_SIGCHILD
 
-/* */
-#undef HAVE_NGETTEXT
+/*   */
+#undef PHP_SIGCHILD
 
-/* Define to 1 if you have the `nice' function. */
-#undef HAVE_NICE
+/*   */
+#undef MAGIC_QUOTES
 
-/* Define to 1 if you have the `nl_langinfo' function. */
-#undef HAVE_NL_LANGINFO
+/*   */
+#undef MAGIC_QUOTES
 
-/* Whether you have a Netscape/iPlanet/Sun Webserver */
-#undef HAVE_NSAPI
+/*   */
+#undef DEFAULT_SHORT_OPEN_TAG
 
-/* */
-#undef HAVE_NSLDAP
+/*   */
+#undef DEFAULT_SHORT_OPEN_TAG
 
-/* */
-#undef HAVE_OCI8
+/* Whether you have dmalloc */
+#undef HAVE_DMALLOC
 
-/* */
-#undef HAVE_OCICOLLASSIGN
+/* Whether to enable IPv6 support */
+#undef HAVE_IPV6
 
-/* */
-#undef HAVE_OCIENVCREATE
+/*  Define if int32_t type is present.  */
+#undef HAVE_INT32_T
 
-/* */
-#undef HAVE_OCIENVNLSCREATE
+/*  Define if uint32_t type is present.  */
+#undef HAVE_UINT32_T
 
-/* */
-#undef HAVE_OCILOBISTEMPORARY
+/* Whether to build date as dynamic module */
+#undef COMPILE_DL_DATE
 
-/* */
-#undef HAVE_OCISTMTFETCH2
+/* Whether to build ereg as dynamic module */
+#undef COMPILE_DL_EREG
 
-/* */
-#undef HAVE_OCI_INSTANT_CLIENT
+/*   */
+#undef HAVE_REGEX_T_RE_MAGIC
 
-/* */
-#undef HAVE_OCI_LOB_READ2
+/*   */
+#undef HSREGEX
 
-/* */
-#undef HAVE_ODBC2
+/*   */
+#undef REGEX
 
-/* */
-#undef HAVE_ODBCSDK_H
+/*   */
+#undef REGEX
 
-/* */
-#undef HAVE_ODBC_H
+/* 1 */
+#undef HAVE_REGEX_T_RE_MAGIC
 
-/* */
-#undef HAVE_ODBC_ROUTER
+/*   */
+#undef HAVE_LIBXML
+
+/*   */
+#undef HAVE_LIBXML
+
+/* Whether to build libxml as dynamic module */
+#undef COMPILE_DL_LIBXML
+
+/* Whether to build openssl as dynamic module */
+#undef COMPILE_DL_OPENSSL
+
+/* OpenSSL 0.9.7 or later */
+#undef HAVE_DSA_DEFAULT_METHOD
+
+/* OpenSSL 0.9.7 or later */
+#undef HAVE_DSA_DEFAULT_METHOD
+
+/*   */
+#undef HAVE_OPENSSL_EXT
+
+/*   */
+#undef HAVE_PCRE
+
+/* Whether to build pcre as dynamic module */
+#undef COMPILE_DL_PCRE
+
+/* Whether to build pcre as dynamic module */
+#undef COMPILE_DL_PCRE
+
+/*   */
+#undef HAVE_BUNDLED_PCRE
+
+/* have commercial sqlite3 with crypto support */
+#undef HAVE_SQLITE3_KEY
+
+/* have sqlite3 with extension support */
+#undef SQLITE_OMIT_LOAD_EXTENSION
+
+/*   */
+#undef HAVE_SQLITE3
+
+/* Whether to build sqlite3 as dynamic module */
+#undef COMPILE_DL_SQLITE3
+
+/* Whether to build zlib as dynamic module */
+#undef COMPILE_DL_ZLIB
+
+/*   */
+#undef HAVE_ZLIB
+
+/* Whether to build bcmath as dynamic module */
+#undef COMPILE_DL_BCMATH
+
+/* Whether you have bcmath */
+#undef HAVE_BCMATH
+
+/*   */
+#undef HAVE_BZ2
+
+/* Whether to build bz2 as dynamic module */
+#undef COMPILE_DL_BZ2
+
+/*   */
+#undef HAVE_CALENDAR
+
+/* Whether to build calendar as dynamic module */
+#undef COMPILE_DL_CALENDAR
+
+/*   */
+#undef HAVE_CTYPE
+
+/* Whether to build ctype as dynamic module */
+#undef COMPILE_DL_CTYPE
+
+/* Have cURL with  SSL support */
+#undef HAVE_CURL_SSL
+
+/* Have cURL with OpenSSL support */
+#undef HAVE_CURL_OPENSSL
+
+/* Have cURL with GnuTLS support */
+#undef HAVE_CURL_GNUTLS
+
+/*   */
+#undef HAVE_CURL
+
+/*   */
+#undef HAVE_CURL_VERSION_INFO
+
+/*   */
+#undef HAVE_CURL_EASY_STRERROR
+
+/*   */
+#undef HAVE_CURL_MULTI_STRERROR
+
+/*   */
+#undef PHP_CURL_URL_WRAPPERS
+
+/* Whether to build curl as dynamic module */
+#undef COMPILE_DL_CURL
+
+/*   */
+#undef QDBM_INCLUDE_FILE
+
+/*   */
+#undef DBA_QDBM
+
+/*   */
+#undef GDBM_INCLUDE_FILE
+
+/*   */
+#undef DBA_GDBM
+
+/*   */
+#undef NDBM_INCLUDE_FILE
+
+/*   */
+#undef DBA_NDBM
+
+/*   */
+#undef DBA_DB4
+
+/*   */
+#undef DB4_INCLUDE_FILE
+
+/*   */
+#undef DBA_DB3
+
+/*   */
+#undef DB3_INCLUDE_FILE
+
+/*   */
+#undef DBA_DB2
+
+/*   */
+#undef DB2_INCLUDE_FILE
+
+/*   */
+#undef DB1_VERSION
+
+/*   */
+#undef DB1_VERSION
+
+/*   */
+#undef DB1_INCLUDE_FILE
+
+/*   */
+#undef DBA_DB1
+
+/*   */
+#undef DBM_INCLUDE_FILE
+
+/*   */
+#undef DBM_VERSION
+
+/*   */
+#undef DBM_VERSION
+
+/*   */
+#undef DBA_DBM
+
+/*   */
+#undef DBA_CDB_BUILTIN
+
+/*   */
+#undef DBA_CDB_MAKE
+
+/*   */
+#undef DBA_CDB
+
+/*   */
+#undef CDB_INCLUDE_FILE
+
+/*   */
+#undef DBA_CDB
+
+/*   */
+#undef DBA_INIFILE
+
+/*   */
+#undef DBA_FLATFILE
+
+/*   */
+#undef HAVE_DBA
+
+/* Whether to build dba as dynamic module */
+#undef COMPILE_DL_DBA
+
+/*   */
+#undef HAVE_LIBXML
+
+/*   */
+#undef HAVE_DOM
+
+/* Whether to build dom as dynamic module */
+#undef COMPILE_DL_DOM
+
+/* Whether to build enchant as dynamic module */
+#undef COMPILE_DL_ENCHANT
+
+/*   */
+#undef HAVE_ENCHANT
+
+/*   */
+#undef HAVE_ENCHANT_BROKER_SET_PARAM
+
+/*   */
+#undef ENCHANT_VERSION_STRING
+
+/* Whether you want EXIF (metadata from images) support */
+#undef HAVE_EXIF
+
+/* Whether to build exif as dynamic module */
+#undef COMPILE_DL_EXIF
+
+/* Whether to build fileinfo as dynamic module */
+#undef COMPILE_DL_FILEINFO
+
+/* Whether to build filter as dynamic module */
+#undef COMPILE_DL_FILTER
+
+/* Whether you want FTP support */
+#undef HAVE_FTP
+
+/* Whether to build ftp as dynamic module */
+#undef COMPILE_DL_FTP
+
+/*   */
+#undef USE_GD_IMGSTRTTF
+
+/*   */
+#undef USE_GD_IMGSTRTTF
+
+/*   */
+#undef HAVE_LIBFREETYPE
+
+/*   */
+#undef ENABLE_GD_TTF
+
+/*   */
+#undef HAVE_LIBT1
+
+/*   */
+#undef HAVE_LIBGD
+
+/*   */
+#undef HAVE_LIBGD13
+
+/*   */
+#undef HAVE_LIBGD15
+
+/*   */
+#undef HAVE_LIBGD20
+
+/*   */
+#undef HAVE_LIBGD204
+
+/*   */
+#undef HAVE_GD_IMAGESETTILE
+
+/*   */
+#undef HAVE_GD_IMAGESETBRUSH
+
+/*   */
+#undef HAVE_GDIMAGECOLORRESOLVE
+
+/*   */
+#undef HAVE_COLORCLOSESTHWB
+
+/*   */
+#undef HAVE_GD_WBMP
+
+/*   */
+#undef HAVE_GD_GD2
+
+/*   */
+#undef HAVE_GD_PNG
+
+/*   */
+#undef HAVE_GD_XBM
+
+/*   */
+#undef HAVE_GD_BUNDLED
+
+/*   */
+#undef HAVE_GD_GIF_READ
+
+/*   */
+#undef HAVE_GD_GIF_CREATE
+
+/*   */
+#undef HAVE_GD_IMAGEELLIPSE
+
+/*   */
+#undef HAVE_GD_FONTCACHESHUTDOWN
+
+/*   */
+#undef HAVE_GD_FONTMUTEX
+
+/*   */
+#undef HAVE_GD_DYNAMIC_CTX_EX
+
+/*   */
+#undef HAVE_GD_GIF_CTX
+
+/*   */
+#undef HAVE_GD_JPG
+
+/*   */
+#undef HAVE_GD_XPM
+
+/*   */
+#undef HAVE_GD_STRINGFT
+
+/*   */
+#undef HAVE_GD_STRINGFTEX
+
+/*   */
+#undef ENABLE_GD_TTF
+
+/*   */
+#undef USE_GD_JISX0208
+
+/*   */
+#undef USE_GD_IMGSTRTTF
+
+/*   */
+#undef USE_GD_IMGSTRTTF
+
+/*   */
+#undef HAVE_LIBFREETYPE
+
+/*   */
+#undef ENABLE_GD_TTF
+
+/*   */
+#undef HAVE_LIBT1
+
+/*   */
+#undef HAVE_LIBGD
+
+/*   */
+#undef HAVE_LIBGD13
+
+/*   */
+#undef HAVE_LIBGD15
+
+/*   */
+#undef HAVE_GD_PNG
+
+/*   */
+#undef HAVE_GD_GIF_READ
+
+/*   */
+#undef HAVE_GD_GIF_CREATE
+
+/*   */
+#undef HAVE_GD_WBMP
+
+/*   */
+#undef HAVE_GD_JPG
+
+/*   */
+#undef HAVE_GD_XPM
+
+/*   */
+#undef HAVE_GD_GD2
+
+/*   */
+#undef HAVE_LIBGD20
+
+/*   */
+#undef HAVE_GD_IMAGESETTILE
+
+/*   */
+#undef HAVE_GD_IMAGEELLIPSE
+
+/*   */
+#undef HAVE_GD_IMAGESETBRUSH
+
+/*   */
+#undef HAVE_GD_STRINGTTF
+
+/*   */
+#undef HAVE_GD_STRINGFT
+
+/*   */
+#undef HAVE_GD_STRINGFTEX
+
+/*   */
+#undef HAVE_COLORCLOSESTHWB
+
+/*   */
+#undef HAVE_GDIMAGECOLORRESOLVE
+
+/*   */
+#undef HAVE_GD_GIF_CTX
+
+/*   */
+#undef HAVE_GD_CACHE_CREATE
+
+/*   */
+#undef HAVE_GD_FONTCACHESHUTDOWN
+
+/*   */
+#undef HAVE_GD_FREEFONTCACHE
+
+/*   */
+#undef HAVE_GD_FONTMUTEX
+
+/*   */
+#undef HAVE_GD_DYNAMIC_CTX_EX
+
+/*   */
+#undef HAVE_LIBGD204
+
+/* Whether to build gd as dynamic module */
+#undef COMPILE_DL_GD
+
+/*   */
+#undef HAVE_LIBINTL
+
+/* Whether to build gettext as dynamic module */
+#undef COMPILE_DL_GETTEXT
+
+/*   */
+#undef HAVE_NGETTEXT
+
+/*   */
+#undef HAVE_DNGETTEXT
+
+/*   */
+#undef HAVE_DCNGETTEXT
+
+/*   */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Whether to build gmp as dynamic module */
+#undef COMPILE_DL_GMP
+
+/*   */
+#undef HAVE_GMP
+
+/*   */
+#undef PHP_MHASH_BC
+
+/* Have HASH Extension */
+#undef HAVE_HASH_EXT
+
+/* Define if processor uses big-endian word */
+#undef WORDS_BIGENDIAN
+
+/* Whether to build hash as dynamic module */
+#undef COMPILE_DL_HASH
+
+/*   */
+#undef HAVE_LIBICONV
+
+/*   */
+#undef HAVE_GICONV_H
+
+/*   */
+#undef HAVE_LIBICONV
+
+/* iconv() is aliased to libiconv() in -liconv */
+#undef ICONV_ALIASED_LIBICONV
+
+/*   */
+#undef HAVE_ICONV
+
+/* Which iconv implementation to use */
+#undef PHP_ICONV_IMPL
+
+/* Konstantin Chuguev's iconv implementation */
+#undef HAVE_BSD_ICONV
+
+/* Which iconv implementation to use */
+#undef PHP_ICONV_IMPL
+
+/* glibc's iconv implementation */
+#undef HAVE_GLIBC_ICONV
+
+/* Which iconv implementation to use */
+#undef PHP_ICONV_IMPL
+
+/* IBM iconv implementation */
+#undef HAVE_IBM_ICONV
+
+/* Which iconv implementation to use */
+#undef PHP_ICONV_IMPL
+
+/* Whether iconv supports error no or not */
+#undef ICONV_SUPPORTS_ERRNO
+
+/* Whether iconv supports error no or not */
+#undef ICONV_SUPPORTS_ERRNO
+
+/* Whether iconv supports error no or not */
+#undef ICONV_SUPPORTS_ERRNO
+
+/* Path to iconv.h */
+#undef PHP_ICONV_H_PATH
+
+/* Whether to build iconv as dynamic module */
+#undef COMPILE_DL_ICONV
+
+/* Whether to build imap as dynamic module */
+#undef COMPILE_DL_IMAP
+
+/*   */
+#undef HAVE_IMAP
+
+/*   */
+#undef HAVE_IMAP2000
+
+/*   */
+#undef HAVE_IMAP2000
 
-/* */
-#undef HAVE_OLD_COMPAT_H
+/*   */
+#undef HAVE_IMAP2000
 
-/* whether you have old-style readdir_r */
-#undef HAVE_OLD_READDIR_R
+/*   */
+#undef HAVE_IMAP2000
 
-/* Define to 1 if the oniguruma library is available */
-#undef HAVE_ONIG
+/*   */
+#undef HAVE_IMAP2000
 
-/* Define to 1 if you have the <openssl/crypto.h> header file. */
-#undef HAVE_OPENSSL_CRYPTO_H
+/*   */
+#undef HAVE_IMAP2000
 
-/* */
-#undef HAVE_OPENSSL_EXT
+/*   */
+#undef HAVE_IMAP2004
 
-/* */
-#undef HAVE_ORALDAP
+/* Whether utf8_mime2text() has new signature */
+#undef HAVE_NEW_MIME2TEXT
 
-/* */
-#undef HAVE_ORALDAP_10
+/*   */
+#undef HAVE_IMAP2001
 
-/* Whether struct _zend_object_value is packed */
-#undef HAVE_PACKED_OBJECT_VALUE
+/*   */
+#undef HAVE_LIBPAM
 
-/* */
-#undef HAVE_PCRE
+/*   */
+#undef HAVE_LIBCRYPT
 
-/* */
-#undef HAVE_PDO_DBLIB
+/*   */
+#undef HAVE_IMAP_KRB
 
-/* */
-#undef HAVE_PDO_FIREBIRD
+/*   */
+#undef HAVE_IMAP_SSL
 
-/* Whether to build PostgreSQL for PDO support or not */
-#undef HAVE_PDO_PGSQL
+/*   */
+#undef HAVE_IMAP_AUTH_GSS
 
-/* */
-#undef HAVE_PDO_SQLITELIB
+/*   */
+#undef HAVE_IMAP_MUTF7
 
-/* Define to 1 if you have the `perror' function. */
-#undef HAVE_PERROR
+/*   */
+#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST
 
-/* Whether to build PostgreSQL support or not */
-#undef HAVE_PGSQL
+/*   */
+#undef HAVE_IBASE
 
-/* Whether libpq is compiled with --enable-multibyte */
-#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
+/* Whether to build interbase as dynamic module */
+#undef COMPILE_DL_INTERBASE
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PGTRANSACTIONSTATUS
+/* Whether to build intl as dynamic module */
+#undef COMPILE_DL_INTL
 
-/* Whether to have pg_config.h */
-#undef HAVE_PG_CONFIG_H
+/* whether to enable JavaScript Object Serialization support */
+#undef HAVE_JSON
 
-/* PostgreSQL 8.1 or later */
-#undef HAVE_PG_LO_CREATE
+/* Whether to build json as dynamic module */
+#undef COMPILE_DL_JSON
 
-/* PostgreSQL 8.4 or later */
-#undef HAVE_PG_LO_IMPORT_WITH_OID
+/* Whether to build ldap as dynamic module */
+#undef COMPILE_DL_LDAP
 
-/* */
-#undef HAVE_PHP_SESSION
+/*   */
+#undef HAVE_NSLDAP
 
-/* Whether you have phttpd */
-#undef HAVE_PHTTPD
+/*   */
+#undef HAVE_NSLDAP
 
-/* Define to 1 if you have the `poll' function. */
-#undef HAVE_POLL
+/*   */
+#undef HAVE_NSLDAP
 
-/* do we have port framework? */
-#undef HAVE_PORT
+/*   */
+#undef HAVE_NSLDAP
 
-/* whether to include POSIX-like functions */
-#undef HAVE_POSIX
+/*   */
+#undef HAVE_ORALDAP
 
-/* whether you have POSIX readdir_r */
-#undef HAVE_POSIX_READDIR_R
+/*   */
+#undef HAVE_ORALDAP_10
 
-/* PostgreSQL 7.0.x or later */
-#undef HAVE_PQCLIENTENCODING
+/*   */
+#undef HAVE_LDAP
 
-/* Broken libpq under windows */
-#undef HAVE_PQCMDTUPLES
+/* Whether 3 arg set_rebind_proc() */
+#undef HAVE_3ARG_SETREBINDPROC
 
-/* PostgreSQL 7.2.0 or later */
-#undef HAVE_PQESCAPE
+/*   */
+#undef HAVE_LDAP_SASL_SASL_H
 
-/* PostgreSQL 8.1.4 or later */
-#undef HAVE_PQESCAPE_BYTEA_CONN
+/*   */
+#undef HAVE_LDAP_SASL_H
 
-/* PostgreSQL 8.1.4 or later */
-#undef HAVE_PQESCAPE_CONN
+/* LDAP SASL support */
+#undef HAVE_LDAP_SASL
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQEXECPARAMS
+/* whether to have multibyte string support */
+#undef HAVE_MBSTRING
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQEXECPREPARED
+/* whether to check multibyte regex backtrack */
+#undef USE_COMBINATION_EXPLOSION_CHECK
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQFREEMEM
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_PROTOTYPES
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQFTABLE
+/* Define to 1 if the bundled oniguruma is used */
+#undef PHP_ONIG_BUNDLED
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQGETCOPYDATA
+/* Define to 1 if the oniguruma library is available */
+#undef HAVE_ONIG
 
-/* Older PostgreSQL */
-#undef HAVE_PQOIDVALUE
+/* Define to 1 if the oniguruma library is available */
+#undef HAVE_ONIG
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPARAMETERSTATUS
+/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */
+#undef PHP_ONIG_BAD_KOI8_ENTRY
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPREPARE
+/* whether to have multibyte regex support */
+#undef HAVE_MBREGEX
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPROTOCOLVERSION
+/* Whether to build mbstring as dynamic module */
+#undef COMPILE_DL_MBSTRING
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPUTCOPYDATA
+/*   */
+#undef HAVE_LIBMCRYPT
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPUTCOPYEND
+/*   */
+#undef HAVE_LIBMCRYPT
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQRESULTERRORFIELD
+/* Whether to build mcrypt as dynamic module */
+#undef COMPILE_DL_MCRYPT
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQSENDPREPARE
+/* Whether to build mssql as dynamic module */
+#undef COMPILE_DL_MSSQL
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQSENDQUERYPARAMS
+/*   */
+#undef HAVE_LIBDNET_STUB
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQSENDQUERYPREPARED
+/*   */
+#undef HAVE_MSSQL
 
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQSETERRORVERBOSITY
+/*   */
+#undef HAVE_FREETDS
 
-/* PostgreSQL 7.0.x or later */
-#undef HAVE_PQSETNONBLOCKING
+/*   */
+#undef PHP_MYSQL_UNIX_SOCK_ADDR
 
-/* PostgreSQL 7.3.0 or later */
-#undef HAVE_PQUNESCAPEBYTEA
+/*   */
+#undef PHP_MYSQL_UNIX_SOCK_ADDR
 
-/* do we have prctl? */
-#undef HAVE_PRCTL
+/* Whether you have MySQL */
+#undef HAVE_MYSQL
 
-/* */
-#undef HAVE_PREAD
+/* Whether to build mysql as dynamic module */
+#undef COMPILE_DL_MYSQL
 
-/* */
-#undef HAVE_PSPELL
+/* Whether mysqlnd is enabled */
+#undef MYSQL_USE_MYSQLND
 
-/* do we have ptrace? */
-#undef HAVE_PTRACE
+/* embedded MySQL support enabled */
+#undef HAVE_EMBEDDED_MYSQLI
 
-/* Whether ptrdiff_t is available */
-#undef HAVE_PTRDIFF_T
+/*   */
+#undef HAVE_MYSQLILIB
 
-/* Define to 1 if you have the `ptsname' function. */
-#undef HAVE_PTSNAME
+/*   */
+#undef HAVE_STMT_NEXT_RESULT
 
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
+/* Whether to build mysqli as dynamic module */
+#undef COMPILE_DL_MYSQLI
 
-/* Define to 1 if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* Whether mysqlnd is enabled */
+#undef MYSQLI_USE_MYSQLND
 
-/* */
-#undef HAVE_PWRITE
+/*   */
+#undef HAVE_OCI_LOB_READ2
 
-/* Define to 1 if you have the `random' function. */
-#undef HAVE_RANDOM
+/* Whether to build oci8 as dynamic module */
+#undef COMPILE_DL_OCI8
 
-/* Define to 1 if you have the `rand_r' function. */
-#undef HAVE_RAND_R
+/*   */
+#undef HAVE_OCI8
 
-/* Define to 1 if you have the `realpath' function. */
-#undef HAVE_REALPATH
+/*   */
+#undef PHP_OCI8_DEF_DIR
 
-/* Whether Reflection is enabled */
-#undef HAVE_REFLECTION
+/*   */
+#undef PHP_OCI8_DEF_SHARED_LIBADD
 
-/* 1 */
-#undef HAVE_REGEX_T_RE_MAGIC
+/*   */
+#undef HAVE_OCI_INSTANT_CLIENT
 
-/* Define to 1 if you have the <resolv.h> header file. */
-#undef HAVE_RESOLV_H
+/*   */
+#undef HAVE_OCI_LOB_READ2
 
-/* */
-#undef HAVE_RES_NSEARCH
+/* Whether to build oci8 as dynamic module */
+#undef COMPILE_DL_OCI8
 
-/* */
-#undef HAVE_RES_SEARCH
+/*   */
+#undef HAVE_OCI8
 
-/* */
-#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST
+/*   */
+#undef HAVE_ADABAS
 
-/* */
-#undef HAVE_RL_CALLBACK_READ_CHAR
+/*   */
+#undef HAVE_SAPDB
 
-/* Define to 1 if you have the `rl_completion_matches' function. */
-#undef HAVE_RL_COMPLETION_MATCHES
+/*   */
+#undef HAVE_SOLID_35
 
-/* Whether you use Roxen */
-#undef HAVE_ROXEN
+/*   */
+#undef HAVE_SOLID_30
 
-/* */
-#undef HAVE_SAPDB
+/*   */
+#undef HAVE_SOLID
 
-/* Define to 1 if you have the `scandir' function. */
-#undef HAVE_SCANDIR
+/* Needed in sqlunix.h  */
+#undef SS_LINUX
 
-/* do we have select? */
-#undef HAVE_SELECT
+/* Needed in sqlunix.h  */
+#undef SS_LINUX
 
-/* */
-#undef HAVE_SEMUN
+/* Needed in sqlunix.h for wchar defs  */
+#undef SS_FBX
 
-/* Define to 1 if you have the `setegid' function. */
-#undef HAVE_SETEGID
+/* Needed in sqlunix.h for wchar defs  */
+#undef SS_FBX
 
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
+/*   */
+#undef HAVE_IBMDB2
 
-/* Define to 1 if you have the `seteuid' function. */
-#undef HAVE_SETEUID
+/*   */
+#undef HAVE_ODBC_ROUTER
 
-/* Define to 1 if you have the `setitimer' function. */
-#undef HAVE_SETITIMER
+/*   */
+#undef HAVE_EMPRESS
 
-/* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
+/*   */
+#undef HAVE_EMPRESS
 
-/* Define to 1 if you have the `setpgid' function. */
-#undef HAVE_SETPGID
+/*   */
+#undef AIX
 
-/* Define to 1 if you have the `setpriority' function. */
-#undef HAVE_SETPRIORITY
+/*   */
+#undef HPUX
 
-/* Define to 1 if you have the `setproctitle' function. */
-#undef HAVE_SETPROCTITLE
+/*   */
+#undef LINUX
 
-/* Define to 1 if you have the `setsid' function. */
-#undef HAVE_SETSID
+/*   */
+#undef NEUTRINO
 
-/* Define to 1 if you have the `setsockopt' function. */
-#undef HAVE_SETSOCKOPT
+/*   */
+#undef ISOLARIS
 
-/* Define to 1 if you have the `setvbuf' function. */
-#undef HAVE_SETVBUF
+/*   */
+#undef SOLARIS
 
-/* */
-#undef HAVE_SHMOP
+/*   */
+#undef UNIXWARE
 
-/* Define to 1 if you have the `shutdown' function. */
-#undef HAVE_SHUTDOWN
+/*   */
+#undef HAVE_BIRDSTEP
 
-/* */
-#undef HAVE_SIGACTION
+/*   */
+#undef HAVE_CODBC
 
-/* Define to 1 if you have the <signal.h> header file. */
-#undef HAVE_SIGNAL_H
+/*   */
+#undef HAVE_IODBC
 
-/* Define to 1 if you have the `sigprocmask' function. */
-#undef HAVE_SIGPROCMASK
+/*   */
+#undef HAVE_ODBC2
 
-/* Define to 1 if you have the `sigsetjmp' function. */
-#undef HAVE_SIGSETJMP
+/*   */
+#undef HAVE_ESOOB
 
-/* Define to 1 if you have the `sigtimedwait' function. */
-#undef HAVE_SIGTIMEDWAIT
+/*   */
+#undef HAVE_UNIXODBC
 
-/* Define to 1 if you have the `sigwaitinfo' function. */
-#undef HAVE_SIGWAITINFO
+/* Whether you want DBMaker */
+#undef HAVE_DBMAKER
 
-/* */
-#undef HAVE_SIMPLEXML
+/*   */
+#undef HAVE_SQLDATASOURCES
 
-/* Define to 1 if you have the `sin' function. */
-#undef HAVE_SIN
+/*   */
+#undef HAVE_UODBC
 
-/* */
-#undef HAVE_SNMP
+/* Whether to build odbc as dynamic module */
+#undef COMPILE_DL_ODBC
 
-/* */
-#undef HAVE_SNMP_PARSE_OID
+/*   */
+#undef HAVE_FORK
 
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
+/*   */
+#undef HAVE_WAITPID
 
-/* */
-#undef HAVE_SOAP
+/*   */
+#undef HAVE_SIGACTION
 
-/* Whether struct sockaddr has field sa_len */
-#undef HAVE_SOCKADDR_SA_LEN
+/* Whether to build pcntl as dynamic module */
+#undef COMPILE_DL_PCNTL
 
-/* Whether you have struct sockaddr_storage */
-#undef HAVE_SOCKADDR_STORAGE
+/* Whether to build pdo as dynamic module */
+#undef COMPILE_DL_PDO
 
-/* Define if sockaddr_un in sys/un.h contains a sun_len component */
-#undef HAVE_SOCKADDR_UN_SUN_LEN
+/* Whether to build pdo_dblib as dynamic module */
+#undef COMPILE_DL_PDO_DBLIB
 
-/* */
-#undef HAVE_SOCKET
+/*   */
+#undef HAVE_LIBDNET_STUB
 
-/* Define to 1 if you have the `socketpair' function. */
-#undef HAVE_SOCKETPAIR
+/*   */
+#undef HAVE_PDO_DBLIB
 
-/* */
-#undef HAVE_SOCKETS
+/*   */
+#undef HAVE_FREETDS
 
-/* Whether you have socklen_t */
-#undef HAVE_SOCKLEN_T
+/*   */
+#undef HAVE_PDO_FIREBIRD
 
-/* */
-#undef HAVE_SOLID
+/* Whether to build pdo_firebird as dynamic module */
+#undef COMPILE_DL_PDO_FIREBIRD
 
-/* */
-#undef HAVE_SOLID_30
+/* Whether pdo_mysql uses mysqlnd */
+#undef PDO_USE_MYSQLND
 
-/* */
-#undef HAVE_SOLID_35
+/* Whether you have MySQL */
+#undef HAVE_MYSQL
 
-/* Whether you want SPL (Standard PHP Library) support */
-#undef HAVE_SPL
+/*   */
+#undef PDO_MYSQL_UNIX_ADDR
 
-/* */
-#undef HAVE_SQLCLI1_H
+/* Whether to build pdo_mysql as dynamic module */
+#undef COMPILE_DL_PDO_MYSQL
 
-/* */
-#undef HAVE_SQLDATASOURCES
+/*   */
+#undef HAVE_OCIENVCREATE
 
-/* */
-#undef HAVE_SQLEXT_H
+/*   */
+#undef HAVE_OCIENVNLSCREATE
 
-/* */
-#undef HAVE_SQLITE3
+/*   */
+#undef HAVE_OCILOBISTEMPORARY
 
-/* have commercial sqlite3 with crypto support */
-#undef HAVE_SQLITE3_KEY
+/*   */
+#undef HAVE_OCILOBISTEMPORARY
 
-/* */
-#undef HAVE_SQLTYPES_H
+/*   */
+#undef HAVE_OCICOLLASSIGN
 
-/* */
-#undef HAVE_SQLUCODE_H
+/*   */
+#undef HAVE_OCISTMTFETCH2
 
-/* */
-#undef HAVE_SQLUNIX_H
+/* Whether to build pdo_oci as dynamic module */
+#undef COMPILE_DL_PDO_OCI
 
-/* */
-#undef HAVE_SQL_H
+/*   */
+#undef PHP_PDO_OCI_CLIENT_VERSION
 
-/* Define to 1 if you have the `srand48' function. */
-#undef HAVE_SRAND48
+/*   */
+#undef HAVE_ODBC_H
 
-/* Define to 1 if you have the `srandom' function. */
-#undef HAVE_SRANDOM
+/*   */
+#undef HAVE_ODBCSDK_H
 
-/* Whether ssize_t is available */
-#undef HAVE_SSIZE_T
+/*   */
+#undef HAVE_IODBC_H
 
-/* Define to 1 if you have the `statfs' function. */
-#undef HAVE_STATFS
+/*   */
+#undef HAVE_SQLUNIX_H
 
-/* Define to 1 if you have the `statvfs' function. */
-#undef HAVE_STATVFS
+/*   */
+#undef HAVE_SQLTYPES_H
 
-/* Define to 1 if you have the <stdarg.h> header file. */
-#undef HAVE_STDARG_H
+/*   */
+#undef HAVE_SQLUCODE_H
 
-/* Define to 1 if you have the <stdarg.h> header file. */
-#undef HAVE_STDARG_PROTOTYPES
+/*   */
+#undef HAVE_SQL_H
 
-/* Define to 1 if you have the <stdbool.h> header file. */
-#undef HAVE_STDBOOL_H
+/*   */
+#undef HAVE_ISQL_H
 
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
+/*   */
+#undef HAVE_SQLEXT_H
 
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
+/*   */
+#undef HAVE_ISQLEXT_H
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/*   */
+#undef HAVE_UDBCEXT_H
 
-/* Define to 1 if you have the `std_syslog' function. */
-#undef HAVE_STD_SYSLOG
+/*   */
+#undef HAVE_SQLCLI1_H
 
-/* */
-#undef HAVE_STMT_NEXT_RESULT
+/*   */
+#undef HAVE_LIBRARYMANAGER_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
+/*   */
+#undef HAVE_CLI0CORE_H
 
-/* Define to 1 if you have the `strcoll' function. */
-#undef HAVE_STRCOLL
+/*   */
+#undef HAVE_CLI0EXT_H
 
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
+/*   */
+#undef HAVE_CLI0CLI_H
 
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
+/*   */
+#undef HAVE_CLI0DEFS_H
 
-/* Define to 1 if you have the `strfmon' function. */
-#undef HAVE_STRFMON
+/*   */
+#undef HAVE_CLI0ENV_H
 
-/* Define to 1 if you have the `strftime' function. */
-#undef HAVE_STRFTIME
+/* Whether to build pdo_odbc as dynamic module */
+#undef COMPILE_DL_PDO_ODBC
 
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
+/* Whether to have pg_config.h */
+#undef HAVE_PG_CONFIG_H
 
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+/* Whether to have pg_config.h */
+#undef HAVE_PG_CONFIG_H
 
-/* Define to 1 if you have the `strlcat' function. */
-#undef HAVE_STRLCAT
+/* Whether to build PostgreSQL for PDO support or not */
+#undef HAVE_PDO_PGSQL
 
-/* Define to 1 if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPARAMETERSTATUS
 
-/* Define to 1 if you have the `strndup' function. */
-#undef HAVE_STRNDUP
+/* PostgreSQL 8.0 or later */
+#undef HAVE_PQPREPARE
 
-/* Define to 1 if you have the `strnlen' function. */
-#undef HAVE_STRNLEN
+/* PostgreSQL 8.1.4 or later */
+#undef HAVE_PQESCAPE_CONN
 
-/* Define to 1 if you have the `strpbrk' function. */
-#undef HAVE_STRPBRK
+/* PostgreSQL 8.1.4 or later */
+#undef HAVE_PQESCAPE_BYTEA_CONN
 
-/* Define to 1 if you have the `strpncpy' function. */
-#undef HAVE_STRPNCPY
+/* Whether libpq is compiled with --enable-multibyte */
+#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
 
-/* Define to 1 if you have the `strptime' function. */
-#undef HAVE_STRPTIME
+/* Whether to build pdo_pgsql as dynamic module */
+#undef COMPILE_DL_PDO_PGSQL
 
-/* whether strptime() declaration fails */
-#undef HAVE_STRPTIME_DECL_FAILS
+/*   */
+#undef HAVE_PDO_SQLITELIB
 
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
+/* have commercial sqlite3 with crypto support */
+#undef HAVE_SQLITE3_KEY
 
-/* Define to 1 if you have the `strtod' function. */
-#undef HAVE_STRTOD
+/* Whether to build pdo_sqlite as dynamic module */
+#undef COMPILE_DL_PDO_SQLITE
 
-/* Define to 1 if you have the `strtok_r' function. */
-#undef HAVE_STRTOK_R
+/* Whether to build pdo_sqlite as dynamic module */
+#undef COMPILE_DL_PDO_SQLITE
 
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
+/* Whether to have pg_config.h */
+#undef HAVE_PG_CONFIG_H
 
-/* Define to 1 if you have the `strtoll' function. */
-#undef HAVE_STRTOLL
+/* Whether to have pg_config.h */
+#undef HAVE_PG_CONFIG_H
 
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
+/* Whether to build PostgreSQL support or not */
+#undef HAVE_PGSQL
 
-/* Define to 1 if you have the `strtoull' function. */
-#undef HAVE_STRTOULL
+/* PostgreSQL 7.2.0 or later */
+#undef HAVE_PQESCAPE
 
-/* whether you have struct flock */
-#undef HAVE_STRUCT_FLOCK
+/* PostgreSQL 7.3.0 or later */
+#undef HAVE_PQUNESCAPEBYTEA
 
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BLKSIZE
+/* PostgreSQL 7.0.x or later */
+#undef HAVE_PQSETNONBLOCKING
 
-/* Define to 1 if `st_blocks' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BLOCKS
+/* Broken libpq under windows */
+#undef HAVE_PQCMDTUPLES
 
-/* Define to 1 if `st_rdev' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_RDEV
+/* Older PostgreSQL */
+#undef HAVE_PQOIDVALUE
 
-/* Define to 1 if `tm_zone' is a member of `struct tm'. */
-#undef HAVE_STRUCT_TM_TM_ZONE
+/* PostgreSQL 7.0.x or later */
+#undef HAVE_PQCLIENTENCODING
 
-/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
-   `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */
-#undef HAVE_ST_BLKSIZE
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPARAMETERSTATUS
 
-/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
-   `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
-#undef HAVE_ST_BLOCKS
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPROTOCOLVERSION
 
-/* Define to 1 if you have the <st.h> header file. */
-#undef HAVE_ST_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PGTRANSACTIONSTATUS
 
-/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
-   `HAVE_STRUCT_STAT_ST_RDEV' instead. */
-#undef HAVE_ST_RDEV
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQEXECPARAMS
 
-/* */
-#undef HAVE_SYBASE_CT
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPREPARE
 
-/* Define to 1 if you have the `symlink' function. */
-#undef HAVE_SYMLINK
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQEXECPREPARED
 
-/* Define if you have the __sync_fetch_and_add function */
-#undef HAVE_SYNC_FETCH_AND_ADD
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQRESULTERRORFIELD
 
-/* do we have sysconf? */
-#undef HAVE_SYSCONF
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQSENDQUERYPARAMS
 
-/* Define to 1 if you have the <sysexits.h> header file. */
-#undef HAVE_SYSEXITS_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQSENDPREPARE
 
-/* Define to 1 if you have the <syslog.h> header file. */
-#undef HAVE_SYSLOG_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQSENDQUERYPREPARED
 
-/* */
-#undef HAVE_SYSVMSG
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPUTCOPYDATA
 
-/* */
-#undef HAVE_SYSVSEM
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPUTCOPYEND
 
-/* */
-#undef HAVE_SYSVSHM
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQGETCOPYDATA
 
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQFREEMEM
 
-/* Define to 1 if you have the <sys/file.h> header file. */
-#undef HAVE_SYS_FILE_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQSETERRORVERBOSITY
 
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQFTABLE
 
-/* Define to 1 if you have the <sys/ipc.h> header file. */
-#undef HAVE_SYS_IPC_H
+/* PostgreSQL 8.1.4 or later */
+#undef HAVE_PQESCAPE_CONN
 
-/* Define to 1 if you have the <sys/loadavg.h> header file. */
-#undef HAVE_SYS_LOADAVG_H
+/* PostgreSQL 8.1.4 or later */
+#undef HAVE_PQESCAPE_BYTEA_CONN
 
-/* Define to 1 if you have the <sys/mkdev.h> header file. */
-#undef HAVE_SYS_MKDEV_H
+/* Whether libpq is compiled with --enable-multibyte */
+#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
 
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#undef HAVE_SYS_MMAN_H
+/* PostgreSQL 8.1 or later */
+#undef HAVE_PG_LO_CREATE
 
-/* Define to 1 if you have the <sys/mount.h> header file. */
-#undef HAVE_SYS_MOUNT_H
+/* PostgreSQL 8.4 or later */
+#undef HAVE_PG_LO_IMPORT_WITH_OID
 
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
+/* Whether to build pgsql as dynamic module */
+#undef COMPILE_DL_PGSQL
 
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+/* Whether to build phar as dynamic module */
+#undef COMPILE_DL_PHAR
 
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#undef HAVE_SYS_POLL_H
+/*   */
+#undef PHAR_HASH_OK
 
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
+/*   */
+#undef PHAR_HAVE_OPENSSL
 
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
+/* whether to include POSIX-like functions */
+#undef HAVE_POSIX
 
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
+/* Whether to build posix as dynamic module */
+#undef COMPILE_DL_POSIX
 
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-#undef HAVE_SYS_STATFS_H
+/* Whether you have a working ttyname_r */
+#undef HAVE_TTYNAME_R
 
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-#undef HAVE_SYS_STATVFS_H
+/* Wether struct utsname has domainname */
+#undef HAVE_UTSNAME_DOMAINNAME
 
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
+/* Whether to build pspell as dynamic module */
+#undef COMPILE_DL_PSPELL
 
-/* Define to 1 if you have the <sys/sysexits.h> header file. */
-#undef HAVE_SYS_SYSEXITS_H
+/*   */
+#undef HAVE_PSPELL
 
-/* Define to 1 if you have the <sys/times.h> header file. */
-#undef HAVE_SYS_TIMES_H
+/*   */
+#undef HAVE_RL_CALLBACK_READ_CHAR
 
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
+/*   */
+#undef HAVE_LIBREADLINE
 
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
+/*   */
+#undef HAVE_LIBEDIT
 
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#undef HAVE_SYS_UIO_H
+/* Whether to build readline as dynamic module */
+#undef COMPILE_DL_READLINE
 
-/* Define to 1 if you have the <sys/un.h> header file. */
-#undef HAVE_SYS_UN_H
+/* Whether we have librecode 3.5 */
+#undef HAVE_BROKEN_RECODE
 
-/* Define to 1 if you have the <sys/utsname.h> header file. */
-#undef HAVE_SYS_UTSNAME_H
+/* Whether we have librecode 3.5 or higher */
+#undef HAVE_LIBRECODE
 
-/* Define to 1 if you have the <sys/varargs.h> header file. */
-#undef HAVE_SYS_VARARGS_H
+/* Whether to build recode as dynamic module */
+#undef COMPILE_DL_RECODE
 
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-#undef HAVE_SYS_VFS_H
+/* Whether Reflection is enabled */
+#undef HAVE_REFLECTION
 
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#undef HAVE_SYS_WAIT_H
+/* Whether to build reflection as dynamic module */
+#undef COMPILE_DL_REFLECTION
 
-/* Define to 1 if you have the `tempnam' function. */
-#undef HAVE_TEMPNAM
+/*   */
+#undef HAVE_PWRITE
 
-/* Define to 1 if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
+/* whether pwrite64 is default */
+#undef PHP_PWRITE_64
 
-/* */
-#undef HAVE_TIDY
+/*   */
+#undef HAVE_PREAD
 
-/* */
-#undef HAVE_TIDYOPTGETDOC
+/* whether pread64 is default */
+#undef PHP_PREAD_64
 
-/* do we have times? */
-#undef HAVE_TIMES
+/* Whether to build session as dynamic module */
+#undef COMPILE_DL_SESSION
 
-/* Define to 1 if you have the <time.h> header file. */
-#undef HAVE_TIME_H
+/*   */
+#undef HAVE_PHP_SESSION
 
-/* whether you have tm_gmtoff in struct tm */
-#undef HAVE_TM_GMTOFF
+/* Whether you have libmm */
+#undef HAVE_LIBMM
 
-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
-   `HAVE_STRUCT_TM_TM_ZONE' instead. */
-#undef HAVE_TM_ZONE
+/*   */
+#undef HAVE_SHMOP
 
-/* Whether you have a working ttyname_r */
-#undef HAVE_TTYNAME_R
+/* Whether to build shmop as dynamic module */
+#undef COMPILE_DL_SHMOP
 
-/* Define to 1 if you have the <tuxmodule.h> header file. */
-#undef HAVE_TUXMODULE_H
+/*   */
+#undef HAVE_LIBXML
 
-/* Define to 1 if you don't have `tm_zone' but do have the external array
-   `tzname'. */
-#undef HAVE_TZNAME
+/*   */
+#undef HAVE_SIMPLEXML
 
-/* Define to 1 if you have the `tzset' function. */
-#undef HAVE_TZSET
+/* Whether to build simplexml as dynamic module */
+#undef COMPILE_DL_SIMPLEXML
 
-/* */
-#undef HAVE_UDBCEXT_H
+/*   */
+#undef HAVE_NET_SNMP
 
-/* Define if uint32_t type is present. */
-#undef HAVE_UINT32_T
+/*   */
+#undef HAVE_SNMP_PARSE_OID
 
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+/*   */
+#undef HAVE_SNMP
 
-/* */
-#undef HAVE_UNIXODBC
+/*   */
+#undef UCD_SNMP_HACK
 
-/* Define to 1 if you have the <unix.h> header file. */
-#undef HAVE_UNIX_H
+/* Whether to build snmp as dynamic module */
+#undef COMPILE_DL_SNMP
 
-/* Define to 1 if you have the `unlockpt' function. */
-#undef HAVE_UNLOCKPT
+/*   */
+#undef HAVE_LIBXML
 
-/* Define to 1 if you have the `unsetenv' function. */
-#undef HAVE_UNSETENV
+/*   */
+#undef HAVE_SOAP
 
-/* */
-#undef HAVE_UODBC
+/* Whether to build soap as dynamic module */
+#undef COMPILE_DL_SOAP
 
-/* Define to 1 if you have the `usleep' function. */
-#undef HAVE_USLEEP
+/* Whether you have struct cmsghdr */
+#undef HAVE_CMSGHDR
 
-/* Define to 1 if you have the `utime' function. */
-#undef HAVE_UTIME
+/*   */
+#undef MISSING_MSGHDR_MSGFLAGS
 
-/* Define to 1 if you have the `utimes' function. */
-#undef HAVE_UTIMES
+/*   */
+#undef HAVE_SOCKETS
 
-/* Define to 1 if you have the <utime.h> header file. */
-#undef HAVE_UTIME_H
+/* Whether to build sockets as dynamic module */
+#undef COMPILE_DL_SOCKETS
 
-/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
-#undef HAVE_UTIME_NULL
+/* Whether struct _zend_object_value is packed */
+#undef HAVE_PACKED_OBJECT_VALUE
 
-/* Wether struct utsname has domainname */
-#undef HAVE_UTSNAME_DOMAINNAME
+/* Whether you want SPL (Standard PHP Library) support */
+#undef HAVE_SPL
 
-/* Define to 1 if you have the `vasprintf' function. */
-#undef HAVE_VASPRINTF
+/* Whether to build spl as dynamic module */
+#undef COMPILE_DL_SPL
 
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
+/* Have PDO */
+#undef PHP_SQLITE2_HAVE_PDO
 
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
+/* Whether to build sqlite as dynamic module */
+#undef COMPILE_DL_SQLITE
 
-/* Define to 1 if you have the `wait3' function. */
-#undef HAVE_WAIT3
+/* Size of a pointer */
+#undef SQLITE_PTR_SZ
 
-/* */
-#undef HAVE_WAITPID
+/*   */
+#undef SQLITE_UTF8
 
-/* Define to 1 if you have the <wchar.h> header file. */
-#undef HAVE_WCHAR_H
+/* Define if flush should be called explicitly after a buffered io. */
+#undef HAVE_FLUSHIO
 
-/* */
-#undef HAVE_WDDX
+/*   */
+#undef HAVE_CRYPT
 
-/* */
-#undef HAVE_XML
+/* whether the compiler supports __alignof__ */
+#undef HAVE_ALIGNOF
 
-/* Define to 1 if you have the <xmlparse.h> header file. */
-#undef HAVE_XMLPARSE_H
+/* whether the compiler supports __attribute__ ((__aligned__)) */
+#undef HAVE_ATTRIBUTE_ALIGNED
 
-/* */
-#undef HAVE_XMLREADER
+/* Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5 */
+#undef PHP_USE_PHP_CRYPT_R
 
-/* */
-#undef HAVE_XMLRPC
+/* Whether the system supports standard DES salt */
+#undef PHP_STD_DES_CRYPT
 
-/* Define to 1 if you have the <xmltok.h> header file. */
-#undef HAVE_XMLTOK_H
+/* Whether the system supports BlowFish salt */
+#undef PHP_BLOWFISH_CRYPT
 
-/* */
-#undef HAVE_XMLWRITER
+/* Whether the system supports extended DES salt */
+#undef PHP_EXT_DES_CRYPT
 
-/* */
-#undef HAVE_XSL
+/* Whether the system supports MD5 salt */
+#undef PHP_MD5_CRYPT
 
-/* */
-#undef HAVE_XSL_EXSLT
+/* Whether the system supports SHA512 salt */
+#undef PHP_SHA512_CRYPT
 
-/* */
-#undef HAVE_YP_GET_DEFAULT_DOMAIN
+/* Whether the system supports SHA256 salt */
+#undef PHP_SHA256_CRYPT
 
-/* */
-#undef HAVE_ZIP
+/* Whether the system supports standard DES salt */
+#undef PHP_STD_DES_CRYPT
 
-/* */
-#undef HAVE_ZLIB
+/* Whether the system supports BlowFish salt */
+#undef PHP_BLOWFISH_CRYPT
 
-/* whether _controlfp is present usable */
-#undef HAVE__CONTROLFP
+/* Whether the system supports extended DES salt */
+#undef PHP_EXT_DES_CRYPT
 
-/* whether _controlfp_s is present and usable */
-#undef HAVE__CONTROLFP_S
+/* Whether the system supports MD5 salt */
+#undef PHP_MD5_CRYPT
 
-/* whether _FPU_SETCW is present and usable */
-#undef HAVE__FPU_SETCW
+/* Whether the system supports SHA512 salt */
+#undef PHP_SHA512_CRYPT
 
-/* */
-#undef HPUX
+/* Whether the system supports SHA256 salt */
+#undef PHP_SHA256_CRYPT
 
-/* */
-#undef HSREGEX
+/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */
+#undef PHP_USE_PHP_CRYPT_R
 
-/* iconv() is aliased to libiconv() in -liconv */
-#undef ICONV_ALIASED_LIBICONV
+/* Define if your system has fork/vfork/CreateProcess */
+#undef PHP_CAN_SUPPORT_PROC_OPEN
 
-/* Whether iconv supports error no or not */
-#undef ICONV_SUPPORTS_ERRNO
+/* Whether to enable chroot() function */
+#undef ENABLE_CHROOT_FUNC
 
-/* */
-#undef ISOLARIS
+/*   */
+#undef HAVE_RES_NSEARCH
 
-/* */
-#undef LINUX
+/*   */
+#undef HAVE_RES_NSEARCH
 
-/* */
-#undef MAGIC_QUOTES
+/*   */
+#undef HAVE_LIBRESOLV
 
-/* Whether asctime_r is declared */
-#undef MISSING_ASCTIME_R_DECL
+/*   */
+#undef HAVE_RES_NSEARCH
 
-/* Whether ctime_r is declared */
-#undef MISSING_CTIME_R_DECL
+/*   */
+#undef HAVE_LIBBIND
 
-/* */
-#undef MISSING_FCLOSE_DECL
+/*   */
+#undef HAVE_RES_NSEARCH
 
-/* Whether gmtime_r is declared */
-#undef MISSING_GMTIME_R_DECL
+/*   */
+#undef HAVE_LIBSOCKET
 
-/* Whether localtime_r is declared */
-#undef MISSING_LOCALTIME_R_DECL
+/*   */
+#undef HAVE_DNS_SEARCH
 
-/* */
-#undef MISSING_MSGHDR_MSGFLAGS
+/*   */
+#undef HAVE_DNS_SEARCH
 
-/* Whether strtok_r is declared */
-#undef MISSING_STRTOK_R_DECL
+/*   */
+#undef HAVE_LIBRESOLV
 
-/* Whether mysqlnd is enabled */
-#undef MYSQLI_USE_MYSQLND
+/*   */
+#undef HAVE_DNS_SEARCH
 
-/* Enable compressed protocol support */
-#undef MYSQLND_COMPRESSION_WANTED
+/*   */
+#undef HAVE_LIBBIND
 
-/* Enable SSL support */
-#undef MYSQLND_SSL_SUPPORTED
+/*   */
+#undef HAVE_DNS_SEARCH
 
-/* Whether mysqlnd is enabled */
-#undef MYSQL_USE_MYSQLND
+/*   */
+#undef HAVE_LIBSOCKET
 
-/* */
-#undef NDBM_INCLUDE_FILE
+/*   */
+#undef HAVE_DN_EXPAND
 
-/* */
-#undef NEUTRINO
+/*   */
+#undef HAVE_DN_EXPAND
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
+/*   */
+#undef HAVE_LIBRESOLV
 
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
+/*   */
+#undef HAVE_DN_EXPAND
 
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
+/*   */
+#undef HAVE_LIBBIND
 
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
+/*   */
+#undef HAVE_DN_EXPAND
 
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
+/*   */
+#undef HAVE_LIBSOCKET
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
+/*   */
+#undef HAVE_DN_SKIPNAME
 
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
+/*   */
+#undef HAVE_DN_SKIPNAME
 
-/* */
-#undef PDO_MYSQL_UNIX_ADDR
+/*   */
+#undef HAVE_LIBRESOLV
 
-/* Whether pdo_mysql uses mysqlnd */
-#undef PDO_USE_MYSQLND
+/*   */
+#undef HAVE_DN_SKIPNAME
 
-/* */
-#undef PHAR_HASH_OK
+/*   */
+#undef HAVE_LIBBIND
 
-/* */
-#undef PHAR_HAVE_OPENSSL
+/*   */
+#undef HAVE_DN_SKIPNAME
 
-/* */
-#undef PHP_APACHE_HAVE_CLIENT_FD
+/*   */
+#undef HAVE_LIBSOCKET
 
-/* Whether the system supports BlowFish salt */
-#undef PHP_BLOWFISH_CRYPT
+/*   */
+#undef HAVE_RES_SEARCH
 
-/* PHP build date */
-#undef PHP_BUILD_DATE
+/*   */
+#undef HAVE_RES_SEARCH
 
-/* Define if your system has fork/vfork/CreateProcess */
-#undef PHP_CAN_SUPPORT_PROC_OPEN
+/*   */
+#undef HAVE_LIBRESOLV
 
-/* */
-#undef PHP_CURL_URL_WRAPPERS
+/*   */
+#undef HAVE_RES_SEARCH
 
-/* Whether the system supports extended DES salt */
-#undef PHP_EXT_DES_CRYPT
+/*   */
+#undef HAVE_LIBBIND
 
-/* fpm group name */
-#undef PHP_FPM_GROUP
+/*   */
+#undef HAVE_RES_SEARCH
 
-/* fpm user name */
-#undef PHP_FPM_USER
+/*   */
+#undef HAVE_LIBSOCKET
 
-/* Whether you have HP-UX 10.x */
-#undef PHP_HPUX_TIME_R
+/* whether atof() accepts NAN */
+#undef HAVE_ATOF_ACCEPTS_NAN
 
-/* Path to iconv.h */
-#undef PHP_ICONV_H_PATH
+/* whether atof() accepts INF */
+#undef HAVE_ATOF_ACCEPTS_INF
 
-/* Which iconv implementation to use */
-#undef PHP_ICONV_IMPL
+/* whether HUGE_VAL == INF */
+#undef HAVE_HUGE_VAL_INF
 
-/* Whether you have IRIX-style functions */
-#undef PHP_IRIX_TIME_R
+/* whether HUGE_VAL + -HUGEVAL == NAN */
+#undef HAVE_HUGE_VAL_NAN
 
-/* Whether the system supports MD5 salt */
-#undef PHP_MD5_CRYPT
+/* whether strptime() declaration fails */
+#undef HAVE_STRPTIME_DECL_FAILS
 
-/* */
-#undef PHP_MHASH_BC
+/* Define if your system has mbstate_t in wchar.h */
+#undef HAVE_MBSTATE_T
 
-/* */
-#undef PHP_MYSQL_UNIX_SOCK_ADDR
+/* Whether to build standard as dynamic module */
+#undef COMPILE_DL_STANDARD
 
-/* */
-#undef PHP_OCI8_DEF_DIR
+/*   */
+#undef HAVE_SYBASE_CT
 
-/* */
-#undef PHP_OCI8_DEF_SHARED_LIBADD
+/* Whether to build sybase_ct as dynamic module */
+#undef COMPILE_DL_SYBASE_CT
 
-/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */
-#undef PHP_ONIG_BAD_KOI8_ENTRY
+/*   */
+#undef HAVE_SYSVMSG
 
-/* Define to 1 if the bundled oniguruma is used */
-#undef PHP_ONIG_BUNDLED
+/* Whether to build sysvmsg as dynamic module */
+#undef COMPILE_DL_SYSVMSG
 
-/* uname output */
-#undef PHP_OS
+/* Whether to build sysvsem as dynamic module */
+#undef COMPILE_DL_SYSVSEM
 
-/* */
-#undef PHP_PDO_OCI_CLIENT_VERSION
+/*   */
+#undef HAVE_SYSVSEM
 
-/* whether pread64 is default */
-#undef PHP_PREAD_64
+/*   */
+#undef HAVE_SEMUN
 
-/* whether pwrite64 is default */
-#undef PHP_PWRITE_64
+/*   */
+#undef HAVE_SEMUN
 
-/* */
-#undef PHP_SAFE_MODE
+/*   */
+#undef HAVE_SYSVSHM
 
-/* */
-#undef PHP_SAFE_MODE_EXEC_DIR
+/* Whether to build sysvshm as dynamic module */
+#undef COMPILE_DL_SYSVSHM
 
-/* Whether the system supports SHA256 salt */
-#undef PHP_SHA256_CRYPT
+/*   */
+#undef HAVE_TIDYOPTGETDOC
 
-/* Whether the system supports SHA512 salt */
-#undef PHP_SHA512_CRYPT
+/* Whether to build tidy as dynamic module */
+#undef COMPILE_DL_TIDY
 
-/* */
-#undef PHP_SIGCHILD
+/*   */
+#undef HAVE_TIDY
 
-/* Have PDO */
-#undef PHP_SQLITE2_HAVE_PDO
+/* Whether to build tokenizer as dynamic module */
+#undef COMPILE_DL_TOKENIZER
 
-/* Whether the system supports standard DES salt */
-#undef PHP_STD_DES_CRYPT
+/*   */
+#undef HAVE_LIBXML
 
-/* uname -a output */
-#undef PHP_UNAME
+/*   */
+#undef HAVE_LIBEXPAT
 
-/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */
-#undef PHP_USE_PHP_CRYPT_R
+/*   */
+#undef HAVE_WDDX
 
-/* whether write(2) works */
-#undef PHP_WRITE_STDOUT
+/* Whether to build wddx as dynamic module */
+#undef COMPILE_DL_WDDX
 
-/* /proc/pid/mem interface */
-#undef PROC_MEM_FILE
+/*   */
+#undef HAVE_LIBXML
 
-/* Whether to use Pthreads */
-#undef PTHREADS
+/*   */
+#undef HAVE_LIBEXPAT
 
-/* */
-#undef QDBM_INCLUDE_FILE
+/* Whether to build xml as dynamic module */
+#undef COMPILE_DL_XML
 
-/* */
-#undef REGEX
+/*   */
+#undef HAVE_XML
 
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
+/*   */
+#undef HAVE_LIBXML
 
-/* Whether to use Roxen in ZTS mode */
-#undef ROXEN_USE_ZTS
+/*   */
+#undef HAVE_XMLREADER
 
-/* The size of `char', as computed by sizeof. */
-#undef SIZEOF_CHAR
+/* Whether to build xmlreader as dynamic module */
+#undef COMPILE_DL_XMLREADER
 
-/* The size of `char *', as computed by sizeof. */
-#undef SIZEOF_CHAR_P
+/*   */
+#undef HAVE_XMLRPC
 
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
+/*   */
+#undef HAVE_LIBXML
 
-/* Size of intmax_t */
-#undef SIZEOF_INTMAX_T
+/*   */
+#undef HAVE_LIBEXPAT
 
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
+/*   */
+#undef HAVE_LIBICONV
 
-/* The size of `long int', as computed by sizeof. */
-#undef SIZEOF_LONG_INT
+/*   */
+#undef HAVE_GICONV_H
 
-/* The size of `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
+/*   */
+#undef HAVE_LIBICONV
 
-/* The size of `long long int', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG_INT
+/* iconv() is aliased to libiconv() in -liconv */
+#undef ICONV_ALIASED_LIBICONV
 
-/* Size of ptrdiff_t */
-#undef SIZEOF_PTRDIFF_T
+/*   */
+#undef HAVE_ICONV
 
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
+/*   */
+#undef UNDEF_THREADS_HACK
 
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
+/* Whether to build xmlrpc as dynamic module */
+#undef COMPILE_DL_XMLRPC
 
-/* Size of ssize_t */
-#undef SIZEOF_SSIZE_T
+/* Whether to build xmlrpc as dynamic module */
+#undef COMPILE_DL_XMLRPC
 
-/* */
-#undef SOLARIS
+/*   */
+#undef HAVE_LIBXML
 
-/* have sqlite3 with extension support */
-#undef SQLITE_OMIT_LOAD_EXTENSION
+/*   */
+#undef HAVE_XMLWRITER
 
-/* Size of a pointer */
-#undef SQLITE_PTR_SZ
+/* Whether to build xmlwriter as dynamic module */
+#undef COMPILE_DL_XMLWRITER
 
-/* */
-#undef SQLITE_UTF8
+/*   */
+#undef HAVE_XSL_EXSLT
 
-/* Needed in sqlunix.h for wchar defs */
-#undef SS_FBX
+/*   */
+#undef HAVE_XSL
 
-/* Needed in sqlunix.h */
-#undef SS_LINUX
+/* Whether to build xsl as dynamic module */
+#undef COMPILE_DL_XSL
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
+/*   */
+#undef HAVE_ZIP
 
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Whether to build zip as dynamic module */
+#undef COMPILE_DL_ZIP
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
+/* Enable compressed protocol support */
+#undef MYSQLND_COMPRESSION_WANTED
 
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
+/* Enable SSL support */
+#undef MYSQLND_SSL_SUPPORTED
 
-/* */
-#undef TSRM_ST
+/* Whether to build mysqlnd as dynamic module */
+#undef COMPILE_DL_MYSQLND
 
-/* */
-#undef UCD_SNMP_HACK
+/* Define if int32_t type is present.  */
+#undef HAVE_INT32_T
 
-/* */
-#undef UNDEF_THREADS_HACK
+/* Define if uint32_t type is present.  */
+#undef HAVE_UINT32_T
 
-/* */
-#undef UNIXWARE
+/* Whether sprintf is broken */
+#undef ZEND_BROKEN_SPRINTF
 
-/* whether to check multibyte regex backtrack */
-#undef USE_COMBINATION_EXPLOSION_CHECK
+/* whether floatingpoint.h defines fp_except */
+#undef HAVE_FP_EXCEPT
 
-/* */
-#undef USE_GD_IMGSTRTTF
+/* whether _FPU_SETCW is present and usable */
+#undef HAVE__FPU_SETCW
 
-/* */
-#undef USE_GD_JISX0208
+/* whether fpsetprec is present and usable */
+#undef HAVE_FPSETPREC
 
-/* Define if cross-process locking is required by accept() */
-#undef USE_LOCKING
+/* whether _controlfp is present usable */
+#undef HAVE__CONTROLFP
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
+/* whether _controlfp_s is present and usable */
+#undef HAVE__CONTROLFP_S
 
+/* whether FPU control word can be manipulated by inline assembler */
+#undef HAVE_FPU_INLINE_ASM_X86
 
-/* */
-#undef USE_TRANSFER_TABLES
+/* Define if double cast to long preserves least significant bits */
+#undef ZEND_DVAL_TO_LVAL_CAST_OK
 
-/* whether you want Pi3Web support */
-#undef WITH_PI3WEB
+/* Define if dlsym() requires a leading underscore in symbol names.  */
+#undef DLSYM_NEEDS_UNDERSCORE
 
-/* */
-#undef WITH_ZEUS
+/* virtual machine dispatch method */
+#undef ZEND_VM_KIND
 
-/* Define if processor uses big-endian word */
-#undef WORDS_BIGENDIAN
+/* virtual machine dispatch method */
+#undef ZEND_VM_KIND
 
-/* Whether sprintf is broken */
-#undef ZEND_BROKEN_SPRINTF
+/* virtual machine dispatch method */
+#undef ZEND_VM_KIND
 
-/* */
+/*   */
 #undef ZEND_DEBUG
 
-/* Define if double cast to long preserves least significant bits */
-#undef ZEND_DVAL_TO_LVAL_CAST_OK
+/*   */
+#undef ZEND_DEBUG
+
+/*   */
+#undef ZTS
 
-/* */
+/*   */
+#undef ZEND_MULTIBYTE
+
+/* Define if the target system is darwin */
+#undef DARWIN
+
+/*   */
 #undef ZEND_MM_ALIGNMENT
 
-/* */
+/*   */
 #undef ZEND_MM_ALIGNMENT_LOG2
 
-/* */
-#undef ZEND_MULTIBYTE
+/* Define if the target system has support for memory allocation using mmap(MAP_ANON) */
+#undef HAVE_MEM_MMAP_ANON
 
-/* virtual machine dispatch method */
-#undef ZEND_VM_KIND
+/* Define if the target system has support for memory allocation using mmap(/dev/zero) */
+#undef HAVE_MEM_MMAP_ZERO
 
-/* */
+/*   */
 #undef ZTS
 
-/* Define to 1 if on MINIX. */
-#undef _MINIX
+/* Whether you use GNU Pth */
+#undef GNUPTH
 
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
+/*   */
+#undef TSRM_ST
 
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
+/* Whether to use native BeOS threads */
+#undef BETHREADS
 
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+/* Whether to use Pthreads */
+#undef PTHREADS
 
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
+/* PHP build date */
+#undef PHP_BUILD_DATE
 
-/* */
-#undef in_addr_t
+/* hardcode for each of the cross compiler host */
+#undef PHP_OS
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
+/* hardcode for each of the cross compiler host */
+#undef PHP_UNAME
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
+/* uname -a output */
+#undef PHP_UNAME
 
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
+/* uname output */
+#undef PHP_OS
 
-/* Define to `unsigned int ' if <sys/types.h> does not define. */
-#undef uint
+/*   */
+#undef HAVE_BUILD_DEFS_H
 
-/* Define to `unsigned long ' if <sys/types.h> does not define. */
-#undef ulong
 
 #ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
 
@@ -2533,29 +3029,6 @@
 #endif
 
 /*
- * Darwin's GCC can generate multiple architectures in a single pass so the size and
- * byte order will only be accurate for the one architecture that happened to invoke
- * configure.
- */
-#ifdef __DARWIN_BYTE_ORDER
-#/* This symbol must be allowed to be cleared. */ undef WORDS_BIGENDIAN
-# if (__DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN)
-#  define WORDS_BIGENDIAN 1
-# endif
-#/* This symbol must be allowed to be cleared. */ undef SIZEOF_LONG
-#/* This symbol must be allowed to be cleared. */ undef SIZEOF_SIZE_T
-# ifdef __LP64__
-#/* This symbol should not be modified by configure. */  define SIZEOF_LONG 8
-#/* This symbol should not be modified by configure. */  define SIZEOF_SIZE_T 8
-# else
-#/* This symbol should not be modified by configure. */  define SIZEOF_LONG 4
-#/* This symbol should not be modified by configure. */  define SIZEOF_SIZE_T 4
-# endif
-#endif
-
-#endif	/* ZEND_API */
-
-/*
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
diff -Naur php-5.3.23-patch1/sapi/cgi/Makefile.frag php-5.3.23-patch2/sapi/cgi/Makefile.frag
--- php-5.3.23-patch1/sapi/cgi/Makefile.frag	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/cgi/Makefile.frag	2013-04-04 21:36:54.000000000 -0700
@@ -1,2 +1,9 @@
-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+cgi: $(SAPI_CGI_PATH)
+
+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS)
 	$(BUILD_CGI)
+
+install-cgi: $(SAPI_CGI_PATH)
+	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
+	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
+
diff -Naur php-5.3.23-patch1/sapi/cgi/config9.m4 php-5.3.23-patch2/sapi/cgi/config9.m4
--- php-5.3.23-patch1/sapi/cgi/config9.m4	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/cgi/config9.m4	2013-04-04 21:36:54.000000000 -0700
@@ -8,11 +8,9 @@
 dnl
 dnl CGI setup
 dnl
-if test "$PHP_SAPI" = "default"; then
-  AC_MSG_CHECKING(whether to build CGI binary)
-  if test "$PHP_CGI" != "no"; then
+AC_MSG_CHECKING(for CGI build)
+if test "$PHP_CGI" != "no"; then
     AC_MSG_RESULT(yes)
-
     AC_MSG_CHECKING([for socklen_t in sys/socket.h])
     AC_EGREP_HEADER([socklen_t], [sys/socket.h],
       [AC_MSG_RESULT([yes])
@@ -50,31 +48,29 @@
         SAPI_CGI_PATH=sapi/cgi/php-cgi
         ;;
     esac
-    PHP_SUBST(SAPI_CGI_PATH)
 
-    dnl Set install target and select SAPI
-    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+    dnl Select SAPI
     PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
 
     case $host_alias in
       *aix*)
-        BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        if test "$php_sapi_module" = "shared"; then
+          BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        else
+          BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        fi
         ;;
       *darwin*)
-        BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
       ;;
       *)
-        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
       ;;
     esac
 
+    dnl Expose to Makefile
+    PHP_SUBST(SAPI_CGI_PATH)
     PHP_SUBST(BUILD_CGI)
-
-  elif test "$PHP_CLI" != "no"; then
-    AC_MSG_RESULT(no)
-    OVERALL_TARGET=
-    PHP_SAPI=cli   
-  else
-    AC_MSG_ERROR([No SAPIs selected.])  
-  fi
+else
+  AC_MSG_RESULT(yes)
 fi
diff -Naur php-5.3.23-patch1/sapi/cli/Makefile.frag php-5.3.23-patch2/sapi/cli/Makefile.frag
--- php-5.3.23-patch1/sapi/cli/Makefile.frag	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/cli/Makefile.frag	2013-04-04 21:36:54.000000000 -0700
@@ -1,11 +1,12 @@
 cli: $(SAPI_CLI_PATH)
 
-$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
+$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
 	$(BUILD_CLI)
 
 install-cli: $(SAPI_CLI_PATH)
 	@echo "Installing PHP CLI binary:        $(INSTALL_ROOT)$(bindir)/"
-	@$(INSTALL_CLI)
+	@$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
 	@echo "Installing PHP CLI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
-	@$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
+	@$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
+
diff -Naur php-5.3.23-patch1/sapi/cli/config.m4 php-5.3.23-patch2/sapi/cli/config.m4
--- php-5.3.23-patch1/sapi/cli/config.m4	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/cli/config.m4	2013-04-04 21:36:54.000000000 -0700
@@ -8,32 +8,41 @@
 
 AC_MSG_CHECKING(for CLI build)
 if test "$PHP_CLI" != "no"; then
-  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag,$abs_srcdir/sapi/cli,sapi/cli)
+  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag)
+
+  dnl Set filename
   SAPI_CLI_PATH=sapi/cli/php
-  PHP_SUBST(SAPI_CLI_PATH)
+
+  dnl Select SAPI
+  PHP_SELECT_SAPI(cli, program, php_cli.c php_cli_readline.c,, '$(SAPI_CLI_PATH)')
 
   case $host_alias in
   *aix*)
-    if test "$php_build_target" = "shared"; then
-      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    if test "$php_sapi_module" = "shared"; then
+      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     else
-      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     fi
     ;;
   *darwin*)
-    BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     ;;
   *netware*)
-    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
     ;;
   *)
-    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     ;;
   esac
-  INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
 
+  dnl Set executable for tests
+  PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
+  PHP_SUBST(PHP_EXECUTABLE)
+
+  dnl Expose to Makefile
+  PHP_SUBST(SAPI_CLI_PATH)
   PHP_SUBST(BUILD_CLI)
-  PHP_SUBST(INSTALL_CLI)
+
   PHP_OUTPUT(sapi/cli/php.1)
 fi
 AC_MSG_RESULT($PHP_CLI)
diff -Naur php-5.3.23-patch1/sapi/fpm/Makefile.frag php-5.3.23-patch2/sapi/fpm/Makefile.frag
--- php-5.3.23-patch1/sapi/fpm/Makefile.frag	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/fpm/Makefile.frag	2013-04-04 21:36:54.000000000 -0700
@@ -1,17 +1,9 @@
 fpm: $(SAPI_FPM_PATH)
 
-$(builddir)/fpm: 
-	@mkdir -p $(builddir)/fpm
-	@mkdir -p $(builddir)/fpm/events
-
-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FPM_OBJS)
 	$(BUILD_FPM)
 
-$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
-
-install-build: install-fpm
-
-install-fpm: install-sapi
+install-fpm: $(SAPI_FPM_PATH)
 	@echo "Installing PHP FPM binary:        $(INSTALL_ROOT)$(sbindir)/"
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir)
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
@@ -20,7 +12,6 @@
 
 	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
 	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
-
 	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
 
 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
diff -Naur php-5.3.23-patch1/sapi/fpm/config.m4 php-5.3.23-patch2/sapi/fpm/config.m4
--- php-5.3.23-patch1/sapi/fpm/config.m4	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/fpm/config.m4	2013-04-04 21:36:54.000000000 -0700
@@ -583,11 +583,12 @@
   AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
   AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
 
+  PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
+  PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
   PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
-  PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag], [$abs_srcdir/sapi/fpm], [sapi/fpm])
+  PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
 
   SAPI_FPM_PATH=sapi/fpm/php-fpm
-  PHP_SUBST(SAPI_FPM_PATH)
   
   if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then
     PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"
@@ -595,7 +596,6 @@
   
   PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
  
-  INSTALL_IT=":"
   PHP_FPM_FILES="fpm/fastcgi.c \
     fpm/fpm.c \
     fpm/fpm_children.c \
@@ -631,17 +631,19 @@
 
   case $host_alias in
       *aix*)
-        BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+        BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
         ;;
       *darwin*)
-        BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+        BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
       ;;
       *)
-        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
       ;;
   esac
 
+  PHP_SUBST(SAPI_FPM_PATH)
   PHP_SUBST(BUILD_FPM)
+
 else
   AC_MSG_RESULT(no)
 fi
diff -Naur php-5.3.23-patch1/sapi/litespeed/Makefile.frag php-5.3.23-patch2/sapi/litespeed/Makefile.frag
--- php-5.3.23-patch1/sapi/litespeed/Makefile.frag	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/litespeed/Makefile.frag	2013-04-04 21:36:54.000000000 -0700
@@ -1,3 +1,9 @@
-$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+litespeed: $(SAPI_LITESPEED_PATH)
+
+$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
 	$(BUILD_LITESPEED)
 
+install-litespeed: $(SAPI_LITESPEED_PATH)
+	@echo "Installing PHP LitSpeed binary:   $(INSTALL_ROOT)$(bindir)/"
+    @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(INSTALL_ROOT)$(bindir)/lsphp
+
diff -Naur php-5.3.23-patch1/sapi/litespeed/config.m4 php-5.3.23-patch2/sapi/litespeed/config.m4
--- php-5.3.23-patch1/sapi/litespeed/config.m4	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/litespeed/config.m4	2013-04-04 21:36:54.000000000 -0700
@@ -10,22 +10,22 @@
 if test "$PHP_LITESPEED" != "no"; then
   PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/litespeed/Makefile.frag,$abs_srcdir/sapi/litespeed,sapi/litespeed)
   SAPI_LITESPEED_PATH=sapi/litespeed/php
-  PHP_SUBST(SAPI_LITESPEED_PATH)
   PHP_SELECT_SAPI(litespeed, program, lsapi_main.c lsapilib.c, "", '$(SAPI_LITESPEED_PATH)') 
   INSTALL_IT="@echo \"Installing PHP LiteSpeed into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_LITESPEED_PATH) \$(INSTALL_ROOT)\$(bindir)/lsphp"
   case $host_alias in
   *darwin*)
-    BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+    BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
     ;;
   *cygwin*)
     SAPI_LITESPEED_PATH=sapi/litespeed/php.exe
-    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
     ;;
   *)
-    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
     ;;
   esac
 
+  PHP_SUBST(SAPI_LITESPEED_PATH)
   PHP_SUBST(BUILD_LITESPEED)
 fi
 
diff -Naur php-5.3.23-patch1/sapi/milter/Makefile.frag php-5.3.23-patch2/sapi/milter/Makefile.frag
--- php-5.3.23-patch1/sapi/milter/Makefile.frag	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/milter/Makefile.frag	2013-04-04 21:36:54.000000000 -0700
@@ -1,2 +1,8 @@
-$(SAPI_MILTER_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+milter: $(SAPI_MILTER_PATH)
+
+$(SAPI_MILTER_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_SAPI_OBJS)
 	$(BUILD_MILTER)
+
+install-milter: $(SAPI_MILTER_PATH)
+	@$(INSTALL) -m 0755 $(SAPI_MILTER_PATH) $(bindir)/php-milter
+
diff -Naur php-5.3.23-patch1/sapi/milter/config.m4 php-5.3.23-patch2/sapi/milter/config.m4
--- php-5.3.23-patch1/sapi/milter/config.m4	2013-04-04 21:27:16.000000000 -0700
+++ php-5.3.23-patch2/sapi/milter/config.m4	2013-04-04 21:36:54.000000000 -0700
@@ -25,8 +25,7 @@
   PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/milter/Makefile.frag)
   PHP_SELECT_SAPI(milter, program, php_milter.c getopt.c,,'$(SAPI_MILTER_PATH)') 
   PHP_ADD_LIBRARY_WITH_PATH(milter, $MILTERPATH,)
-  BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
-  INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_MILTER_PATH) \$(bindir)/php-milter"
+  BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_MILTER_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
   PHP_SUBST(SAPI_MILTER_PATH)
   PHP_SUBST(BUILD_MILTER)
 fi