New upstream version 5.6.0~beta1+dfsgupstream/5.6.0_beta1+dfsg

1 files changed, 63 insertions, 92 deletions

diff --git a/configure b/configure
index be4f91009..fec5aabb5 100755
--- a/configure
+++ b/configure
@@ -3666,7 +3666,7 @@ ac_config_headers="$ac_config_headers main/php_config.h"
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=6
 PHP_RELEASE_VERSION=0
-PHP_EXTRA_VERSION="alpha3"
+PHP_EXTRA_VERSION="beta1"
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr $PHP_MAJOR_VERSION \* 10000 + $PHP_MINOR_VERSION \* 100 + $PHP_RELEASE_VERSION`
 
@@ -73661,9 +73661,10 @@ $as_echo "no" >&6; }
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQparameterStatus in -lpq" >&5
-$as_echo_n "checking for PQparameterStatus in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then :
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprepare in -lpq" >&5
+$as_echo_n "checking for PQprepare in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQprepare+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -73677,41 +73678,40 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char PQparameterStatus ();
+char PQprepare ();
 int
 main ()
 {
-return PQparameterStatus ();
+return PQprepare ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pq_PQparameterStatus=yes
+  ac_cv_lib_pq_PQprepare=yes
 else
-  ac_cv_lib_pq_PQparameterStatus=no
+  ac_cv_lib_pq_PQprepare=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQparameterStatus" >&5
-$as_echo "$ac_cv_lib_pq_PQparameterStatus" >&6; }
-if test "x$ac_cv_lib_pq_PQparameterStatus" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQprepare" >&5
+$as_echo "$ac_cv_lib_pq_PQprepare" >&6; }
+if test "x$ac_cv_lib_pq_PQprepare" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPQ 1
+_ACEOF
 
-$as_echo "#define HAVE_PQPARAMETERSTATUS 1" >>confdefs.h
+  LIBS="-lpq $LIBS"
 
 else
-
-    echo "Unable to build the PDO PostgreSQL driver: libpq 7.4+ is required"
-    exit 1
-
+  as_fn_error $? "Unable to build the PDO PostgreSQL driver: a newer libpq is required" "$LINENO" 5
 fi
 
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprepare in -lpq" >&5
-$as_echo_n "checking for PQprepare in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQprepare+set}" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQexecParams in -lpq" >&5
+$as_echo_n "checking for PQexecParams in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQexecParams+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -73725,30 +73725,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char PQprepare ();
+char PQexecParams ();
 int
 main ()
 {
-return PQprepare ();
+return PQexecParams ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pq_PQprepare=yes
+  ac_cv_lib_pq_PQexecParams=yes
 else
-  ac_cv_lib_pq_PQprepare=no
+  ac_cv_lib_pq_PQexecParams=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQprepare" >&5
-$as_echo "$ac_cv_lib_pq_PQprepare" >&6; }
-if test "x$ac_cv_lib_pq_PQprepare" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQexecParams" >&5
+$as_echo "$ac_cv_lib_pq_PQexecParams" >&6; }
+if test "x$ac_cv_lib_pq_PQexecParams" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPQ 1
+_ACEOF
 
-$as_echo "#define HAVE_PQPREPARE 1" >>confdefs.h
+  LIBS="-lpq $LIBS"
 
+else
+  as_fn_error $? "Unable to build the PDO PostgreSQL driver: a newer libpq is required" "$LINENO" 5
 fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5
@@ -73788,9 +73793,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeStringConn" >&5
 $as_echo "$ac_cv_lib_pq_PQescapeStringConn" >&6; }
 if test "x$ac_cv_lib_pq_PQescapeStringConn" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPQ 1
+_ACEOF
 
-$as_echo "#define HAVE_PQESCAPE_CONN 1" >>confdefs.h
+  LIBS="-lpq $LIBS"
 
+else
+  as_fn_error $? "Unable to build the PDO PostgreSQL driver: a newer libpq is required" "$LINENO" 5
 fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeByteaConn in -lpq" >&5
@@ -73830,56 +73840,17 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5
 $as_echo "$ac_cv_lib_pq_PQescapeByteaConn" >&6; }
 if test "x$ac_cv_lib_pq_PQescapeByteaConn" = x""yes; then :
-
-$as_echo "#define HAVE_PQESCAPE_BYTEA_CONN 1" >>confdefs.h
-
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5
-$as_echo_n "checking for pg_encoding_to_char in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpq  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pg_encoding_to_char ();
-int
-main ()
-{
-return pg_encoding_to_char ();
-  ;
-  return 0;
-}
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPQ 1
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pq_pg_encoding_to_char=yes
-else
-  ac_cv_lib_pq_pg_encoding_to_char=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
-$as_echo "$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
-if test "x$ac_cv_lib_pq_pg_encoding_to_char" = x""yes; then :
 
-$as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h
+  LIBS="-lpq $LIBS"
 
+else
+  as_fn_error $? "Unable to build the PDO PostgreSQL driver: a newer libpq is required" "$LINENO" 5
 fi
 
 
-
   LIBS=$old_LIBS
   LDFLAGS=$old_LDFLAGS
 
@@ -105005,7 +104976,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 105008 "configure"
+#line 104979 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -106917,7 +106888,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 106920 "configure"' > conftest.$ac_ext
+  echo '#line 106891 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -108309,7 +108280,7 @@ else
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
 
 cat > conftest.$ac_ext <<EOF
-#line 108312 "configure"
+#line 108283 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -108467,11 +108438,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:108470: $lt_compile\"" >&5)
+   (eval echo "\"configure:108441: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:108474: \$? = $ac_status" >&5
+   echo "configure:108445: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -108765,11 +108736,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:108768: $lt_compile\"" >&5)
+   (eval echo "\"configure:108739: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:108772: \$? = $ac_status" >&5
+   echo "configure:108743: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -108869,11 +108840,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:108872: $lt_compile\"" >&5)
+   (eval echo "\"configure:108843: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:108876: \$? = $ac_status" >&5
+   echo "configure:108847: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -109333,7 +109304,7 @@ _LT_EOF
        # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 109336 "configure"
+#line 109307 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -109375,7 +109346,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	 # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 109378 "configure"
+#line 109349 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -110900,7 +110871,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 110903 "configure"
+#line 110874 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -111000,7 +110971,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 111003 "configure"
+#line 110974 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -112065,7 +112036,7 @@ case $host_os in
       # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 112068 "configure"
+#line 112039 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -112108,7 +112079,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 112111 "configure"
+#line 112082 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -113360,11 +113331,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:113363: $lt_compile\"" >&5)
+   (eval echo "\"configure:113334: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:113367: \$? = $ac_status" >&5
+   echo "configure:113338: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -113464,11 +113435,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:113467: $lt_compile\"" >&5)
+   (eval echo "\"configure:113438: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:113471: \$? = $ac_status" >&5
+   echo "configure:113442: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized