--
-- MYSQL_LIB_CFG='--libmysqld-libs'
-- mysqli_extra_sources="mysqli_embedded.c"
-- elif test "$enable_maintainer_zts" = "yes"; then
-- MYSQL_LIB_CFG='--libs_r'
-- MYSQL_LIB_NAME='mysqlclient_r'
-- 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"`
-+ 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
-- echo "$ac_t""mysql_config not found" 1>&6
-- { echo "configure: error: Please reinstall the mysql distribution" 1>&2; exit 1; }
-+
-+ ep_dir="`echo $FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$FREETDS_INCLUDE_DIR\"`"
- 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'`
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "EXTRA_LDFLAGS$unique=set"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
--
-+ eval "INCLUDEPATH$unique=set"
-+
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
-+
-+ fi
-
-- fi
-- ;;
-- esac
-+ fi
-
-+
-
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
-+ if test "$ext_shared" = "yes"; then
-+ MSSQL_SHARED_LIBADD="-lsybdb $MSSQL_SHARED_LIBADD"
-+ if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
-
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+ if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-+ 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 $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
- fi
-
-
- if test "$ext_shared" = "yes"; then
-- LDFLAGS="-L$ai_p $LDFLAGS"
-- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ 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
-
-
-@@ -61089,254 +61160,26 @@ EOF
-
- fi
-
-- ;;
-- esac
-- done
--
-- echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
--echo "configure:61098: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
--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_save_LIBS="$LIBS"
--LIBS="-l$MYSQL_LIB_NAME $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 61106 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char mysql_set_server_option();
--
--int main() {
--mysql_set_server_option()
--; return 0; }
--EOF
--if { (eval echo configure:61117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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
--
-- ;;
-- esac
-- done
-+ fi
-+ else
-+
-
-+ if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
-
-- 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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
--
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
--
-- fi
-- ;;
-- esac
--
--
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+ if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-+ 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 $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$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
--
-+ ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
- fi
-
-- ;;
-- esac
-- done
--
-- cat >> confdefs.h <<\EOF
--#define HAVE_MYSQLILIB 1
--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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
--
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
--
-- fi
-- ;;
-- esac
--
--
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
-
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
--
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-- else
--
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-- fi
--
--
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="-L$ai_p $LDFLAGS"
-- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-- else
--
-
-
- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -61352,253 +61195,40 @@ EOF
- fi
-
-
-- fi
-
- fi
-
-- ;;
-- esac
-- done
--
-- echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
--echo "configure:61365: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
--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_save_LIBS="$LIBS"
--LIBS="-l$MYSQL_LIB_NAME $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 61373 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char mysql_set_character_set();
--
--int main() {
--mysql_set_character_set()
--; return 0; }
--EOF
--if { (eval echo configure:61384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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 "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 "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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
- fi
--
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
-
-- case $ac_ii in
-+ case sybdb in
- c|c_r|pthread*) ;;
- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
--
-- fi
-+ LIBS="-lsybdb $LIBS"
- ;;
- esac
-
-
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
--
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-- else
--
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-- fi
--
--
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="-L$ai_p $LDFLAGS"
-- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-- else
--
--
--
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
--
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
--
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
-
-
-- fi
--
- fi
-
-- ;;
-- esac
-- done
--
-- echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
--echo "configure:61528: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
--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_save_LIBS="$LIBS"
--LIBS="-l$MYSQL_LIB_NAME $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 61536 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char mysql_stmt_next_result();
--
--int main() {
--mysql_stmt_next_result()
--; return 0; }
--EOF
--if { (eval echo configure:61547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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_STMT_NEXT_RESULT 1
--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
-
--if test "$PHP_MYSQLI" != "no"; then
-- 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
-+ ext_builddir=ext/mssql
-+ ext_srcdir=$abs_srcdir/ext/mssql
-
- ac_extra=
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_MYSQLI_SHARED=no
-+ PHP_MSSQL_SHARED=no
-
-
-- case ext/mysqli in
-+ case ext/mssql 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" ;;
-+ /*) 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
-
-
-@@ -61613,7 +61243,7 @@ if test "$PHP_MYSQLI" != "no"; then
-
-
- old_IFS=$IFS
-- for ac_src in $mysqli_sources; do
-+ for ac_src in php_mssql.c; do
-
- IFS=.
- set $ac_src
-@@ -61636,18 +61266,18 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC mysqli"
-+ EXT_STATIC="$EXT_STATIC mssql"
- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC mssql"
- fi
- else
- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-- PHP_MYSQLI_SHARED=yes
-+ PHP_MSSQL_SHARED=yes
-
-- case ext/mysqli in
-+ case ext/mssql 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" ;;
-+ /*) 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
-
-
-@@ -61662,14 +61292,14 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in $mysqli_sources; do
-+ for ac_src in php_mssql.c; do
-
- IFS=.
- set $ac_src
- ac_obj=$1
- IFS=$old_IFS
-
-- shared_objects_mysqli="$shared_objects_mysqli $ac_bdir$ac_obj.lo"
-+ shared_objects_mssql="$shared_objects_mssql $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" ;;
-@@ -61692,31 +61322,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmysqli.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(PHPMYSQLI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmysqli.so '$ext_builddir'/phpmysqli.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmssql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(PHPMSSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmssql.so '$ext_builddir'/phpmssql.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLI, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMSSQL, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(PHPMYSQLI_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(PHPMSSQL_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmysqli.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmssql.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqli.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmssql.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phpmysqli.$suffix: $ext_builddir/phpmysqli.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phpmysqli.$suffix \$(phplibdir)
-+\$(phplibdir)/phpmssql.$suffix: $ext_builddir/phpmssql.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phpmssql.$suffix \$(phplibdir)
-
--$ext_builddir/phpmysqli.$suffix: \$(shared_objects_mysqli) \$(PHPMYSQLI_SHARED_DEPENDENCIES)
-+$ext_builddir/phpmssql.$suffix: \$(shared_objects_mssql) \$(PHPMSSQL_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -61729,31 +61359,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mysqli.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(MYSQLI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mysqli.so '$ext_builddir'/mysqli.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mssql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(MSSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mssql.so '$ext_builddir'/mssql.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQLI, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MSSQL, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(MYSQLI_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(MSSQL_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mysqli.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mssql.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysqli.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/mssql.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/mysqli.$suffix: $ext_builddir/mysqli.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/mysqli.$suffix \$(phplibdir)
-+\$(phplibdir)/mssql.$suffix: $ext_builddir/mssql.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/mssql.$suffix \$(phplibdir)
-
--$ext_builddir/mysqli.$suffix: \$(shared_objects_mysqli) \$(MYSQLI_SHARED_DEPENDENCIES)
-+$ext_builddir/mssql.$suffix: \$(shared_objects_mssql) \$(MSSQL_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -61761,23 +61391,23 @@ EOF
- ;;
- esac
- cat >> confdefs.h <<EOF
--#define COMPILE_DL_MYSQLI 1
-+#define COMPILE_DL_MSSQL 1
- EOF
-
- fi
- fi
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_MYSQLI_SHARED=no
-+ PHP_MSSQL_SHARED=no
- case "$PHP_SAPI" in
- cgi|embed)
-
-
-- case ext/mysqli in
-+ case ext/mssql 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
-+ /*) 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
-
-
-
-@@ -61791,7 +61421,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in $mysqli_sources; do
-+ for ac_src in php_mssql.c; do
-
- IFS=.
- set $ac_src
-@@ -61814,15 +61444,15 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC mysqli"
-+ EXT_STATIC="$EXT_STATIC mssql"
- ;;
- *)
-
-
-- case ext/mysqli in
-+ case ext/mssql 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" ;;
-+ /*) 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
-
-
-@@ -61837,7 +61467,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in $mysqli_sources; do
-+ for ac_src in php_mssql.c; do
-
- IFS=.
- set $ac_src
-@@ -61862,7 +61492,7 @@ EOF
-
- ;;
- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC mssql"
- fi
-
-
-@@ -61871,71 +61501,165 @@ EOF
-
-
- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=mysqli
-+ PHP_PECL_EXTENSION=mssql
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
- fi
-
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQLI_SHARED_LIBADD"
-+ echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
-+echo "configure:61512: 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_save_LIBS="$LIBS"
-+LIBS="-ldnet_stub $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 61520 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dnet_addr();
-
--
--
-- for header_file in ext/mysqli/php_mysqli_structs.h; do
-+int main() {
-+dnet_addr()
-+; return 0; }
-+EOF
-+if { (eval echo configure:61531: \"$ac_link\") 1>&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 $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "INSTALLHEADERS$unique=set"
-+ eval "LIBPATH$unique=set"
-
-- INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
--
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
- fi
-
-- done
-+
-+ 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
-
-
-- 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 "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.
--" 1>&2; exit 1; }
- fi
-- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-- { echo "configure: error:
--You've configured extension mysqli, which depends on extension mysqlnd,
--but you've either not enabled mysqlnd, or have disabled it.
--" 1>&2; exit 1; }
-+
- fi
-
-- cat >> confdefs.h <<\EOF
--#define MYSQLI_USE_MYSQLND 1
--EOF
-+
-+ case dnet_stub in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-ldnet_stub $LIBS"
-+ ;;
-+ esac
-+
-+
-+
-
- fi
--fi
-
-
--if test -z "$SED"; then
-- PHP_OCI8_SED="sed";
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_LIBDNET_STUB 1
-+EOF
-+
-+
- else
-- PHP_OCI8_SED="$SED";
-+ echo "$ac_t""no" 1>&6
- fi
-
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_MSSQL 1
-+EOF
-
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_FREETDS 1
-+EOF
-
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST MSSQL_SHARED_LIBADD"
-
-+fi
-
-
-
-@@ -61944,18 +61668,18 @@ fi
-
-
-
--php_with_oci8=no
-+php_with_mysql=no
-
--echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6
--echo "configure:61951: checking for Oracle (OCI8) support" >&5
--# Check whether --with-oci8 or --without-oci8 was given.
--if test "${with_oci8+set}" = set; then
-- withval="$with_oci8"
-- PHP_OCI8=$withval
-+echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
-+echo "configure:61675: 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_OCI8=no
-- test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL
-+ PHP_MYSQL=no
-+ test "$PHP_ENABLE_ALL" && PHP_MYSQL=$PHP_ENABLE_ALL
-
- fi
-
-@@ -61963,12 +61687,12 @@ fi
-
- ext_output="yes, shared"
- ext_shared=yes
--case $PHP_OCI8 in
-+case $PHP_MYSQL in
- shared,*)
-- PHP_OCI8=`echo "$PHP_OCI8"|$SED 's/^shared,//'`
-+ PHP_MYSQL=`echo "$PHP_MYSQL"|$SED 's/^shared,//'`
- ;;
- shared)
-- PHP_OCI8=yes
-+ PHP_MYSQL=yes
- ;;
- no)
- ext_output=no
-@@ -61987,364 +61711,318 @@ echo "$ac_t""$ext_output" 1>&6
-
-
-
--if test "$PHP_OCI8" != "no"; then
-
-- if test -z "$PHP_OCI8"; then
-- { echo "configure: error: Empty parameter value passed to --with-oci8" 1>&2; exit 1; }
-- fi
-+php_with_mysql_sock=no
-
-+echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
-+echo "configure:61719: 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
-
-- echo $ac_n "checking PHP version""... $ac_c" 1>&6
--echo "configure:61999: checking PHP version" >&5
-
-- tmp_version=$PHP_VERSION
-- if test -z "$tmp_version"; then
-- if test -z "$PHP_CONFIG"; then
-- { 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
-- php_version=`echo "$tmp_version"|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
-- fi
-+fi
-
-- if test -z "$php_version"; then
-- { echo "configure: error: failed to detect PHP version, please report" 1>&2; exit 1; }
-- fi
-
-- ac_IFS=$IFS
-- IFS="."
-- set $php_version
-- IFS=$ac_IFS
-- oci8_php_version=`expr $1 \* 1000000 + $2 \* 1000 + $3`
-+ext_output=$PHP_MYSQL_SOCK
-+echo "$ac_t""$ext_output" 1>&6
-+
-
-- if test "$oci8_php_version" -lt "4003009"; then
-- { 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 "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
-
-+
-+if test -z "$PHP_ZLIB_DIR"; then
-
-- echo $ac_n "checking size of long int""... $ac_c" 1>&6
--echo "configure:62031: 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
-- ac_cv_sizeof_long_int=4
--else
-- cat > conftest.$ac_ext <<EOF
--#line 62039 "configure"
--#include "confdefs.h"
--#include <stdio.h>
--int main()
--{
-- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-- fprintf(f, "%d\n", sizeof(long int));
-- return(0);
--}
--EOF
--if { (eval echo configure:62050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-- ac_cv_sizeof_long_int=`cat conftestval`
-+php_with_zlib_dir=no
-+
-+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-+echo "configure:61743: 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
-- 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
-+
-+ PHP_ZLIB_DIR=no
-+
-
- fi
--echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
--cat >> confdefs.h <<EOF
--#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
--EOF
-
-
-- echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
--echo "configure:62070: checking checking if we're on a 64-bit platform" >&5
-- if test "$ac_cv_sizeof_long_int" = "4"; then
-- echo "$ac_t""no" 1>&6
-- PHP_OCI8_OH_LIBDIR=lib32
-- PHP_OCI8_IC_LIBDIR_SUFFIX=""
-- else
-- echo "$ac_t""yes" 1>&6
-- PHP_OCI8_OH_LIBDIR=lib
-- PHP_OCI8_IC_LIBDIR_SUFFIX=64
-- fi
-+ext_output=$PHP_ZLIB_DIR
-+echo "$ac_t""$ext_output" 1>&6
-
--
-- PHP_OCI8_INSTANT_CLIENT="no"
-
-- if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then
-- echo "configure: warning: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" 1>&2
-- PHP_OCI8=instantclient
-- fi
-
-- if test "`echo $PHP_OCI8`" = "instantclient"; then
-- PHP_OCI8_INSTANT_CLIENT="yes"
-- elif test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then
-- PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
-- PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f1,4`"
-- if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-- PHP_OCI8_INSTANT_CLIENT="yes"
-- fi
-- if test -z "$PHP_OCI8"; then
-- PHP_OCI8=yes
-- fi
-- elif test "`echo $PHP_OCI8 | cut -d, -f1`" = "instantclient"; then
-- PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
-- PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f3,4`"
-- if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-- PHP_OCI8_INSTANT_CLIENT="yes"
-- fi
-- if test -z "$PHP_OCI8"; then
-- PHP_OCI8=yes
-- fi
-- fi
-+fi
-
-- if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
--
-- echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6
--echo "configure:62114: checking Oracle ORACLE_HOME install directory" >&5
-+if test "$PHP_MYSQL" = "mysqlnd"; then
-+ PHP_MYSQLND_ENABLED=yes
-
-- if test "$PHP_OCI8" = "yes"; then
-- OCI8_DIR=$ORACLE_HOME
-- else
-- OCI8_DIR=$PHP_OCI8
-+elif test "$PHP_MYSQL" != "no"; then
-+ MYSQL_DIR=
-+ MYSQL_INC_DIR=
-+
-+ for i in $PHP_MYSQL /usr/local /usr; do
-+ if test -r $i/include/mysql/mysql.h; then
-+ MYSQL_DIR=$i
-+ MYSQL_INC_DIR=$i/include/mysql
-+ break
-+ elif test -r $i/include/mysql.h; then
-+ MYSQL_DIR=$i
-+ MYSQL_INC_DIR=$i/include
-+ break
- fi
-- echo "$ac_t""$OCI8_DIR" 1>&6
-+ done
-
--
-- echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
--echo "configure:62125: checking ORACLE_HOME library validity" >&5
-- if test ! -d "$OCI8_DIR"; then
-- { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; }
-+ if test -z "$MYSQL_DIR"; then
-+ { 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 -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then
-- OCI8_LIB_DIR=lib
-- elif test ! -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
-- OCI8_LIB_DIR=lib32
-- elif test -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
-- OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
-+
-+ if test "$enable_maintainer_zts" = "yes"; then
-+ MYSQL_LIBNAME=mysqlclient_r
- else
-- if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then
-- { 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 "configure: error: Oracle library directory not found in ${OCI8_DIR}" 1>&2; exit 1; }
-- fi
-+ MYSQL_LIBNAME=mysqlclient
- fi
-- echo "$ac_t""$OCI8_LIB_DIR" 1>&6
-+ case $host_alias in
-+ *netware*)
-+ MYSQL_LIBNAME=mysql
-+ ;;
-+ esac
-
-+ if test -z "$PHP_LIBDIR"; then
-+ PHP_LIBDIR=lib
-+ fi
-
-- 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%/*[^/][^/]*/*$%%'`"
-+ for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do
-
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/public\"`"
-+ str="$MYSQL_DIR/$i/lib$MYSQL_LIBNAME.*"
-+ for j in `echo $str`; do
-+ if test -r $j; then
-+ MYSQL_LIB_DIR=$MYSQL_DIR/$i
-+ break 2
-+ fi
-+ done
-+
-+ done
-+
-+ if test -z "$MYSQL_LIB_DIR"; then
-+ { 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
-
--
-
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+ save_old_LDFLAGS=$LDFLAGS
-+ ac_stuff="
-+ -L$MYSQL_LIB_DIR
-+ "
-
-- 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"
-+ 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
-- INCLUDES="$INCLUDES -I$ai_p"
-- fi
--
-+
-+
-+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "EXTRA_LDFLAGS$unique=set"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
- fi
-
-- fi
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-
-- OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/public"
- fi
-- if test -d "$OCI8_DIR/rdbms/demo"; then
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-
-- if test "$OCI8_DIR/rdbms/demo" != "/usr/include"; then
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-
-- if test -z "$OCI8_DIR/rdbms/demo" || echo "$OCI8_DIR/rdbms/demo" | grep '^/' >/dev/null ; then
-- ai_p=$OCI8_DIR/rdbms/demo
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
- else
-
-- ep_dir="`echo $OCI8_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/demo\"`"
-+ 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 \"\$INCLUDEPATH$unique$ac_c\""
-+ cmd="echo $ac_n \"\$LIBPATH$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
-+ eval "LIBPATH$unique=set"
-
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
- fi
-
-- fi
-
-- 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%/*[^/][^/]*/*$%%'`"
-+ fi
-
-- 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'`
-+ ;;
-+ esac
-+ done
-+
-+ echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-+echo "configure:61917: 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_save_LIBS="$LIBS"
-+LIBS="-l$MYSQL_LIBNAME $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 61925 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char mysql_close();
-+
-+int main() {
-+mysql_close()
-+; return 0; }
-+EOF
-+if { (eval echo configure:61936: \"$ac_link\") 1>&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
-
-- 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
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+
-+
-+else
-+ echo "$ac_t""no" 1>&6
-
-- fi
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+ unset ac_cv_lib_$MYSQL_LIBNAME_mysql_close
-+
-+ if test "$PHP_ZLIB_DIR" != "no"; then
-+
-
-- OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/network/public"
-- fi
-- if test -d "$OCI8_DIR/plsql/public"; then
-+ if test "$ext_shared" = "yes"; then
-+ MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD"
-+ if test -n "$PHP_ZLIB_DIR"; then
-
-- if test "$OCI8_DIR/plsql/public" != "/usr/include"; then
-+ if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
-
-- if test -z "$OCI8_DIR/plsql/public" || echo "$OCI8_DIR/plsql/public" | grep '^/' >/dev/null ; then
-- ai_p=$OCI8_DIR/plsql/public
-+ if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
-+ ai_p=$PHP_ZLIB_DIR
- else
-
-- ep_dir="`echo $OCI8_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$OCI8_DIR/plsql/public\"`"
-+ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_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
--
-- OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/plsql/public"
-- 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"
-+ 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 $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "EXTRA_LDFLAGS$unique=set"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
- fi
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
-
-+ fi
-+
-+ fi
-
- fi
-- ;;
-- esac
--
-+ else
-+
-
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+ if test -n "$PHP_ZLIB_DIR"; then
-
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-+ 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 $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
- 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'`
-@@ -62360,21 +62038,39 @@ echo "configure:62125: checking ORACLE_H
- fi
-
-
-- fi
-
- fi
-
-- ;;
-- esac
-- done
-+ fi
-+
-+
-+ case z in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-lz $LIBS"
-+ ;;
-+ esac
-+
-+
-+
-+
-+ fi
-+
-
-- elif test -f "$OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist"; then
-
-- for ac_i in `cat $OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist`; do
-+ save_old_LDFLAGS=$LDFLAGS
-+ ac_stuff="
-+ -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
-- OCI8_SYSLIB="$OCI8_SYSLIB -pthread"
-+ LDFLAGS="$LDFLAGS -pthread"
- else
-
-
-@@ -62396,7 +62092,7 @@ echo "configure:62125: checking ORACLE_H
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
-- OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
- else
-
-
-@@ -62431,8 +62127,8 @@ echo "configure:62125: checking ORACLE_H
-
-
- 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"
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
- else
-
-
-@@ -62458,47 +62154,88 @@ echo "configure:62125: checking ORACLE_H
- esac
- done
-
-- fi
-+ echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-+echo "configure:62159: 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_save_LIBS="$LIBS"
-+LIBS="-l$MYSQL_LIBNAME $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 62167 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char mysql_error();
-+
-+int main() {
-+mysql_error()
-+; return 0; }
-+EOF
-+if { (eval echo configure:62178: \"$ac_link\") 1>&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 $ac_n "checking Oracle version""... $ac_c" 1>&6
--echo "configure:62466: checking Oracle version" >&5
-- if test -s "$OCI8_DIR/orainst/unix.rgs"; then
-- OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/ */:/g' | cut -d: -f 6 | cut -c 2-4`
-- test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
-- elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
-- OCI8_ORACLE_VERSION=11.1
-- elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
-- OCI8_ORACLE_VERSION=10.1
-- elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
-- OCI8_ORACLE_VERSION=9.0
-- elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
-- OCI8_ORACLE_VERSION=8.1
-- elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.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
-- OCI8_ORACLE_VERSION=8.0
-+
-+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 "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
-- OCI8_ORACLE_VERSION=8.1
-- fi
-- else
-- { echo "configure: error: Oracle client libraries not found" 1>&2; exit 1; }
-- fi
-- echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
-+
-+
-+ case z in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD"
-+ else
-+
-+
-+ case z in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-lz $LIBS"
-+ ;;
-+ esac
-
-
-- case $OCI8_ORACLE_VERSION in
-- 7.3|8.0|8.1)
-- { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; }
-- ;;
-+ fi
-+ ;;
-+ esac
-
-- 9.0)
--
-+
-+
- save_old_LDFLAGS=$LDFLAGS
- ac_stuff="
-- -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-- "
-+ -L$MYSQL_LIB_DIR
-+ "
-
- save_ext_shared=$ext_shared
- ext_shared=yes
-@@ -62591,27 +62328,27 @@ echo "configure:62466: checking Oracle v
- esac
- done
-
-- echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
--echo "configure:62596: checking for OCIEnvNlsCreate in -lclntsh" >&5
--ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-+echo "configure:62333: 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_save_LIBS="$LIBS"
--LIBS="-lclntsh $LIBS"
-+LIBS="-l$MYSQL_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 62604 "configure"
-+#line 62341 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char OCIEnvNlsCreate();
-+char mysql_errno();
-
- int main() {
--OCIEnvNlsCreate()
-+mysql_errno()
- ; return 0; }
- EOF
--if { (eval echo configure:62615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:62352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -62630,75 +62367,48 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- 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
-+ unset ac_cv_lib_$MYSQL_LIBNAME_mysql_errno
-
-- { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; }
--
-+ { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; }
-+
-
- fi
--
-- ;;
--
-- 10.1|11.1)
-- cat >> confdefs.h <<\EOF
--#define HAVE_OCI_LOB_READ2 1
--EOF
--
-- ;;
--
-- *)
-- { echo "configure: error: Oracle version $OCI8_ORACLE_VERSION is not supported" 1>&2; exit 1; }
-- ;;
-- esac
--
--
-+
-+ MYSQL_LIBS="-lz"
-+ fi
-
-- case clntsh in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
-- else
--
-
-- case clntsh in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -lclntsh"
-- ;;
-- esac
--
-+fi
-
-- fi
-- ;;
-- esac
-
-+
-
-+ 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 "$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
-+ if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then
-+ ai_p=$MYSQL_LIB_DIR
- else
-
-- ep_dir="`echo $OCI8_DIR/$OCI8_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$OCI8_DIR/$OCI8_LIB_DIR\"`"
-+ ai_p="$ep_realdir/`basename \"$MYSQL_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"
-+ 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
-
-
-@@ -62720,91 +62430,248 @@ EOF
-
- fi
-
-+ fi
-+ else
-
-- ext_builddir=ext/oci8
-- ext_srcdir=$abs_srcdir/ext/oci8
-
-- ac_extra=
-+ 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" != "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
-
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-
-+ fi
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
-
-+
-+ fi
-
-- old_IFS=$IFS
-- for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-+ fi
-
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
--
-- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
-+
-+ case $MYSQL_LIBNAME in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-l$MYSQL_LIBNAME $LIBS"
-+ ;;
-+ esac
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-
-
-- EXT_STATIC="$EXT_STATIC oci8"
-- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
-- fi
-+ 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
-- 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
-+
-+ 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
-
-- b_c_pre=$shared_c_pre
-- b_cxx_pre=$shared_cxx_pre
-- b_c_meta=$shared_c_meta
-- b_cxx_meta=$shared_cxx_meta
-- b_c_post=$shared_c_post
-- b_cxx_post=$shared_cxx_post
-- b_lo=$shared_lo
-+ fi
-
-
-- old_IFS=$IFS
-- for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-+ MYSQL_MODULE_TYPE=external
-+ MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS"
-+ MYSQL_INCLUDE=-I$MYSQL_INC_DIR
-+
-
-- IFS=.
-- set $ac_src
-+
-+ 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 $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
-+echo "configure:62546: checking for MySQL UNIX socket location" >&5
-+ if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
-+ MYSQL_SOCK=$PHP_MYSQL_SOCK
-+ cat >> confdefs.h <<EOF
-+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
-+EOF
-+
-+ 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 \
-+ /var/run/mysql/mysql.sock \
-+ /var/lib/mysql/mysql.sock \
-+ /var/mysql/mysql.sock \
-+ /usr/local/mysql/var/mysql.sock \
-+ /Private/tmp/mysql.sock \
-+ /private/tmp/mysql.sock \
-+ /tmp/mysql.sock \
-+ ; do
-+ if test -r $i; then
-+ MYSQL_SOCK=$i
-+ break 2
-+ fi
-+ done
-+
-+ if test -n "$MYSQL_SOCK"; then
-+ cat >> confdefs.h <<EOF
-+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
-+EOF
-+
-+ echo "$ac_t""$MYSQL_SOCK" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_MYSQL 1
-+EOF
-+
-+
-+ ext_builddir=ext/mysql
-+ ext_srcdir=$abs_srcdir/ext/mysql
-+
-+ ac_extra=
-+
-+ 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
-+ 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_mysql.c; do
-+
-+ IFS=.
-+ set $ac_src
- ac_obj=$1
- IFS=$old_IFS
-
-- shared_objects_oci8="$shared_objects_oci8 $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" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC mysql"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC mysql"
-+ fi
-+ 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
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in 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
- *.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" ;;
-@@ -62827,31 +62694,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpoci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpoci8.so '$ext_builddir'/phpoci8.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(PHPMYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmysql.so '$ext_builddir'/phpmysql.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQL, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(PHPMYSQL_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpoci8.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmysql.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysql.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phpoci8.$suffix: $ext_builddir/phpoci8.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phpoci8.$suffix \$(phplibdir)
-+\$(phplibdir)/phpmysql.$suffix: $ext_builddir/phpmysql.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phpmysql.$suffix \$(phplibdir)
-
--$ext_builddir/phpoci8.$suffix: \$(shared_objects_oci8) \$(PHPOCI8_SHARED_DEPENDENCIES)
-+$ext_builddir/phpmysql.$suffix: \$(shared_objects_mysql) \$(PHPMYSQL_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -62864,31 +62731,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/oci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/oci8.so '$ext_builddir'/oci8.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mysql.so '$ext_builddir'/mysql.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQL, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(MYSQL_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/oci8.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mysql.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysql.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/oci8.$suffix: $ext_builddir/oci8.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/oci8.$suffix \$(phplibdir)
-+\$(phplibdir)/mysql.$suffix: $ext_builddir/mysql.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/mysql.$suffix \$(phplibdir)
-
--$ext_builddir/oci8.$suffix: \$(shared_objects_oci8) \$(OCI8_SHARED_DEPENDENCIES)
-+$ext_builddir/mysql.$suffix: \$(shared_objects_mysql) \$(MYSQL_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -62896,22 +62763,22 @@ EOF
- ;;
- esac
- cat >> confdefs.h <<EOF
--#define COMPILE_DL_OCI8 1
-+#define COMPILE_DL_MYSQL 1
- EOF
-
- fi
- fi
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_OCI8_SHARED=no
-+ PHP_MYSQL_SHARED=no
- case "$PHP_SAPI" in
- cgi|embed)
-
-
-- case ext/oci8 in
-+ case ext/mysql 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" ;;
-+ /*) 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
-
-
-@@ -62926,7 +62793,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-+ for ac_src in php_mysql.c; do
-
- IFS=.
- set $ac_src
-@@ -62949,15 +62816,15 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC oci8"
-+ EXT_STATIC="$EXT_STATIC mysql"
- ;;
- *)
-
-
-- case ext/oci8 in
-+ case ext/mysql 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" ;;
-+ /*) 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
-
-
-@@ -62972,7 +62839,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-+ for ac_src in php_mysql.c; do
-
- IFS=.
- set $ac_src
-@@ -62997,7 +62864,7 @@ EOF
-
- ;;
- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC mysql"
- fi
-
-
-@@ -63006,183 +62873,159 @@ EOF
-
-
- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=oci8
-+ PHP_PECL_EXTENSION=mysql
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
- fi
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_OCI8 1
--EOF
-+
-+ 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 "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.
-+" 1>&2; exit 1; }
-+ fi
-+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ { echo "configure: error:
-+You've configured extension mysql, which depends on extension mysqlnd,
-+but you've either not enabled mysqlnd, or have disabled it.
-+" 1>&2; exit 1; }
-+ fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD"
-+ cat >> confdefs.h <<\EOF
-+#define MYSQL_USE_MYSQLND 1
-+EOF
-
--
-+ fi
-+fi
-
--
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR"
-
--
-
--
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION"
-+php_with_mysqli=no
-
-+echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6
-+echo "configure:62919: 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
-
-- cat >> confdefs.h <<EOF
--#define PHP_OCI8_DEF_DIR "$OCI8_DIR"
--EOF
-
-- cat >> confdefs.h <<EOF
--#define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD"
--EOF
-
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_MYSQLI in
-+shared,*)
-+ PHP_MYSQLI=`echo "$PHP_MYSQLI"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_MYSQLI=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-
-- else
--
-- echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
--echo "configure:63052: checking Oracle Instant Client directory" >&5
-
-- if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
-- PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
-- if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
-- { 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 "$ac_t""$PHP_OCI8_INSTANT_CLIENT" 1>&6
-
-- OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
-+echo "$ac_t""$ext_output" 1>&6
-
-- echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
--echo "configure:63065: checking Oracle Instant Client SDK header directory" >&5
-
-- 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!'`
-
-- OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
-
-- OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib/*$!\1/include!'`
-
-- if test -f "$OCISDKRPMINC/oci.h"; then
-- 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
-+php_enable_embedded_mysqli=no
-
--
-+echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6
-+echo "configure:62963: 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
-
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+ PHP_EMBEDDED_MYSQLI=no
-
-- 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
-
-- OCI8INCDIR=$OCISDKRPMINC
-- elif test -f "$OCISDKZIPINC/oci.h"; then
-- 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
-+
-+ext_output=$PHP_EMBEDDED_MYSQLI
-+echo "$ac_t""$ext_output" 1>&6
-+
-+
-+
-+
-+if test "$PHP_MYSQLI" = "mysqlnd"; then
-+ PHP_MYSQLND_ENABLED=yes
-+
-+elif test "$PHP_MYSQLI" != "no"; then
-+
-+ if test "$PHP_MYSQLI" = "yes"; then
-+ MYSQL_CONFIG=`$php_shtool path mysql_config`
- else
--
-- ep_dir="`echo $OCISDKZIPINC|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$OCISDKZIPINC\"`"
-+ MYSQL_CONFIG=$PHP_MYSQLI
- 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
-+ MYSQL_LIB_NAME='mysqlclient'
-+ if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_EMBEDDED_MYSQLI 1
-+EOF
-
-+ MYSQL_LIB_CFG='--libmysqld-libs'
-+ mysqli_extra_sources="mysqli_embedded.c"
-+ elif test "$enable_maintainer_zts" = "yes"; then
-+ MYSQL_LIB_CFG='--libs_r'
-+ MYSQL_LIB_NAME='mysqlclient_r'
-+ else
-+ MYSQL_LIB_CFG='--libs'
- fi
--
-- OCI8INCDIR=$OCISDKZIPINC
-- elif test -f "$OCISDKMANINC/oci.h"; then
-- 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
-+
-+ 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
--
-- ep_dir="`echo $OCISDKMANINC|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$OCISDKMANINC\"`"
-+ 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
-+ "
-
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+ save_ext_shared=$ext_shared
-+ ext_shared=yes
-
-- 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 "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
-+ for ac_i in $ac_stuff; do
- case $ac_i in
- -pthread)
- if test "$ext_shared" = "yes"; then
-- OCI8_SYSLIB="$OCI8_SYSLIB -pthread"
-+ LDFLAGS="$LDFLAGS -pthread"
- else
-
-
-@@ -63204,7 +63047,7 @@ echo "configure:63065: checking Oracle I
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
-- OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
- else
-
-
-@@ -63239,8 +63082,8 @@ echo "configure:63065: checking Oracle I
-
-
- 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"
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
- else
-
-
-@@ -63266,50 +63109,120 @@ echo "configure:63065: checking Oracle I
- esac
- done
-
-- fi
-+ echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
-+echo "configure:63114: 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_save_LIBS="$LIBS"
-+LIBS="-l$MYSQL_LIB_NAME $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 63122 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char mysql_set_server_option();
-
--
-- echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
--echo "configure:63274: checking Oracle Instant Client version" >&5
-- if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then
-- if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
-- if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
-- { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.11.1 not found" 1>&2; exit 1; }
-- fi
-- OCI8_ORACLE_VERSION=11.1
-- else
-- { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; }
-- fi
-- elif test -f $PHP_OCI8_INSTANT_CLIENT/libnnz10.$SHLIB_SUFFIX_NAME; then
-- if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
-- if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
-- { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found" 1>&2; exit 1; }
-- fi
-- OCI8_ORACLE_VERSION=10.1
-- else
-- { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; }
-- fi
-- else
-- { echo "configure: error: Oracle Instant Client libraries not found" 1>&2; exit 1; }
-- fi
-- echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
-+int main() {
-+mysql_set_server_option()
-+; return 0; }
-+EOF
-+if { (eval echo configure:63133: \"$ac_link\") 1>&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"
-
-- case $OCI8_ORACLE_VERSION in
-- 10.1|11.1)
--
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-
-- case clntsh in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
-+ 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
-+
-+ ;;
-+ 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii"
- else
-
-
-- case clntsh in
-+ case $ac_ii in
- c|c_r|pthread*) ;;
- *)
-- LIBS="$LIBS -lclntsh"
-+ LIBS="$LIBS -l$ac_ii"
- ;;
- esac
-
-@@ -63319,23 +63232,26 @@ echo "configure:63274: checking Oracle I
- esac
-
-
--
-- if test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/$PHP_LIBDIR" && test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/lib"; then
-+ ;;
-+ -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 "$PHP_OCI8_INSTANT_CLIENT" || echo "$PHP_OCI8_INSTANT_CLIENT" | grep '^/' >/dev/null ; then
-- ai_p=$PHP_OCI8_INSTANT_CLIENT
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
- else
-
-- ep_dir="`echo $PHP_OCI8_INSTANT_CLIENT|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PHP_OCI8_INSTANT_CLIENT\"`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
- 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"
-+ 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
-
-
-@@ -63357,36 +63273,348 @@ echo "configure:63274: checking Oracle I
-
- fi
-
-- ;;
--
-- *)
-- { echo "configure: error: Oracle Instant Client version $PHP_OCI8_INSTANT_CLIENT is not supported" 1>&2; exit 1; }
-- ;;
-+ ;;
- esac
-+ done
-
- cat >> confdefs.h <<\EOF
--#define HAVE_OCI_INSTANT_CLIENT 1
-+#define HAVE_MYSQLILIB 1
-+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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-+
-+
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ else
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-+
-+
-+ fi
-+
-+ fi
-+
-+ ;;
-+ esac
-+ done
-+
-+ echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
-+echo "configure:63381: 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_save_LIBS="$LIBS"
-+LIBS="-l$MYSQL_LIB_NAME $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 63389 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char mysql_set_character_set();
-+
-+int main() {
-+mysql_set_character_set()
-+; return 0; }
-+EOF
-+if { (eval echo configure:63400: \"$ac_link\") 1>&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 "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 "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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-+
-+
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ else
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-+
-+
-+ fi
-+
-+ fi
-+
-+ ;;
-+ esac
-+ done
-+
-+ echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
-+echo "configure:63544: 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_save_LIBS="$LIBS"
-+LIBS="-l$MYSQL_LIB_NAME $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 63552 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char mysql_stmt_next_result();
-+
-+int main() {
-+mysql_stmt_next_result()
-+; return 0; }
- EOF
-+if { (eval echo configure:63563: \"$ac_link\") 1>&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_OCI_LOB_READ2 1
-+#define HAVE_STMT_NEXT_RESULT 1
- 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
-
-- ext_builddir=ext/oci8
-- ext_srcdir=$abs_srcdir/ext/oci8
-+
-+
-+fi
-+
-+fi
-+
-+if test "$PHP_MYSQLI" != "no"; then
-+ 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
-
- ac_extra=
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_OCI8_SHARED=no
-+ PHP_MYSQLI_SHARED=no
-
-
-- case ext/oci8 in
-+ case ext/mysqli 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" ;;
-+ /*) 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
-
-
-@@ -63401,7 +63629,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-+ for ac_src in $mysqli_sources; do
-
- IFS=.
- set $ac_src
-@@ -63424,18 +63652,18 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC oci8"
-+ EXT_STATIC="$EXT_STATIC mysqli"
- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
- fi
- else
- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-- PHP_OCI8_SHARED=yes
-+ PHP_MYSQLI_SHARED=yes
-
-- case ext/oci8 in
-+ case ext/mysqli 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" ;;
-+ /*) 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
-
-
-@@ -63450,14 +63678,14 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-+ for ac_src in $mysqli_sources; do
-
- IFS=.
- set $ac_src
- ac_obj=$1
- IFS=$old_IFS
-
-- shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo"
-+ shared_objects_mysqli="$shared_objects_mysqli $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" ;;
-@@ -63480,31 +63708,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpoci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpoci8.so '$ext_builddir'/phpoci8.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmysqli.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(PHPMYSQLI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmysqli.so '$ext_builddir'/phpmysqli.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLI, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(PHPMYSQLI_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpoci8.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmysqli.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqli.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phpoci8.$suffix: $ext_builddir/phpoci8.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phpoci8.$suffix \$(phplibdir)
-+\$(phplibdir)/phpmysqli.$suffix: $ext_builddir/phpmysqli.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phpmysqli.$suffix \$(phplibdir)
-
--$ext_builddir/phpoci8.$suffix: \$(shared_objects_oci8) \$(PHPOCI8_SHARED_DEPENDENCIES)
-+$ext_builddir/phpmysqli.$suffix: \$(shared_objects_mysqli) \$(PHPMYSQLI_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -63517,31 +63745,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/oci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/oci8.so '$ext_builddir'/oci8.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mysqli.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(MYSQLI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mysqli.so '$ext_builddir'/mysqli.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQLI, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(MYSQLI_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/oci8.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mysqli.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysqli.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/oci8.$suffix: $ext_builddir/oci8.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/oci8.$suffix \$(phplibdir)
-+\$(phplibdir)/mysqli.$suffix: $ext_builddir/mysqli.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/mysqli.$suffix \$(phplibdir)
-
--$ext_builddir/oci8.$suffix: \$(shared_objects_oci8) \$(OCI8_SHARED_DEPENDENCIES)
-+$ext_builddir/mysqli.$suffix: \$(shared_objects_mysqli) \$(MYSQLI_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -63549,22 +63777,22 @@ EOF
- ;;
- esac
- cat >> confdefs.h <<EOF
--#define COMPILE_DL_OCI8 1
-+#define COMPILE_DL_MYSQLI 1
- EOF
-
- fi
- fi
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_OCI8_SHARED=no
-+ PHP_MYSQLI_SHARED=no
- case "$PHP_SAPI" in
- cgi|embed)
-
-
-- case ext/oci8 in
-+ case ext/mysqli 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" ;;
-+ /*) 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
-
-
-@@ -63579,7 +63807,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-+ for ac_src in $mysqli_sources; do
-
- IFS=.
- set $ac_src
-@@ -63602,15 +63830,15 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC oci8"
-+ EXT_STATIC="$EXT_STATIC mysqli"
- ;;
- *)
-
-
-- case ext/oci8 in
-+ case ext/mysqli 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" ;;
-+ /*) 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
-
-
-@@ -63625,7 +63853,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-+ for ac_src in $mysqli_sources; do
-
- IFS=.
- set $ac_src
-@@ -63650,7 +63878,7 @@ EOF
-
- ;;
- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
- fi
-
-
-@@ -63659,40 +63887,67 @@ EOF
-
-
- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=oci8
-+ PHP_PECL_EXTENSION=mysqli
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
- fi
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_OCI8 1
--EOF
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQLI_SHARED_LIBADD"
-
--
--
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD"
--
-
--
--
-+ for header_file in ext/mysqli/php_mysqli_structs.h; do
-+
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR"
--
-+ 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"
-
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION"
-+ INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
-+
-+ fi
-
-+ 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 "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.
-+" 1>&2; exit 1; }
-+ fi
-+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ { echo "configure: error:
-+You've configured extension mysqli, which depends on extension mysqlnd,
-+but you've either not enabled mysqlnd, or have disabled it.
-+" 1>&2; exit 1; }
-+ fi
-+
-+ cat >> confdefs.h <<\EOF
-+#define MYSQLI_USE_MYSQLND 1
-+EOF
-+
- fi
- fi
-
-
-+if test -z "$SED"; then
-+ PHP_OCI8_SED="sed";
-+else
-+ PHP_OCI8_SED="$SED";
-+fi
-
-
-
-@@ -63703,19 +63958,20 @@ fi
-
-
-
--if test -z "$ODBC_TYPE"; then
-
--php_with_adabas=no
-
-+php_with_oci8=no
-
--# Check whether --with-adabas or --without-adabas was given.
--if test "${with_adabas+set}" = set; then
-- withval="$with_adabas"
-- PHP_ADABAS=$withval
-+echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6
-+echo "configure:63967: checking for Oracle (OCI8) support" >&5
-+# Check whether --with-oci8 or --without-oci8 was given.
-+if test "${with_oci8+set}" = set; then
-+ withval="$with_oci8"
-+ PHP_OCI8=$withval
- else
-
-- PHP_ADABAS=no
-- test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL
-+ PHP_OCI8=no
-+ test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL
-
- fi
-
-@@ -63723,12 +63979,12 @@ fi
-
- ext_output="yes, shared"
- ext_shared=yes
--case $PHP_ADABAS in
-+case $PHP_OCI8 in
- shared,*)
-- PHP_ADABAS=`echo "$PHP_ADABAS"|$SED 's/^shared,//'`
-+ PHP_OCI8=`echo "$PHP_OCI8"|$SED 's/^shared,//'`
- ;;
- shared)
-- PHP_ADABAS=yes
-+ PHP_OCI8=yes
- ;;
- no)
- ext_output=no
-@@ -63742,28 +63998,178 @@ esac
-
-
-
-+echo "$ac_t""$ext_output" 1>&6
-
-
-
-
-+if test "$PHP_OCI8" != "no"; then
-
-- if test "$PHP_ADABAS" != "no"; then
-- echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
--echo "configure:63753: checking for Adabas support" >&5
-- if test "$PHP_ADABAS" = "yes"; then
-- PHP_ADABAS=/usr/local
-+ if test -z "$PHP_OCI8"; then
-+ { echo "configure: error: Empty parameter value passed to --with-oci8" 1>&2; exit 1; }
-+ fi
-+
-+
-+ echo $ac_n "checking PHP version""... $ac_c" 1>&6
-+echo "configure:64015: checking PHP version" >&5
-+
-+ tmp_version=$PHP_VERSION
-+ if test -z "$tmp_version"; then
-+ if test -z "$PHP_CONFIG"; then
-+ { 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
-+ php_version=`echo "$tmp_version"|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
-+ fi
-+
-+ if test -z "$php_version"; then
-+ { echo "configure: error: failed to detect PHP version, please report" 1>&2; exit 1; }
-+ fi
-+
-+ ac_IFS=$IFS
-+ IFS="."
-+ set $php_version
-+ IFS=$ac_IFS
-+ oci8_php_version=`expr $1 \* 1000000 + $2 \* 1000 + $3`
-+
-+ if test "$oci8_php_version" -lt "4003009"; then
-+ { 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 "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 $ac_n "checking size of long int""... $ac_c" 1>&6
-+echo "configure:64047: 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
-+ ac_cv_sizeof_long_int=4
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 64055 "configure"
-+#include "confdefs.h"
-+#include <stdio.h>
-+#include <sys/types.h>
-+main()
-+{
-+ FILE *f=fopen("conftestval", "w");
-+ if (!f) exit(1);
-+ fprintf(f, "%d\n", sizeof(long int));
-+ exit(0);
-+}
-+EOF
-+if { (eval echo configure:64067: \"$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 "$ac_t""$ac_cv_sizeof_long_int" 1>&6
-+cat >> confdefs.h <<EOF
-+#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
-+EOF
-+
-+
-+ echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
-+echo "configure:64087: checking checking if we're on a 64-bit platform" >&5
-+ if test "$ac_cv_sizeof_long_int" = "4"; then
-+ echo "$ac_t""no" 1>&6
-+ PHP_OCI8_OH_LIBDIR=lib32
-+ PHP_OCI8_IC_LIBDIR_SUFFIX=""
-+ else
-+ 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 "configure: warning: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" 1>&2
-+ PHP_OCI8=instantclient
-+ fi
-+
-+ if test "`echo $PHP_OCI8`" = "instantclient"; then
-+ PHP_OCI8_INSTANT_CLIENT="yes"
-+ elif test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then
-+ PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
-+ PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f1,4`"
-+ if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-+ PHP_OCI8_INSTANT_CLIENT="yes"
-+ fi
-+ if test -z "$PHP_OCI8"; then
-+ PHP_OCI8=yes
-+ fi
-+ elif test "`echo $PHP_OCI8 | cut -d, -f1`" = "instantclient"; then
-+ PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
-+ PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f3,4`"
-+ if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-+ PHP_OCI8_INSTANT_CLIENT="yes"
-+ fi
-+ if test -z "$PHP_OCI8"; then
-+ PHP_OCI8=yes
-+ fi
-+ fi
-+
-+ if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
-+
-+ echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6
-+echo "configure:64131: checking Oracle ORACLE_HOME install directory" >&5
-+
-+ if test "$PHP_OCI8" = "yes"; then
-+ OCI8_DIR=$ORACLE_HOME
-+ else
-+ OCI8_DIR=$PHP_OCI8
- fi
-+ echo "$ac_t""$OCI8_DIR" 1>&6
-+
-
-- if test "$PHP_ADABAS/incl" != "/usr/include"; then
-+ echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
-+echo "configure:64142: checking ORACLE_HOME library validity" >&5
-+ if test ! -d "$OCI8_DIR"; then
-+ { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; }
-+ fi
-+ if test -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then
-+ OCI8_LIB_DIR=lib
-+ elif test ! -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
-+ OCI8_LIB_DIR=lib32
-+ elif test -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
-+ OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
-+ else
-+ if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then
-+ { 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 "configure: error: Oracle library directory not found in ${OCI8_DIR}" 1>&2; exit 1; }
-+ fi
-+ fi
-+ 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 "$PHP_ADABAS/incl" || echo "$PHP_ADABAS/incl" | grep '^/' >/dev/null ; then
-- ai_p=$PHP_ADABAS/incl
-+ 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 $PHP_ADABAS/incl|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $OCI8_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PHP_ADABAS/incl\"`"
-+ ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/public\"`"
- fi
-
-
-@@ -63784,189 +64190,88 @@ echo "configure:63753: checking for Adab
-
- fi
-
-+ 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 "$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
-+ 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 $PHP_ADABAS/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $OCI8_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PHP_ADABAS/$PHP_LIBDIR\"`"
-+ 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 \"\$LIBPATH$unique$ac_c\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
-+ eval "INCLUDEPATH$unique=set"
-
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
-+ fi
-
- fi
-
-- ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a"
-- ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
-- $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"
-- ;;
-- esac
--
--
--
--
-- case sqlrte in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="-lsqlrte $LIBS"
-- ;;
-- esac
--
--
--
-+ fi
-
-- 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
-+ 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 "$abs_builddir/ext/odbc" || echo "$abs_builddir/ext/odbc" | grep '^/' >/dev/null ; then
-- ai_p=$abs_builddir/ext/odbc
-+ 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 $abs_builddir/ext/odbc|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $OCI8_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$abs_builddir/ext/odbc\"`"
-+ 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 \"\$LIBPATH$unique$ac_c\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
-+ eval "INCLUDEPATH$unique=set"
-
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
-+ fi
-
- fi
-
- fi
--
--
-- case odbc_adabas in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="-lodbc_adabas $LIBS"
-- ;;
-- esac
--
--
--
--
-- ODBC_TYPE=adabas
-- ODBC_INCDIR=$PHP_ADABAS/incl
--
--if ! test -f "$ODBC_INCDIR/sqlext.h"; then
-- { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
--fi
--
-- cat >> confdefs.h <<\EOF
--#define HAVE_ADABAS 1
--EOF
--
-- echo "$ac_t""$ext_output" 1>&6
-- fi
--fi
--
--if test -z "$ODBC_TYPE"; then
--
--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
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_SAPDB in
--shared,*)
-- PHP_SAPDB=`echo "$PHP_SAPDB"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_SAPDB=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
-
--
--
--
--
--
-- if test "$PHP_SAPDB" != "no"; then
-- echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
--echo "configure:63956: checking for SAP DB support" >&5
-- if test "$PHP_SAPDB" = "yes"; then
-- PHP_SAPDB=/usr/local
-+ 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 "$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
-+ 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 $PHP_SAPDB/incl|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $OCI8_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PHP_SAPDB/incl\"`"
-+ ai_p="$ep_realdir/`basename \"$OCI8_DIR/plsql/public\"`"
- fi
-
-
-@@ -63987,21 +64292,76 @@ echo "configure:63956: checking for SAP
-
- fi
-
-+ OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/plsql/public"
-+ 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-
-- if test "$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
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
- else
-
-- ep_dir="`echo $PHP_SAPDB/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PHP_SAPDB/$PHP_LIBDIR\"`"
-+ 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'`
-@@ -64017,813 +64377,728 @@ echo "configure:63956: checking for SAP
- fi
-
-
-+ fi
-
- fi
-
--
-+ ;;
-+ esac
-+ 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
-+
-
-- case sqlod in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="-lsqlod $LIBS"
-- ;;
-- esac
-+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "EXTRA_LDFLAGS$unique=set"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-
-- ODBC_TYPE=sapdb
-- cat >> confdefs.h <<\EOF
--#define HAVE_SAPDB 1
--EOF
--
-- echo "$ac_t""$ext_output" 1>&6
-- fi
--fi
-
--if test -z "$ODBC_TYPE"; then
-+ fi
-+ ;;
-+ esac
-
--php_with_solid=no
-
-+ ;;
-+ -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
-
--# Check whether --with-solid or --without-solid was given.
--if test "${with_solid+set}" = set; then
-- withval="$with_solid"
-- PHP_SOLID=$withval
--else
-+
-+ 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
-+
-
-- PHP_SOLID=no
-- test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL
--
--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
-
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_SOLID in
--shared,*)
-- PHP_SOLID=`echo "$PHP_SOLID"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_SOLID=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
-+ ;;
-+ esac
-+ done
-
-+ fi
-
-+
-+ echo $ac_n "checking Oracle version""... $ac_c" 1>&6
-+echo "configure:64483: checking Oracle version" >&5
-+ if test -s "$OCI8_DIR/orainst/unix.rgs"; then
-+ OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/ */:/g' | cut -d: -f 6 | cut -c 2-4`
-+ test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
-+ elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
-+ OCI8_ORACLE_VERSION=11.1
-+ elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
-+ OCI8_ORACLE_VERSION=10.1
-+ elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
-+ OCI8_ORACLE_VERSION=9.0
-+ elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
-+ OCI8_ORACLE_VERSION=8.1
-+ elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.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
-+ OCI8_ORACLE_VERSION=8.0
-+ else
-+ OCI8_ORACLE_VERSION=8.1
-+ fi
-+ else
-+ { echo "configure: error: Oracle client libraries not found" 1>&2; exit 1; }
-+ fi
-+ echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
-
-
-+ case $OCI8_ORACLE_VERSION in
-+ 7.3|8.0|8.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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-
-
-- if test "$PHP_SOLID" != "no"; then
-- echo $ac_n "checking for Solid support""... $ac_c" 1>&6
--echo "configure:64089: checking for Solid support" >&5
-- if test "$PHP_SOLID" = "yes"; then
-- PHP_SOLID=/usr/local/solid
- fi
-- ODBC_INCDIR=$PHP_SOLID/include
-- ODBC_LIBDIR=$PHP_SOLID/$PHP_LIBDIR
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_TYPE=solid
-- if test -f $ODBC_LIBDIR/soc*35.a; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_SOLID_35 1
--EOF
--
-- elif test -f $ODBC_LIBDIR/scl*30.a; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_SOLID_30 1
--EOF
-+ ;;
-+ esac
-
-- elif test -f $ODBC_LIBDIR/scl*23.a; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_SOLID 1
--EOF
-
-- fi
-- echo "$ac_t""$ext_output" 1>&6
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-
-- echo $ac_n "checking Solid library file""... $ac_c" 1>&6
--echo "configure:64116: 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)
-- if ldd -v /bin/sh | grep GLIBC > /dev/null; then
-- cat >> confdefs.h <<\EOF
--#define SS_LINUX 1
--EOF
-+ 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
-
-- ac_solid_os=l2x
-+
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
- else
-- cat >> confdefs.h <<\EOF
--#define SS_LINUX 1
--EOF
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-
-- ac_solid_os=lux
-- fi;;
-- SunOS)
-- ac_solid_os=ssx;; # should we deal with SunOS 4?
-- FreeBSD)
-- if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
-- cat >> confdefs.h <<\EOF
--#define SS_FBX 1
--EOF
-
-- ac_solid_os=fex
-- else
-- cat >> confdefs.h <<\EOF
--#define SS_FBX 1
--EOF
-+ fi
-+
-+ fi
-
-- ac_solid_os=fbx
-- fi;;
-- esac
-+ ;;
-+ esac
-+ done
-
-- if test -f $ODBC_LIBDIR/soc${ac_solid_os}35.a; then
-- ac_solid_version=35
-- ac_solid_prefix=soc
-- elif test -f $ODBC_LIBDIR/scl${ac_solid_os}30.a; then
-- ac_solid_version=30
-- ac_solid_prefix=scl
-- elif test -f $ODBC_LIBDIR/scl${ac_solid_os}23.a; then
-- ac_solid_version=23
-- ac_solid_prefix=scl
-- fi
-+ echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
-+echo "configure:64613: 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_save_LIBS="$LIBS"
-+LIBS="-lclntsh $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 64621 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char OCIEnvNlsCreate();
-
--#
--# Check for the library files, and setup the ODBC_LIBS path...
--#
--if test ! -f $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \
-- ! -f $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then
-- #
-- # we have an error and should bail out, as we can't find the libs!
-- #
-- echo ""
-- echo "*********************************************************************"
-- echo "* Unable to locate $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
-- echo "* Please correct this by creating the following links and reconfiguring:"
-- echo "* $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
-- echo "* $ODBC_LIBDIR/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so"
-- echo "*********************************************************************"
-+int main() {
-+OCIEnvNlsCreate()
-+; return 0; }
-+EOF
-+if { (eval echo configure:64632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=yes"
- else
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
-+ 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"
-
-- echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
--
-- fi
- fi
--
--if test -z "$ODBC_TYPE"; then
--
--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
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-
-- PHP_IBM_DB2=no
-- test "$PHP_ENABLE_ALL" && PHP_IBM_DB2=$PHP_ENABLE_ALL
-+ 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 "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; }
-+
-+
- fi
-
-+ ;;
-
-+ 10.1|11.1)
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCI_LOB_READ2 1
-+EOF
-
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_IBM_DB2 in
--shared,*)
-- PHP_IBM_DB2=`echo "$PHP_IBM_DB2"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_IBM_DB2=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
--
--
--
--
-+ ;;
-
-+ *)
-+ { echo "configure: error: Oracle version $OCI8_ORACLE_VERSION is not supported" 1>&2; exit 1; }
-+ ;;
-+ esac
-
-- if test "$PHP_IBM_DB2" != "no"; then
-- echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
--echo "configure:64237: checking for IBM DB2 support" >&5
-- if test "$PHP_IBM_DB2" = "yes"; then
-- ODBC_INCDIR=/home/db2inst1/sqllib/include
-- ODBC_LIBDIR=/home/db2inst1/sqllib/lib
-+
-+
-+ case clntsh in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
- else
-- ODBC_INCDIR=$PHP_IBM_DB2/include
-- ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR
-- fi
-+
-+
-+ case clntsh in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -lclntsh"
-+ ;;
-+ esac
-
--
--if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then
-- { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" 1>&2; exit 1; }
--fi
-
-+ fi
-+ ;;
-+ esac
-
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- 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 <<EOF
--#line 64268 "configure"
--#include "confdefs.h"
--
-+ if test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/lib"; then
-
-- char SQLExecute();
-- int main() {
-- SQLExecute();
-- return 0;
-- }
--
--EOF
--if { (eval echo configure:64279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--
-- LIBS=$old_LIBS
-+ 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
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_IBMDB2 1
--EOF
-+ 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
-
-- echo "$ac_t""$ext_output" 1>&6
-
-+ 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
-+
-
--else
-- 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.
--You need to source your DB2 environment before running PHP configure:
--# . \$IBM_DB2/db2profile
--" 1>&2; exit 1; }
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-
--fi
--rm -fr conftest*
--fi
-+ fi
-
-
-+ fi
-+
- fi
--fi
--
--if test -z "$ODBC_TYPE"; then
-
--php_with_odbcrouter=no
-+
-+ ext_builddir=ext/oci8
-+ ext_srcdir=$abs_srcdir/ext/oci8
-
-+ ac_extra=
-
--# Check whether --with-ODBCRouter or --without-ODBCRouter was given.
--if test "${with_ODBCRouter+set}" = set; then
-- withval="$with_ODBCRouter"
-- PHP_ODBCROUTER=$withval
--else
-+ 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
-+
-
-- PHP_ODBCROUTER=no
-- test "$PHP_ENABLE_ALL" && PHP_ODBCROUTER=$PHP_ENABLE_ALL
--
--fi
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_ODBCROUTER in
--shared,*)
-- PHP_ODBCROUTER=`echo "$PHP_ODBCROUTER"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_ODBCROUTER=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--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 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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-
-
-- if test "$PHP_ODBCROUTER" != "no"; then
-- echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
--echo "configure:64360: checking for ODBCRouter.com support" >&5
-- if test "$PHP_ODBCROUTER" = "yes"; then
-- PHP_ODBCROUTER=/usr
-+ EXT_STATIC="$EXT_STATIC oci8"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
- fi
-- ODBC_INCDIR=$PHP_ODBCROUTER/include
-- ODBC_LIBDIR=$PHP_ODBCROUTER/lib
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_LIBS=-lodbcsdk
-- ODBC_TYPE=ODBCRouter
-- cat >> confdefs.h <<\EOF
--#define HAVE_ODBC_ROUTER 1
--EOF
-+ 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
-+
-+
-
-- echo "$ac_t""$ext_output" 1>&6
-- fi
--fi
-+ b_c_pre=$shared_c_pre
-+ b_cxx_pre=$shared_cxx_pre
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-
--if test -z "$ODBC_TYPE"; then
-
--php_with_empress=no
-+ 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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
--# 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
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-
--fi
-+ case $host_alias in
-+ *netware*)
-+
-+ install_modules="install-modules"
-
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpoci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpoci8.so '$ext_builddir'/phpoci8.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD)'
-+ ;;
-+ esac
-
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpoci8.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
-
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_EMPRESS in
--shared,*)
-- PHP_EMPRESS=`echo "$PHP_EMPRESS"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_EMPRESS=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/phpoci8.$suffix: $ext_builddir/phpoci8.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phpoci8.$suffix \$(phplibdir)
-
-+$ext_builddir/phpoci8.$suffix: \$(shared_objects_oci8) \$(PHPOCI8_SHARED_DEPENDENCIES)
-+ $link_cmd
-
-+EOF
-
-+ ;;
-+ *)
-+
-+ install_modules="install-modules"
-
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/oci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/oci8.so '$ext_builddir'/oci8.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD)'
-+ ;;
-+ esac
-
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/oci8.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
-
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/oci8.$suffix: $ext_builddir/oci8.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/oci8.$suffix \$(phplibdir)
-
-+$ext_builddir/oci8.$suffix: \$(shared_objects_oci8) \$(OCI8_SHARED_DEPENDENCIES)
-+ $link_cmd
-
-- if test "$PHP_EMPRESS" != "no"; then
-- echo $ac_n "checking for Empress support""... $ac_c" 1>&6
--echo "configure:64424: checking for Empress support" >&5
-- if test "$PHP_EMPRESS" = "yes"; then
-- ODBC_INCDIR=$EMPRESSPATH/include/odbc
-- ODBC_LIBDIR=$EMPRESSPATH/shlib
-- else
-- ODBC_INCDIR=$PHP_EMPRESS/include/odbc
-- ODBC_LIBDIR=$PHP_EMPRESS/shlib
-- fi
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- ODBC_TYPE=empress
-- cat >> confdefs.h <<\EOF
--#define HAVE_EMPRESS 1
- EOF
-
-- echo "$ac_t""$ext_output" 1>&6
--
-- echo $ac_n "checking Empress library file""... $ac_c" 1>&6
--echo "configure:64442: checking Empress library file" >&5
-- 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 "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
-+ ;;
-+ esac
-+ cat >> confdefs.h <<EOF
-+#define COMPILE_DL_OCI8 1
-+EOF
-
-+ fi
- fi
--fi
-
--if test -z "$ODBC_TYPE"; then
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-+ 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
-+
-+
-
--php_with_empress_bcs=no
-+ 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
-
-
--# 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
-+ old_IFS=$IFS
-+ for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-
-- PHP_EMPRESS_BCS=no
-- test "$PHP_ENABLE_ALL" && PHP_EMPRESS_BCS=$PHP_ENABLE_ALL
--
--fi
-+ IFS=.
-+ set $ac_src
-+ ac_obj=$1
-+ IFS=$old_IFS
-+
-+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
-
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_EMPRESS_BCS in
--shared,*)
-- PHP_EMPRESS_BCS=`echo "$PHP_EMPRESS_BCS"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_EMPRESS_BCS=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
-
-+ 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
-+ 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 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"
-
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-
-
-- if test "$PHP_EMPRESS_BCS" != "no"; then
-- echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
--echo "configure:64498: checking for Empress local access support" >&5
-- if test "$PHP_EMPRESS_BCS" = "yes"; then
-- ODBC_INCDIR=$EMPRESSPATH/include/odbc
-- ODBC_LIBDIR=$EMPRESSPATH/shlib
-- else
-- ODBC_INCDIR=$PHP_EMPRESS_BCS/include/odbc
-- ODBC_LIBDIR=$PHP_EMPRESS_BCS/shlib
-- fi
-- CC="empocc -bcs";export CC;
-- LD="empocc -bcs";export LD;
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- LIST=`empocc -listlines -bcs -o a a.c`
-+ ;;
-+ esac
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
-+ fi
-+
-+
-+ BUILD_DIR="$BUILD_DIR $ext_builddir"
-+
-
-- NEWLIST=
-- for I in $LIST
-- do
-- case $I in
-- $EMPRESSPATH/odbccl/lib/* | \
-- $EMPRESSPATH/rdbms/lib/* | \
-- $EMPRESSPATH/common/lib/*)
-- NEWLIST="$NEWLIST $I"
-- ;;
-- esac
-- done
-- ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
-- ODBC_TYPE=empress-bcs
-- cat >> confdefs.h <<\EOF
--#define HAVE_EMPRESS 1
--EOF
-
-- echo "$ac_t""$ext_output" 1>&6
-+ if test "$ext_builddir" = "."; then
-+ PHP_PECL_EXTENSION=oci8
-
-- echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
--echo "configure:64532: 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 "$ac_t""`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`" 1>&6
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
- fi
--fi
--
--if test -z "$ODBC_TYPE"; then
-
--php_with_birdstep=no
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCI8 1
-+EOF
-
-
--# 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
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD"
-
--fi
-+
-
-+
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR"
-
-+
-
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_BIRDSTEP in
--shared,*)
-- PHP_BIRDSTEP=`echo "$PHP_BIRDSTEP"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_BIRDSTEP=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
-+
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION"
-
-+
-
-
-+ cat >> confdefs.h <<EOF
-+#define PHP_OCI8_DEF_DIR "$OCI8_DIR"
-+EOF
-
-+ cat >> confdefs.h <<EOF
-+#define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD"
-+EOF
-
-
-+ else
-+
-+ echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
-+echo "configure:65069: checking Oracle Instant Client directory" >&5
-
--
-- if test "$PHP_BIRDSTEP" != "no"; then
-- echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
--echo "configure:64588: checking for Birdstep support" >&5
-- if test "$PHP_BIRDSTEP" = "yes"; then
-- ODBC_INCDIR=/usr/local/birdstep/include
-- ODBC_LIBDIR=/usr/local/birdstep/lib
-- else
-- ODBC_INCDIR=$PHP_BIRDSTEP/include
-- ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR
-+ if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
-+ PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
-+ if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
-+ { 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
--
-- case $host_alias in
-- *aix*)
-- cat >> confdefs.h <<\EOF
--#define AIX 1
--EOF
--;;
-- *hpux*)
-- cat >> confdefs.h <<\EOF
--#define HPUX 1
--EOF
--;;
-- *linux*)
-- cat >> confdefs.h <<\EOF
--#define LINUX 1
--EOF
--;;
-- *qnx*)
-- cat >> confdefs.h <<\EOF
--#define NEUTRINO 1
--EOF
--;;
-- i?86-*-solaris*)
-- cat >> confdefs.h <<\EOF
--#define ISOLARIS 1
--EOF
--;;
-- sparc-*-solaris*)
-- cat >> confdefs.h <<\EOF
--#define SOLARIS 1
--EOF
--;;
-- *unixware*)
-- cat >> confdefs.h <<\EOF
--#define UNIXWARE 1
--EOF
--;;
-- esac
-+ echo "$ac_t""$PHP_OCI8_INSTANT_CLIENT" 1>&6
-
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_TYPE=birdstep
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- ODBC_LIBS="-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil"
-+ OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
-
-- if test -f "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then
-- ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil"
-- elif test -f "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then
-- ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil"
-- fi
-+ echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
-+echo "configure:65082: checking Oracle Instant Client SDK header directory" >&5
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_BIRDSTEP 1
--EOF
-+ 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!'`
-
-- echo "$ac_t""$ext_output" 1>&6
-- fi
--fi
-+ OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
-
--if test -z "$ODBC_TYPE"; then
-+ OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib/*$!\1/include!'`
-
--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
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_CUSTOM_ODBC in
--shared,*)
-- PHP_CUSTOM_ODBC=`echo "$PHP_CUSTOM_ODBC"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_CUSTOM_ODBC=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
--
--
--
--
--
--
-- if test "$PHP_CUSTOM_ODBC" != "no"; then
-- echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
--echo "configure:64700: checking for a custom ODBC support" >&5
-- if test "$PHP_CUSTOM_ODBC" = "yes"; then
-- PHP_CUSTOM_ODBC=/usr/local
-- fi
-- ODBC_INCDIR=$PHP_CUSTOM_ODBC/include
-- ODBC_LIBDIR=$PHP_CUSTOM_ODBC/$PHP_LIBDIR
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_LIBS=$CUSTOM_ODBC_LIBS
-- ODBC_TYPE=custom-odbc
-- cat >> confdefs.h <<\EOF
--#define HAVE_CODBC 1
--EOF
--
-- echo "$ac_t""$ext_ouput" 1>&6
-- fi
--fi
--
--if test -z "$ODBC_TYPE"; then
--
--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
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_IODBC in
--shared,*)
-- PHP_IODBC=`echo "$PHP_IODBC"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_IODBC=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
--
--
--
--
--
--
-- if test "$PHP_IODBC" != "no"; then
-- echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
--echo "configure:64764: checking for iODBC support" >&5
-- 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
--
--
-+ if test -f "$OCISDKRPMINC/oci.h"; then
-+ echo "$ac_t""$OCISDKRPMINC" 1>&6
-
--
--
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
--
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
--
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
--
-- fi
--
-- fi
--
--
-- case iodbc in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="-liodbc $LIBS"
-- ;;
-- esac
--
--
--
--
--
-- if test "$PHP_IODBC/include" != "/usr/include"; then
-+ if test "$OCISDKRPMINC" != "/usr/include"; then
-
-- if test -z "$PHP_IODBC/include" || echo "$PHP_IODBC/include" | grep '^/' >/dev/null ; then
-- ai_p=$PHP_IODBC/include
-+ if test -z "$OCISDKRPMINC" || echo "$OCISDKRPMINC" | grep '^/' >/dev/null ; then
-+ ai_p=$OCISDKRPMINC
- else
-
-- ep_dir="`echo $PHP_IODBC/include|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $OCISDKRPMINC|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PHP_IODBC/include\"`"
-+ ai_p="$ep_realdir/`basename \"$OCISDKRPMINC\"`"
- fi
-
-
-@@ -64834,7 +65109,7 @@ echo "configure:64764: checking for iODB
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "INCLUDEPATH$unique=set"
-
-- if test "1"; then
-+ if test ""; then
- INCLUDES="-I$ai_p $INCLUDES"
- else
- INCLUDES="$INCLUDES -I$ai_p"
-@@ -64844,302 +65119,54 @@ echo "configure:64764: checking for iODB
-
- fi
-
-- ODBC_TYPE=iodbc
-- ODBC_INCLUDE=-I$PHP_IODBC/include
-- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-- ODBC_LIBS=-liodbc
-- cat >> confdefs.h <<\EOF
--#define HAVE_IODBC 1
--EOF
--
-- cat >> confdefs.h <<\EOF
--#define HAVE_ODBC2 1
--EOF
--
-- echo "$ac_t""$ext_output" 1>&6
-- fi
--fi
--
--if test -z "$ODBC_TYPE"; then
--
--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
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_ESOOB in
--shared,*)
-- PHP_ESOOB=`echo "$PHP_ESOOB"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_ESOOB=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
--
--
--
--
--
--
-- if test "$PHP_ESOOB" != "no"; then
-- echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
--echo "configure:64910: checking for Easysoft ODBC-ODBC Bridge support" >&5
-- if test "$PHP_ESOOB" = "yes"; then
-- PHP_ESOOB=/usr/local/easysoft/oob/client
-- fi
-- ODBC_INCDIR=$PHP_ESOOB/include
-- ODBC_LIBDIR=$PHP_ESOOB/$PHP_LIBDIR
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_LIBS=-lesoobclient
-- ODBC_TYPE=esoob
-- cat >> confdefs.h <<\EOF
--#define HAVE_ESOOB 1
--EOF
--
-- echo "$ac_t""$ext_output" 1>&6
-- fi
--fi
--
--if test -z "$ODBC_TYPE"; then
--
--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
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_UNIXODBC in
--shared,*)
-- PHP_UNIXODBC=`echo "$PHP_UNIXODBC"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_UNIXODBC=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
--
--
--
--
--
--
-- if test "$PHP_UNIXODBC" != "no"; then
-- echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
--echo "configure:64974: checking for unixODBC support" >&5
-- if test "$PHP_UNIXODBC" = "yes"; then
-- PHP_UNIXODBC=/usr/local
-- fi
-- ODBC_INCDIR=$PHP_UNIXODBC/include
-- ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_LIBS=-lodbc
-- ODBC_TYPE=unixODBC
--
--if ! test -f "$ODBC_INCDIR/sqlext.h"; then
-- { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
--fi
--
-- cat >> confdefs.h <<\EOF
--#define HAVE_UNIXODBC 1
--EOF
--
-- echo "$ac_t""$ext_output" 1>&6
-- fi
--fi
--
--if test -z "$ODBC_TYPE"; then
--
--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
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_DBMAKER in
--shared,*)
-- PHP_DBMAKER=`echo "$PHP_DBMAKER"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_DBMAKER=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
--
--
--
--
--
--
-- if test "$PHP_DBMAKER" != "no"; then
-- echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
--echo "configure:65043: checking for DBMaker support" >&5
-- if test "$PHP_DBMAKER" = "yes"; then
-- # find dbmaker's home directory
-- DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
--
-- # check DBMaker version (from 5.0 to 2.0)
-- DBMAKER_VERSION=5.0
--
-- while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do
-- DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | $AWK '{ print $1-1;}'`
-- MAJOR_V=`echo $DM_VER | $AWK '{ print $1/10; }' | $AWK -F. '{ print $1; }'`
-- MINOR_V=`echo $DM_VER | $AWK '{ print $1%10; }'`
-- DBMAKER_VERSION=$MAJOR_V.$MINOR_V
-- done
--
-- if test "$DBMAKER_VERSION" = "2.9"; then
-- PHP_DBMAKER=$DBMAKER_HOME
-- else
-- PHP_DBMAKER=$DBMAKER_HOME/$DBMAKER_VERSION
-- fi
-- fi
--
-- ODBC_INCDIR=$PHP_DBMAKER/include
-- ODBC_LIBDIR=$PHP_DBMAKER/$PHP_LIBDIR
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_LFLAGS=-L$ODBC_LIBDIR
-- ODBC_INCLUDE=-I$ODBC_INCDIR
-- ODBC_LIBS="-ldmapic -lc"
-- ODBC_TYPE=dbmaker
--
-- cat >> confdefs.h <<\EOF
--#define HAVE_DBMAKER 1
--EOF
--
--
-- if test "$ext_shared" = "yes"; then
-- echo "$ac_t""yes (shared)" 1>&6
-- ODBC_LIBS="-ldmapic -lc -lm"
-- ODBC_SHARED="odbc.la"
-- else
-- echo "$ac_t""yes (static)" 1>&6
-+ OCI8INCDIR=$OCISDKRPMINC
-+ elif test -f "$OCISDKZIPINC/oci.h"; then
-+ echo "$ac_t""$OCISDKZIPINC" 1>&6
-
--
-- if test -n "$ODBC_LIBDIR"; then
--
-- if test "$ODBC_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ODBC_LIBDIR" != "/usr/lib"; then
-+ if test "$OCISDKZIPINC" != "/usr/include"; then
-
-- if test -z "$ODBC_LIBDIR" || echo "$ODBC_LIBDIR" | grep '^/' >/dev/null ; then
-- ai_p=$ODBC_LIBDIR
-+ if test -z "$OCISDKZIPINC" || echo "$OCISDKZIPINC" | grep '^/' >/dev/null ; then
-+ ai_p=$OCISDKZIPINC
- else
-
-- ep_dir="`echo $ODBC_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $OCISDKZIPINC|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ODBC_LIBDIR\"`"
-+ ai_p="$ep_realdir/`basename \"$OCISDKZIPINC\"`"
- fi
-
-
--
--
-
- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
-+ eval "INCLUDEPATH$unique=set"
-
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
-+ fi
-
- fi
-
- fi
--
--
-- case dmapic in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="-ldmapic $LIBS"
-- ;;
-- esac
--
--
--
-
-+ OCI8INCDIR=$OCISDKZIPINC
-+ elif test -f "$OCISDKMANINC/oci.h"; then
-+ echo "$ac_t""$OCISDKMANINC" 1>&6
-
-- if test "$ODBC_INCDIR" != "/usr/include"; then
-+ if test "$OCISDKMANINC" != "/usr/include"; then
-
-- if test -z "$ODBC_INCDIR" || echo "$ODBC_INCDIR" | grep '^/' >/dev/null ; then
-- ai_p=$ODBC_INCDIR
-+ if test -z "$OCISDKMANINC" || echo "$OCISDKMANINC" | grep '^/' >/dev/null ; then
-+ ai_p=$OCISDKMANINC
- else
-
-- ep_dir="`echo $ODBC_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $OCISDKMANINC|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ODBC_INCDIR\"`"
-+ ai_p="$ep_realdir/`basename \"$OCISDKMANINC\"`"
- fi
-
-
-@@ -65160,19 +65187,19 @@ EOF
-
- fi
-
-- ODBC_STATIC="libphpext_odbc.la"
-+ OCI8INCDIR=$OCISDKMANINC
-+ else
-+ { echo "configure: error: Oracle Instant Client SDK header files not found" 1>&2; exit 1; }
- fi
-- fi
--fi
-
--if test -n "$ODBC_TYPE"; then
-- if test "$ODBC_TYPE" != "dbmaker"; then
--
-- for ac_i in $ODBC_LFLAGS $ODBC_LIBS; do
-+ 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
-- ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -pthread"
-+ OCI8_SYSLIB="$OCI8_SYSLIB -pthread"
- else
-
-
-@@ -65194,7 +65221,7 @@ if test -n "$ODBC_TYPE"; then
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
-- ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii"
-+ OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
- else
-
-
-@@ -65229,8 +65256,8 @@ if test -n "$ODBC_TYPE"; then
-
-
- 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"
-+ OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
-+ test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
- else
-
-
-@@ -65256,66 +65283,127 @@ if test -n "$ODBC_TYPE"; then
- esac
- done
-
-- if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_SQLDATASOURCES 1
--EOF
-+ fi
-
-+
-+ echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
-+echo "configure:65291: checking Oracle Instant Client version" >&5
-+ if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then
-+ if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
-+ if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
-+ { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.11.1 not found" 1>&2; exit 1; }
-+ fi
-+ OCI8_ORACLE_VERSION=11.1
-+ else
-+ { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; }
-+ fi
-+ elif test -f $PHP_OCI8_INSTANT_CLIENT/libnnz10.$SHLIB_SUFFIX_NAME; then
-+ if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
-+ if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
-+ { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found" 1>&2; exit 1; }
-+ fi
-+ OCI8_ORACLE_VERSION=10.1
-+ else
-+ { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; }
- fi
-+ else
-+ { echo "configure: error: Oracle Instant Client libraries not found" 1>&2; exit 1; }
- fi
--
-- cat >> confdefs.h <<\EOF
--#define HAVE_UODBC 1
--EOF
-+ echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
-
-+ case $OCI8_ORACLE_VERSION in
-+ 10.1|11.1)
-+
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD"
--
-+ case clntsh in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
-+ else
-+
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCDIR"
-+ case clntsh in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -lclntsh"
-+ ;;
-+ esac
-
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBDIR"
-
--
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCLUDE"
-+ fi
-+ ;;
-+ esac
-
--
-
--
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBS"
-+
-+ 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'`
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LFLAGS"
--
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-
-+ fi
-
--
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_TYPE"
-
--
-+ fi
-+
-+ fi
-
-+ ;;
-
--
-- ext_builddir=ext/odbc
-- ext_srcdir=$abs_srcdir/ext/odbc
-+ *)
-+ { echo "configure: error: Oracle Instant Client version $PHP_OCI8_INSTANT_CLIENT is not supported" 1>&2; exit 1; }
-+ ;;
-+ esac
-
-- ac_extra=`echo "$ODBC_INCLUDE"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCI_INSTANT_CLIENT 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCI_LOB_READ2 1
-+EOF
-+
-+
-+
-+ ext_builddir=ext/oci8
-+ ext_srcdir=$abs_srcdir/ext/oci8
-+
-+ ac_extra=
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_ODBC_SHARED=no
-+ PHP_OCI8_SHARED=no
-
-
-- case ext/odbc in
-+ case ext/oci8 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" ;;
-+ /*) 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
-
-
-@@ -65330,7 +65418,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in php_odbc.c; do
-+ for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-
- IFS=.
- set $ac_src
-@@ -65353,18 +65441,18 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC odbc"
-+ EXT_STATIC="$EXT_STATIC oci8"
- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
- fi
- else
- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-- PHP_ODBC_SHARED=yes
-+ PHP_OCI8_SHARED=yes
-
-- case ext/odbc in
-+ case ext/oci8 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" ;;
-+ /*) 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
-
-
-@@ -65379,14 +65467,14 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in php_odbc.c; do
-+ 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_odbc="$shared_objects_odbc $ac_bdir$ac_obj.lo"
-+ shared_objects_oci8="$shared_objects_oci8 $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" ;;
-@@ -65409,31 +65497,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpodbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(PHPODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpodbc.so '$ext_builddir'/phpodbc.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpoci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpoci8.so '$ext_builddir'/phpoci8.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPODBC, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(PHPODBC_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpodbc.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpoci8.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpodbc.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phpodbc.$suffix: $ext_builddir/phpodbc.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phpodbc.$suffix \$(phplibdir)
-+\$(phplibdir)/phpoci8.$suffix: $ext_builddir/phpoci8.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phpoci8.$suffix \$(phplibdir)
-
--$ext_builddir/phpodbc.$suffix: \$(shared_objects_odbc) \$(PHPODBC_SHARED_DEPENDENCIES)
-+$ext_builddir/phpoci8.$suffix: \$(shared_objects_oci8) \$(PHPOCI8_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -65446,31 +65534,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/odbc.so '$ext_builddir'/odbc.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/oci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/oci8.so '$ext_builddir'/oci8.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ODBC, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/odbc.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/oci8.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/odbc.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/odbc.$suffix: $ext_builddir/odbc.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/odbc.$suffix \$(phplibdir)
-+\$(phplibdir)/oci8.$suffix: $ext_builddir/oci8.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/oci8.$suffix \$(phplibdir)
-
--$ext_builddir/odbc.$suffix: \$(shared_objects_odbc) \$(ODBC_SHARED_DEPENDENCIES)
-+$ext_builddir/oci8.$suffix: \$(shared_objects_oci8) \$(OCI8_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -65478,22 +65566,22 @@ EOF
- ;;
- esac
- cat >> confdefs.h <<EOF
--#define COMPILE_DL_ODBC 1
-+#define COMPILE_DL_OCI8 1
- EOF
-
- fi
- fi
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_ODBC_SHARED=no
-+ PHP_OCI8_SHARED=no
- case "$PHP_SAPI" in
- cgi|embed)
-
-
-- case ext/odbc in
-+ case ext/oci8 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" ;;
-+ /*) 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
-
-
-@@ -65508,7 +65596,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in php_odbc.c; do
-+ for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-
- IFS=.
- set $ac_src
-@@ -65531,15 +65619,15 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC odbc"
-+ EXT_STATIC="$EXT_STATIC oci8"
- ;;
- *)
-
-
-- case ext/odbc in
-+ case ext/oci8 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" ;;
-+ /*) 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
-
-
-@@ -65554,7 +65642,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in php_odbc.c; do
-+ for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
-
- IFS=.
- set $ac_src
-@@ -65579,7 +65667,7 @@ EOF
-
- ;;
- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
- fi
-
-
-@@ -65588,28 +65676,63 @@ EOF
-
-
- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=odbc
-+ PHP_PECL_EXTENSION=oci8
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
- fi
-
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCI8 1
-+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
- fi
-
-
-
--php_enable_pcntl=no
-
--echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
--echo "configure:65605: checking whether to enable pcntl support" >&5
--# Check whether --enable-pcntl or --disable-pcntl was given.
--if test "${enable_pcntl+set}" = set; then
-- enableval="$enable_pcntl"
-- PHP_PCNTL=$enableval
-+
-+
-+
-+
-+
-+
-+
-+
-+if test -z "$ODBC_TYPE"; then
-+
-+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_PCNTL=no
-- test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL
-+ PHP_ADABAS=no
-+ test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL
-
- fi
-
-@@ -65617,12 +65740,12 @@ fi
-
- ext_output="yes, shared"
- ext_shared=yes
--case $PHP_PCNTL in
-+case $PHP_ADABAS in
- shared,*)
-- PHP_PCNTL=`echo "$PHP_PCNTL"|$SED 's/^shared,//'`
-+ PHP_ADABAS=`echo "$PHP_ADABAS"|$SED 's/^shared,//'`
- ;;
- shared)
-- PHP_PCNTL=yes
-+ PHP_ADABAS=yes
- ;;
- no)
- ext_output=no
-@@ -65636,554 +65759,316 @@ esac
-
-
-
--echo "$ac_t""$ext_output" 1>&6
-
-
-
-
--if test "$PHP_PCNTL" != "no"; then
-- for ac_func in fork
--do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:65649: checking for $ac_func" >&5
--if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 65654 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func();
-
--int main() {
-+ if test "$PHP_ADABAS" != "no"; then
-+ echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
-+echo "configure:65770: 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
-
--/* 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
--$ac_func();
--#endif
-+
-+
-+ 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
-
--; return 0; }
--EOF
--if { (eval echo configure:65677: \"$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
-+ 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
-- cat >> confdefs.h <<\EOF
--#define HAVE_FORK 1
--EOF
--
--else
-- echo "$ac_t""no" 1>&6
--{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; }
--fi
--done
-+
-+ 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
-
-- for ac_func in waitpid
--do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:65708: checking for $ac_func" >&5
--if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 65713 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func();
-+
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-
--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
--$ac_func();
--#endif
-+
-+ fi
-
--; return 0; }
--EOF
--if { (eval echo configure:65736: \"$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
-+ ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a"
-+ ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
-+ $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"
-+ ;;
-+ esac
-
--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
--EOF
--
--else
-- 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 sigaction
--do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:65767: checking for $ac_func" >&5
--if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 65772 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func();
-+
-+
-+ case sqlrte in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-lsqlrte $LIBS"
-+ ;;
-+ esac
-
--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
--$ac_func();
--#endif
-+
-
--; return 0; }
--EOF
--if { (eval echo configure:65795: \"$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 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
-
--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
--EOF
--
--else
-- echo "$ac_t""no" 1>&6
--{ echo "configure: error: pcntl: sigaction() not supported by this platform" 1>&2; exit 1; }
--fi
--done
-+
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-
-- for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
--do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:65826: checking for $ac_func" >&5
--if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 65831 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $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
--$ac_func();
--#endif
--
--; return 0; }
--EOF
--if { (eval echo configure:65854: \"$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
-+
-+ fi
-
-+ fi
-
-- ext_builddir=ext/pcntl
-- ext_srcdir=$abs_srcdir/ext/pcntl
--
-- ac_extra=
--
-- 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" ;;
-+ case odbc_adabas in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-lodbc_adabas $LIBS"
-+ ;;
- 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 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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-+ ODBC_TYPE=adabas
-+ ODBC_INCDIR=$PHP_ADABAS/incl
-+
-+if ! test -f "$ODBC_INCDIR/sqlext.h"; then
-+ { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
-+fi
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ADABAS 1
- EOF
-- done
-
-+ echo "$ac_t""$ext_output" 1>&6
-+ fi
-+fi
-
-- EXT_STATIC="$EXT_STATIC pcntl"
-- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
-- fi
-- 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
--
--
-+if test -z "$ODBC_TYPE"; then
-
-- b_c_pre=$shared_c_pre
-- b_cxx_pre=$shared_cxx_pre
-- b_c_meta=$shared_c_meta
-- b_cxx_meta=$shared_cxx_meta
-- b_c_post=$shared_c_post
-- b_cxx_post=$shared_cxx_post
-- b_lo=$shared_lo
-+php_with_sapdb=no
-
-
-- old_IFS=$IFS
-- for ac_src in pcntl.c php_signal.c; do
-+# Check whether --with-sapdb or --without-sapdb was given.
-+if test "${with_sapdb+set}" = set; then
-+ withval="$with_sapdb"
-+ PHP_SAPDB=$withval
-+else
-
-- 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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
--
-- case $host_alias in
-- *netware*)
--
-- install_modules="install-modules"
--
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppcntl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PHPPCNTL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppcntl.so '$ext_builddir'/phppcntl.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCNTL, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PHPPCNTL_SHARED_LIBADD)'
-- ;;
-- esac
-+ PHP_SAPDB=no
-+ test "$PHP_ENABLE_ALL" && PHP_SAPDB=$PHP_ENABLE_ALL
-
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppcntl.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcntl.$suffix"
-- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
-+fi
-
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppcntl.$suffix: $ext_builddir/phppcntl.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppcntl.$suffix \$(phplibdir)
-
--$ext_builddir/phppcntl.$suffix: \$(shared_objects_pcntl) \$(PHPPCNTL_SHARED_DEPENDENCIES)
-- $link_cmd
-
--EOF
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_SAPDB in
-+shared,*)
-+ PHP_SAPDB=`echo "$PHP_SAPDB"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_SAPDB=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-
-- ;;
-- *)
--
-- install_modules="install-modules"
-
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pcntl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PCNTL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pcntl.so '$ext_builddir'/pcntl.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCNTL, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PCNTL_SHARED_LIBADD)'
-- ;;
-- esac
-
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pcntl.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcntl.$suffix"
-- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
-
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pcntl.$suffix: $ext_builddir/pcntl.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pcntl.$suffix \$(phplibdir)
-
--$ext_builddir/pcntl.$suffix: \$(shared_objects_pcntl) \$(PCNTL_SHARED_DEPENDENCIES)
-- $link_cmd
-
--EOF
-
-- ;;
-- esac
-- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PCNTL 1
--EOF
-
-+ if test "$PHP_SAPDB" != "no"; then
-+ echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
-+echo "configure:65973: 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
-
-- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
-- 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
-+
-
-+ 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
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
-+ fi
-
-+
-+ if test "$PHP_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
-
-- 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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
--
--
-- EXT_STATIC="$EXT_STATIC 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
-
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
--
-- 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 pcntl.c php_signal.c; do
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
--
-- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
--
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-+ fi
-
-
-- ;;
-- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
-+
- fi
-+
-+
-
--
-- BUILD_DIR="$BUILD_DIR $ext_builddir"
--
-+ case sqlod in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-lsqlod $LIBS"
-+ ;;
-+ esac
-
-
-- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=pcntl
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-+ ODBC_TYPE=sapdb
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SAPDB 1
-+EOF
-
-+ echo "$ac_t""$ext_output" 1>&6
- fi
--
- fi
-
-+if test -z "$ODBC_TYPE"; then
-
-+php_with_solid=no
-
-
--
--php_enable_pdo=yes
--
--echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
--echo "configure:66179: checking whether to enable PDO support" >&5
--# Check whether --enable-pdo or --disable-pdo was given.
--if test "${enable_pdo+set}" = set; then
-- enableval="$enable_pdo"
-- PHP_PDO=$enableval
-+# Check whether --with-solid or --without-solid was given.
-+if test "${with_solid+set}" = set; then
-+ withval="$with_solid"
-+ PHP_SOLID=$withval
- else
-
-- PHP_PDO=yes
-- test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL
-+ PHP_SOLID=no
-+ test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL
-
- fi
-
-@@ -66191,12 +66076,12 @@ fi
-
- ext_output="yes, shared"
- ext_shared=yes
--case $PHP_PDO in
-+case $PHP_SOLID in
- shared,*)
-- PHP_PDO=`echo "$PHP_PDO"|$SED 's/^shared,//'`
-+ PHP_SOLID=`echo "$PHP_SOLID"|$SED 's/^shared,//'`
- ;;
- shared)
-- PHP_PDO=yes
-+ PHP_SOLID=yes
- ;;
- no)
- ext_output=no
-@@ -66210,414 +66095,315 @@ esac
-
-
-
--echo "$ac_t""$ext_output" 1>&6
-
-
-
-
--if test "$PHP_PDO" != "no"; then
-
-- PHP_PDO=yes
-+ if test "$PHP_SOLID" != "no"; then
-+ echo $ac_n "checking for Solid support""... $ac_c" 1>&6
-+echo "configure:66106: checking for Solid support" >&5
-+ if test "$PHP_SOLID" = "yes"; then
-+ PHP_SOLID=/usr/local/solid
-+ fi
-+ ODBC_INCDIR=$PHP_SOLID/include
-+ ODBC_LIBDIR=$PHP_SOLID/$PHP_LIBDIR
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_TYPE=solid
-+ if test -f $ODBC_LIBDIR/soc*35.a; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SOLID_35 1
-+EOF
-
--
-- pdo_running_under_pear=0
-- case `pwd` in
-- /var/tmp/pear-build-*)
-- pdo_running_under_pear=1
-- ;;
-- esac
-+ elif test -f $ODBC_LIBDIR/scl*30.a; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SOLID_30 1
-+EOF
-
-- if test "$pdo_running_under_pear$PHP_PEAR_VERSION" = "1"; then
-- # we're running in an environment that smells like pear,
-- # and the PHP_PEAR_VERSION env var is not set. That implies
-- # that we're running under a slightly broken pear installer
-- { echo "configure: error:
--PDO requires that you upgrade your PEAR installer tools. Please
--do so now by running:
-+ elif test -f $ODBC_LIBDIR/scl*23.a; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SOLID 1
-+EOF
-
-- % sudo pear upgrade pear
-+ fi
-+ echo "$ac_t""$ext_output" 1>&6
-+
-+ echo $ac_n "checking Solid library file""... $ac_c" 1>&6
-+echo "configure:66133: 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)
-+ if ldd -v /bin/sh | grep GLIBC > /dev/null; then
-+ cat >> confdefs.h <<\EOF
-+#define SS_LINUX 1
-+EOF
-
--or by manually downloading and installing PEAR version 1.3.5 or higher.
-+ ac_solid_os=l2x
-+ else
-+ cat >> confdefs.h <<\EOF
-+#define SS_LINUX 1
-+EOF
-
--Once you've upgraded, please re-try your PDO install.
-- " 1>&2; exit 1; }
-- fi
-+ ac_solid_os=lux
-+ fi;;
-+ SunOS)
-+ ac_solid_os=ssx;; # should we deal with SunOS 4?
-+ FreeBSD)
-+ if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
-+ cat >> confdefs.h <<\EOF
-+#define SS_FBX 1
-+EOF
-
-+ ac_solid_os=fex
-+ else
-+ cat >> confdefs.h <<\EOF
-+#define SS_FBX 1
-+EOF
-
-- if test "$ext_shared" = "yes" ; then
-- case $host_alias in
-- *darwin*)
-- { 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.
-+ ac_solid_os=fbx
-+ fi;;
-+ esac
-
--Please follow the instructions at: http://netevil.org/node.php?nid=202
--for more detail on this issue.
-- " 1>&2; exit 1; }
-- ext_shared=no
-- ;;
-- esac
-+ if test -f $ODBC_LIBDIR/soc${ac_solid_os}35.a; then
-+ ac_solid_version=35
-+ ac_solid_prefix=soc
-+ elif test -f $ODBC_LIBDIR/scl${ac_solid_os}30.a; then
-+ ac_solid_version=30
-+ ac_solid_prefix=scl
-+ elif test -f $ODBC_LIBDIR/scl${ac_solid_os}23.a; then
-+ ac_solid_version=23
-+ ac_solid_prefix=scl
- fi
--
-- ext_builddir=ext/pdo
-- ext_srcdir=$abs_srcdir/ext/pdo
--
-- ac_extra=
--
-- 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
-- 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
-+#
-+# Check for the library files, and setup the ODBC_LIBS path...
-+#
-+if test ! -f $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \
-+ ! -f $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then
-+ #
-+ # we have an error and should bail out, as we can't find the libs!
-+ #
-+ echo ""
-+ echo "*********************************************************************"
-+ echo "* Unable to locate $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
-+ echo "* Please correct this by creating the following links and reconfiguring:"
-+ echo "* $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
-+ echo "* $ODBC_LIBDIR/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so"
-+ echo "*********************************************************************"
-+else
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
-+fi
-
-+ echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
-
-- 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"
-+ fi
-+fi
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-+if test -z "$ODBC_TYPE"; then
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-+php_with_ibm_db2=no
-
-
-- EXT_STATIC="$EXT_STATIC pdo"
-- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo"
-- fi
-- 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
--
-+# 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
-
-- b_c_pre=$shared_c_pre
-- b_cxx_pre=$shared_cxx_pre
-- b_c_meta=$shared_c_meta
-- b_cxx_meta=$shared_cxx_meta
-- b_c_post=$shared_c_post
-- b_cxx_post=$shared_cxx_post
-- b_lo=$shared_lo
-+fi
-
-
-- old_IFS=$IFS
-- for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
--
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
--
-- shared_objects_pdo="$shared_objects_pdo $ac_bdir$ac_obj.lo"
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_IBM_DB2 in
-+shared,*)
-+ PHP_IBM_DB2=`echo "$PHP_IBM_DB2"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_IBM_DB2=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-
-- case $host_alias in
-- *netware*)
--
-- install_modules="install-modules"
-
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PHPPDO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo.so '$ext_builddir'/phppdo.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PHPPDO_SHARED_LIBADD)'
-- ;;
-- esac
-
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo.$suffix"
-- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
-
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppdo.$suffix: $ext_builddir/phppdo.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo.$suffix \$(phplibdir)
-
--$ext_builddir/phppdo.$suffix: \$(shared_objects_pdo) \$(PHPPDO_SHARED_DEPENDENCIES)
-- $link_cmd
-
--EOF
-
-- ;;
-- *)
--
-- install_modules="install-modules"
-+ if test "$PHP_IBM_DB2" != "no"; then
-+ echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
-+echo "configure:66254: 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
-+ else
-+ ODBC_INCDIR=$PHP_IBM_DB2/include
-+ ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR
-+ fi
-
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PDO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo.so '$ext_builddir'/pdo.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PDO_SHARED_LIBADD)'
-- ;;
-- esac
-+
-+if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then
-+ { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" 1>&2; exit 1; }
-+fi
-
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo.$suffix"
-- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
-
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pdo.$suffix: $ext_builddir/pdo.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pdo.$suffix \$(phplibdir)
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_TYPE=ibm-db2
-+ ODBC_LIBS=-ldb2
-
--$ext_builddir/pdo.$suffix: \$(shared_objects_pdo) \$(PDO_SHARED_DEPENDENCIES)
-- $link_cmd
-+
-+ old_LIBS=$LIBS
-+ LIBS="
-+ $ODBC_LFLAGS $ODBC_LIBS
-+ $LIBS"
-+ if test "$cross_compiling" = yes; then
-+
-+ LIBS=$old_LIBS
-+
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 66285 "configure"
-+#include "confdefs.h"
-
-+
-+ char SQLExecute();
-+ int main() {
-+ SQLExecute();
-+ return 0;
-+ }
-+
- EOF
--
-- ;;
-- esac
-- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PDO 1
-+if { (eval echo configure:66296: \"$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 <<\EOF
-+#define HAVE_IBMDB2 1
- EOF
-
-- fi
-- fi
--
-- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_PDO_SHARED=no
-- case "$PHP_SAPI" in
-- cgi|embed)
--
-+ echo "$ac_t""$ext_output" 1>&6
-+
-
-- 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
-+else
-+ 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.
-+You need to source your DB2 environment before running PHP configure:
-+# . \$IBM_DB2/db2profile
-+" 1>&2; exit 1; }
-+
-
--
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
-+fi
-+rm -fr conftest*
-+fi
-
-
-- 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"
-+ fi
-+fi
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-+if test -z "$ODBC_TYPE"; then
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-+php_with_odbcrouter=no
-
-
-- 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
--
-+# 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
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
--
--
-- old_IFS=$IFS
-- for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
--
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
--
-- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
-+fi
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_ODBCROUTER in
-+shared,*)
-+ PHP_ODBCROUTER=`echo "$PHP_ODBCROUTER"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_ODBCROUTER=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-
-- ;;
-- 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 "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.
--" 1>&2; exit 1; }
-- fi
-- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-- { echo "configure: error:
--You've configured extension pdo, which depends on extension spl,
--but you've either not enabled spl, or have disabled it.
--" 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
--
-
--
-
--
-- 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
-+ if test "$PHP_ODBCROUTER" != "no"; then
-+ echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
-+echo "configure:66377: checking for ODBCRouter.com support" >&5
-+ if test "$PHP_ODBCROUTER" = "yes"; then
-+ PHP_ODBCROUTER=/usr
-+ fi
-+ ODBC_INCDIR=$PHP_ODBCROUTER/include
-+ ODBC_LIBDIR=$PHP_ODBCROUTER/lib
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_LIBS=-lodbcsdk
-+ ODBC_TYPE=ODBCRouter
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ODBC_ROUTER 1
-+EOF
-
-+ echo "$ac_t""$ext_output" 1>&6
-+ fi
- fi
-
-+if test -z "$ODBC_TYPE"; then
-
-+php_with_empress=no
-
-
--php_with_pdo_dblib=no
--
--echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
--echo "configure:66613: checking for PDO_DBLIB support via FreeTDS" >&5
--# 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
-+# Check whether --with-empress or --without-empress was given.
-+if test "${with_empress+set}" = set; then
-+ withval="$with_empress"
-+ PHP_EMPRESS=$withval
- else
-
-- PHP_PDO_DBLIB=no
-- test "$PHP_ENABLE_ALL" && PHP_PDO_DBLIB=$PHP_ENABLE_ALL
-+ PHP_EMPRESS=no
-+ test "$PHP_ENABLE_ALL" && PHP_EMPRESS=$PHP_ENABLE_ALL
-
- fi
-
-@@ -66625,12 +66411,12 @@ fi
-
- ext_output="yes, shared"
- ext_shared=yes
--case $PHP_PDO_DBLIB in
-+case $PHP_EMPRESS in
- shared,*)
-- PHP_PDO_DBLIB=`echo "$PHP_PDO_DBLIB"|$SED 's/^shared,//'`
-+ PHP_EMPRESS=`echo "$PHP_EMPRESS"|$SED 's/^shared,//'`
- ;;
- shared)
-- PHP_PDO_DBLIB=yes
-+ PHP_EMPRESS=yes
- ;;
- no)
- ext_output=no
-@@ -66644,146 +66430,371 @@ esac
-
-
-
--echo "$ac_t""$ext_output" 1>&6
--
-
-
-
--if test "$PHP_PDO_DBLIB" != "no"; then
-
-- if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-- { 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
-+ if test "$PHP_EMPRESS" != "no"; then
-+ echo $ac_n "checking for Empress support""... $ac_c" 1>&6
-+echo "configure:66441: checking for Empress support" >&5
-+ if test "$PHP_EMPRESS" = "yes"; then
-+ ODBC_INCDIR=$EMPRESSPATH/include/odbc
-+ ODBC_LIBDIR=$EMPRESSPATH/shlib
-+ else
-+ ODBC_INCDIR=$PHP_EMPRESS/include/odbc
-+ ODBC_LIBDIR=$PHP_EMPRESS/shlib
-+ fi
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_TYPE=empress
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_EMPRESS 1
-+EOF
-
-- for i in /usr/local /usr; do
-- if test -f $i/include/sybdb.h; then
-- PDO_FREETDS_INSTALLATION_DIR=$i
-- PDO_FREETDS_INCLUDE_DIR=$i/include
-- break
-- elif test -f $i/include/freetds/sybdb.h; then
-- PDO_FREETDS_INSTALLATION_DIR=$i
-- PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
-- break;
-- fi
-- done
-+ echo "$ac_t""$ext_output" 1>&6
-+
-+ echo $ac_n "checking Empress library file""... $ac_c" 1>&6
-+echo "configure:66459: 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 "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
-
-- if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then
-- { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; }
-- fi
-+ fi
-+fi
-
-- elif test "$PHP_PDO_DBLIB" != "no"; then
-+if test -z "$ODBC_TYPE"; then
-
-- if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
-- PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
-- PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
-- elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
-- PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
-- PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
-+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
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_EMPRESS_BCS in
-+shared,*)
-+ PHP_EMPRESS_BCS=`echo "$PHP_EMPRESS_BCS"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_EMPRESS_BCS=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+
-+ if test "$PHP_EMPRESS_BCS" != "no"; then
-+ echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
-+echo "configure:66515: checking for Empress local access support" >&5
-+ if test "$PHP_EMPRESS_BCS" = "yes"; then
-+ ODBC_INCDIR=$EMPRESSPATH/include/odbc
-+ ODBC_LIBDIR=$EMPRESSPATH/shlib
- else
-- { echo "configure: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" 1>&2; exit 1; }
-+ ODBC_INCDIR=$PHP_EMPRESS_BCS/include/odbc
-+ ODBC_LIBDIR=$PHP_EMPRESS_BCS/shlib
- fi
-- fi
-+ CC="empocc -bcs";export CC;
-+ LD="empocc -bcs";export LD;
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ LIST=`empocc -listlines -bcs -o a a.c`
-
-- if test "x$PHP_LIBDIR" = "x" ; then
-- PHP_LIBDIR=lib
-- fi
-+ NEWLIST=
-+ for I in $LIST
-+ do
-+ case $I in
-+ $EMPRESSPATH/odbccl/lib/* | \
-+ $EMPRESSPATH/rdbms/lib/* | \
-+ $EMPRESSPATH/common/lib/*)
-+ NEWLIST="$NEWLIST $I"
-+ ;;
-+ esac
-+ done
-+ ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
-+ ODBC_TYPE=empress-bcs
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_EMPRESS 1
-+EOF
-
-- if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-- { echo "configure: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; }
-+ echo "$ac_t""$ext_output" 1>&6
-+
-+ echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
-+echo "configure:66549: 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 "$ac_t""`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`" 1>&6
-
--
-- 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
-+fi
-
--
-+if test -z "$ODBC_TYPE"; then
-+
-+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
-
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+ PHP_BIRDSTEP=no
-+ test "$PHP_ENABLE_ALL" && PHP_BIRDSTEP=$PHP_ENABLE_ALL
-+
-+fi
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_BIRDSTEP in
-+shared,*)
-+ PHP_BIRDSTEP=`echo "$PHP_BIRDSTEP"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_BIRDSTEP=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-
-- 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
-+ if test "$PHP_BIRDSTEP" != "no"; then
-+ echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
-+echo "configure:66605: checking for Birdstep support" >&5
-+ if test "$PHP_BIRDSTEP" = "yes"; then
-+ ODBC_INCDIR=/usr/local/birdstep/include
-+ ODBC_LIBDIR=/usr/local/birdstep/lib
-+ else
-+ ODBC_INCDIR=$PHP_BIRDSTEP/include
-+ ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR
-+ fi
-+
-+ case $host_alias in
-+ *aix*)
-+ cat >> confdefs.h <<\EOF
-+#define AIX 1
-+EOF
-+;;
-+ *hpux*)
-+ cat >> confdefs.h <<\EOF
-+#define HPUX 1
-+EOF
-+;;
-+ *linux*)
-+ cat >> confdefs.h <<\EOF
-+#define LINUX 1
-+EOF
-+;;
-+ *qnx*)
-+ cat >> confdefs.h <<\EOF
-+#define NEUTRINO 1
-+EOF
-+;;
-+ i?86-*-solaris*)
-+ cat >> confdefs.h <<\EOF
-+#define ISOLARIS 1
-+EOF
-+;;
-+ sparc-*-solaris*)
-+ cat >> confdefs.h <<\EOF
-+#define SOLARIS 1
-+EOF
-+;;
-+ *unixware*)
-+ cat >> confdefs.h <<\EOF
-+#define UNIXWARE 1
-+EOF
-+;;
-+ esac
-+
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_TYPE=birdstep
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_LIBS="-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil"
-+
-+ if test -f "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then
-+ ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil"
-+ elif test -f "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then
-+ ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil"
-+ fi
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_BIRDSTEP 1
-+EOF
-
-+ echo "$ac_t""$ext_output" 1>&6
- fi
-+fi
-+
-+if test -z "$ODBC_TYPE"; then
-+
-+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
-
-- 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
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_CUSTOM_ODBC in
-+shared,*)
-+ PHP_CUSTOM_ODBC=`echo "$PHP_CUSTOM_ODBC"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_CUSTOM_ODBC=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+
-+ if test "$PHP_CUSTOM_ODBC" != "no"; then
-+ echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
-+echo "configure:66717: checking for a custom ODBC support" >&5
-+ if test "$PHP_CUSTOM_ODBC" = "yes"; then
-+ PHP_CUSTOM_ODBC=/usr/local
-+ fi
-+ ODBC_INCDIR=$PHP_CUSTOM_ODBC/include
-+ ODBC_LIBDIR=$PHP_CUSTOM_ODBC/$PHP_LIBDIR
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_LIBS=$CUSTOM_ODBC_LIBS
-+ ODBC_TYPE=custom-odbc
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_CODBC 1
-+EOF
-+
-+ echo "$ac_t""$ext_ouput" 1>&6
- fi
-+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"
-+if test -z "$ODBC_TYPE"; then
-+
-+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
-
-- fi
-+ PHP_IODBC=no
-+ test "$PHP_ENABLE_ALL" && PHP_IODBC=$PHP_ENABLE_ALL
-+
-+fi
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_IODBC in
-+shared,*)
-+ PHP_IODBC=`echo "$PHP_IODBC"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_IODBC=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-+
-+
-+
-+
-
-
-- fi
--
-- fi
-
-+
-+ if test "$PHP_IODBC" != "no"; then
-+ echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
-+echo "configure:66781: checking for iODBC support" >&5
-+ if test "$PHP_IODBC" = "yes"; then
-+ PHP_IODBC=/usr/local
- fi
-- else
-
-
-- if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
-+ if test -n "$PHP_IODBC/$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 "$PHP_IODBC/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_IODBC/$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
-+ 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 $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PHP_IODBC/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
-+ ai_p="$ep_realdir/`basename \"$PHP_IODBC/$PHP_LIBDIR\"`"
- fi
-
-
-@@ -66809,401 +66820,301 @@ if test "$PHP_PDO_DBLIB" != "no"; then
- fi
-
-
-- case sybdb in
-+ case iodbc in
- c|c_r|pthread*) ;;
- *)
-- LIBS="-lsybdb $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
-
--
--
--
-
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:66830: checking for PDO includes" >&5
--if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:66836: checking for PDO includes" >&5
-- 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
-- pdo_inc_path=$abs_srcdir/ext
-- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-- pdo_inc_path=$prefix/include/php/ext
-- fi
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
--fi
-+ 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
-
--echo "$ac_t""$pdo_inc_path" 1>&6
-- if test -n "$pdo_inc_path"; then
--:
-- else
--{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
- fi
-
--
-+ ODBC_TYPE=iodbc
-+ ODBC_INCLUDE=-I$PHP_IODBC/include
-+ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-+ ODBC_LIBS=-liodbc
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_IODBC 1
-+EOF
-
-- PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
--
-- ext_builddir=ext/pdo_dblib
-- ext_srcdir=$abs_srcdir/ext/pdo_dblib
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ODBC2 1
-+EOF
-
-- ac_extra=`echo "-I$pdo_inc_path $PDO_DBLIB_DEFS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+ echo "$ac_t""$ext_output" 1>&6
-+ fi
-+fi
-
-- 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
--
--
-+if test -z "$ODBC_TYPE"; then
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
-+php_with_esoob=no
-
-
-- old_IFS=$IFS
-- for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
-+# Check whether --with-esoob or --without-esoob was given.
-+if test "${with_esoob+set}" = set; then
-+ withval="$with_esoob"
-+ PHP_ESOOB=$withval
-+else
-
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
--
-- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
-+ PHP_ESOOB=no
-+ test "$PHP_ENABLE_ALL" && PHP_ESOOB=$PHP_ENABLE_ALL
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-+fi
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-
-
-- EXT_STATIC="$EXT_STATIC pdo_dblib"
-- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib"
-- fi
-- 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
--
--
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_ESOOB in
-+shared,*)
-+ PHP_ESOOB=`echo "$PHP_ESOOB"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_ESOOB=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-
-- b_c_pre=$shared_c_pre
-- b_cxx_pre=$shared_cxx_pre
-- b_c_meta=$shared_c_meta
-- b_cxx_meta=$shared_cxx_meta
-- b_c_post=$shared_c_post
-- b_cxx_post=$shared_cxx_post
-- b_lo=$shared_lo
-
-
-- old_IFS=$IFS
-- for ac_src in pdo_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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-
-- case $host_alias in
-- *netware*)
--
-- install_modules="install-modules"
-
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_dblib.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PHPPDO_DBLIB_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_dblib.so '$ext_builddir'/phppdo_dblib.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_DBLIB, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PHPPDO_DBLIB_SHARED_LIBADD)'
-- ;;
-- esac
-
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_dblib.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_dblib.$suffix"
-+ if test "$PHP_ESOOB" != "no"; then
-+ echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
-+echo "configure:66927: checking for Easysoft ODBC-ODBC Bridge support" >&5
-+ if test "$PHP_ESOOB" = "yes"; then
-+ PHP_ESOOB=/usr/local/easysoft/oob/client
-+ fi
-+ ODBC_INCDIR=$PHP_ESOOB/include
-+ ODBC_LIBDIR=$PHP_ESOOB/$PHP_LIBDIR
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_LIBS=-lesoobclient
-+ ODBC_TYPE=esoob
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ESOOB 1
-+EOF
-+
-+ echo "$ac_t""$ext_output" 1>&6
- fi
-+fi
-+
-+if test -z "$ODBC_TYPE"; then
-+
-+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_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
-+ PHP_UNIXODBC=no
-+ test "$PHP_ENABLE_ALL" && PHP_UNIXODBC=$PHP_ENABLE_ALL
-
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppdo_dblib.$suffix: $ext_builddir/phppdo_dblib.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_dblib.$suffix \$(phplibdir)
-+fi
-
--$ext_builddir/phppdo_dblib.$suffix: \$(shared_objects_pdo_dblib) \$(PHPPDO_DBLIB_SHARED_DEPENDENCIES)
-- $link_cmd
-
--EOF
-
-- ;;
-- *)
--
-- install_modules="install-modules"
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_UNIXODBC in
-+shared,*)
-+ PHP_UNIXODBC=`echo "$PHP_UNIXODBC"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_UNIXODBC=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_dblib.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PDO_DBLIB_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_dblib.so '$ext_builddir'/pdo_dblib.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_DBLIB, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PDO_DBLIB_SHARED_LIBADD)'
-- ;;
-- esac
-
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_dblib.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_dblib.$suffix"
-- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
-
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pdo_dblib.$suffix: $ext_builddir/pdo_dblib.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_dblib.$suffix \$(phplibdir)
-
--$ext_builddir/pdo_dblib.$suffix: \$(shared_objects_pdo_dblib) \$(PDO_DBLIB_SHARED_DEPENDENCIES)
-- $link_cmd
-
--EOF
-
-- ;;
-- esac
-- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PDO_DBLIB 1
--EOF
-
-+
-+ if test "$PHP_UNIXODBC" != "no"; then
-+ echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
-+echo "configure:66991: checking for unixODBC support" >&5
-+ if test "$PHP_UNIXODBC" = "yes"; then
-+ PHP_UNIXODBC=/usr/local
- fi
-+ ODBC_INCDIR=$PHP_UNIXODBC/include
-+ ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_LIBS=-lodbc
-+ ODBC_TYPE=unixODBC
-+
-+if ! test -f "$ODBC_INCDIR/sqlext.h"; then
-+ { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
-+fi
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_UNIXODBC 1
-+EOF
-+
-+ echo "$ac_t""$ext_output" 1>&6
- fi
-+fi
-
-- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- 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
--
--
-+if test -z "$ODBC_TYPE"; then
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
-+php_with_dbmaker=no
-
-
-- old_IFS=$IFS
-- for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
-+# Check whether --with-dbmaker or --without-dbmaker was given.
-+if test "${with_dbmaker+set}" = set; then
-+ withval="$with_dbmaker"
-+ PHP_DBMAKER=$withval
-+else
-
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
--
-- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
-+ PHP_DBMAKER=no
-+ test "$PHP_ENABLE_ALL" && PHP_DBMAKER=$PHP_ENABLE_ALL
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-+fi
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-
-
-- 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
--
--
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_DBMAKER in
-+shared,*)
-+ PHP_DBMAKER=`echo "$PHP_DBMAKER"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_DBMAKER=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
-
-
-- old_IFS=$IFS
-- for ac_src in pdo_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"
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-
-
-- ;;
-- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib"
-- fi
--
--
-- BUILD_DIR="$BUILD_DIR $ext_builddir"
--
-
-+ if test "$PHP_DBMAKER" != "no"; then
-+ echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
-+echo "configure:67060: 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}'`
-
-- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=pdo_dblib
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-+ # check DBMaker version (from 5.0 to 2.0)
-+ DBMAKER_VERSION=5.0
-
-- fi
-+ while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do
-+ DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | $AWK '{ print $1-1;}'`
-+ MAJOR_V=`echo $DM_VER | $AWK '{ print $1/10; }' | $AWK -F. '{ print $1; }'`
-+ MINOR_V=`echo $DM_VER | $AWK '{ print $1%10; }'`
-+ DBMAKER_VERSION=$MAJOR_V.$MINOR_V
-+ done
-
-- echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:67150: checking for dnet_addr in -ldnet_stub" >&5
--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_save_LIBS="$LIBS"
--LIBS="-ldnet_stub $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 67158 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dnet_addr();
-+ if test "$DBMAKER_VERSION" = "2.9"; then
-+ PHP_DBMAKER=$DBMAKER_HOME
-+ else
-+ PHP_DBMAKER=$DBMAKER_HOME/$DBMAKER_VERSION
-+ fi
-+ fi
-
--int main() {
--dnet_addr()
--; return 0; }
-+ ODBC_INCDIR=$PHP_DBMAKER/include
-+ ODBC_LIBDIR=$PHP_DBMAKER/$PHP_LIBDIR
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_INCLUDE=-I$ODBC_INCDIR
-+ ODBC_LIBS="-ldmapic -lc"
-+ ODBC_TYPE=dbmaker
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_DBMAKER 1
- EOF
--if { (eval echo configure:67169: \"$ac_link\") 1>&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 "$ext_shared" = "yes"; then
-+ echo "$ac_t""yes (shared)" 1>&6
-+ ODBC_LIBS="-ldmapic -lc -lm"
-+ ODBC_SHARED="odbc.la"
-+ else
-+ echo "$ac_t""yes (static)" 1>&6
-
-- if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
-+
-+ if test -n "$ODBC_LIBDIR"; then
-
-- if test -z "" || echo "" | grep '^/' >/dev/null ; then
-- ai_p=
-+ 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 |$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $ODBC_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"\"`"
-+ ai_p="$ep_realdir/`basename \"$ODBC_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'`
-@@ -67219,241 +67130,124 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- fi
-
-
-- fi
-
- fi
-
-- fi
-- else
--
-+ fi
-+
-+
-+ case dmapic in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-ldmapic $LIBS"
-+ ;;
-+ esac
-
-- if test -n ""; then
--
-- if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
-+
-+
-+
-+
-+ if test "$ODBC_INCDIR" != "/usr/include"; then
-
-- if test -z "" || echo "" | grep '^/' >/dev/null ; then
-- ai_p=
-+ if test -z "$ODBC_INCDIR" || echo "$ODBC_INCDIR" | grep '^/' >/dev/null ; then
-+ ai_p=$ODBC_INCDIR
- else
-
-- ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $ODBC_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"\"`"
-+ ai_p="$ep_realdir/`basename \"$ODBC_INCDIR\"`"
- fi
-
-
--
--
-
- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
-+ eval "INCLUDEPATH$unique=set"
-+
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
-+ fi
-
-- test -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_STATIC="libphpext_odbc.la"
-+ fi
- fi
-+fi
-
-+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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
- fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii"
-+ else
-+
-
-- case dnet_stub in
-+ case $ac_ii in
- c|c_r|pthread*) ;;
- *)
-- LIBS="-ldnet_stub $LIBS"
-+ LIBS="$LIBS -l$ac_ii"
- ;;
- esac
-
-
-+ fi
-+ ;;
-+ esac
-
-
-- fi
--
--
-- cat >> confdefs.h <<\EOF
--#define HAVE_LIBDNET_STUB 1
--EOF
--
--
--else
-- echo "$ac_t""no" 1>&6
--fi
--
-- cat >> confdefs.h <<\EOF
--#define HAVE_PDO_DBLIB 1
--EOF
--
-- cat >> confdefs.h <<\EOF
--#define HAVE_FREETDS 1
--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 "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.
--" 1>&2; exit 1; }
-- fi
-- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-- { 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.
--" 1>&2; exit 1; }
-- fi
--
--
--fi
--
--
--
--php_with_pdo_firebird=no
--
--echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
--echo "configure:67330: checking for Firebird support for PDO" >&5
--# 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
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_PDO_FIREBIRD in
--shared,*)
-- PHP_PDO_FIREBIRD=`echo "$PHP_PDO_FIREBIRD"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_PDO_FIREBIRD=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
--
--echo "$ac_t""$ext_output" 1>&6
--
--
--
--
--if test "$PHP_PDO_FIREBIRD" != "no"; then
--
-- if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-- { 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
-- FIREBIRD_INCDIR=
-- FIREBIRD_LIBDIR=
-- FIREBIRD_LIBDIR_FLAG=
-- else
-- FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
-- FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
-- 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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
--
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
--
-- fi
-- ;;
-- esac
--
--
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
--
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-- else
--
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ ;;
-+ -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"
-+ 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
-
-
-@@ -67479,652 +67273,184 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the
- esac
- done
-
-- echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
--echo "configure:67484: checking for isc_detach_database in -lfbclient" >&5
--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_save_LIBS="$LIBS"
--LIBS="-lfbclient $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 67492 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char isc_detach_database();
-+ if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SQLDATASOURCES 1
-+EOF
-
--int main() {
--isc_detach_database()
--; return 0; }
-+ fi
-+ fi
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_UODBC 1
- EOF
--if { (eval echo configure:67503: \"$ac_link\") 1>&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
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD"
-+
-
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCDIR"
-+
-
--else
-- echo "$ac_t""no" 1>&6
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBDIR"
-
-- 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
--
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCLUDE"
-+
-
-- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-
-- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "EXTRA_LDFLAGS$unique=set"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBS"
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
-+
-
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LFLAGS"
-
-+
-
-- fi
-- ;;
-- esac
-+
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_TYPE"
-
-+
-
-- ;;
-- -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
--
-
-+ ext_builddir=ext/odbc
-+ ext_srcdir=$abs_srcdir/ext/odbc
-+
-+ ac_extra=`echo "$ODBC_INCLUDE"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-+ PHP_ODBC_SHARED=no
-+
-
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+ 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
-
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
--
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
-
-- fi
-
-+ b_c_pre=$php_c_pre
-+ b_cxx_pre=$php_cxx_pre
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-
-- fi
--
-- fi
-
-- ;;
-- esac
-- done
-+ 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"
-
-- echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
--echo "configure:67630: checking for isc_detach_database in -lgds" >&5
--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_save_LIBS="$LIBS"
--LIBS="-lgds $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 67638 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char isc_detach_database();
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
--int main() {
--isc_detach_database()
--; return 0; }
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
- EOF
--if { (eval echo configure:67649: \"$ac_link\") 1>&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"
-+ done
-
--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
--
-+ EXT_STATIC="$EXT_STATIC odbc"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
-+ fi
-+ else
-+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-+ PHP_ODBC_SHARED=yes
-
-- 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
--
-+ 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
-
-- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "EXTRA_LDFLAGS$unique=set"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-+ b_c_pre=$shared_c_pre
-+ b_cxx_pre=$shared_cxx_pre
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in php_odbc.c; do
-
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
-+ IFS=.
-+ set $ac_src
-+ ac_obj=$1
-+ IFS=$old_IFS
-
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
-+ shared_objects_odbc="$shared_objects_odbc $ac_bdir$ac_obj.lo"
-
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
-- fi
-- ;;
-- esac
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-
-+ case $host_alias in
-+ *netware*)
-+
-+ install_modules="install-modules"
-
-- ;;
-- -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
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpodbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(PHPODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpodbc.so '$ext_builddir'/phpodbc.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPODBC, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(PHPODBC_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpodbc.$suffix"
- else
--
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpodbc.$suffix"
- fi
--
--
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="-L$ai_p $LDFLAGS"
-- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-- else
--
--
-
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
--
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
--
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
-- fi
--
-- fi
--
-- ;;
-- esac
-- done
--
-- echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
--echo "configure:67776: 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_save_LIBS="$LIBS"
--LIBS="-lib_util $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 67784 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char isc_detach_database();
--
--int main() {
--isc_detach_database()
--; return 0; }
--EOF
--if { (eval echo configure:67795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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 "configure: error: libfbclient, libgds or libib_util not found! Check config.log for more information." 1>&2; exit 1; }
--
--
--fi
--
--
--
--fi
--
--
--
--fi
--
--
--
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:67840: checking for PDO includes" >&5
--if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
--
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:67846: checking for PDO includes" >&5
-- 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
-- pdo_inc_path=$abs_srcdir/ext
-- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-- pdo_inc_path=$prefix/include/php/ext
-- fi
--
--fi
--
--echo "$ac_t""$pdo_inc_path" 1>&6
-- if test -n "$pdo_inc_path"; then
--:
-- else
--{ 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"
-- ;;
-- esac
--
--
--
--
-- 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 <<\EOF
--#define HAVE_PDO_FIREBIRD 1
--EOF
--
--
-- ext_builddir=ext/pdo_firebird
-- ext_srcdir=$abs_srcdir/ext/pdo_firebird
--
-- ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
--
-- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_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
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
--
--
-- old_IFS=$IFS
-- for ac_src in pdo_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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
--
--
-- EXT_STATIC="$EXT_STATIC pdo_firebird"
-- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
-- fi
-- 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
-- b_c_meta=$shared_c_meta
-- b_cxx_meta=$shared_cxx_meta
-- b_c_post=$shared_c_post
-- b_cxx_post=$shared_cxx_post
-- b_lo=$shared_lo
--
--
-- old_IFS=$IFS
-- for ac_src in pdo_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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
--
-- case $host_alias in
-- *netware*)
--
-- install_modules="install-modules"
--
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_firebird.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PHPPDO_FIREBIRD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_firebird.so '$ext_builddir'/phppdo_firebird.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_FIREBIRD, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PHPPDO_FIREBIRD_SHARED_LIBADD)'
-- ;;
-- esac
--
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_firebird.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_firebird.$suffix"
-- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppdo_firebird.$suffix: $ext_builddir/phppdo_firebird.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_firebird.$suffix \$(phplibdir)
-+\$(phplibdir)/phpodbc.$suffix: $ext_builddir/phpodbc.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phpodbc.$suffix \$(phplibdir)
-
--$ext_builddir/phppdo_firebird.$suffix: \$(shared_objects_pdo_firebird) \$(PHPPDO_FIREBIRD_SHARED_DEPENDENCIES)
-+$ext_builddir/phpodbc.$suffix: \$(shared_objects_odbc) \$(PHPODBC_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -68137,31 +67463,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_firebird.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PDO_FIREBIRD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_firebird.so '$ext_builddir'/pdo_firebird.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/odbc.so '$ext_builddir'/odbc.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_FIREBIRD, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ODBC, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PDO_FIREBIRD_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_firebird.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/odbc.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_firebird.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/odbc.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pdo_firebird.$suffix: $ext_builddir/pdo_firebird.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_firebird.$suffix \$(phplibdir)
-+\$(phplibdir)/odbc.$suffix: $ext_builddir/odbc.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/odbc.$suffix \$(phplibdir)
-
--$ext_builddir/pdo_firebird.$suffix: \$(shared_objects_pdo_firebird) \$(PDO_FIREBIRD_SHARED_DEPENDENCIES)
-+$ext_builddir/odbc.$suffix: \$(shared_objects_odbc) \$(ODBC_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -68169,22 +67495,22 @@ EOF
- ;;
- esac
- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PDO_FIREBIRD 1
-+#define COMPILE_DL_ODBC 1
- EOF
-
- fi
- fi
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_PDO_FIREBIRD_SHARED=no
-+ PHP_ODBC_SHARED=no
- case "$PHP_SAPI" in
- cgi|embed)
-
-
-- case ext/pdo_firebird in
-+ case ext/odbc 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" ;;
-+ /*) 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
-
-
-@@ -68199,7 +67525,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
-+ for ac_src in php_odbc.c; do
-
- IFS=.
- set $ac_src
-@@ -68222,15 +67548,15 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC pdo_firebird"
-+ EXT_STATIC="$EXT_STATIC odbc"
- ;;
- *)
-
-
-- case ext/pdo_firebird in
-+ case ext/odbc 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" ;;
-+ /*) 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
-
-
-@@ -68245,7 +67571,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
-+ for ac_src in php_odbc.c; do
-
- IFS=.
- set $ac_src
-@@ -68270,7 +67596,7 @@ EOF
-
- ;;
- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
- fi
-
-
-@@ -68279,50 +67605,28 @@ EOF
-
-
- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=pdo_firebird
-+ PHP_PECL_EXTENSION=odbc
-
- 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 "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.
--" 1>&2; exit 1; }
-- fi
-- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-- { 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.
--" 1>&2; exit 1; }
-- fi
--
- fi
-
-
-
--php_with_pdo_mysql=no
-+php_enable_pcntl=no
-
--echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
--echo "configure:68318: 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
-+echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
-+echo "configure:67622: 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_PDO_MYSQL=no
-- test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL
-+ PHP_PCNTL=no
-+ test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL
-
- fi
-
-@@ -68330,12 +67634,12 @@ fi
-
- ext_output="yes, shared"
- ext_shared=yes
--case $PHP_PDO_MYSQL in
-+case $PHP_PCNTL in
- shared,*)
-- PHP_PDO_MYSQL=`echo "$PHP_PDO_MYSQL"|$SED 's/^shared,//'`
-+ PHP_PCNTL=`echo "$PHP_PCNTL"|$SED 's/^shared,//'`
- ;;
- shared)
-- PHP_PDO_MYSQL=yes
-+ PHP_PCNTL=yes
- ;;
- no)
- ext_output=no
-@@ -68354,1125 +67658,637 @@ echo "$ac_t""$ext_output" 1>&6
-
-
-
--if test -z "$PHP_ZLIB_DIR"; then
--
--php_with_zlib_dir=no
--
--echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
--echo "configure:68363: checking for the location of libz" >&5
--# 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
-+if test "$PHP_PCNTL" != "no"; then
-+ for ac_func in fork
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:67666: 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
--
-- PHP_ZLIB_DIR=no
--
--
--fi
--
--
--ext_output=$PHP_ZLIB_DIR
--echo "$ac_t""$ext_output" 1>&6
-+ cat > conftest.$ac_ext <<EOF
-+#line 67671 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $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
-+$ac_func();
-+#endif
-
-+; return 0; }
-+EOF
-+if { (eval echo configure:67694: \"$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 test "$PHP_PDO_MYSQL" != "no"; then
--
-- if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-- { 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
-- elif test "$PHP_PDO_MYSQL" != "yes"; then
-- if test -d "$PHP_PDO_MYSQL" ; then
-- if test -x "$PHP_PDO_MYSQL/bin/mysql_config" ; then
-- PDO_MYSQL_CONFIG="$PHP_PDO_MYSQL/bin/mysql_config"
-- else
-- PDO_MYSQL_DIR="$PHP_PDO_MYSQL"
-- fi
-- fi
-- else
-- for i in /usr/local /usr ; do
-- if test -x "$i/bin/mysql_config" ; then
-- PDO_MYSQL_CONFIG="$i/bin/mysql_config"
-- break;
-- fi
-- if test -r $i/include/mysql/mysql.h || test -r $i/include/mysql.h ; then
-- PDO_MYSQL_DIR="$i"
-- break;
-- fi
-- done
-- fi
--
-- if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
-- PHP_MYSQLND_ENABLED=yes
-- cat >> confdefs.h <<\EOF
--#define PDO_USE_MYSQLND 1
-+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
-- cat >> confdefs.h <<\EOF
--#define HAVE_MYSQL 1
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_FORK 1
- EOF
--
--
-- echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
--echo "configure:68427: checking for mysql_config" >&5
-- if test -n "$PDO_MYSQL_CONFIG"; then
-- echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6
-- if test "x$SED" = "x"; then
-- # Extract the first word of "sed", so it can be a program name with args.
--set dummy sed; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:68434: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- 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.
-- ;;
-- *)
-- 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"
--if test -n "$SED"; then
-- echo "$ac_t""$SED" 1>&6
-+
- else
- echo "$ac_t""no" 1>&6
-+{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; }
- fi
-+done
-
-- fi
-- if test "$enable_maintainer_zts" = "yes"; then
-- PDO_MYSQL_LIBNAME=mysqlclient_r
-- PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
-- else
-- PDO_MYSQL_LIBNAME=mysqlclient
-- PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
-- fi
-- PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
-- elif test -n "$PDO_MYSQL_DIR"; then
-- echo "$ac_t""not found" 1>&6
-- echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
--echo "configure:68478: checking for mysql install under $PDO_MYSQL_DIR" >&5
-- if test -r $PDO_MYSQL_DIR/include/mysql; then
-- PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
-- else
-- PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include
-- fi
-- if test -r $PDO_MYSQL_DIR/$PHP_LIBDIR/mysql; then
-- PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR/mysql
-- else
-- PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR
-- fi
--
-- if test -r "$PDO_MYSQL_LIB_DIR"; then
-- echo "$ac_t""libs under $PDO_MYSQL_LIB_DIR; seems promising" 1>&6
-- else
-- 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 "$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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
-+ for ac_func in waitpid
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:67725: 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 67730 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func();
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
-+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
-+$ac_func();
-+#endif
-
-- fi
-- ;;
-- esac
-+; return 0; }
-+EOF
-+if { (eval echo configure:67753: \"$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
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_WAITPID 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; }
-+fi
-+done
-
-- ;;
-- -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
-+ for ac_func in sigaction
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:67784: 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 67789 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func();
-
--
-- 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
-+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
-+$ac_func();
-+#endif
-
-- fi
--
-- fi
-+; return 0; }
-+EOF
-+if { (eval echo configure:67812: \"$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
-
-- ;;
-- esac
-- done
-+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
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+{ echo "configure: error: pcntl: sigaction() not supported by this platform" 1>&2; exit 1; }
-+fi
-+done
-
-- echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
--echo "configure:68632: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
--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
-+ for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:67843: 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
-- ac_save_LIBS="$LIBS"
--LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 68640 "configure"
-+ cat > conftest.$ac_ext <<EOF
-+#line 67848 "configure"
- #include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func(); below. */
-+#include <assert.h>
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char mysql_query();
-+char $ac_func();
-
- int main() {
--mysql_query()
-+
-+/* 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
-+$ac_func();
-+#endif
-+
- ; return 0; }
- EOF
--if { (eval echo configure:68651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:67871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
-+ eval "ac_cv_func_$ac_func=yes"
- else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
--LIBS="$ac_save_LIBS"
--
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-
-- 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
-+ ext_builddir=ext/pcntl
-+ ext_srcdir=$abs_srcdir/ext/pcntl
-+
-+ ac_extra=
-
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then
-+ PHP_PCNTL_SHARED=no
-
-
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+ 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
-+
-
-- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "INCLUDEPATH$unique=set"
--
-- if test ""; then
-- INCLUDES="-I$ai_p $INCLUDES"
-- else
-- INCLUDES="$INCLUDES -I$ai_p"
-- fi
--
-- fi
--
-- fi
-
-- ;;
-- esac
-- done
-+ 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
-
--
-- 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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-+ old_IFS=$IFS
-+ for ac_src in pcntl.c php_signal.c; do
-
-- 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"
-- else
-+ IFS=.
-+ set $ac_src
-+ ac_obj=$1
-+ IFS=$old_IFS
-
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
-+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
-
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
-- fi
-- ;;
-- esac
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-
-
-- ;;
-- -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
-+ EXT_STATIC="$EXT_STATIC pcntl"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
-+ fi
- 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'`
-+ 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
-
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
--
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
-
-- fi
-+
-+ b_c_pre=$shared_c_pre
-+ b_cxx_pre=$shared_cxx_pre
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-
-
-- fi
--
-- fi
-+ 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"
-
-- ;;
-- esac
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
- done
-
--
--
--else
-- echo "$ac_t""no" 1>&6
-+ case $host_alias in
-+ *netware*)
-+
-+ install_modules="install-modules"
-
-- 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
--
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppcntl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PHPPCNTL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppcntl.so '$ext_builddir'/phppcntl.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCNTL, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PHPPCNTL_SHARED_LIBADD)'
-+ ;;
-+ esac
-
-- 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
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppcntl.$suffix"
- else
--
-- ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcntl.$suffix"
- 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
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/phppcntl.$suffix: $ext_builddir/phppcntl.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppcntl.$suffix \$(phplibdir)
-
-+$ext_builddir/phppcntl.$suffix: \$(shared_objects_pcntl) \$(PHPPCNTL_SHARED_DEPENDENCIES)
-+ $link_cmd
-
-- fi
--
-- fi
-+EOF
-
-- fi
-- else
--
-+ ;;
-+ *)
-+
-+ install_modules="install-modules"
-
-- 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
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pcntl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PCNTL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pcntl.so '$ext_builddir'/pcntl.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCNTL, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PCNTL_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pcntl.$suffix"
- else
--
-- ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcntl.$suffix"
- 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
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/pcntl.$suffix: $ext_builddir/pcntl.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pcntl.$suffix \$(phplibdir)
-
-+$ext_builddir/pcntl.$suffix: \$(shared_objects_pcntl) \$(PCNTL_SHARED_DEPENDENCIES)
-+ $link_cmd
-
--
-- fi
-+EOF
-+
-+ ;;
-+ esac
-+ cat >> confdefs.h <<EOF
-+#define COMPILE_DL_PCNTL 1
-+EOF
-
-+ fi
- fi
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
-+ PHP_PCNTL_SHARED=no
-+ case "$PHP_SAPI" in
-+ cgi|embed)
-+
-
--
-- case z in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="-lz $LIBS"
-- ;;
-+ 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
-+ 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 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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
-- fi
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-
-
-+ EXT_STATIC="$EXT_STATIC pcntl"
-+ ;;
-+ *)
-
-- save_old_LDFLAGS=$LDFLAGS
-- ac_stuff="
-- -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
--
-+ 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
-
-- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "EXTRA_LDFLAGS$unique=set"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-+ 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 pcntl.c php_signal.c; do
-
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
-+ IFS=.
-+ set $ac_src
-+ ac_obj=$1
-+ IFS=$old_IFS
-
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
-+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
-
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
-- fi
-- ;;
-- esac
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-
-
-- ;;
-- -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\"`"
-+ ;;
-+ esac
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
- 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"
-+ BUILD_DIR="$BUILD_DIR $ext_builddir"
-
-- fi
-
-
-- fi
-+ if test "$ext_builddir" = "."; then
-+ PHP_PECL_EXTENSION=pcntl
-
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-+
- fi
-
-- ;;
-- esac
-- done
-+fi
-
-- echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
--echo "configure:69004: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
--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_save_LIBS="$LIBS"
--LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 69012 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char mysql_query();
-
--int main() {
--mysql_query()
--; return 0; }
--EOF
--if { (eval echo configure:69023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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 "configure: error: PDO_MYSQL configure failed. Please check config.log for more information." 1>&2; exit 1; }
--
-+
-+php_enable_pdo=yes
-+
-+echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
-+echo "configure:68196: 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
--
-- 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"
-- else
--
--
-- case z in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="-lz $LIBS"
-- ;;
-- esac
-
-
-- fi
-- ;;
-- esac
-
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_PDO in
-+shared,*)
-+ PHP_PDO=`echo "$PHP_PDO"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_PDO=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-
--
-- 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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
-
-+echo "$ac_t""$ext_output" 1>&6
-
-- fi
-- ;;
-- esac
--
--
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
--
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-- else
--
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-- fi
--
--
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="-L$ai_p $LDFLAGS"
-- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-- else
--
--
--
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
--
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
--
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
-- fi
--
-- fi
--
-- ;;
-- esac
-- done
--
-- echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
--echo "configure:69178: 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_save_LIBS="$LIBS"
--LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 69186 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char mysql_query();
--
--int main() {
--mysql_query()
--; return 0; }
--EOF
--if { (eval echo configure:69197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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 "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
-
-- ;;
-- esac
-- done
-+if test "$PHP_PDO" != "no"; then
-
--
-- 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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
-+ PHP_PDO=yes
-
-- fi
-- ;;
-- -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"
-- else
--
-
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-+ pdo_running_under_pear=0
-+ case `pwd` in
-+ /var/tmp/pear-build-*)
-+ pdo_running_under_pear=1
-+ ;;
- esac
-
-+ if test "$pdo_running_under_pear$PHP_PEAR_VERSION" = "1"; then
-+ # we're running in an environment that smells like pear,
-+ # and the PHP_PEAR_VERSION env var is not set. That implies
-+ # that we're running under a slightly broken pear installer
-+ { echo "configure: error:
-+PDO requires that you upgrade your PEAR installer tools. Please
-+do so now by running:
-
-- fi
-- ;;
-- esac
--
-+ % sudo pear upgrade pear
-
-- ;;
-- -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
-+or by manually downloading and installing PEAR version 1.3.5 or higher.
-
--
-- 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"
--
-+Once you've upgraded, please re-try your PDO install.
-+ " 1>&2; exit 1; }
- fi
-
-
-- fi
--
-- fi
-+ if test "$ext_shared" = "yes" ; then
-+ case $host_alias in
-+ *darwin*)
-+ { 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.
-+ " 1>&2; exit 1; }
-+ ext_shared=no
-+ ;;
- 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
--do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:69371: checking for $ac_func" >&5
--if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 69376 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $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
--$ac_func();
--#endif
--
--; return 0; }
--EOF
--if { (eval echo configure:69399: \"$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 $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:69429: checking for PDO includes" >&5
--if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
--
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:69435: checking for PDO includes" >&5
-- 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
-- pdo_inc_path=$abs_srcdir/ext
-- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-- pdo_inc_path=$prefix/include/php/ext
-- fi
--
--fi
--
--echo "$ac_t""$pdo_inc_path" 1>&6
-- if test -n "$pdo_inc_path"; then
--:
-- else
--{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
- fi
--
-
-+ ext_builddir=ext/pdo
-+ ext_srcdir=$abs_srcdir/ext/pdo
-
-- if test -n "$PDO_MYSQL_CONFIG"; then
-- PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
-- cat >> confdefs.h <<EOF
--#define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET"
--EOF
--
-- fi
--
--
-- ext_builddir=ext/pdo_mysql
-- ext_srcdir=$abs_srcdir/ext/pdo_mysql
--
-- ac_extra=`echo "-I$pdo_inc_path -I"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+ ac_extra=
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_PDO_MYSQL_SHARED=no
-+ PHP_PDO_SHARED=no
-
-
-- case ext/pdo_mysql in
-+ case ext/pdo 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" ;;
-+ /*) 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
-
-
-@@ -69487,7 +68303,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
-+ for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
- IFS=.
- set $ac_src
-@@ -69510,18 +68326,18 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC pdo_mysql"
-+ EXT_STATIC="$EXT_STATIC pdo"
- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo"
- fi
- else
- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-- PHP_PDO_MYSQL_SHARED=yes
-+ PHP_PDO_SHARED=yes
-
-- case ext/pdo_mysql in
-+ case ext/pdo 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" ;;
-+ /*) 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
-
-
-@@ -69536,14 +68352,14 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
-+ 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_mysql="$shared_objects_pdo_mysql $ac_bdir$ac_obj.lo"
-+ shared_objects_pdo="$shared_objects_pdo $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" ;;
-@@ -69566,31 +68382,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PHPPDO_MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_mysql.so '$ext_builddir'/phppdo_mysql.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PHPPDO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo.so '$ext_builddir'/phppdo.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_MYSQL, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PHPPDO_MYSQL_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PHPPDO_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_mysql.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_mysql.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppdo_mysql.$suffix: $ext_builddir/phppdo_mysql.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_mysql.$suffix \$(phplibdir)
-+\$(phplibdir)/phppdo.$suffix: $ext_builddir/phppdo.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo.$suffix \$(phplibdir)
-
--$ext_builddir/phppdo_mysql.$suffix: \$(shared_objects_pdo_mysql) \$(PHPPDO_MYSQL_SHARED_DEPENDENCIES)
-+$ext_builddir/phppdo.$suffix: \$(shared_objects_pdo) \$(PHPPDO_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -69603,31 +68419,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PDO_MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_mysql.so '$ext_builddir'/pdo_mysql.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PDO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo.so '$ext_builddir'/pdo.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_MYSQL, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PDO_MYSQL_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PDO_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_mysql.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_mysql.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pdo_mysql.$suffix: $ext_builddir/pdo_mysql.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_mysql.$suffix \$(phplibdir)
-+\$(phplibdir)/pdo.$suffix: $ext_builddir/pdo.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pdo.$suffix \$(phplibdir)
-
--$ext_builddir/pdo_mysql.$suffix: \$(shared_objects_pdo_mysql) \$(PDO_MYSQL_SHARED_DEPENDENCIES)
-+$ext_builddir/pdo.$suffix: \$(shared_objects_pdo) \$(PDO_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -69635,22 +68451,22 @@ EOF
- ;;
- esac
- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PDO_MYSQL 1
-+#define COMPILE_DL_PDO 1
- EOF
-
- fi
- fi
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_PDO_MYSQL_SHARED=no
-+ PHP_PDO_SHARED=no
- case "$PHP_SAPI" in
- cgi|embed)
-
-
-- case ext/pdo_mysql in
-+ case ext/pdo 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" ;;
-+ /*) 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
-
-
-@@ -69665,7 +68481,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
-+ for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
- IFS=.
- set $ac_src
-@@ -69688,15 +68504,15 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC pdo_mysql"
-+ EXT_STATIC="$EXT_STATIC pdo"
- ;;
- *)
-
-
-- case ext/pdo_mysql in
-+ case ext/pdo 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" ;;
-+ /*) 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
-
-
-@@ -69711,7 +68527,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
-+ for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
- IFS=.
- set $ac_src
-@@ -69736,7 +68552,7 @@ EOF
-
- ;;
- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo"
- fi
-
-
-@@ -69745,7 +68561,7 @@ EOF
-
-
- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=pdo_mysql
-+ PHP_PECL_EXTENSION=pdo
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
-@@ -69753,91 +68569,85 @@ EOF
-
-
-
-- am_i_shared=$PHP_PDO_MYSQL_SHARED
-- is_it_shared=$PHP_PDO_SHARED
-- is_it_enabled=$PHP_PDO
-+ 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 "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
-+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.
- " 1>&2; exit 1; }
- fi
-- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
- { 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.
-+You've configured extension pdo, which depends on extension spl,
-+but you've either not enabled spl, or have disabled it.
- " 1>&2; exit 1; }
- fi
-
-- if test "$PHP_MYSQL" = "mysqlnd"; then
-+
-+
-+
-+
-+
-+ header_path=ext/pdo
-+ for header_file in php_pdo.h php_pdo_driver.h; do
-+ hp_hf="$header_path/$header_file"
-
-- 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 "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.
--" 1>&2; exit 1; }
-- fi
-- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-- { 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.
--" 1>&2; exit 1; }
-- fi
-
-- fi
-+ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- PDO_MYSQL_MODULE_TYPE=external
-+ 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
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_SHARED_LIBADD"
-
-
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_MODULE_TYPE"
-
--
-+
-+ src=$ext_srcdir/Makefile.frag
-+ ac_srcdir=$ext_srcdir
-+ ac_builddir=$ext_builddir
-+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
-
- fi
-
-
--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_dblib=no
-
-+echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
-+echo "configure:68630: 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
-
--php_with_pdo_oci=no
--
--echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
--echo "configure:69820: checking Oracle OCI support for PDO" >&5
--# 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"
- ext_shared=yes
--case $PHP_PDO_OCI in
-+case $PHP_PDO_DBLIB in
- shared,*)
-- PHP_PDO_OCI=`echo "$PHP_PDO_OCI"|$SED 's/^shared,//'`
-+ PHP_PDO_DBLIB=`echo "$PHP_PDO_DBLIB"|$SED 's/^shared,//'`
- ;;
- shared)
-- PHP_PDO_OCI=yes
-+ PHP_PDO_DBLIB=yes
- ;;
- no)
- ext_output=no
-@@ -69856,81 +68666,62 @@ echo "$ac_t""$ext_output" 1>&6
-
-
-
--if test "$PHP_PDO_OCI" != "no"; then
-+if test "$PHP_PDO_DBLIB" != "no"; then
-
- if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
- { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
- fi
-
-- echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
--echo "configure:69867: 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 "$ac_t""$PHP_PDO_OCI" 1>&6
-+ if test "$PHP_PDO_DBLIB" = "yes"; then
-
-- echo $ac_n "checking if that is sane""... $ac_c" 1>&6
--echo "configure:69876: checking if that is sane" >&5
-- if test -z "$PDO_OCI_DIR"; then
-- { echo "configure: error:
--You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
--" 1>&2; exit 1; }
-- else
-- echo "$ac_t""yes" 1>&6
-- fi
-+ for i in /usr/local /usr; do
-+ if test -f $i/include/sybdb.h; then
-+ PDO_FREETDS_INSTALLATION_DIR=$i
-+ PDO_FREETDS_INCLUDE_DIR=$i/include
-+ break
-+ elif test -f $i/include/freetds/sybdb.h; then
-+ PDO_FREETDS_INSTALLATION_DIR=$i
-+ PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
-+ break;
-+ fi
-+ done
-
-- if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
-- PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
-- PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
-- echo $ac_n "checking for oci.h""... $ac_c" 1>&6
--echo "configure:69889: checking for oci.h" >&5
-- if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then
--
-- if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then
--
-- if test -z "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" || echo "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" | grep '^/' >/dev/null ; then
-- ai_p=$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client
-- else
--
-- ep_dir="`echo $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client\"`"
-- fi
-+ if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then
-+ { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; }
-+ 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
--
-+ elif test "$PHP_PDO_DBLIB" != "no"; then
-+
-+ if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
-+ PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
-+ PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
-+ elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
-+ PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
-+ PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
-+ else
-+ { echo "configure: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" 1>&2; exit 1; }
-+ 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 "configure: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; }
- fi
-
-- echo "$ac_t""$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" 1>&6
-- elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then
--
-- if test "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" != "/usr/include"; then
-+
-+ if test "$PDO_FREETDS_INCLUDE_DIR" != "/usr/include"; then
-
-- if test -z "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" || echo "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" | grep '^/' >/dev/null ; then
-- ai_p=$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include
-+ 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_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PDO_FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include\"`"
-+ ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INCLUDE_DIR\"`"
- fi
-
-
-@@ -69951,387 +68742,483 @@ echo "configure:69889: checking for oci.
-
- fi
-
-- echo "$ac_t""$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" 1>&6
-- elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then
-+
-+
-+ 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_OCI_IC_PREFIX/sdk/include" != "/usr/include"; 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_OCI_IC_PREFIX/sdk/include" || echo "$PDO_OCI_IC_PREFIX/sdk/include" | grep '^/' >/dev/null ; then
-- ai_p=$PDO_OCI_IC_PREFIX/sdk/include
-+ 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_OCI_IC_PREFIX/sdk/include|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/sdk/include\"`"
-+ 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 \"\$INCLUDEPATH$unique$ac_c\""
-+ cmd="echo $ac_n \"\$LIBPATH$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
-+ eval "LIBPATH$unique=set"
-
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
- fi
-
-- fi
--
-- echo "$ac_t""$PDO_OCI_IC_PREFIX/sdk/include" 1>&6
-- elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then
--
-- if test "$PDO_OCI_IC_PREFIX/client/include" != "/usr/include"; then
--
-- if test -z "$PDO_OCI_IC_PREFIX/client/include" || echo "$PDO_OCI_IC_PREFIX/client/include" | grep '^/' >/dev/null ; then
-- ai_p=$PDO_OCI_IC_PREFIX/client/include
-- else
--
-- ep_dir="`echo $PDO_OCI_IC_PREFIX/client/include|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/client/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 "$ac_t""$PDO_OCI_IC_PREFIX/client/include" 1>&6
-- else
-- { 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/client/lib/libclntsh.so" ; then
-- PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
-- elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
-- PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib"
-- elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then
-- PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
-- else
-- { 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 $ac_n "checking size of long int""... $ac_c" 1>&6
--echo "configure:70038: 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
-- ac_cv_sizeof_long_int=4
--else
-- cat > conftest.$ac_ext <<EOF
--#line 70046 "configure"
--#include "confdefs.h"
--#include <stdio.h>
--int main()
--{
-- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-- fprintf(f, "%d\n", sizeof(long int));
-- return(0);
--}
--EOF
--if { (eval echo configure:70057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--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 "$ac_t""$ac_cv_sizeof_long_int" 1>&6
--cat >> confdefs.h <<EOF
--#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
--EOF
-
--
-- echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
--echo "configure:70077: checking if we're on a 64-bit platform" >&5
-- if test "$ac_cv_sizeof_long_int" = "4" ; then
-- echo "$ac_t""no" 1>&6
-- TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
-- else
-- echo "$ac_t""yes" 1>&6
-- TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
-- fi
--
-- echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
--echo "configure:70087: 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
-- PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
-- 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 "configure: error: Oracle required OCI8 libraries not found" 1>&2; exit 1; }
-- fi
-- 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 -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; 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
-+ 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_OCI_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/public\"`"
-+ 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 \"\$INCLUDEPATH$unique$ac_c\""
-+ cmd="echo $ac_n \"\$LIBPATH$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
-+ eval "LIBPATH$unique=set"
-
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
- fi
-
-- fi
-
-- 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
-
--
-+ 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
-+ case sybdb in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-lsybdb $LIBS"
-+ ;;
-+ esac
-
-- fi
-
-- 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
-
-- 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
-
-+
-+
-
-+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:68847: checking for PDO includes" >&5
-+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:68853: 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
-+ pdo_inc_path=$abs_srcdir/ext
-+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-+ pdo_inc_path=$prefix/include/php/ext
-+ fi
-
-- 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
-
-- 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
-+echo "$ac_t""$pdo_inc_path" 1>&6
-+ if test -n "$pdo_inc_path"; then
-+:
- 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\"`"
-+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
- 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_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
-+
-+ ext_builddir=ext/pdo_dblib
-+ ext_srcdir=$abs_srcdir/ext/pdo_dblib
-
-- PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/include"
-- fi
-+ ac_extra=`echo "-I$pdo_inc_path $PDO_DBLIB_DEFS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-
-- 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
--
-+ 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
-
-- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "EXTRA_LDFLAGS$unique=set"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-+ b_c_pre=$php_c_pre
-+ b_cxx_pre=$php_cxx_pre
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
-
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
-- else
-+ IFS=.
-+ set $ac_src
-+ ac_obj=$1
-+ IFS=$old_IFS
-
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
-+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
-
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-
-- fi
-- ;;
-- esac
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-
-
-- ;;
-- -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
-+ EXT_STATIC="$EXT_STATIC pdo_dblib"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib"
-+ fi
- else
--
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
--
-+ 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
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+ case $host_alias in
-+ *netware*)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_dblib.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PHPPDO_DBLIB_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_dblib.so '$ext_builddir'/phppdo_dblib.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_DBLIB, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PHPPDO_DBLIB_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_dblib.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_dblib.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/phppdo_dblib.$suffix: $ext_builddir/phppdo_dblib.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_dblib.$suffix \$(phplibdir)
-+
-+$ext_builddir/phppdo_dblib.$suffix: \$(shared_objects_pdo_dblib) \$(PHPPDO_DBLIB_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ *)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_dblib.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PDO_DBLIB_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_dblib.so '$ext_builddir'/pdo_dblib.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_DBLIB, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PDO_DBLIB_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_dblib.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_dblib.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/pdo_dblib.$suffix: $ext_builddir/pdo_dblib.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_dblib.$suffix \$(phplibdir)
-+
-+$ext_builddir/pdo_dblib.$suffix: \$(shared_objects_pdo_dblib) \$(PDO_DBLIB_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ esac
-+ cat >> confdefs.h <<EOF
-+#define COMPILE_DL_PDO_DBLIB 1
-+EOF
-+
-+ fi
-+ fi
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-+ 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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC 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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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"
-+
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ ;;
-+ esac
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC 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 $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
-+echo "configure:69167: 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_save_LIBS="$LIBS"
-+LIBS="-ldnet_stub $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 69175 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dnet_addr();
-+
-+int main() {
-+dnet_addr()
-+; return 0; }
-+EOF
-+if { (eval echo configure:69186: \"$ac_link\") 1>&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 \"$ac_ii\"`"
-+ ai_p="$ep_realdir/`basename \"\"`"
- 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"
-+ 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
-
-
-@@ -70353,17 +69240,179 @@ echo "configure:70087: checking OCI8 lib
-
- fi
-
-- ;;
-- esac
-- done
-+ fi
-+ else
-+
-
-- elif test -f "$PDO_OCI_DIR/rdbms/lib/sysliblist"; then
-+ 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
-+
-+
-
-- for ac_i in `cat $PDO_OCI_DIR/rdbms/lib/sysliblist`; do
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$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"
-+ ;;
-+ esac
-+
-+
-+
-+
-+ fi
-+
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_LIBDNET_STUB 1
-+EOF
-+
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_PDO_DBLIB 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_FREETDS 1
-+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 "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.
-+" 1>&2; exit 1; }
-+ fi
-+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ { 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.
-+" 1>&2; exit 1; }
-+ fi
-+
-+
-+fi
-+
-+
-+
-+php_with_pdo_firebird=no
-+
-+echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
-+echo "configure:69347: 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
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_PDO_FIREBIRD in
-+shared,*)
-+ PHP_PDO_FIREBIRD=`echo "$PHP_PDO_FIREBIRD"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_PDO_FIREBIRD=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-+
-+
-+
-+echo "$ac_t""$ext_output" 1>&6
-+
-+
-+
-+
-+if test "$PHP_PDO_FIREBIRD" != "no"; then
-+
-+ if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-+ { 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
-+ FIREBIRD_INCDIR=
-+ FIREBIRD_LIBDIR=
-+ FIREBIRD_LIBDIR_FLAG=
-+ else
-+ FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
-+ FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
-+ 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
-- PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -pthread"
-+ LDFLAGS="$LDFLAGS -pthread"
- else
-
-
-@@ -70385,7 +69434,7 @@ echo "configure:70087: checking OCI8 lib
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
-- PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
- else
-
-
-@@ -70420,8 +69469,8 @@ echo "configure:70087: checking OCI8 lib
-
-
- 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"
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
- else
-
-
-@@ -70447,98 +69496,60 @@ echo "configure:70087: checking OCI8 lib
- esac
- done
-
-- fi
--
-- echo $ac_n "checking Oracle version""... $ac_c" 1>&6
--echo "configure:70454: 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 "configure: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" 1>&2; exit 1; }
-- fi
-- echo "$ac_t""$PDO_OCI_VERSION" 1>&6
-+ echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
-+echo "configure:69501: 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_save_LIBS="$LIBS"
-+LIBS="-lfbclient $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 69509 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char isc_detach_database();
-
-- 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"
-- else
--
--
-- case clntsh in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -lclntsh"
-- ;;
-- esac
--
--
-- fi
-- ;;
-- esac
--
--
-- ;;
--
-- *)
-- { echo "configure: error: Unsupported Oracle version $PDO_OCI_VERSION" 1>&2; exit 1; }
-- ;;
-- esac
-+int main() {
-+isc_detach_database()
-+; return 0; }
-+EOF
-+if { (eval echo configure:69520: \"$ac_link\") 1>&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 "$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
--
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-
-- 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'`
-+ FIREBIRD_LIBNAME=fbclient
-
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
--
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
-
-- fi
--
-+else
-+ echo "$ac_t""no" 1>&6
-
-- fi
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+ unset ac_cv_lib_fbclient_isc_detach_database
-+
-
-- fi
--
--
--
- save_old_LDFLAGS=$LDFLAGS
- ac_stuff="
-- -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
-- "
-+ $FIREBIRD_LIBDIR_FLAG
-+ "
-
- save_ext_shared=$ext_shared
- ext_shared=yes
-@@ -70631,27 +69642,27 @@ echo "configure:70454: checking Oracle v
- esac
- done
-
-- echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
--echo "configure:70636: checking for OCIEnvCreate in -lclntsh" >&5
--ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
-+echo "configure:69647: 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_save_LIBS="$LIBS"
--LIBS="-lclntsh $LIBS"
-+LIBS="-lgds $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 70644 "configure"
-+#line 69655 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char OCIEnvCreate();
-+char isc_detach_database();
-
- int main() {
--OCIEnvCreate()
-+isc_detach_database()
- ; return 0; }
- EOF
--if { (eval echo configure:70655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:69666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -70670,28 +69681,21 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_OCIENVCREATE 1
--EOF
--
--
-+ FIREBIRD_LIBNAME=gds
-+
-
- else
- echo "$ac_t""no" 1>&6
-
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-- unset ac_cv_lib_clntsh_OCIEnvCreate
-+ unset ac_cv_lib_gds_isc_detach_database
-
--
--fi
--
--
--
-+
- save_old_LDFLAGS=$LDFLAGS
- ac_stuff="
-- -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
-- "
-+ $FIREBIRD_LIBDIR_FLAG
-+ "
-
- save_ext_shared=$ext_shared
- ext_shared=yes
-@@ -70784,27 +69788,27 @@ fi
- esac
- done
-
-- echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
--echo "configure:70789: checking for OCIEnvNlsCreate in -lclntsh" >&5
--ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
-+echo "configure:69793: 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_save_LIBS="$LIBS"
--LIBS="-lclntsh $LIBS"
-+LIBS="-lib_util $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 70797 "configure"
-+#line 69801 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char OCIEnvNlsCreate();
-+char isc_detach_database();
-
- int main() {
--OCIEnvNlsCreate()
-+isc_detach_database()
- ; return 0; }
- EOF
--if { (eval echo configure:70808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:69812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -70823,95 +69827,79 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_OCIENVNLSCREATE 1
--EOF
--
--
-+ FIREBIRD_LIBNAME=ib_util
-+
-
- else
- echo "$ac_t""no" 1>&6
-
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-- unset ac_cv_lib_clntsh_OCIEnvNlsCreate
-+ unset ac_cv_lib_ib_util_isc_detach_database
-
-+ { echo "configure: error: libfbclient, libgds or libib_util not found! Check config.log for more information." 1>&2; exit 1; }
-+
-
- 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
--
-+fi
-+
-
-- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "EXTRA_LDFLAGS$unique=set"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
-+fi
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-+
-
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
-+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:69857: checking for PDO includes" >&5
-+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
-+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:69863: 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
-+ pdo_inc_path=$abs_srcdir/ext
-+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-+ pdo_inc_path=$prefix/include/php/ext
-+ fi
-+
-+fi
-
-+echo "$ac_t""$pdo_inc_path" 1>&6
-+ if test -n "$pdo_inc_path"; then
-+:
-+ else
-+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
-+ fi
-
-- fi
-- ;;
-- esac
-
-+
-
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
-+ 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 "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+ if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then
-
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-+ if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then
-+ ai_p=$FIREBIRD_LIBDIR
- else
-
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`"
- fi
-
-
- if test "$ext_shared" = "yes"; then
-- LDFLAGS="-L$ai_p $LDFLAGS"
-- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ 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
-
-
-@@ -70933,136 +69921,26 @@ fi
-
- fi
-
-- ;;
-- esac
-- done
--
-- echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
--echo "configure:70942: 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_save_LIBS="$LIBS"
--LIBS="-lclntsh $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 70950 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char OCILobIsTemporary();
--
--int main() {
--OCILobIsTemporary()
--; return 0; }
--EOF
--if { (eval echo configure:70961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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
-+ fi
-+ else
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_OCILOBISTEMPORARY 1
--EOF
--
--
--
--else
-- echo "$ac_t""no" 1>&6
-
-- LDFLAGS=$save_old_LDFLAGS
-- ext_shared=$save_ext_shared
-- unset ac_cv_lib_clntsh_OCILobIsTemporary
--
-+ if test -n "$FIREBIRD_LIBDIR"; then
-
-- 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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
--
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
--
-- fi
-- ;;
-- esac
--
--
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+ if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then
-
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-+ if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then
-+ ai_p=$FIREBIRD_LIBDIR
- else
-
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`"
- 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'`
-@@ -71078,446 +69956,74 @@ else
- fi
-
-
-- fi
-
- fi
-
-- ;;
-- esac
-- done
--
-- echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
--echo "configure:71091: 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_save_LIBS="$LIBS"
--LIBS="-locijdbc8 $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 71099 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char OCILobIsTemporary();
--
--int main() {
--OCILobIsTemporary()
--; return 0; }
--EOF
--if { (eval echo configure:71110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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
--
--
-+ fi
-
-- case ocijdbc8 in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8"
-- else
--
-
-- case ocijdbc8 in
-+ case $FIREBIRD_LIBNAME in
- c|c_r|pthread*) ;;
- *)
-- LIBS="$LIBS -locijdbc8"
-- ;;
-- esac
--
--
-- fi
-+ LIBS="-l$FIREBIRD_LIBNAME $LIBS"
- ;;
- esac
-
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_OCILOBISTEMPORARY 1
--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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
- fi
-
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
--
-- fi
-- ;;
-- esac
--
-
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test "$FIREBIRD_INCDIR" != "/usr/include"; then
-
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-+ if test -z "$FIREBIRD_INCDIR" || echo "$FIREBIRD_INCDIR" | grep '^/' >/dev/null ; then
-+ ai_p=$FIREBIRD_INCDIR
- else
-
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $FIREBIRD_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ ai_p="$ep_realdir/`basename \"$FIREBIRD_INCDIR\"`"
- 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\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
-+ eval "INCLUDEPATH$unique=set"
-
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
- fi
-
- fi
-
-- ;;
-- esac
-- done
-+ fi
-
-- echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
--echo "configure:71271: 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_save_LIBS="$LIBS"
--LIBS="-lclntsh $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 71279 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char OCICollAssign();
--
--int main() {
--OCICollAssign()
--; return 0; }
--EOF
--if { (eval echo configure:71290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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_OCICOLLASSIGN 1
--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"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
--
-- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
--
-- fi
-- ;;
-- esac
--
--
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
--
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-- else
--
-- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-- fi
--
--
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="-L$ai_p $LDFLAGS"
-- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-- else
--
--
--
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
--
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
--
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
-- fi
--
-- fi
--
-- ;;
-- esac
-- done
--
-- echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
--echo "configure:71424: 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_save_LIBS="$LIBS"
--LIBS="-lclntsh $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 71432 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char OCIStmtFetch2();
--
--int main() {
--OCIStmtFetch2()
--; return 0; }
--EOF
--if { (eval echo configure:71443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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_OCISTMTFETCH2 1
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_PDO_FIREBIRD 1
- 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 $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:71482: checking for PDO includes" >&5
--if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
--
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:71488: checking for PDO includes" >&5
-- 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
-- pdo_inc_path=$abs_srcdir/ext
-- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-- pdo_inc_path=$prefix/include/php/ext
-- fi
--
--fi
--
--echo "$ac_t""$pdo_inc_path" 1>&6
-- if test -n "$pdo_inc_path"; then
--:
-- else
--{ 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
-+ ext_builddir=ext/pdo_firebird
-+ ext_srcdir=$abs_srcdir/ext/pdo_firebird
-
- ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_PDO_OCI_SHARED=no
-+ PHP_PDO_FIREBIRD_SHARED=no
-
-
-- case ext/pdo_oci in
-+ case ext/pdo_firebird 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" ;;
-+ /*) 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
-
-
-@@ -71532,7 +70038,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
-
-
- old_IFS=$IFS
-- for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
-+ for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
-
- IFS=.
- set $ac_src
-@@ -71555,18 +70061,18 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC pdo_oci"
-+ EXT_STATIC="$EXT_STATIC pdo_firebird"
- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
- fi
- else
- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-- PHP_PDO_OCI_SHARED=yes
-+ PHP_PDO_FIREBIRD_SHARED=yes
-
-- case ext/pdo_oci in
-+ case ext/pdo_firebird 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" ;;
-+ /*) 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
-
-
-@@ -71581,14 +70087,14 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
-+ 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_oci="$shared_objects_pdo_oci $ac_bdir$ac_obj.lo"
-+ shared_objects_pdo_firebird="$shared_objects_pdo_firebird $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" ;;
-@@ -71611,31 +70117,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_oci.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PHPPDO_OCI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_oci.so '$ext_builddir'/phppdo_oci.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_firebird.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PHPPDO_FIREBIRD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_firebird.so '$ext_builddir'/phppdo_firebird.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_OCI, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_FIREBIRD, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PHPPDO_OCI_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PHPPDO_FIREBIRD_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_oci.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_firebird.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_oci.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_firebird.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppdo_oci.$suffix: $ext_builddir/phppdo_oci.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_oci.$suffix \$(phplibdir)
-+\$(phplibdir)/phppdo_firebird.$suffix: $ext_builddir/phppdo_firebird.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_firebird.$suffix \$(phplibdir)
-
--$ext_builddir/phppdo_oci.$suffix: \$(shared_objects_pdo_oci) \$(PHPPDO_OCI_SHARED_DEPENDENCIES)
-+$ext_builddir/phppdo_firebird.$suffix: \$(shared_objects_pdo_firebird) \$(PHPPDO_FIREBIRD_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -71648,31 +70154,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_oci.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PDO_OCI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_oci.so '$ext_builddir'/pdo_oci.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_firebird.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PDO_FIREBIRD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_firebird.so '$ext_builddir'/pdo_firebird.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_OCI, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_FIREBIRD, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PDO_OCI_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PDO_FIREBIRD_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_oci.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_firebird.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_oci.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_firebird.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pdo_oci.$suffix: $ext_builddir/pdo_oci.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_oci.$suffix \$(phplibdir)
-+\$(phplibdir)/pdo_firebird.$suffix: $ext_builddir/pdo_firebird.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_firebird.$suffix \$(phplibdir)
-
--$ext_builddir/pdo_oci.$suffix: \$(shared_objects_pdo_oci) \$(PDO_OCI_SHARED_DEPENDENCIES)
-+$ext_builddir/pdo_firebird.$suffix: \$(shared_objects_pdo_firebird) \$(PDO_FIREBIRD_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -71680,22 +70186,22 @@ EOF
- ;;
- esac
- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PDO_OCI 1
-+#define COMPILE_DL_PDO_FIREBIRD 1
- EOF
-
- fi
- fi
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_PDO_OCI_SHARED=no
-+ PHP_PDO_FIREBIRD_SHARED=no
- case "$PHP_SAPI" in
- cgi|embed)
-
-
-- case ext/pdo_oci in
-+ case ext/pdo_firebird 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" ;;
-+ /*) 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
-
-
-@@ -71710,7 +70216,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
-+ for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
-
- IFS=.
- set $ac_src
-@@ -71733,15 +70239,15 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC pdo_oci"
-+ EXT_STATIC="$EXT_STATIC pdo_firebird"
- ;;
- *)
-
-
-- case ext/pdo_oci in
-+ case ext/pdo_firebird 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" ;;
-+ /*) 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
-
-
-@@ -71756,7 +70262,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
-+ for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
-
- IFS=.
- set $ac_src
-@@ -71781,7 +70287,7 @@ EOF
-
- ;;
- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
- fi
-
-
-@@ -71790,77 +70296,50 @@ EOF
-
-
- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=pdo_oci
-+ PHP_PECL_EXTENSION=pdo_firebird
-
- 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"
--
-
--
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_FIREBIRD_SHARED_LIBADD"
-
-
--
-- am_i_shared=$PHP_PDO_OCI_SHARED
-+ 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 "configure: error:
--You've configured extension pdo_oci to build statically, but it
-+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_oci shared or build pdo statically for the
-+You either need to build pdo_firebird shared or build pdo statically for the
- build to be successful.
- " 1>&2; exit 1; }
- fi
- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
- { echo "configure: error:
--You've configured extension pdo_oci, which depends on extension pdo,
-+You've configured extension pdo_firebird, which depends on extension pdo,
- but you've either not enabled pdo, or have disabled it.
- " 1>&2; exit 1; }
- fi
-
--
--
-- cat >> confdefs.h <<EOF
--#define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION"
--EOF
--
- fi
-
-
-
-+php_with_pdo_mysql=no
-
--
--
--php_with_pdo_odbc=no
--
--echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
--echo "configure:71856: checking for ODBC v3 support for PDO" >&5
--# 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
-+echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
-+echo "configure:70335: 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_ODBC=no
-- test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL
-+ PHP_PDO_MYSQL=no
-+ test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL
-
- fi
-
-@@ -71868,12 +70347,12 @@ fi
-
- ext_output="yes, shared"
- ext_shared=yes
--case $PHP_PDO_ODBC in
-+case $PHP_PDO_MYSQL in
- shared,*)
-- PHP_PDO_ODBC=`echo "$PHP_PDO_ODBC"|$SED 's/^shared,//'`
-+ PHP_PDO_MYSQL=`echo "$PHP_PDO_MYSQL"|$SED 's/^shared,//'`
- ;;
- shared)
-- PHP_PDO_ODBC=yes
-+ PHP_PDO_MYSQL=yes
- ;;
- no)
- ext_output=no
-@@ -71892,475 +70371,187 @@ 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 "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
-- fi
--
-+if test -z "$PHP_ZLIB_DIR"; then
-
--
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:71908: checking for PDO includes" >&5
--if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+php_with_zlib_dir=no
-+
-+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-+echo "configure:70380: 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
-
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:71914: 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
-- pdo_inc_path=$abs_srcdir/ext
-- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-- pdo_inc_path=$prefix/include/php/ext
-- fi
-+ PHP_ZLIB_DIR=no
-
-+
- fi
-
--echo "$ac_t""$pdo_inc_path" 1>&6
-- if test -n "$pdo_inc_path"; then
--:
-- else
--{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
-- fi
-
--
-+ext_output=$PHP_ZLIB_DIR
-+echo "$ac_t""$ext_output" 1>&6
-
-- echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
--echo "configure:71935: checking for selected PDO ODBC flavour" >&5
-
-- pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
-- pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
-
-- if test "$pdo_odbc_dir" = "$PHP_PDO_ODBC" ; then
-- pdo_odbc_dir=
-- fi
-+fi
-
-- case $pdo_odbc_flavour in
-- ibm-db2)
-- pdo_odbc_def_libdir=/home/db2inst1/sqllib/lib
-- pdo_odbc_def_incdir=/home/db2inst1/sqllib/include
-- pdo_odbc_def_lib=db2
-- ;;
-+if test "$PHP_PDO_MYSQL" != "no"; then
-
-- iODBC|iodbc)
-- pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
-- pdo_odbc_def_incdir=/usr/local/include
-- pdo_odbc_def_lib=iodbc
-- ;;
-+ if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
-+ fi
-
-- unixODBC|unixodbc)
-- pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
-- pdo_odbc_def_incdir=/usr/local/include
-- pdo_odbc_def_lib=odbc
-- ;;
-+
-
-- ODBCRouter|odbcrouter)
-- pdo_odbc_def_libdir=/usr/$PHP_LIBDIR
-- pdo_odbc_def_incdir=/usr/include
-- pdo_odbc_def_lib=odbcsdk
-- ;;
-+ if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then
-+ PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL
-+ elif test "$PHP_PDO_MYSQL" != "yes"; then
-+ if test -d "$PHP_PDO_MYSQL" ; then
-+ if test -x "$PHP_PDO_MYSQL/bin/mysql_config" ; then
-+ PDO_MYSQL_CONFIG="$PHP_PDO_MYSQL/bin/mysql_config"
-+ else
-+ PDO_MYSQL_DIR="$PHP_PDO_MYSQL"
-+ fi
-+ fi
-+ else
-+ for i in /usr/local /usr ; do
-+ if test -x "$i/bin/mysql_config" ; then
-+ PDO_MYSQL_CONFIG="$i/bin/mysql_config"
-+ break;
-+ fi
-+ if test -r $i/include/mysql/mysql.h || test -r $i/include/mysql.h ; then
-+ PDO_MYSQL_DIR="$i"
-+ break;
-+ fi
-+ done
-+ fi
-
-- generic)
-- pdo_odbc_def_lib="`echo $PHP_PDO_ODBC | cut -d, -f3`"
-- pdo_odbc_def_ldflags="`echo $PHP_PDO_ODBC | cut -d, -f4`"
-- pdo_odbc_def_cflags="`echo $PHP_PDO_ODBC | cut -d, -f5`"
-- pdo_odbc_flavour="generic-$pdo_odbc_def_lib"
-- ;;
-+ if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
-+ PHP_MYSQLND_ENABLED=yes
-+ cat >> confdefs.h <<\EOF
-+#define PDO_USE_MYSQLND 1
-+EOF
-
-- *)
-- { 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
-- 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
-+ else
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_MYSQL 1
-+EOF
-
-- When build as shared the extension filename is always pdo_odbc.so" 1>&2; exit 1; }
-- ;;
-- esac
-
-- if test -n "$pdo_odbc_dir"; then
-- PDO_ODBC_INCDIR="$pdo_odbc_dir/include"
-- PDO_ODBC_LIBDIR="$pdo_odbc_dir/$PHP_LIBDIR"
-- else
-- PDO_ODBC_INCDIR="$pdo_odbc_def_incdir"
-- PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
-- fi
--
-- echo "$ac_t""$pdo_odbc_flavour
-- libs $PDO_ODBC_LIBDIR,
-- headers $PDO_ODBC_INCDIR" 1>&6
--
-- if test ! -d "$PDO_ODBC_LIBDIR" ; then
-- echo "configure: warning: library dir $PDO_ODBC_LIBDIR does not exist" 1>&2
-- fi
--
--
-- echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72014: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_ODBC_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72028: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_ODBCSDK_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72042: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_IODBC_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72056: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_SQLUNIX_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72070: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_SQLTYPES_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72084: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_SQLUCODE_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72098: checking for sql.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/sql.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_SQL_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72112: checking for isql.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/isql.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_ISQL_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72126: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_SQLEXT_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72140: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_ISQLEXT_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72154: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_UDBCEXT_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72168: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_SQLCLI1_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72182: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_LIBRARYMANAGER_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72196: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_CLI0CORE_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72210: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_CLI0EXT_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72224: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_CLI0CLI_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72238: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_CLI0DEFS_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:72252: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
-- if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
-- php_pdo_have_header=yes
-- cat >> confdefs.h <<\EOF
--#define HAVE_CLI0ENV_H 1
--EOF
--
-- echo "$ac_t""yes" 1>&6
-- else
-- echo "$ac_t""no" 1>&6
-- fi
--
--
-- if test "$php_pdo_have_header" != "yes"; then
-- { 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"
-+ echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
-+echo "configure:70444: checking for mysql_config" >&5
-+ if test -n "$PDO_MYSQL_CONFIG"; then
-+ echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6
-+ if test "x$SED" = "x"; then
-+ # Extract the first word of "sed", so it can be a program name with args.
-+set dummy sed; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:70451: 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
-+ /*)
-+ 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.
-+ ;;
-+ *)
-+ 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"
-+if test -n "$SED"; then
-+ echo "$ac_t""$SED" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-
--
-- 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"
-+ fi
-+ if test "$enable_maintainer_zts" = "yes"; then
-+ PDO_MYSQL_LIBNAME=mysqlclient_r
-+ PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
- else
--
--
-- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
--
-- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "EXTRA_LDFLAGS$unique=set"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
--
-+ PDO_MYSQL_LIBNAME=mysqlclient
-+ PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
-+ fi
-+ PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
-+ elif test -n "$PDO_MYSQL_DIR"; then
-+ echo "$ac_t""not found" 1>&6
-+ echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
-+echo "configure:70495: 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
-+ PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include
-+ fi
-+ if test -r $PDO_MYSQL_DIR/$PHP_LIBDIR/mysql; then
-+ PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR/mysql
-+ else
-+ PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR
- fi
-- ;;
-- -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"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
--
-- fi
-- ;;
-- esac
-
-+ if test -r "$PDO_MYSQL_LIB_DIR"; then
-+ echo "$ac_t""libs under $PDO_MYSQL_LIB_DIR; seems promising" 1>&6
-+ else
-+ echo "$ac_t""can not find it" 1>&6
-+ { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; }
-+ fi
-
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
-
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+ if test "$PDO_MYSQL_INC_DIR" != "/usr/include"; then
-
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-+ 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 $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PDO_MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ ai_p="$ep_realdir/`basename \"$PDO_MYSQL_INC_DIR\"`"
- 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\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
-+ eval "INCLUDEPATH$unique=set"
-
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
- fi
-
- fi
-
-- ;;
-- esac
-- done
-+ fi
-
-+ PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
-+ else
-+ 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_ODBC_LDFLAGS"
-+ ac_stuff="
-+ $PDO_MYSQL_LIBS
-+ "
-
- save_ext_shared=$ext_shared
- ext_shared=yes
-@@ -72453,27 +70644,27 @@ EOF
- esac
- done
-
-- echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
--echo "configure:72458: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
--ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
-+echo "configure:70649: 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_save_LIBS="$LIBS"
--LIBS="-l$pdo_odbc_def_lib $LIBS"
-+LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 72466 "configure"
-+#line 70657 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char SQLBindCol();
-+char mysql_query();
-
- int main() {
--SQLBindCol()
-+mysql_query()
- ; return 0; }
- EOF
--if { (eval echo configure:72477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:70668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -72492,18 +70683,52 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-
--
-- save_old_LDFLAGS=$LDFLAGS
-- ac_stuff="$PDO_ODBC_LDFLAGS"
-+
-+ 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
-+
-+
-
-- save_ext_shared=$ext_shared
-- ext_shared=yes
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- for ac_i in $ac_stuff; do
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "INCLUDEPATH$unique=set"
-+
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
-+ fi
-+
-+ fi
-+
-+ fi
-+
-+ ;;
-+ esac
-+ done
-+
-+
-+ for ac_i in $PDO_MYSQL_LIBS; do
- case $ac_i in
- -pthread)
- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -pthread"
-+ PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread"
- else
-
-
-@@ -72525,7 +70750,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-+ PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii"
- else
-
-
-@@ -72560,8 +70785,8 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
-
-
- if test "$ext_shared" = "yes"; then
-- LDFLAGS="-L$ai_p $LDFLAGS"
-- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ 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
-
-
-@@ -72587,44 +70812,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- esac
- done
-
-- echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
--echo "configure:72592: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
--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_save_LIBS="$LIBS"
--LIBS="-l$pdo_odbc_def_lib $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 72600 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char SQLAllocHandle();
--
--int main() {
--SQLAllocHandle()
--; return 0; }
--EOF
--if { (eval echo configure:72611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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
-@@ -72632,548 +70819,398 @@ else
-
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-- unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle
-+ unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
-
-- { 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.
--" 1>&2; exit 1; }
--
--fi
-+ if test "$PHP_ZLIB_DIR" != "no"; then
-+
-
--
--
--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
-+ 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
-
-- { 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
--
-- ac_extra=`echo "-I$pdo_inc_path $PDO_ODBC_INCLUDE"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+ 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" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_PDO_ODBC_SHARED=no
-
-+ 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
-+
-
-- 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
-
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
--
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
--
--
-- old_IFS=$IFS
-- for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
--
-- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
--
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-+ fi
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-
-+ fi
-+
-+ fi
-
-- EXT_STATIC="$EXT_STATIC pdo_odbc"
-- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc"
- fi
- else
-- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-- PHP_PDO_ODBC_SHARED=yes
-+
-+
-+ 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
-+
-+
-
-- 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
-- b_c_meta=$shared_c_meta
-- b_cxx_meta=$shared_cxx_meta
-- b_c_post=$shared_c_post
-- b_cxx_post=$shared_cxx_post
-- b_lo=$shared_lo
--
--
-- old_IFS=$IFS
-- for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- 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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-
-- case $host_alias in
-- *netware*)
--
-- install_modules="install-modules"
-
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PHPPDO_ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_odbc.so '$ext_builddir'/phppdo_odbc.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_ODBC, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PHPPDO_ODBC_SHARED_LIBADD)'
-- ;;
-- esac
-+
-+ fi
-
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_odbc.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_odbc.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
-+
-+ case z in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-lz $LIBS"
-+ ;;
-+ esac
-
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppdo_odbc.$suffix: $ext_builddir/phppdo_odbc.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_odbc.$suffix \$(phplibdir)
-
--$ext_builddir/phppdo_odbc.$suffix: \$(shared_objects_pdo_odbc) \$(PHPPDO_ODBC_SHARED_DEPENDENCIES)
-- $link_cmd
-
--EOF
-
-- ;;
-- *)
--
-- install_modules="install-modules"
-+ fi
-
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PDO_ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_odbc.so '$ext_builddir'/pdo_odbc.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_ODBC, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PDO_ODBC_SHARED_LIBADD)'
-- ;;
-- esac
-
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_odbc.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_odbc.$suffix"
-- fi
-+
-+ save_old_LDFLAGS=$LDFLAGS
-+ ac_stuff="
-+ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR
-+ "
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
-+ save_ext_shared=$ext_shared
-+ ext_shared=yes
-+
-+ for ac_i in $ac_stuff; do
-+ case $ac_i in
-+ -pthread)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -pthread"
-+ else
-+
-+
-+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "EXTRA_LDFLAGS$unique=set"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pdo_odbc.$suffix: $ext_builddir/pdo_odbc.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_odbc.$suffix \$(phplibdir)
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-
--$ext_builddir/pdo_odbc.$suffix: \$(shared_objects_pdo_odbc) \$(PDO_ODBC_SHARED_DEPENDENCIES)
-- $link_cmd
-
--EOF
-+ fi
-+ ;;
-+ esac
-
-- ;;
-- esac
-- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PDO_ODBC 1
--EOF
-
-- fi
-+ ;;
-+ -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" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_PDO_ODBC_SHARED=no
-- case "$PHP_SAPI" in
-- cgi|embed)
-+
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ else
-
-
-- 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
-
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-
-+ fi
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
-
-+ fi
-+
-+ fi
-
-- 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"
-+ ;;
-+ esac
-+ done
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-+ echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
-+echo "configure:71021: 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_save_LIBS="$LIBS"
-+LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 71029 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char mysql_query();
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
-+int main() {
-+mysql_query()
-+; return 0; }
- EOF
-- done
-+if { (eval echo configure:71040: \"$ac_link\") 1>&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
-
-- EXT_STATIC="$EXT_STATIC pdo_odbc"
-- ;;
-- *)
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+ unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
-+
-+ { echo "configure: error: PDO_MYSQL configure failed. Please check config.log for more information." 1>&2; exit 1; }
-
-
-- 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
--
-+fi
-
--
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
--
--
-- old_IFS=$IFS
-- for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
-+ PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
-+ else
-+
-
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
-+ case z in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD"
-+ else
-
-- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
-+
-+ case z in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-lz $LIBS"
-+ ;;
-+ esac
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-+ fi
-+ ;;
-+ esac
-
-
-- ;;
-- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc"
-- fi
-+
-+ save_old_LDFLAGS=$LDFLAGS
-+ ac_stuff="
-+ -L$PDO_MYSQL_LIB_DIR
-+ "
-
-+ save_ext_shared=$ext_shared
-+ ext_shared=yes
-
-- BUILD_DIR="$BUILD_DIR $ext_builddir"
-+ for ac_i in $ac_stuff; do
-+ case $ac_i in
-+ -pthread)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -pthread"
-+ else
-+
-+
-+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "EXTRA_LDFLAGS$unique=set"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-
-- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=pdo_odbc
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
-- fi
-+ fi
-+ ;;
-+ esac
-
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_ODBC_SHARED_LIBADD"
-
--
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-
-- 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 "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.
--" 1>&2; exit 1; }
-- fi
-- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-- { 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.
--" 1>&2; exit 1; }
-- fi
--
--
--fi
--
--
--
--php_with_pdo_pgsql=no
--
--echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
--echo "configure:72985: checking for PostgreSQL support for PDO" >&5
--# 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
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_PDO_PGSQL in
--shared,*)
-- PHP_PDO_PGSQL=`echo "$PHP_PDO_PGSQL"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_PDO_PGSQL=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
--
--echo "$ac_t""$ext_output" 1>&6
--
--
--
--
--if test "$PHP_PDO_PGSQL" != "no"; then
--
-- if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-- { 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
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
- else
-
-- ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
- fi
-
--
-- echo $ac_n "checking for pg_config""... $ac_c" 1>&6
--echo "configure:73044: 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"
-- break;
-- fi
-- done
--
-- if test -n "$PG_CONFIG"; then
-- echo "$ac_t""$PG_CONFIG" 1>&6
-- PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-- PGSQL_LIBDIR=`$PG_CONFIG --libdir`
-- cat >> confdefs.h <<\EOF
--#define HAVE_PG_CONFIG_H 1
--EOF
--
-- else
-- 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
-+
-+ 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"
-
-- 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 <<\EOF
--#define HAVE_PG_CONFIG_H 1
--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
-- PGSQL_LIBDIR=$i/$j
-- fi
-- done
-- done
-- fi
--
-- if test -z "$PGSQL_INCLUDE"; then
-- { 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 "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 "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
-+ fi
-+
- fi
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_PDO_PGSQL 1
--EOF
--
--
-- echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
--echo "configure:73108: checking for openssl dependencies" >&5
-- if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then
-- echo "$ac_t""yes" 1>&6
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:73114: checking for $ac_word" >&5
--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
-- /*)
-- 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.
-- ;;
-- *)
-- 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
-+ ;;
-+ esac
- 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"
--if test -n "$PKG_CONFIG"; then
-- echo "$ac_t""$PKG_CONFIG" 1>&6
--else
-- 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 "$ac_t""no" 1>&6
-- fi
-
-- old_LIBS=$LIBS
-- old_LDFLAGS=$LDFLAGS
-- LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-- echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
--echo "configure:73158: checking for PQparameterStatus in -lpq" >&5
--ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
-+echo "configure:71195: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
-+LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 73166 "configure"
-+#line 71203 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char PQparameterStatus();
-+char mysql_query();
-
- int main() {
--PQparameterStatus()
-+mysql_query()
- ; return 0; }
- EOF
--if { (eval echo configure:73177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:71214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -73188,260 +71225,132 @@ 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_PQPARAMETERSTATUS 1
--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 $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
--echo "configure:73206: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 73214 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQprepare();
--
--int main() {
--PQprepare()
--; return 0; }
--EOF
--if { (eval echo configure:73225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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
--EOF
--
--else
-- echo "$ac_t""no" 1>&6
--fi
--
-- echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
--echo "configure:73249: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 73257 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQescapeStringConn();
--
--int main() {
--PQescapeStringConn()
--; return 0; }
--EOF
--if { (eval echo configure:73268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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_PQESCAPE_CONN 1
--EOF
--
--else
-- echo "$ac_t""no" 1>&6
--fi
--
-- echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
--echo "configure:73292: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 73300 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQescapeByteaConn();
--
--int main() {
--PQescapeByteaConn()
--; return 0; }
--EOF
--if { (eval echo configure:73311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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_PQESCAPE_BYTEA_CONN 1
--EOF
--
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--
-- echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
--echo "configure:73336: checking for pg_encoding_to_char in -lpq" >&5
--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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 73344 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char pg_encoding_to_char();
--
--int main() {
--pg_encoding_to_char()
--; return 0; }
--EOF
--if { (eval echo configure:73355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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
--
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+
-+
- else
- echo "$ac_t""no" 1>&6
--fi
--
--
--
-- LIBS=$old_LIBS
-- LDFLAGS=$old_LDFLAGS
-
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+ unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
-+
-+ { 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
-
-- 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
-+ 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 "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
-- ai_p=$PGSQL_LIBDIR
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
- else
-
-- ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
- 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\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
-+ eval "INCLUDEPATH$unique=set"
-+
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
-+ fi
-
-- test -n "$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 $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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
- fi
-
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ 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"
-+ ;;
-+ esac
-+
-+
- fi
-- else
--
-+ ;;
-+ esac
-
-- if test -n "$PGSQL_LIBDIR"; then
--
-- if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
-+
-+ ;;
-+ -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 "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
-- ai_p=$PGSQL_LIBDIR
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
- else
-
-- ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
-+ 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'`
-@@ -73457,71 +71366,89 @@ fi
- fi
-
-
-+ fi
-
- fi
-
-- fi
--
--
-- case pq in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="-lpq $LIBS"
-- ;;
-- esac
--
--
--
-+ ;;
-+ esac
-+ done
-
-- fi
-+
-+
-+fi
-
-
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_PGSQL_SHARED_LIBADD"
-+ _SAVE_LIBS=$LIBS
-+ LIBS="$LIBS $PDO_MYSQL_LIBS"
-+ for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:71388: 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 71393 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func();
-
-+int main() {
-
--
-- 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
-+/* 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
-+$ac_func();
-+#endif
-
--
--
-- 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
-+; return 0; }
-+EOF
-+if { (eval echo configure:71416: \"$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 $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:73519: checking for PDO includes" >&5
-+echo "configure:71446: checking for PDO includes" >&5
- if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:73525: checking for PDO includes" >&5
-+echo "configure:71452: 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
-@@ -73541,20 +71468,28 @@ echo "$ac_t""$pdo_inc_path" 1>&6
-
-
-
--
-- ext_builddir=ext/pdo_pgsql
-- ext_srcdir=$abs_srcdir/ext/pdo_pgsql
-+ if test -n "$PDO_MYSQL_CONFIG"; then
-+ PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
-+ cat >> confdefs.h <<EOF
-+#define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET"
-+EOF
-
-- ac_extra=`echo "-I$pdo_inc_path $PDO_PGSQL_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+ fi
-+
-+
-+ ext_builddir=ext/pdo_mysql
-+ ext_srcdir=$abs_srcdir/ext/pdo_mysql
-+
-+ ac_extra=`echo "-I$pdo_inc_path -I"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_PDO_PGSQL_SHARED=no
-+ PHP_PDO_MYSQL_SHARED=no
-
-
-- case ext/pdo_pgsql in
-+ case ext/pdo_mysql 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" ;;
-+ /*) 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
-
-
-@@ -73569,7 +71504,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
-
-
- old_IFS=$IFS
-- for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
-+ for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
-
- IFS=.
- set $ac_src
-@@ -73592,18 +71527,18 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC pdo_pgsql"
-+ EXT_STATIC="$EXT_STATIC pdo_mysql"
- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
- fi
- else
- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-- PHP_PDO_PGSQL_SHARED=yes
-+ PHP_PDO_MYSQL_SHARED=yes
-
-- case ext/pdo_pgsql in
-+ case ext/pdo_mysql 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" ;;
-+ /*) 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
-
-
-@@ -73618,14 +71553,14 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
-+ 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_pgsql="$shared_objects_pdo_pgsql $ac_bdir$ac_obj.lo"
-+ shared_objects_pdo_mysql="$shared_objects_pdo_mysql $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" ;;
-@@ -73648,31 +71583,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PHPPDO_PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_pgsql.so '$ext_builddir'/phppdo_pgsql.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PHPPDO_MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_mysql.so '$ext_builddir'/phppdo_mysql.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_PGSQL, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_MYSQL, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PHPPDO_PGSQL_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PHPPDO_MYSQL_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_pgsql.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_mysql.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_pgsql.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_mysql.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppdo_pgsql.$suffix: $ext_builddir/phppdo_pgsql.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_pgsql.$suffix \$(phplibdir)
-+\$(phplibdir)/phppdo_mysql.$suffix: $ext_builddir/phppdo_mysql.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_mysql.$suffix \$(phplibdir)
-
--$ext_builddir/phppdo_pgsql.$suffix: \$(shared_objects_pdo_pgsql) \$(PHPPDO_PGSQL_SHARED_DEPENDENCIES)
-+$ext_builddir/phppdo_mysql.$suffix: \$(shared_objects_pdo_mysql) \$(PHPPDO_MYSQL_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -73685,31 +71620,31 @@ EOF
- case $host_alias in
- *aix*)
- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PDO_PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_pgsql.so '$ext_builddir'/pdo_pgsql.so'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PDO_MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_mysql.so '$ext_builddir'/pdo_mysql.so'
- ;;
- *netware*)
- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_PGSQL, 3)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_MYSQL, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PDO_PGSQL_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PDO_MYSQL_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_pgsql.$suffix"
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_mysql.$suffix"
- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_pgsql.$suffix"
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_mysql.$suffix"
- fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
-
- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pdo_pgsql.$suffix: $ext_builddir/pdo_pgsql.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_pgsql.$suffix \$(phplibdir)
-+\$(phplibdir)/pdo_mysql.$suffix: $ext_builddir/pdo_mysql.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_mysql.$suffix \$(phplibdir)
-
--$ext_builddir/pdo_pgsql.$suffix: \$(shared_objects_pdo_pgsql) \$(PDO_PGSQL_SHARED_DEPENDENCIES)
-+$ext_builddir/pdo_mysql.$suffix: \$(shared_objects_pdo_mysql) \$(PDO_MYSQL_SHARED_DEPENDENCIES)
- $link_cmd
-
- EOF
-@@ -73717,22 +71652,22 @@ EOF
- ;;
- esac
- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PDO_PGSQL 1
-+#define COMPILE_DL_PDO_MYSQL 1
- EOF
-
- fi
- fi
-
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- PHP_PDO_PGSQL_SHARED=no
-+ PHP_PDO_MYSQL_SHARED=no
- case "$PHP_SAPI" in
- cgi|embed)
-
-
-- case ext/pdo_pgsql in
-+ case ext/pdo_mysql 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" ;;
-+ /*) 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
-
-
-@@ -73747,7 +71682,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
-+ for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
-
- IFS=.
- set $ac_src
-@@ -73770,15 +71705,15 @@ EOF
- done
-
-
-- EXT_STATIC="$EXT_STATIC pdo_pgsql"
-+ EXT_STATIC="$EXT_STATIC pdo_mysql"
- ;;
- *)
-
-
-- case ext/pdo_pgsql in
-+ case ext/pdo_mysql 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" ;;
-+ /*) 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
-
-
-@@ -73793,7 +71728,7 @@ EOF
-
-
- old_IFS=$IFS
-- for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
-+ for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
-
- IFS=.
- set $ac_src
-@@ -73818,7 +71753,7 @@ EOF
-
- ;;
- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql"
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
- fi
-
-
-@@ -73827,7 +71762,7 @@ EOF
-
-
- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=pdo_pgsql
-+ PHP_PECL_EXTENSION=pdo_mysql
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
-@@ -73835,41 +71770,78 @@ EOF
-
-
-
-- am_i_shared=$PHP_PDO_PGSQL_SHARED
-+ 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 "configure: error:
--You've configured extension pdo_pgsql to build statically, but it
-+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_pgsql shared or build pdo statically for the
-+You either need to build pdo_mysql shared or build pdo statically for the
- build to be successful.
- " 1>&2; exit 1; }
- fi
- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
- { echo "configure: error:
--You've configured extension pdo_pgsql, which depends on extension pdo,
-+You've configured extension pdo_mysql, which depends on extension pdo,
- but you've either not enabled pdo, or have disabled it.
- " 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 "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.
-+" 1>&2; exit 1; }
-+ fi
-+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ { 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.
-+" 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_sqlite=$PHP_PDO
-
--echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
--echo "configure:73865: checking for sqlite 3 support for PDO" >&5
--# 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
-+
-+
-+php_with_pdo_oci=no
-+
-+echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
-+echo "configure:71837: 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_SQLITE=$PHP_PDO
-- test "$PHP_ENABLE_ALL" && PHP_PDO_SQLITE=$PHP_ENABLE_ALL
-+ PHP_PDO_OCI=no
-+ test "$PHP_ENABLE_ALL" && PHP_PDO_OCI=$PHP_ENABLE_ALL
-
- fi
-
-@@ -73877,12 +71849,12 @@ fi
-
- ext_output="yes, shared"
- ext_shared=yes
--case $PHP_PDO_SQLITE in
-+case $PHP_PDO_OCI in
- shared,*)
-- PHP_PDO_SQLITE=`echo "$PHP_PDO_SQLITE"|$SED 's/^shared,//'`
-+ PHP_PDO_OCI=`echo "$PHP_PDO_OCI"|$SED 's/^shared,//'`
- ;;
- shared)
-- PHP_PDO_SQLITE=yes
-+ PHP_PDO_OCI=yes
- ;;
- no)
- ext_output=no
-@@ -73901,74 +71873,48 @@ echo "$ac_t""$ext_output" 1>&6
-
-
-
--if test "$PHP_PDO_SQLITE" != "no"; then
-+if test "$PHP_PDO_OCI" != "no"; then
-
- if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
- { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
- fi
-
--
--
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:73914: checking for PDO includes" >&5
--if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
--
-- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:73920: checking for PDO includes" >&5
-- 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
-- pdo_inc_path=$abs_srcdir/ext
-- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-- pdo_inc_path=$prefix/include/php/ext
-- fi
--
--fi
--
--echo "$ac_t""$pdo_inc_path" 1>&6
-- if test -n "$pdo_inc_path"; then
--:
-+ echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
-+echo "configure:71884: checking Oracle Install-Dir" >&5
-+ if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
-+ PDO_OCI_DIR=$ORACLE_HOME
- else
--{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
-+ PDO_OCI_DIR=$PHP_PDO_OCI
- fi
-+ echo "$ac_t""$PHP_PDO_OCI" 1>&6
-
--
--
-- php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
--
-- if test "$PHP_PDO_SQLITE" != "yes"; then
-- SEARCH_PATH="$PHP_PDO_SQLITE /usr/local /usr" # you might want to change this
-- SEARCH_FOR="/include/sqlite3.h" # you most likely want to change this
-- 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 $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
--echo "configure:73949: 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 "$ac_t""found in $i" 1>&6
-- fi
-- done
-- fi
-- if test -z "$PDO_SQLITE_DIR"; then
-- echo "$ac_t""not found" 1>&6
-- { echo "configure: error: Please reinstall the sqlite3 distribution" 1>&2; exit 1; }
-- fi
-+ echo $ac_n "checking if that is sane""... $ac_c" 1>&6
-+echo "configure:71893: checking if that is sane" >&5
-+ if test -z "$PDO_OCI_DIR"; then
-+ { echo "configure: error:
-+You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
-+" 1>&2; exit 1; }
-+ else
-+ echo "$ac_t""yes" 1>&6
-+ fi
-
-+ if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
-+ PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
-+ PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
-+ echo $ac_n "checking for oci.h""... $ac_c" 1>&6
-+echo "configure:71906: checking for oci.h" >&5
-+ if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then
-+
-+ if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then
-
-- 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
-+ if test -z "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" || echo "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" | grep '^/' >/dev/null ; then
-+ ai_p=$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client
- else
-
-- ep_dir="`echo $PDO_SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/include\"`"
-+ ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client\"`"
- fi
-
-
-@@ -73989,209 +71935,423 @@ echo "configure:73949: checking for sqli
-
- fi
-
--
-- LIBNAME=sqlite3
-- LIBSYMBOL=sqlite3_open
-+ echo "$ac_t""$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" 1>&6
-+ elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then
-+
-+ if test "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" != "/usr/include"; then
-+
-+ if test -z "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" || echo "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" | grep '^/' >/dev/null ; then
-+ ai_p=$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include
-+ else
-+
-+ ep_dir="`echo $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include\"`"
-+ fi
-
-
-- 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'`
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "EXTRA_LDFLAGS$unique=set"
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-- fi
--
-+ eval "INCLUDEPATH$unique=set"
-+
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
- fi
-- ;;
-- -l*)
-- ac_ii=`echo $ac_i|cut -c 3-`
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- if test "$ext_shared" = "yes"; then
-- LDFLAGS="$LDFLAGS -l$ac_ii"
-- else
--
--
-- case $ac_ii in
-- c|c_r|pthread*) ;;
-- *)
-- LIBS="$LIBS -l$ac_ii"
-- ;;
-- esac
--
--
-- fi
-- ;;
-- esac
-+
-+ fi
-
-+ fi
-
-- ;;
-- -L*)
-- ac_ii=`echo $ac_i|cut -c 3-`
-+ echo "$ac_t""$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" 1>&6
-+ elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then
-
-- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+ if test "$PDO_OCI_IC_PREFIX/sdk/include" != "/usr/include"; then
-
-- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-- ai_p=$ac_ii
-+ 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 $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PDO_OCI_IC_PREFIX/sdk/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/sdk/include\"`"
- 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\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
-+ eval "INCLUDEPATH$unique=set"
-
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
- fi
-
- fi
-
-- ;;
-- esac
-- done
--
-- echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
--echo "configure:74095: 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_save_LIBS="$LIBS"
--LIBS="-l$LIBNAME $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 74103 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $LIBSYMBOL();
--
--int main() {
--$LIBSYMBOL()
--; return 0; }
--EOF
--if { (eval echo configure:74114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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
--
--
-+ fi
-
-- 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
-+ echo "$ac_t""$PDO_OCI_IC_PREFIX/sdk/include" 1>&6
-+ elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then
-
-- if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-+ if test "$PDO_OCI_IC_PREFIX/client/include" != "/usr/include"; 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
-+ if test -z "$PDO_OCI_IC_PREFIX/client/include" || echo "$PDO_OCI_IC_PREFIX/client/include" | grep '^/' >/dev/null ; then
-+ ai_p=$PDO_OCI_IC_PREFIX/client/include
- else
-
-- ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PDO_OCI_IC_PREFIX/client/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
-+ ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/client/include\"`"
- 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 \"\$INCLUDEPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "INCLUDEPATH$unique=set"
-+
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
-+ fi
-+
-+ fi
-+
-+ fi
-+
-+ echo "$ac_t""$PDO_OCI_IC_PREFIX/client/include" 1>&6
-+ else
-+ { 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/client/lib/libclntsh.so" ; then
-+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
-+ elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
-+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib"
-+ elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then
-+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
-+ else
-+ { 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 $ac_n "checking size of long int""... $ac_c" 1>&6
-+echo "configure:72055: 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
-+ ac_cv_sizeof_long_int=4
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 72063 "configure"
-+#include "confdefs.h"
-+#include <stdio.h>
-+#include <sys/types.h>
-+main()
-+{
-+ FILE *f=fopen("conftestval", "w");
-+ if (!f) exit(1);
-+ fprintf(f, "%d\n", sizeof(long int));
-+ exit(0);
-+}
-+EOF
-+if { (eval echo configure:72075: \"$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 "$ac_t""$ac_cv_sizeof_long_int" 1>&6
-+cat >> confdefs.h <<EOF
-+#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
-+EOF
-+
-+
-+ echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
-+echo "configure:72095: checking if we're on a 64-bit platform" >&5
-+ if test "$ac_cv_sizeof_long_int" = "4" ; then
-+ echo "$ac_t""no" 1>&6
-+ TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
-+ else
-+ echo "$ac_t""yes" 1>&6
-+ TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
-+ fi
-+
-+ echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
-+echo "configure:72105: 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
-+ PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
-+ 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 "configure: error: Oracle required OCI8 libraries not found" 1>&2; exit 1; }
-+ fi
-+ 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 \"\$LIBPATH$unique$ac_c\""
-+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
-+ eval "INCLUDEPATH$unique=set"
-
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
-+ fi
-+
-+ fi
-+
-+ fi
-+
-+ 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
-
-+ 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
-+
-+ 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
-
-- 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
-+
-+ 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 -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
-- ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR
-+ if test ""; then
-+ INCLUDES="-I$ai_p $INCLUDES"
-+ else
-+ INCLUDES="$INCLUDES -I$ai_p"
-+ fi
-+
-+ fi
-+
-+ fi
-+
-+ 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_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $PDO_OCI_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
-+ 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
-+
-+ PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/include"
-+ 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-+
-+
-+ if test "$ext_shared" = "yes"; then
-+ 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'`
-@@ -74207,46 +72367,196 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- fi
-
-
-+ fi
-
- fi
-
-+ ;;
-+ esac
-+ 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
- fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
-+ else
-+
-
-- case $LIBNAME in
-+ case $ac_ii in
- c|c_r|pthread*) ;;
- *)
-- LIBS="-l$LIBNAME $LIBS"
-+ LIBS="$LIBS -l$ac_ii"
- ;;
- esac
-
-
-+ fi
-+ ;;
-+ esac
-+
-
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-
-+
-+ if test "$ext_shared" = "yes"; then
-+ 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
-
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_PDO_SQLITELIB 1
--EOF
-+ fi
-+
-+ fi
-+
-+ ;;
-+ esac
-+ done
-
-+ fi
-
-+ echo $ac_n "checking Oracle version""... $ac_c" 1>&6
-+echo "configure:72472: 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 "configure: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" 1>&2; exit 1; }
-+ fi
-+ echo "$ac_t""$PDO_OCI_VERSION" 1>&6
-+
-+ fi
-+
-+ case $PDO_OCI_VERSION in
-+ 9.0|10.1|10.2|11.1|11.2)
-+
-
--else
-- echo "$ac_t""no" 1>&6
-+ case clntsh in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -lclntsh"
-+ else
-+
-+
-+ case clntsh in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -lclntsh"
-+ ;;
-+ esac
-
-- LDFLAGS=$save_old_LDFLAGS
-- ext_shared=$save_ext_shared
-- unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+
-+ *)
-+ { 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
-
-- { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
-+ 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
-
-+ fi
-+
-+
-+
- save_old_LDFLAGS=$LDFLAGS
-- ac_stuff=""
-+ ac_stuff="
-+ -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
-+ "
-
- save_ext_shared=$ext_shared
- ext_shared=yes
-@@ -74339,27 +72649,27 @@ fi
- esac
- done
-
-- echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
--echo "configure:74344: checking for sqlite3_key in -lsqlite3" >&5
--ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
-+echo "configure:72654: 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_save_LIBS="$LIBS"
--LIBS="-lsqlite3 $LIBS"
-+LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 74352 "configure"
-+#line 72662 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char sqlite3_key();
-+char OCIEnvCreate();
-
- int main() {
--sqlite3_key()
-+OCIEnvCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:74363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:72673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -74378,825 +72688,330 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_SQLITE3_KEY 1
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCIENVCREATE 1
- EOF
-
--
-+
-
- else
- echo "$ac_t""no" 1>&6
-
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-- unset ac_cv_lib_sqlite3_sqlite3_key
-+ unset ac_cv_lib_clntsh_OCIEnvCreate
-
-
- fi
-
-
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD"
--
--
-- ext_builddir=ext/pdo_sqlite
-- ext_srcdir=$abs_srcdir/ext/pdo_sqlite
--
-- ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
--
-- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_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
-+ 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
--
--
-- old_IFS=$IFS
-- for ac_src in $php_pdo_sqlite_sources_core; do
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-
-- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
--
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-
-
-- EXT_STATIC="$EXT_STATIC pdo_sqlite"
-- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
- fi
-- 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
-- b_c_meta=$shared_c_meta
-- b_cxx_meta=$shared_cxx_meta
-- b_c_post=$shared_c_post
-- b_cxx_post=$shared_cxx_post
-- b_lo=$shared_lo
-
-
-- old_IFS=$IFS
-- for ac_src in $php_pdo_sqlite_sources_core; do
--
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-
-- shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo"
--
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
--
-- case $host_alias in
-- *netware*)
--
-- install_modules="install-modules"
--
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_sqlite.so '$ext_builddir'/phppdo_sqlite.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD)'
-- ;;
-- esac
--
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_sqlite.$suffix"
-+ 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
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
--
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppdo_sqlite.$suffix: $ext_builddir/phppdo_sqlite.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_sqlite.$suffix \$(phplibdir)
--
--$ext_builddir/phppdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PHPPDO_SQLITE_SHARED_DEPENDENCIES)
-- $link_cmd
--
--EOF
-
-- ;;
-- *)
--
-- install_modules="install-modules"
-+
-+ 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
-
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_sqlite.so '$ext_builddir'/pdo_sqlite.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD)'
-- ;;
-- esac
-
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_sqlite.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
-+ fi
-+
- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
-
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pdo_sqlite.$suffix: $ext_builddir/pdo_sqlite.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_sqlite.$suffix \$(phplibdir)
-+ ;;
-+ esac
-+ done
-
--$ext_builddir/pdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PDO_SQLITE_SHARED_DEPENDENCIES)
-- $link_cmd
-+ echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
-+echo "configure:72807: 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_save_LIBS="$LIBS"
-+LIBS="-lclntsh $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 72815 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char OCIEnvNlsCreate();
-
-+int main() {
-+OCIEnvNlsCreate()
-+; return 0; }
- EOF
-+if { (eval echo configure:72826: \"$ac_link\") 1>&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"
-
-- ;;
-- esac
-- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PDO_SQLITE 1
-+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_OCIENVNLSCREATE 1
- EOF
-
-- fi
-- fi
--
-- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- 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
-
-
-+else
-+ echo "$ac_t""no" 1>&6
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
--
--
-- old_IFS=$IFS
-- for ac_src in $php_pdo_sqlite_sources_core; do
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+ unset ac_cv_lib_clntsh_OCIEnvNlsCreate
-+
-
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
--
-- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
--
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-+fi
-
-
-- EXT_STATIC="$EXT_STATIC pdo_sqlite"
-- ;;
-- *)
-
-+ save_old_LDFLAGS=$LDFLAGS
-+ ac_stuff="
-+ -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
-+ "
-
-- 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
-+ save_ext_shared=$ext_shared
-+ ext_shared=yes
-
-+ for ac_i in $ac_stuff; do
-+ case $ac_i in
-+ -pthread)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -pthread"
-+ else
-+
-
-+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "EXTRA_LDFLAGS$unique=set"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-
-- 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_pdo_sqlite_sources_core; do
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-
-- IFS=.
-- set $ac_src
-- ac_obj=$1
-- IFS=$old_IFS
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-
-- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
-
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
-+ fi
-+ ;;
-+ esac
-
-
-- ;;
-- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
-+ ;;
-+ -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
-+
-
-
-- BUILD_DIR="$BUILD_DIR $ext_builddir"
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-
-
-- if test "$ext_builddir" = "."; then
-- PHP_PECL_EXTENSION=pdo_sqlite
-+ fi
-
-- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
--
- fi
-
-- else
-- # use bundled libs
-- if test "$enable_maintainer_zts" = "yes"; then
-- threadsafe_flags="-DSQLITE_THREADSAFE=1"
-- else
-- threadsafe_flags="-DSQLITE_THREADSAFE=0"
-- fi
-+ ;;
-+ esac
-+ done
-
-- other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
-+ echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
-+echo "configure:72960: 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_save_LIBS="$LIBS"
-+LIBS="-lclntsh $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 72968 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char OCILobIsTemporary();
-
-- if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then
-- other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
-- fi
-+int main() {
-+OCILobIsTemporary()
-+; return 0; }
-+EOF
-+if { (eval echo configure:72979: \"$ac_link\") 1>&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"
-
-- if test "$PHP_SQLITE3" != "yes"; then
--
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-
-- 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
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCILOBISTEMPORARY 1
-+EOF
-+
-
-
-+else
-+ echo "$ac_t""no" 1>&6
-
-- b_c_pre=$php_c_pre
-- b_cxx_pre=$php_cxx_pre
-- b_c_meta=$php_c_meta
-- b_cxx_meta=$php_cxx_meta
-- b_c_post=$php_c_post
-- b_cxx_post=$php_cxx_post
-- b_lo=$php_lo
--
--
-- 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
-- *.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
--
--
-- fi
--
--
-- ext_builddir=ext/pdo_sqlite
-- ext_srcdir=$abs_srcdir/ext/pdo_sqlite
--
-- ac_extra=`echo "-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
--
-- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-- PHP_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
-- 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_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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
--
--
-- EXT_STATIC="$EXT_STATIC pdo_sqlite"
-- if test "$ext_shared" != "nocli"; then
-- EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
-- fi
-- 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
-- b_c_meta=$shared_c_meta
-- b_cxx_meta=$shared_cxx_meta
-- b_c_post=$shared_c_post
-- b_cxx_post=$shared_cxx_post
-- b_lo=$shared_lo
--
--
-- old_IFS=$IFS
-- for ac_src in $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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
--
-- case $host_alias in
-- *netware*)
--
-- install_modules="install-modules"
--
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_sqlite.so '$ext_builddir'/phppdo_sqlite.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD)'
-- ;;
-- esac
--
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_sqlite.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
-- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
--
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/phppdo_sqlite.$suffix: $ext_builddir/phppdo_sqlite.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_sqlite.$suffix \$(phplibdir)
--
--$ext_builddir/phppdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PHPPDO_SQLITE_SHARED_DEPENDENCIES)
-- $link_cmd
--
--EOF
--
-- ;;
-- *)
--
-- install_modules="install-modules"
--
-- case $host_alias in
-- *aix*)
-- suffix=so
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_sqlite.so '$ext_builddir'/pdo_sqlite.so'
-- ;;
-- *netware*)
-- suffix=nlm
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
-- ;;
-- *)
-- suffix=la
-- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD)'
-- ;;
-- esac
--
-- if test "x" = "xyes"; then
-- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_sqlite.$suffix"
-- else
-- PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
-- fi
--
-- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
--
-- cat >>Makefile.objects<<EOF
--\$(phplibdir)/pdo_sqlite.$suffix: $ext_builddir/pdo_sqlite.$suffix
-- \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_sqlite.$suffix \$(phplibdir)
--
--$ext_builddir/pdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PDO_SQLITE_SHARED_DEPENDENCIES)
-- $link_cmd
--
--EOF
--
-- ;;
-- esac
-- cat >> confdefs.h <<EOF
--#define COMPILE_DL_PDO_SQLITE 1
--EOF
--
-- fi
-- fi
--
-- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-- 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
-- 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_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
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
--
--
-- EXT_STATIC="$EXT_STATIC 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
-- 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_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"
--
-- case $ac_src in
-- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-- esac
--
-- cat >>Makefile.objects<<EOF
--$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-- $ac_comp
--EOF
-- done
--
--
-- ;;
-- esac
-- EXT_CLI_STATIC="$EXT_CLI_STATIC 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 "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.
--" 1>&2; exit 1; }
-- fi
-- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-- { 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.
--" 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
--do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:75104: checking for $ac_func" >&5
--if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 75109 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $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
--$ac_func();
--#endif
--
--; return 0; }
--EOF
--if { (eval echo configure:75132: \"$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_hdr in time.h
--do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:75160: checking for $ac_hdr" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 75165 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:75170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--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
--
-- fi
--
--
-- save_old_LDFLAGS=$LDFLAGS
-- ac_stuff=""
-+ 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
-@@ -75289,27 +73104,27 @@ done
- esac
- done
-
-- echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
--echo "configure:75294: checking for fdatasync in -lrt" >&5
--ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
-+echo "configure:73109: 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_save_LIBS="$LIBS"
--LIBS="-lrt $LIBS"
-+LIBS="-locijdbc8 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 75302 "configure"
-+#line 73117 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char fdatasync();
-+char OCILobIsTemporary();
-
- int main() {
--fdatasync()
-+OCILobIsTemporary()
- ; return 0; }
- EOF
--if { (eval echo configure:75313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:73128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -75328,19 +73143,20 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-
-+
-
-- case rt in
-+ case ocijdbc8 in
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
-- PDO_SQLITE_SHARED_LIBADD="-lrt $PDO_SQLITE_SHARED_LIBADD"
-+ PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8"
- else
-
-
-- case rt in
-+ case ocijdbc8 in
- c|c_r|pthread*) ;;
- *)
-- LIBS="-lrt $LIBS"
-+ LIBS="$LIBS -locijdbc8"
- ;;
- esac
-
-@@ -75350,188 +73166,145 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- esac
-
-
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCILOBISTEMPORARY 1
-+EOF
-+
-+
-
- else
- echo "$ac_t""no" 1>&6
-
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-- unset ac_cv_lib_rt_fdatasync
-+ unset ac_cv_lib_ocijdbc8_OCILobIsTemporary
-
-
- 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 "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.
--" 1>&2; exit 1; }
-- fi
-- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-- { 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.
--" 1>&2; exit 1; }
-- fi
-
-
- fi
-
-
--
--php_with_pgsql=no
--
--echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
--echo "configure:75394: 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
-+
-+ save_old_LDFLAGS=$LDFLAGS
-+ ac_stuff="
-+ -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
-+ "
-
-- PHP_PGSQL=no
-- test "$PHP_ENABLE_ALL" && PHP_PGSQL=$PHP_ENABLE_ALL
--
--fi
--
--
--
--ext_output="yes, shared"
--ext_shared=yes
--case $PHP_PGSQL in
--shared,*)
-- PHP_PGSQL=`echo "$PHP_PGSQL"|$SED 's/^shared,//'`
-- ;;
--shared)
-- PHP_PGSQL=yes
-- ;;
--no)
-- ext_output=no
-- ext_shared=no
-- ;;
--*)
-- ext_output=yes
-- ext_shared=no
-- ;;
--esac
--
--
-+ save_ext_shared=$ext_shared
-+ ext_shared=yes
-+
-+ for ac_i in $ac_stuff; do
-+ case $ac_i in
-+ -pthread)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -pthread"
-+ else
-+
-+
-+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "EXTRA_LDFLAGS$unique=set"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-
--echo "$ac_t""$ext_output" 1>&6
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-
-
-+ fi
-+ ;;
-+ esac
-
-
--if test "$PHP_PGSQL" != "no"; then
--
-- if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
-- PGSQL_INCLUDE=$PGSQL_INCLUDE
-+ ;;
-+ -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 $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
- fi
-
--
-- echo $ac_n "checking for pg_config""... $ac_c" 1>&6
--echo "configure:75448: 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"
-- break;
-- fi
-- done
--
-- if test -n "$PG_CONFIG"; then
-- 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 <<\EOF
--#define HAVE_PG_CONFIG_H 1
--EOF
--
-- fi
-- else
-- 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
-+
-+ 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"
-
-- 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 <<\EOF
--#define HAVE_PG_CONFIG_H 1
--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
-- PGSQL_LIBDIR=$i/$j
-- fi
-- done
-- done
-- fi
--
-- if test -z "$PGSQL_INCLUDE"; then
-- { 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 "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 "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
-+ fi
-+
- fi
-
-- cat >> confdefs.h <<\EOF
--#define HAVE_PGSQL 1
--EOF
-+ ;;
-+ esac
-+ done
-
-- old_LIBS=$LIBS
-- old_LDFLAGS=$LDFLAGS
-- LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-- echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
--echo "configure:75516: checking for PQescapeString in -lpq" >&5
--ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
-+echo "configure:73289: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
-+LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 75524 "configure"
-+#line 73297 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char PQescapeString();
-+char OCICollAssign();
-
- int main() {
--PQescapeString()
-+OCICollAssign()
- ; return 0; }
- EOF
--if { (eval echo configure:75535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:73308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -75546,164 +73319,145 @@ 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_PQESCAPE 1
-+
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCICOLLASSIGN 1
- EOF
-
-+
-+
- else
- echo "$ac_t""no" 1>&6
--fi
--
-- echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
--echo "configure:75559: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 75567 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQunescapeBytea();
-
--int main() {
--PQunescapeBytea()
--; return 0; }
--EOF
--if { (eval echo configure:75578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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"
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+ unset ac_cv_lib_clntsh_OCICollAssign
-+
-+
- 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_PQUNESCAPEBYTEA 1
--EOF
-
--else
-- echo "$ac_t""no" 1>&6
--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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-
-- echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
--echo "configure:75602: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 75610 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQsetnonblocking();
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-
--int main() {
--PQsetnonblocking()
--; return 0; }
--EOF
--if { (eval echo configure:75621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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
--EOF
-+ fi
-+ ;;
-+ esac
-
--else
-- echo "$ac_t""no" 1>&6
--fi
-
-- echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
--echo "configure:75645: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 75653 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQcmdTuples();
-+ ;;
-+ -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
-
--int main() {
--PQcmdTuples()
--; return 0; }
--EOF
--if { (eval echo configure:75664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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"
-+
-+ 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
--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
--EOF
-
--else
-- echo "$ac_t""no" 1>&6
--fi
-+ fi
-+
-+ fi
-
-- echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
--echo "configure:75688: checking for PQoidValue in -lpq" >&5
--ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
-+ ;;
-+ esac
-+ done
-+
-+ echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
-+echo "configure:73442: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
-+LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 75696 "configure"
-+#line 73450 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char PQoidValue();
-+char OCIStmtFetch2();
-
- int main() {
--PQoidValue()
-+OCIStmtFetch2()
- ; return 0; }
- EOF
--if { (eval echo configure:75707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:73461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -75718,250 +73472,7167 @@ 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_PQOIDVALUE 1
-+
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_OCISTMTFETCH2 1
- EOF
-
-+
-+
- else
- echo "$ac_t""no" 1>&6
--fi
--
-- echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
--echo "configure:75731: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 75739 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQclientEncoding();
-
--int main() {
--PQclientEncoding()
--; return 0; }
--EOF
--if { (eval echo configure:75750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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"
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+ unset ac_cv_lib_clntsh_OCIStmtFetch2
-+
-+
- 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_PQCLIENTENCODING 1
--EOF
-
-+
-+
-+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:73500: 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_t""no" 1>&6
-+
-+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:73506: 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
-+ pdo_inc_path=$abs_srcdir/ext
-+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-+ pdo_inc_path=$prefix/include/php/ext
-+ fi
-+
- fi
-
-- echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
--echo "configure:75774: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 75782 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQparameterStatus();
-+echo "$ac_t""$pdo_inc_path" 1>&6
-+ if test -n "$pdo_inc_path"; then
-+:
-+ else
-+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
-+ fi
-
--int main() {
--PQparameterStatus()
--; return 0; }
--EOF
--if { (eval echo configure:75793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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_PQPARAMETERSTATUS 1
-+
-+ ext_builddir=ext/pdo_oci
-+ ext_srcdir=$abs_srcdir/ext/pdo_oci
-+
-+ ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-+ PHP_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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
- EOF
-+ done
-
--else
-- echo "$ac_t""no" 1>&6
--fi
-
-- echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
--echo "configure:75817: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 75825 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQprotocolVersion();
-+ EXT_STATIC="$EXT_STATIC pdo_oci"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci"
-+ fi
-+ 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
-+
-+
-
--int main() {
--PQprotocolVersion()
--; return 0; }
-+ b_c_pre=$shared_c_pre
-+ b_cxx_pre=$shared_cxx_pre
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
- EOF
--if { (eval echo configure:75836: \"$ac_link\") 1>&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"
-+ done
-+
-+ case $host_alias in
-+ *netware*)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_oci.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PHPPDO_OCI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_oci.so '$ext_builddir'/phppdo_oci.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_OCI, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PHPPDO_OCI_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_oci.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_oci.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/phppdo_oci.$suffix: $ext_builddir/phppdo_oci.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_oci.$suffix \$(phplibdir)
-+
-+$ext_builddir/phppdo_oci.$suffix: \$(shared_objects_pdo_oci) \$(PHPPDO_OCI_SHARED_DEPENDENCIES)
-+ $link_cmd
-
--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
- EOF
-
--else
-- echo "$ac_t""no" 1>&6
--fi
-+ ;;
-+ *)
-+
-+ install_modules="install-modules"
-
-- echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
--echo "configure:75860: 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_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 75868 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQtransactionStatus();
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_oci.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PDO_OCI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_oci.so '$ext_builddir'/pdo_oci.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_OCI, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PDO_OCI_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_oci.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_oci.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/pdo_oci.$suffix: $ext_builddir/pdo_oci.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_oci.$suffix \$(phplibdir)
-+
-+$ext_builddir/pdo_oci.$suffix: \$(shared_objects_pdo_oci) \$(PDO_OCI_SHARED_DEPENDENCIES)
-+ $link_cmd
-
--int main() {
--PQtransactionStatus()
--; return 0; }
- EOF
--if { (eval echo configure:75879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- 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_PGTRANSACTIONSTATUS 1
-+ ;;
-+ esac
-+ cat >> confdefs.h <<EOF
-+#define COMPILE_DL_PDO_OCI 1
-+EOF
-+
-+ fi
-+ fi
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-+ 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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC 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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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"
-+
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ ;;
-+ esac
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC 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 "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.
-+" 1>&2; exit 1; }
-+ fi
-+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ { 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.
-+" 1>&2; exit 1; }
-+ fi
-+
-+
-+
-+ cat >> confdefs.h <<EOF
-+#define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION"
- EOF
-
--else
-- echo "$ac_t""no" 1>&6
- fi
-
-- echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
--echo "configure:75903: 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
-+
-+
-+
-+
-+
-+php_with_pdo_odbc=no
-+
-+echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
-+echo "configure:73874: 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
-- ac_save_LIBS="$LIBS"
--LIBS="-lpq $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 75911 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char PQexecParams();
-+
-+ PHP_PDO_ODBC=no
-+ test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL
-
--int main() {
--PQexecParams()
--; return 0; }
--EOF
--if { (eval echo configure:75922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
-+fi
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_PDO_ODBC in
-+shared,*)
-+ PHP_PDO_ODBC=`echo "$PHP_PDO_ODBC"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_PDO_ODBC=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-+
-+
-+
-+echo "$ac_t""$ext_output" 1>&6
-+
-+
-+
-+
-+
-+
-+
-+if test "$PHP_PDO_ODBC" != "no"; then
-+
-+ if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
-+ fi
-+
-+
-+
-+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:73926: 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 "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
-+
-+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:73932: 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
-+ pdo_inc_path=$abs_srcdir/ext
-+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-+ pdo_inc_path=$prefix/include/php/ext
-+ fi
-+
- 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_PQEXECPARAMS 1
--EOF
-+echo "$ac_t""$pdo_inc_path" 1>&6
-+ if test -n "$pdo_inc_path"; then
-+:
-+ else
-+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
-+ fi
-+
-+
-+
-+ echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
-+echo "configure:73953: 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`"
-+
-+ if test "$pdo_odbc_dir" = "$PHP_PDO_ODBC" ; then
-+ pdo_odbc_dir=
-+ fi
-+
-+ case $pdo_odbc_flavour in
-+ ibm-db2)
-+ pdo_odbc_def_libdir=/home/db2inst1/sqllib/lib
-+ pdo_odbc_def_incdir=/home/db2inst1/sqllib/include
-+ pdo_odbc_def_lib=db2
-+ ;;
-+
-+ iODBC|iodbc)
-+ pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
-+ pdo_odbc_def_incdir=/usr/local/include
-+ pdo_odbc_def_lib=iodbc
-+ ;;
-+
-+ unixODBC|unixodbc)
-+ pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
-+ pdo_odbc_def_incdir=/usr/local/include
-+ pdo_odbc_def_lib=odbc
-+ ;;
-+
-+ ODBCRouter|odbcrouter)
-+ pdo_odbc_def_libdir=/usr/$PHP_LIBDIR
-+ pdo_odbc_def_incdir=/usr/include
-+ pdo_odbc_def_lib=odbcsdk
-+ ;;
-+
-+ generic)
-+ pdo_odbc_def_lib="`echo $PHP_PDO_ODBC | cut -d, -f3`"
-+ pdo_odbc_def_ldflags="`echo $PHP_PDO_ODBC | cut -d, -f4`"
-+ pdo_odbc_def_cflags="`echo $PHP_PDO_ODBC | cut -d, -f5`"
-+ pdo_odbc_flavour="generic-$pdo_odbc_def_lib"
-+ ;;
-+
-+ *)
-+ { 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
-+ 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" 1>&2; exit 1; }
-+ ;;
-+ esac
-+
-+ if test -n "$pdo_odbc_dir"; then
-+ PDO_ODBC_INCDIR="$pdo_odbc_dir/include"
-+ PDO_ODBC_LIBDIR="$pdo_odbc_dir/$PHP_LIBDIR"
-+ else
-+ PDO_ODBC_INCDIR="$pdo_odbc_def_incdir"
-+ PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
-+ fi
-+
-+ echo "$ac_t""$pdo_odbc_flavour
-+ libs $PDO_ODBC_LIBDIR,
-+ headers $PDO_ODBC_INCDIR" 1>&6
-+
-+ if test ! -d "$PDO_ODBC_LIBDIR" ; then
-+ echo "configure: warning: library dir $PDO_ODBC_LIBDIR does not exist" 1>&2
-+ fi
-+
-+
-+ echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74032: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ODBC_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74046: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ODBCSDK_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74060: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_IODBC_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74074: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SQLUNIX_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74088: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SQLTYPES_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74102: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SQLUCODE_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74116: checking for sql.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/sql.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SQL_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74130: checking for isql.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/isql.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ISQL_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74144: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SQLEXT_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74158: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_ISQLEXT_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74172: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_UDBCEXT_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74186: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_SQLCLI1_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74200: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_LIBRARYMANAGER_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74214: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_CLI0CORE_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74228: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_CLI0EXT_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74242: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_CLI0CLI_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74256: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_CLI0DEFS_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-+echo "configure:74270: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
-+ if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
-+ php_pdo_have_header=yes
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_CLI0ENV_H 1
-+EOF
-+
-+ echo "$ac_t""yes" 1>&6
-+ else
-+ echo "$ac_t""no" 1>&6
-+ fi
-+
-+
-+ if test "$php_pdo_have_header" != "yes"; then
-+ { 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ 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"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-+
-+
-+ if test "$ext_shared" = "yes"; then
-+ 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
-+
-+ ;;
-+ esac
-+ 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-+
-+
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ else
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-+
-+
-+ fi
-+
-+ fi
-+
-+ ;;
-+ esac
-+ done
-+
-+ echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
-+echo "configure:74476: 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_save_LIBS="$LIBS"
-+LIBS="-l$pdo_odbc_def_lib $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 74484 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char SQLBindCol();
-+
-+int main() {
-+SQLBindCol()
-+; return 0; }
-+EOF
-+if { (eval echo configure:74495: \"$ac_link\") 1>&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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-+
-+
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ else
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-+
-+
-+ fi
-+
-+ fi
-+
-+ ;;
-+ esac
-+ done
-+
-+ echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
-+echo "configure:74610: 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_save_LIBS="$LIBS"
-+LIBS="-l$pdo_odbc_def_lib $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 74618 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char SQLAllocHandle();
-+
-+int main() {
-+SQLAllocHandle()
-+; return 0; }
-+EOF
-+if { (eval echo configure:74629: \"$ac_link\") 1>&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 "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.
-+" 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 "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
-+
-+ ac_extra=`echo "-I$pdo_inc_path $PDO_ODBC_INCLUDE"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-+ PHP_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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC pdo_odbc"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc"
-+ fi
-+ 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
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+ case $host_alias in
-+ *netware*)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PHPPDO_ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_odbc.so '$ext_builddir'/phppdo_odbc.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_ODBC, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PHPPDO_ODBC_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_odbc.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_odbc.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/phppdo_odbc.$suffix: $ext_builddir/phppdo_odbc.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_odbc.$suffix \$(phplibdir)
-+
-+$ext_builddir/phppdo_odbc.$suffix: \$(shared_objects_pdo_odbc) \$(PHPPDO_ODBC_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ *)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PDO_ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_odbc.so '$ext_builddir'/pdo_odbc.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_ODBC, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PDO_ODBC_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_odbc.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_odbc.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/pdo_odbc.$suffix: $ext_builddir/pdo_odbc.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_odbc.$suffix \$(phplibdir)
-+
-+$ext_builddir/pdo_odbc.$suffix: \$(shared_objects_pdo_odbc) \$(PDO_ODBC_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ esac
-+ cat >> confdefs.h <<EOF
-+#define COMPILE_DL_PDO_ODBC 1
-+EOF
-+
-+ fi
-+ fi
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-+ 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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC 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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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"
-+
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ ;;
-+ esac
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC 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 "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.
-+" 1>&2; exit 1; }
-+ fi
-+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ { 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.
-+" 1>&2; exit 1; }
-+ fi
-+
-+
-+fi
-+
-+
-+
-+php_with_pdo_pgsql=no
-+
-+echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
-+echo "configure:75003: 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
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_PDO_PGSQL in
-+shared,*)
-+ PHP_PDO_PGSQL=`echo "$PHP_PDO_PGSQL"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_PDO_PGSQL=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-+
-+
-+
-+echo "$ac_t""$ext_output" 1>&6
-+
-+
-+
-+
-+if test "$PHP_PDO_PGSQL" != "no"; then
-+
-+ if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-+ { 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 $ac_n "checking for pg_config""... $ac_c" 1>&6
-+echo "configure:75062: 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"
-+ break;
-+ fi
-+ done
-+
-+ if test -n "$PG_CONFIG"; then
-+ echo "$ac_t""$PG_CONFIG" 1>&6
-+ PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-+ PGSQL_LIBDIR=`$PG_CONFIG --libdir`
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_PG_CONFIG_H 1
-+EOF
-+
-+ else
-+ 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 <<\EOF
-+#define HAVE_PG_CONFIG_H 1
-+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
-+ PGSQL_LIBDIR=$i/$j
-+ fi
-+ done
-+ done
-+ fi
-+
-+ if test -z "$PGSQL_INCLUDE"; then
-+ { 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 "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 "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
-+ fi
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_PDO_PGSQL 1
-+EOF
-+
-+
-+ echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
-+echo "configure:75126: checking for openssl dependencies" >&5
-+ if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then
-+ echo "$ac_t""yes" 1>&6
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:75132: 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
-+ /*)
-+ 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.
-+ ;;
-+ *)
-+ 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"
-+if test -n "$PKG_CONFIG"; then
-+ echo "$ac_t""$PKG_CONFIG" 1>&6
-+else
-+ 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 "$ac_t""no" 1>&6
-+ fi
-+
-+ old_LIBS=$LIBS
-+ old_LDFLAGS=$LDFLAGS
-+ LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-+ echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
-+echo "configure:75176: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 75184 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQparameterStatus();
-+
-+int main() {
-+PQparameterStatus()
-+; return 0; }
-+EOF
-+if { (eval echo configure:75195: \"$ac_link\") 1>&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_PQPARAMETERSTATUS 1
-+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 $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
-+echo "configure:75224: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 75232 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQprepare();
-+
-+int main() {
-+PQprepare()
-+; return 0; }
-+EOF
-+if { (eval echo configure:75243: \"$ac_link\") 1>&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
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
-+echo "configure:75267: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 75275 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQescapeStringConn();
-+
-+int main() {
-+PQescapeStringConn()
-+; return 0; }
-+EOF
-+if { (eval echo configure:75286: \"$ac_link\") 1>&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_PQESCAPE_CONN 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
-+echo "configure:75310: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 75318 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQescapeByteaConn();
-+
-+int main() {
-+PQescapeByteaConn()
-+; return 0; }
-+EOF
-+if { (eval echo configure:75329: \"$ac_link\") 1>&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_PQESCAPE_BYTEA_CONN 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+ echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
-+echo "configure:75354: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 75362 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char pg_encoding_to_char();
-+
-+int main() {
-+pg_encoding_to_char()
-+; return 0; }
-+EOF
-+if { (eval echo configure:75373: \"$ac_link\") 1>&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"
-+ ;;
-+ esac
-+
-+
-+
-+
-+ 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 $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:75537: 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:75543: 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
-+ pdo_inc_path=$abs_srcdir/ext
-+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-+ pdo_inc_path=$prefix/include/php/ext
-+ fi
-+
-+fi
-+
-+echo "$ac_t""$pdo_inc_path" 1>&6
-+ if test -n "$pdo_inc_path"; then
-+:
-+ else
-+{ 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
-+
-+ ac_extra=`echo "-I$pdo_inc_path $PDO_PGSQL_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-+ PHP_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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC pdo_pgsql"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql"
-+ fi
-+ 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
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+ case $host_alias in
-+ *netware*)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PHPPDO_PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_pgsql.so '$ext_builddir'/phppdo_pgsql.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_PGSQL, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PHPPDO_PGSQL_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_pgsql.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_pgsql.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/phppdo_pgsql.$suffix: $ext_builddir/phppdo_pgsql.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_pgsql.$suffix \$(phplibdir)
-+
-+$ext_builddir/phppdo_pgsql.$suffix: \$(shared_objects_pdo_pgsql) \$(PHPPDO_PGSQL_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ *)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PDO_PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_pgsql.so '$ext_builddir'/pdo_pgsql.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_PGSQL, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PDO_PGSQL_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_pgsql.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_pgsql.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/pdo_pgsql.$suffix: $ext_builddir/pdo_pgsql.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_pgsql.$suffix \$(phplibdir)
-+
-+$ext_builddir/pdo_pgsql.$suffix: \$(shared_objects_pdo_pgsql) \$(PDO_PGSQL_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ esac
-+ cat >> confdefs.h <<EOF
-+#define COMPILE_DL_PDO_PGSQL 1
-+EOF
-+
-+ fi
-+ fi
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-+ 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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC 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
-+ b_c_meta=$php_c_meta
-+ b_cxx_meta=$php_cxx_meta
-+ b_c_post=$php_c_post
-+ b_cxx_post=$php_cxx_post
-+ b_lo=$php_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in pdo_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"
-+
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ ;;
-+ esac
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC 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 "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.
-+" 1>&2; exit 1; }
-+ fi
-+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ { 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.
-+" 1>&2; exit 1; }
-+ fi
-+
-+
-+fi
-+
-+
-+
-+php_with_pdo_sqlite=$PHP_PDO
-+
-+echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
-+echo "configure:75883: 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
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_PDO_SQLITE in
-+shared,*)
-+ PHP_PDO_SQLITE=`echo "$PHP_PDO_SQLITE"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_PDO_SQLITE=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-+
-+
-+
-+echo "$ac_t""$ext_output" 1>&6
-+
-+
-+
-+
-+if test "$PHP_PDO_SQLITE" != "no"; then
-+
-+ if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
-+ fi
-+
-+
-+
-+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-+echo "configure:75932: 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:75938: 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
-+ pdo_inc_path=$abs_srcdir/ext
-+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-+ pdo_inc_path=$prefix/include/php/ext
-+ fi
-+
-+fi
-+
-+echo "$ac_t""$pdo_inc_path" 1>&6
-+ if test -n "$pdo_inc_path"; then
-+:
-+ else
-+{ 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"
-+
-+ if test "$PHP_PDO_SQLITE" != "yes"; then
-+ SEARCH_PATH="$PHP_PDO_SQLITE /usr/local /usr" # you might want to change this
-+ SEARCH_FOR="/include/sqlite3.h" # you most likely want to change this
-+ 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 $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
-+echo "configure:75967: 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 "$ac_t""found in $i" 1>&6
-+ fi
-+ done
-+ fi
-+ if test -z "$PDO_SQLITE_DIR"; then
-+ 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
-+
-+
-+ 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-+
-+
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ else
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-+
-+
-+ fi
-+
-+ fi
-+
-+ ;;
-+ esac
-+ done
-+
-+ echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
-+echo "configure:76113: 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_save_LIBS="$LIBS"
-+LIBS="-l$LIBNAME $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 76121 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $LIBSYMBOL();
-+
-+int main() {
-+$LIBSYMBOL()
-+; return 0; }
-+EOF
-+if { (eval echo configure:76132: \"$ac_link\") 1>&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"
-+ ;;
-+ esac
-+
-+
-+
-+
-+ fi
-+
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_PDO_SQLITELIB 1
-+EOF
-+
-+
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+
-+ LDFLAGS=$save_old_LDFLAGS
-+ ext_shared=$save_ext_shared
-+ unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
-+
-+ { 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-+
-+
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ else
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-+
-+
-+ fi
-+
-+ fi
-+
-+ ;;
-+ esac
-+ done
-+
-+ echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
-+echo "configure:76362: 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_save_LIBS="$LIBS"
-+LIBS="-lsqlite3 $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 76370 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char sqlite3_key();
-+
-+int main() {
-+sqlite3_key()
-+; return 0; }
-+EOF
-+if { (eval echo configure:76381: \"$ac_link\") 1>&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_SQLITE3_KEY 1
-+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
-+
-+ ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-+ PHP_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
-+ 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_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC pdo_sqlite"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
-+ fi
-+ 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
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in $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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+ case $host_alias in
-+ *netware*)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_sqlite.so '$ext_builddir'/phppdo_sqlite.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_sqlite.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/phppdo_sqlite.$suffix: $ext_builddir/phppdo_sqlite.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_sqlite.$suffix \$(phplibdir)
-+
-+$ext_builddir/phppdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PHPPDO_SQLITE_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ *)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_sqlite.so '$ext_builddir'/pdo_sqlite.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_sqlite.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/pdo_sqlite.$suffix: $ext_builddir/pdo_sqlite.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_sqlite.$suffix \$(phplibdir)
-+
-+$ext_builddir/pdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PDO_SQLITE_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ esac
-+ cat >> confdefs.h <<EOF
-+#define COMPILE_DL_PDO_SQLITE 1
-+EOF
-+
-+ fi
-+ fi
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-+ 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
-+ 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_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC 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
-+ 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_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"
-+
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ ;;
-+ esac
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC 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
-+
-+ else
-+ # use bundled libs
-+ if test "$enable_maintainer_zts" = "yes"; then
-+ threadsafe_flags="-DSQLITE_THREADSAFE=1"
-+ else
-+ threadsafe_flags="-DSQLITE_THREADSAFE=0"
-+ fi
-+
-+ other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
-+
-+ if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then
-+ other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
-+ 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
-+ 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 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
-+ *.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
-+
-+
-+ fi
-+
-+
-+ ext_builddir=ext/pdo_sqlite
-+ ext_srcdir=$abs_srcdir/ext/pdo_sqlite
-+
-+ ac_extra=`echo "-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-+ PHP_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
-+ 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_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC pdo_sqlite"
-+ if test "$ext_shared" != "nocli"; then
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
-+ fi
-+ 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
-+ b_c_meta=$shared_c_meta
-+ b_cxx_meta=$shared_cxx_meta
-+ b_c_post=$shared_c_post
-+ b_cxx_post=$shared_cxx_post
-+ b_lo=$shared_lo
-+
-+
-+ old_IFS=$IFS
-+ for ac_src in $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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+ case $host_alias in
-+ *netware*)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_sqlite.so '$ext_builddir'/phppdo_sqlite.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_sqlite.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/phppdo_sqlite.$suffix: $ext_builddir/phppdo_sqlite.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_sqlite.$suffix \$(phplibdir)
-+
-+$ext_builddir/phppdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PHPPDO_SQLITE_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ *)
-+
-+ install_modules="install-modules"
-+
-+ case $host_alias in
-+ *aix*)
-+ suffix=so
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_sqlite.so '$ext_builddir'/pdo_sqlite.so'
-+ ;;
-+ *netware*)
-+ suffix=nlm
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
-+ ;;
-+ *)
-+ suffix=la
-+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD)'
-+ ;;
-+ esac
-+
-+ if test "x" = "xyes"; then
-+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_sqlite.$suffix"
-+ else
-+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
-+ fi
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
-+
-+ cat >>Makefile.objects<<EOF
-+\$(phplibdir)/pdo_sqlite.$suffix: $ext_builddir/pdo_sqlite.$suffix
-+ \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_sqlite.$suffix \$(phplibdir)
-+
-+$ext_builddir/pdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PDO_SQLITE_SHARED_DEPENDENCIES)
-+ $link_cmd
-+
-+EOF
-+
-+ ;;
-+ esac
-+ cat >> confdefs.h <<EOF
-+#define COMPILE_DL_PDO_SQLITE 1
-+EOF
-+
-+ fi
-+ fi
-+
-+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-+ 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
-+ 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_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
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ EXT_STATIC="$EXT_STATIC 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
-+ 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_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"
-+
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
-+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
-+
-+
-+ ;;
-+ esac
-+ EXT_CLI_STATIC="$EXT_CLI_STATIC 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 "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.
-+" 1>&2; exit 1; }
-+ fi
-+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ { 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.
-+" 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
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:77122: 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 77127 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $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
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:77150: \"$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_hdr in time.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:77178: 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 77183 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:77188: \"$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
-+
-+ 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"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
-+ fi
-+
-+ fi
-+ ;;
-+ -l*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="$LDFLAGS -l$ac_ii"
-+ else
-+
-+
-+ case $ac_ii in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="$LIBS -l$ac_ii"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ esac
-+
-+
-+ ;;
-+ -L*)
-+ ac_ii=`echo $ac_i|cut -c 3-`
-+
-+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-+
-+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
-+ ai_p=$ac_ii
-+ else
-+
-+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-+
-+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
-+ fi
-+
-+
-+ if test "$ext_shared" = "yes"; then
-+ LDFLAGS="-L$ai_p $LDFLAGS"
-+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
-+ else
-+
-+
-+
-+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-+
-+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
-+ eval "LIBPATH$unique=set"
-+
-+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-+ LDFLAGS="$LDFLAGS -L$ai_p"
-+ PHP_RPATHS="$PHP_RPATHS $ai_p"
-+
-+ fi
-+
-+
-+ fi
-+
-+ fi
-+
-+ ;;
-+ esac
-+ done
-+
-+ echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
-+echo "configure:77312: 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_save_LIBS="$LIBS"
-+LIBS="-lrt $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77320 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char fdatasync();
-+
-+int main() {
-+fdatasync()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77331: \"$ac_link\") 1>&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"
-+ else
-+
-+
-+ case rt in
-+ c|c_r|pthread*) ;;
-+ *)
-+ LIBS="-lrt $LIBS"
-+ ;;
-+ esac
-+
-+
-+ fi
-+ ;;
-+ 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 "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.
-+" 1>&2; exit 1; }
-+ fi
-+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-+ { 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.
-+" 1>&2; exit 1; }
-+ fi
-+
-+
-+fi
-+
-+
-+
-+php_with_pgsql=no
-+
-+echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
-+echo "configure:77412: 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
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
-+case $PHP_PGSQL in
-+shared,*)
-+ PHP_PGSQL=`echo "$PHP_PGSQL"|$SED 's/^shared,//'`
-+ ;;
-+shared)
-+ PHP_PGSQL=yes
-+ ;;
-+no)
-+ ext_output=no
-+ ext_shared=no
-+ ;;
-+*)
-+ ext_output=yes
-+ ext_shared=no
-+ ;;
-+esac
-+
-+
-+
-+echo "$ac_t""$ext_output" 1>&6
-+
-+
-+
-+
-+if test "$PHP_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 $ac_n "checking for pg_config""... $ac_c" 1>&6
-+echo "configure:77466: 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"
-+ break;
-+ fi
-+ done
-+
-+ if test -n "$PG_CONFIG"; then
-+ 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 <<\EOF
-+#define HAVE_PG_CONFIG_H 1
-+EOF
-+
-+ fi
-+ else
-+ 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 <<\EOF
-+#define HAVE_PG_CONFIG_H 1
-+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
-+ PGSQL_LIBDIR=$i/$j
-+ fi
-+ done
-+ done
-+ fi
-+
-+ if test -z "$PGSQL_INCLUDE"; then
-+ { 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 "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 "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
-+ fi
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_PGSQL 1
-+EOF
-+
-+ old_LIBS=$LIBS
-+ old_LDFLAGS=$LDFLAGS
-+ LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-+ echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
-+echo "configure:77534: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77542 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQescapeString();
-+
-+int main() {
-+PQescapeString()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77553: \"$ac_link\") 1>&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_PQESCAPE 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
-+echo "configure:77577: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77585 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQunescapeBytea();
-+
-+int main() {
-+PQunescapeBytea()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77596: \"$ac_link\") 1>&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_PQUNESCAPEBYTEA 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
-+echo "configure:77620: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77628 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQsetnonblocking();
-+
-+int main() {
-+PQsetnonblocking()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77639: \"$ac_link\") 1>&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
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-+echo "configure:77663: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77671 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQcmdTuples();
-+
-+int main() {
-+PQcmdTuples()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77682: \"$ac_link\") 1>&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_PQCMDTUPLES 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
-+echo "configure:77706: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77714 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQoidValue();
-+
-+int main() {
-+PQoidValue()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77725: \"$ac_link\") 1>&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_PQOIDVALUE 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
-+echo "configure:77749: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77757 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQclientEncoding();
-+
-+int main() {
-+PQclientEncoding()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77768: \"$ac_link\") 1>&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_PQCLIENTENCODING 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
-+echo "configure:77792: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77800 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQparameterStatus();
-+
-+int main() {
-+PQparameterStatus()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77811: \"$ac_link\") 1>&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_PQPARAMETERSTATUS 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
-+echo "configure:77835: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77843 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQprotocolVersion();
-+
-+int main() {
-+PQprotocolVersion()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77854: \"$ac_link\") 1>&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_PQPROTOCOLVERSION 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
-+echo "configure:77878: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77886 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQtransactionStatus();
-+
-+int main() {
-+PQtransactionStatus()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77897: \"$ac_link\") 1>&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_PGTRANSACTIONSTATUS 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
-+echo "configure:77921: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77929 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQexecParams();
-+
-+int main() {
-+PQexecParams()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77940: \"$ac_link\") 1>&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_PQEXECPARAMS 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
-+echo "configure:77964: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 77972 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQprepare();
-+
-+int main() {
-+PQprepare()
-+; return 0; }
-+EOF
-+if { (eval echo configure:77983: \"$ac_link\") 1>&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
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6
-+echo "configure:78007: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78015 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQexecPrepared();
-+
-+int main() {
-+PQexecPrepared()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78026: \"$ac_link\") 1>&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_PQEXECPREPARED 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
-+echo "configure:78050: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78058 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQresultErrorField();
-+
-+int main() {
-+PQresultErrorField()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78069: \"$ac_link\") 1>&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_PQRESULTERRORFIELD 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6
-+echo "configure:78093: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78101 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQsendQueryParams();
-+
-+int main() {
-+PQsendQueryParams()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78112: \"$ac_link\") 1>&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_PQSENDQUERYPARAMS 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6
-+echo "configure:78136: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78144 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQsendPrepare();
-+
-+int main() {
-+PQsendPrepare()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78155: \"$ac_link\") 1>&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_PQSENDPREPARE 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6
-+echo "configure:78179: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78187 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQsendQueryPrepared();
-+
-+int main() {
-+PQsendQueryPrepared()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78198: \"$ac_link\") 1>&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_PQSENDQUERYPREPARED 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6
-+echo "configure:78222: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78230 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQputCopyData();
-+
-+int main() {
-+PQputCopyData()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78241: \"$ac_link\") 1>&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_PQPUTCOPYDATA 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6
-+echo "configure:78265: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78273 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQputCopyEnd();
-+
-+int main() {
-+PQputCopyEnd()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78284: \"$ac_link\") 1>&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_PQPUTCOPYEND 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6
-+echo "configure:78308: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78316 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQgetCopyData();
-+
-+int main() {
-+PQgetCopyData()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78327: \"$ac_link\") 1>&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
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6
-+echo "configure:78351: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78359 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQfreemem();
-+
-+int main() {
-+PQfreemem()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78370: \"$ac_link\") 1>&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_PQFREEMEM 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6
-+echo "configure:78394: 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_save_LIBS="$LIBS"
-+LIBS="-lpq $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 78402 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char PQsetErrorVerbosity();
-+
-+int main() {
-+PQsetErrorVerbosity()
-+; return 0; }
-+EOF
-+if { (eval echo configure:78413: \"$ac_link\") 1>&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"
-+