let ipkg fail when a package file to be installed is not found

[openwrt.git] / openwrt / package / php4 / patches / php-4.3.11-sqlite-1.0.patch

diff -ruN php-4.3.11-old/configure php-4.3.11-new/configure
--- php-4.3.11-old/configure    2005-03-30 16:35:34.000000000 +0200
+++ php-4.3.11-new/configure    2005-07-04 17:29:33.000000000 +0200
@@ -827,6 +827,8 @@
 ac_help="$ac_help
   --enable-sockets        Enable sockets support"
 ac_help="$ac_help
+  --with-sqlite           Include sqlite support"
+ac_help="$ac_help
   --with-regex=TYPE       regex library type: system, apache, php. Default: php
                           WARNING: Do NOT use unless you know what you are doing!"
 ac_help="$ac_help
@@ -1649,7 +1651,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1653: checking host system type" >&5
+echo "configure:1655: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1749,7 +1751,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1753: checking for $ac_word" >&5
+echo "configure:1755: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1779,7 +1781,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1783: checking for $ac_word" >&5
+echo "configure:1785: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1830,7 +1832,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1834: checking for $ac_word" >&5
+echo "configure:1836: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1862,7 +1864,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1866: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1868: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1873,12 +1875,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1877 "configure"
+#line 1879 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1904,12 +1906,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1908: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1910: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1913: checking whether we are using GNU C" >&5
+echo "configure:1915: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1918,7 +1920,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1937,7 +1939,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1941: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1943: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1970,10 +1972,10 @@
 
 if test "x$CC" != xcc; then
   echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
-echo "configure:1974: checking whether $CC and cc understand -c and -o together" >&5
+echo "configure:1976: checking whether $CC and cc understand -c and -o together" >&5
 else
   echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
-echo "configure:1977: checking whether cc understands -c and -o together" >&5
+echo "configure:1979: checking whether cc understands -c and -o together" >&5
 fi
 set dummy $CC; ac_cc="`echo $2 |
                       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
@@ -1985,16 +1987,16 @@
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
-if { (eval echo configure:1989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-   test -f conftest.o && { (eval echo configure:1990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+if { (eval echo configure:1991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+   test -f conftest.o && { (eval echo configure:1992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 then
   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
   if test "x$CC" != xcc; then
     # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
       ac_try='cc -c conftest.c -o conftest.o 1>&5'
-      if { (eval echo configure:1997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-        test -f conftest.o && { (eval echo configure:1998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+      if { (eval echo configure:1999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+        test -f conftest.o && { (eval echo configure:2000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
       then
         # cc works too.
         :
@@ -2021,7 +2023,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2025: checking how to run the C preprocessor" >&5
+echo "configure:2027: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2036,13 +2038,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2040 "configure"
+#line 2042 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2048: \"$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
   :
@@ -2053,13 +2055,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2057 "configure"
+#line 2059 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2065: \"$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
   :
@@ -2070,13 +2072,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2074 "configure"
+#line 2076 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2082: \"$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
   :
@@ -2102,9 +2104,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2106: checking for AIX" >&5
+echo "configure:2108: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2108 "configure"
+#line 2110 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2129,7 +2131,7 @@
 
 
 echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6
-echo "configure:2133: checking if compiler supports -R" >&5
+echo "configure:2135: checking if compiler supports -R" >&5
 if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2137,14 +2139,14 @@
        SAVE_LIBS=$LIBS
        LIBS="-R /usr/lib $LIBS"
        cat > conftest.$ac_ext <<EOF
-#line 2141 "configure"
+#line 2143 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   php_cv_cc_dashr=yes
 else
@@ -2162,7 +2164,7 @@
        ld_runpath_switch=-R
 else
        echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
-echo "configure:2166: checking if compiler supports -Wl,-rpath," >&5
+echo "configure:2168: checking if compiler supports -Wl,-rpath," >&5
        if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2170,14 +2172,14 @@
                SAVE_LIBS=$LIBS
                LIBS="-Wl,-rpath,/usr/lib $LIBS"
                cat > conftest.$ac_ext <<EOF
-#line 2174 "configure"
+#line 2176 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   php_cv_cc_rpath=yes
 else
@@ -2203,7 +2205,7 @@
   # Extract the first word of "re2c", so it can be a program name with args.
 set dummy re2c; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2207: checking for $ac_word" >&5
+echo "configure:2209: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2232,7 +2234,7 @@
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2236: checking whether ln -s works" >&5
+echo "configure:2238: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2257,7 +2259,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2261: checking for $ac_word" >&5
+echo "configure:2263: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2291,7 +2293,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2295: checking for $ac_word" >&5
+echo "configure:2297: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2325,7 +2327,7 @@
     echo "configure: warning: You will need bison if you want to regenerate the PHP parsers." 1>&2
 else
     echo $ac_n "checking bison version""... $ac_c" 1>&6
-echo "configure:2329: checking bison version" >&5
+echo "configure:2331: checking bison version" >&5
     set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'|tr -d a-z`
     if test "${1}" -ne "1" -o "(" "${2}" != "28" -a "${2}" != "35" -a "${2}" != "75" -a "${2}" != "875" ")"; then
       echo "configure: warning: You will need bison 1.28" 1>&2
@@ -2335,7 +2337,7 @@
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2339: checking for $ac_word" >&5
+echo "configure:2341: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2369,7 +2371,7 @@
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:2373: checking for yywrap in -l$ac_lib" >&5
+echo "configure:2375: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2377,7 +2379,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2381 "configure"
+#line 2383 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2388,7 +2390,7 @@
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2412,7 +2414,7 @@
 
 if test -n "$LEX"; then
   echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:2416: checking lex output file root" >&5
+echo "configure:2418: checking lex output file root" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2433,7 +2435,7 @@
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:2437: checking whether yytext is a pointer" >&5
+echo "configure:2439: checking whether yytext is a pointer" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,14 +2447,14 @@
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 2449 "configure"
+#line 2451 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -2476,12 +2478,12 @@
   :
 fi
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2480: checking for working const" >&5
+echo "configure:2482: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2485 "configure"
+#line 2487 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2530,7 +2532,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2555,7 +2557,7 @@
 fi
 
 echo $ac_n "checking flex version""... $ac_c" 1>&6
-echo "configure:2559: checking flex version" >&5
+echo "configure:2561: checking flex version" >&5
 if test "$LEX" ;then
        flexvers=`echo "" | $LEX -V -v --version 2>/dev/null | 
                sed -e 's/^.* //' -e 's/\./ /g'`
@@ -2571,7 +2573,7 @@
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2575: checking whether byte ordering is bigendian" >&5
+echo "configure:2577: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2581,7 +2583,7 @@
   ac_cv_c_bigendian_php=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 2585 "configure"
+#line 2587 "configure"
 #include "confdefs.h"
 
 int main(void)
@@ -2597,7 +2599,7 @@
 }
   
 EOF
-if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian_php=yes
 else
@@ -2654,7 +2656,7 @@
 # Disable PIC mode by default where it is known to be safe to do so,
 # to avoid the performance hit from the lost register
 echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6
-echo "configure:2658: checking whether to force non-PIC code in shared modules" >&5
+echo "configure:2660: checking whether to force non-PIC code in shared modules" >&5
 case $host_alias in
 i?86-*-linux*|i?86-*-freebsd*)
     if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
@@ -2753,7 +2755,7 @@
   pthreads_working=no 
 else
   cat > conftest.$ac_ext <<EOF
-#line 2757 "configure"
+#line 2759 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -2771,7 +2773,7 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 } 
 EOF
-if { (eval echo configure:2775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   pthreads_working=yes
@@ -2791,7 +2793,7 @@
   CFLAGS=$save_CFLAGS
 
   echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
-echo "configure:2795: checking for pthreads_cflags" >&5
+echo "configure:2797: checking for pthreads_cflags" >&5
 if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2806,7 +2808,7 @@
   pthreads_working=no 
 else
   cat > conftest.$ac_ext <<EOF
-#line 2810 "configure"
+#line 2812 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -2824,7 +2826,7 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 } 
 EOF
-if { (eval echo configure:2828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   pthreads_working=yes
@@ -2854,7 +2856,7 @@
 echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
 
 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
-echo "configure:2858: checking for pthreads_lib" >&5
+echo "configure:2860: checking for pthreads_lib" >&5
 if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2869,7 +2871,7 @@
   pthreads_working=no 
 else
   cat > conftest.$ac_ext <<EOF
-#line 2873 "configure"
+#line 2875 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -2887,7 +2889,7 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 } 
 EOF
-if { (eval echo configure:2891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   pthreads_working=yes
@@ -2985,7 +2987,7 @@
 
 
 echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6
-echo "configure:2989: checking for AOLserver support" >&5
+echo "configure:2991: checking for AOLserver support" >&5
 # Check whether --with-aolserver or --without-aolserver was given.
 if test "${with_aolserver+set}" = set; then
   withval="$with_aolserver"
@@ -3226,7 +3228,7 @@
 
 
 echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6
-echo "configure:3230: checking for Apache 1.x module support via DSO through APXS" >&5
+echo "configure:3232: checking for Apache 1.x module support via DSO through APXS" >&5
 # Check whether --with-apxs or --without-apxs was given.
 if test "${with_apxs+set}" = set; then
   withval="$with_apxs"
@@ -3529,7 +3531,7 @@
 
 if test "$PHP_SAPI" != "apache"; then
 echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6
-echo "configure:3533: checking for Apache 1.x module support" >&5
+echo "configure:3535: checking for Apache 1.x module support" >&5
 # Check whether --with-apache or --without-apache was given.
 if test "${with_apache+set}" = set; then
   withval="$with_apache"
@@ -4364,7 +4366,7 @@
 fi
 
 echo $ac_n "checking for mod_charset compatibility option""... $ac_c" 1>&6
-echo "configure:4368: checking for mod_charset compatibility option" >&5
+echo "configure:4370: checking for mod_charset compatibility option" >&5
 # Check whether --with-mod_charset or --without-mod_charset was given.
 if test "${with_mod_charset+set}" = set; then
   withval="$with_mod_charset"
@@ -4388,7 +4390,7 @@
         
   gcc_arg_name=ac_cv_gcc_arg_rdynamic
   echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
-echo "configure:4392: checking whether $CC supports -rdynamic" >&5
+echo "configure:4394: checking whether $CC supports -rdynamic" >&5
 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4431,7 +4433,7 @@
 
   
 echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
-echo "configure:4435: checking for member fd in BUFF *" >&5
+echo "configure:4437: checking for member fd in BUFF *" >&5
 if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4443,14 +4445,14 @@
     CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
   fi
   cat > conftest.$ac_ext <<EOF
-#line 4447 "configure"
+#line 4449 "configure"
 #include "confdefs.h"
 #include <httpd.h>
 int main() {
 conn_rec *c; int fd = c->client->fd;
 ; return 0; }
 EOF
-if { (eval echo configure:4454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     ac_cv_php_fd_in_buff=yes
@@ -4501,7 +4503,7 @@
 
 
 echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6
-echo "configure:4505: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
+echo "configure:4507: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
 # Check whether --with-apxs2filter or --without-apxs2filter was given.
 if test "${with_apxs2filter+set}" = set; then
   withval="$with_apxs2filter"
@@ -5323,7 +5325,7 @@
 
 
 echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6
-echo "configure:5327: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
+echo "configure:5329: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
 # Check whether --with-apxs2 or --without-apxs2 was given.
 if test "${with_apxs2+set}" = set; then
   withval="$with_apxs2"
@@ -6146,7 +6148,7 @@
 
 RESULT=no
 echo $ac_n "checking for Caudium support""... $ac_c" 1>&6
-echo "configure:6150: checking for Caudium support" >&5
+echo "configure:6152: checking for Caudium support" >&5
 # Check whether --with-caudium or --without-caudium was given.
 if test "${with_caudium+set}" = set; then
   withval="$with_caudium"
@@ -6218,7 +6220,7 @@
                   PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE`
                fi
                echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6
-echo "configure:6222: checking for C includes in $PIKE_C_INCLUDE" >&5
+echo "configure:6224: checking for C includes in $PIKE_C_INCLUDE" >&5
                if test -f $PIKE_C_INCLUDE/version.h; then
                  PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
                      ###### VERSION MATCH CHECK #######
@@ -6476,7 +6478,7 @@
 
 
 echo $ac_n "checking for CLI build""... $ac_c" 1>&6
-echo "configure:6480: checking for CLI build" >&5
+echo "configure:6482: checking for CLI build" >&5
 
 # Check whether --enable-cli or --disable-cli was given.
 if test "${enable_cli+set}" = set; then
@@ -6536,7 +6538,7 @@
 
 
 echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6
-echo "configure:6540: checking for embedded SAPI library support" >&5
+echo "configure:6542: checking for embedded SAPI library support" >&5
 
 # Check whether --enable-embed or --disable-embed was given.
 if test "${enable_embed+set}" = set; then
@@ -6739,7 +6741,7 @@
 
 RESULT=no
 echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6
-echo "configure:6743: checking for Zeus ISAPI support" >&5
+echo "configure:6745: checking for Zeus ISAPI support" >&5
 # Check whether --with-isapi or --without-isapi was given.
 if test "${with_isapi+set}" = set; then
   withval="$with_isapi"
@@ -6969,7 +6971,7 @@
 
 
 echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6
-echo "configure:6973: checking for NSAPI support" >&5
+echo "configure:6975: checking for NSAPI support" >&5
 # Check whether --with-nsapi or --without-nsapi was given.
 if test "${with_nsapi+set}" = set; then
   withval="$with_nsapi"
@@ -6989,7 +6991,7 @@
     { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/SunONE server using --with-nsapi=DIR" 1>&2; exit 1; }
   fi
   echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6
-echo "configure:6993: checking for NSAPI include files" >&5
+echo "configure:6995: checking for NSAPI include files" >&5
   if test -d $PHP_NSAPI/include ; then
     NSAPI_INCLUDE=$PHP_NSAPI/include
     echo "$ac_t""Netscape-Enterprise 3.x style" 1>&6
@@ -6997,17 +6999,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7001: checking for $ac_hdr" >&5
+echo "configure:7003: 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 7006 "configure"
+#line 7008 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7013: \"$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*
@@ -7042,17 +7044,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7046: checking for $ac_hdr" >&5
+echo "configure:7048: 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 7051 "configure"
+#line 7053 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7058: \"$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*
@@ -7310,7 +7312,7 @@
 
 RESULT=no
 echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6
-echo "configure:7314: checking for PHTTPD support" >&5
+echo "configure:7316: checking for PHTTPD support" >&5
 # Check whether --with-phttpd or --without-phttpd was given.
 if test "${with_phttpd+set}" = set; then
   withval="$with_phttpd"
@@ -7539,7 +7541,7 @@
 
 RESULT=no
 echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6
-echo "configure:7543: checking for Pi3Web support" >&5
+echo "configure:7545: checking for Pi3Web support" >&5
 
 # Check whether --with-pi3web or --without-pi3web was given.
 if test "${with_pi3web+set}" = set; then
@@ -7868,7 +7870,7 @@
 
 RESULT=no
 echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6
-echo "configure:7872: checking for Roxen/Pike support" >&5
+echo "configure:7874: checking for Roxen/Pike support" >&5
 # Check whether --with-roxen or --without-roxen was given.
 if test "${with_roxen+set}" = set; then
   withval="$with_roxen"
@@ -8110,7 +8112,7 @@
 if test "$RESULT" != "no" ; then 
  RESULT=no
  echo $ac_n "checking if Roxen should use ZTS""... $ac_c" 1>&6
-echo "configure:8114: checking if Roxen should use ZTS" >&5
+echo "configure:8116: checking if Roxen should use ZTS" >&5
  # Check whether --enable-roxen-zts or --disable-roxen-zts was given.
 if test "${enable_roxen_zts+set}" = set; then
   enableval="$enable_roxen_zts"
@@ -8137,7 +8139,7 @@
 
 
 echo $ac_n "checking for Servlet support""... $ac_c" 1>&6
-echo "configure:8141: checking for Servlet support" >&5
+echo "configure:8143: checking for Servlet support" >&5
 # Check whether --with-servlet or --without-servlet was given.
 if test "${with_servlet+set}" = set; then
   withval="$with_servlet"
@@ -8448,7 +8450,7 @@
         
   gcc_arg_name=ac_cv_gcc_arg_rdynamic
   echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
-echo "configure:8452: checking whether $CC supports -rdynamic" >&5
+echo "configure:8454: checking whether $CC supports -rdynamic" >&5
 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8655,7 +8657,7 @@
 
 
 echo $ac_n "checking for thttpd""... $ac_c" 1>&6
-echo "configure:8659: checking for thttpd" >&5
+echo "configure:8661: checking for thttpd" >&5
 echo "$ac_t""$PHP_THTTPD" 1>&6
 
 
@@ -8670,17 +8672,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8674: checking for $ac_hdr" >&5
+echo "configure:8676: 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 8679 "configure"
+#line 8681 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8686: \"$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*
@@ -8881,7 +8883,7 @@
 
 
 echo $ac_n "checking for TUX""... $ac_c" 1>&6
-echo "configure:8885: checking for TUX" >&5
+echo "configure:8887: checking for TUX" >&5
 echo "$ac_t""$PHP_TUX" 1>&6
 
 unset PHP_TUX
@@ -9115,7 +9117,7 @@
 
 
 echo $ac_n "checking for webjames""... $ac_c" 1>&6
-echo "configure:9119: checking for webjames" >&5
+echo "configure:9121: checking for webjames" >&5
 echo "$ac_t""$PHP_WEBJAMES" 1>&6
 
 
@@ -9189,7 +9191,7 @@
 
 if test "$PHP_SAPI" = "default"; then
   echo $ac_n "checking for CGI build""... $ac_c" 1>&6
-echo "configure:9193: checking for CGI build" >&5
+echo "configure:9195: checking for CGI build" >&5
   if test "$PHP_SAPI_CGI" != "no"; then
     echo "$ac_t""yes" 1>&6
 
@@ -9213,7 +9215,7 @@
 
     
   echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6
-echo "configure:9217: checking whether writing to stdout works" >&5
+echo "configure:9219: checking whether writing to stdout works" >&5
 if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9224,7 +9226,7 @@
     
 else
   cat > conftest.$ac_ext <<EOF
-#line 9228 "configure"
+#line 9230 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_UNISTD_H
@@ -9242,7 +9244,7 @@
 }
     
 EOF
-if { (eval echo configure:9246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
       ac_cv_write_stdout=yes
@@ -9271,7 +9273,7 @@
 
 
     echo $ac_n "checking whether to force Apache CGI redirect""... $ac_c" 1>&6
-echo "configure:9275: checking whether to force Apache CGI redirect" >&5
+echo "configure:9277: checking whether to force Apache CGI redirect" >&5
     if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then
       REDIRECT=1
     else
@@ -9285,7 +9287,7 @@
 
 
     echo $ac_n "checking whether to discard path_info + path_translated""... $ac_c" 1>&6
-echo "configure:9289: checking whether to discard path_info + path_translated" >&5
+echo "configure:9291: checking whether to discard path_info + path_translated" >&5
     if test "$PHP_DISCARD_PATH" = "yes"; then
       DISCARD_PATH=1
     else
@@ -9298,7 +9300,7 @@
     echo "$ac_t""$PHP_DISCARD_PATH" 1>&6
 
     echo $ac_n "checking whether to enable path info checking""... $ac_c" 1>&6
-echo "configure:9302: checking whether to enable path info checking" >&5
+echo "configure:9304: checking whether to enable path info checking" >&5
     if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then
       ENABLE_PATHINFO_CHECK=1
     else
@@ -9311,7 +9313,7 @@
     echo "$ac_t""$PHP_ENABLE_PATHINFO_CHECK" 1>&6
 
     echo $ac_n "checking whether to enable fastcgi support""... $ac_c" 1>&6
-echo "configure:9315: checking whether to enable fastcgi support" >&5
+echo "configure:9317: checking whether to enable fastcgi support" >&5
     PHP_LIBFCGI_DIR="$abs_srcdir/sapi/cgi/libfcgi"
     if test -z $PHP_LIBFCGI_DIR; then
       echo "$PHP_LIBFCGI_DIR does not exist"
@@ -9536,7 +9538,7 @@
 
 
 echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6
-echo "configure:9540: checking for chosen SAPI module" >&5
+echo "configure:9542: checking for chosen SAPI module" >&5
 echo "$ac_t""$PHP_SAPI" 1>&6
 
 if test "$enable_experimental_zts" = "yes"; then
@@ -9639,7 +9641,7 @@
 #AC_LANG([C])
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:9643: checking for gethostbyname in -lnsl" >&5
+echo "configure:9645: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9647,7 +9649,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9651 "configure"
+#line 9653 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9658,7 +9660,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:9662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9686,7 +9688,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:9690: checking for socket in -lsocket" >&5
+echo "configure:9692: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9694,7 +9696,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9698 "configure"
+#line 9700 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9705,7 +9707,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:9709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9741,17 +9743,17 @@
 # If it isn't, don't bother looking for the threads libraries.
 ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
-echo "configure:9745: checking for pthread.h" >&5
+echo "configure:9747: checking for pthread.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9750 "configure"
+#line 9752 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9757: \"$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*
@@ -9788,9 +9790,9 @@
         save_LIBS="$LIBS"
         LIBS="$PTHREAD_LIBS $LIBS"
         echo $ac_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS""... $ac_c" 1>&6
-echo "configure:9792: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
+echo "configure:9794: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
         cat > conftest.$ac_ext <<EOF
-#line 9794 "configure"
+#line 9796 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9801,7 +9803,7 @@
 pthread_join()
 ; return 0; }
 EOF
-if { (eval echo configure:9805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   acx_pthread_ok=yes
 else
@@ -9863,18 +9865,18 @@
         case $flag in
                 none)
                 echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6
-echo "configure:9867: checking whether pthreads work without any flags" >&5
+echo "configure:9869: checking whether pthreads work without any flags" >&5
                 ;;
 
                 -*)
                 echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
-echo "configure:9872: checking whether pthreads work with $flag" >&5
+echo "configure:9874: checking whether pthreads work with $flag" >&5
                 PTHREAD_CFLAGS="$flag"
                 ;;
 
                 *)
                 echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6
-echo "configure:9878: checking for the pthreads library -l$flag" >&5
+echo "configure:9880: checking for the pthreads library -l$flag" >&5
                 PTHREAD_LIBS="-l$flag"
                 ;;
         esac
@@ -9894,7 +9896,7 @@
         # functions on Solaris that doesn't have a non-functional libc stub.
         # We try pthread_create on general principles.
         cat > conftest.$ac_ext <<EOF
-#line 9898 "configure"
+#line 9900 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -9903,7 +9905,7 @@
                      pthread_create(0,0,0,0); pthread_cleanup_pop(0); 
 ; return 0; }
 EOF
-if { (eval echo configure:9907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   acx_pthread_ok=yes
 else
@@ -9935,16 +9937,16 @@
         # Detect AIX lossage: threads are created detached by default
         # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
         echo $ac_n "checking for joinable pthread attribute""... $ac_c" 1>&6
-echo "configure:9939: checking for joinable pthread attribute" >&5
+echo "configure:9941: checking for joinable pthread attribute" >&5
         cat > conftest.$ac_ext <<EOF
-#line 9941 "configure"
+#line 9943 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 int attr=PTHREAD_CREATE_JOINABLE;
 ; return 0; }
 EOF
-if { (eval echo configure:9948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ok=PTHREAD_CREATE_JOINABLE
 else
@@ -9956,14 +9958,14 @@
 rm -f conftest*
         if test x"$ok" = xunknown; then
                 cat > conftest.$ac_ext <<EOF
-#line 9960 "configure"
+#line 9962 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 int attr=PTHREAD_CREATE_UNDETACHED;
 ; return 0; }
 EOF
-if { (eval echo configure:9967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ok=PTHREAD_CREATE_UNDETACHED
 else
@@ -9986,7 +9988,7 @@
         fi
 
         echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
-echo "configure:9990: checking if more special flags are required for pthreads" >&5
+echo "configure:9992: checking if more special flags are required for pthreads" >&5
         flag=no
         case "${host_cpu}-${host_os}" in
                 *-aix* | *-freebsd*)     flag="-D_THREAD_SAFE";;
@@ -10004,7 +10006,7 @@
         # Extract the first word of "cc_r", so it can be a program name with args.
 set dummy cc_r; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:10008: checking for $ac_word" >&5
+echo "configure:10010: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PTHREAD_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10053,9 +10055,9 @@
 
 
     echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6
-echo "configure:10057: checking for sun_len in sys/un.h" >&5
+echo "configure:10059: checking for sun_len in sys/un.h" >&5
     cat > conftest.$ac_ext <<EOF
-#line 10059 "configure"
+#line 10061 "configure"
 #include "confdefs.h"
 #include <sys/un.h>
 EOF
@@ -10075,9 +10077,9 @@
 
 
     echo $ac_n "checking for fpos_t in stdio.h""... $ac_c" 1>&6
-echo "configure:10079: checking for fpos_t in stdio.h" >&5
+echo "configure:10081: checking for fpos_t in stdio.h" >&5
     cat > conftest.$ac_ext <<EOF
-#line 10081 "configure"
+#line 10083 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 EOF
@@ -10100,17 +10102,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10104: checking for $ac_hdr" >&5
+echo "configure:10106: 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 10109 "configure"
+#line 10111 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10116: \"$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*
@@ -10140,17 +10142,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10144: checking for $ac_hdr" >&5
+echo "configure:10146: 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 10149 "configure"
+#line 10151 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10156: \"$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*
@@ -10178,9 +10180,9 @@
 
 
     echo $ac_n "checking for a fileno() prototype in stdio.h""... $ac_c" 1>&6
-echo "configure:10182: checking for a fileno() prototype in stdio.h" >&5
+echo "configure:10184: checking for a fileno() prototype in stdio.h" >&5
     cat > conftest.$ac_ext <<EOF
-#line 10184 "configure"
+#line 10186 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 EOF
@@ -10201,9 +10203,9 @@
 
     if test "$HAVE_SYS_SOCKET_H"; then
        echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
-echo "configure:10205: checking for socklen_t in sys/socket.h" >&5
+echo "configure:10207: checking for socklen_t in sys/socket.h" >&5
        cat > conftest.$ac_ext <<EOF
-#line 10207 "configure"
+#line 10209 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 EOF
@@ -10227,7 +10229,7 @@
     #  Do we need cross-process locking on this platform?
     #--------------------------------------------------------------------
     echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6
-echo "configure:10231: checking whether cross-process locking is required by accept()" >&5
+echo "configure:10233: checking whether cross-process locking is required by accept()" >&5
     case "`uname -sr`" in
        IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)    
                    echo "$ac_t""yes" 1>&6
@@ -10246,16 +10248,16 @@
     #  hpux 9.04 compiler does and so does Stratus FTX (uses HP's compiler)
     #--------------------------------------------------------------------
     echo $ac_n "checking whether va_arg(arg, long double) crashes the compiler""... $ac_c" 1>&6
-echo "configure:10250: checking whether va_arg(arg, long double) crashes the compiler" >&5
+echo "configure:10252: checking whether va_arg(arg, long double) crashes the compiler" >&5
     cat > conftest.$ac_ext <<EOF
-#line 10252 "configure"
+#line 10254 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 int main() {
 long double lDblArg; va_list arg; lDblArg = va_arg(arg, long double);
 ; return 0; }
 EOF
-if { (eval echo configure:10259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -10271,12 +10273,12 @@
 rm -f conftest*
 
     echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:10275: checking for working const" >&5
+echo "configure:10277: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10280 "configure"
+#line 10282 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -10325,7 +10327,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -10350,12 +10352,12 @@
 for ac_func in strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10354: checking for $ac_func" >&5
+echo "configure:10356: 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 10359 "configure"
+#line 10361 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10378,7 +10380,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10384: \"$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
@@ -10441,16 +10443,16 @@
 
 
   echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6
-echo "configure:10445: checking for missing declarations of reentrant functions" >&5
+echo "configure:10447: checking for missing declarations of reentrant functions" >&5
   cat > conftest.$ac_ext <<EOF
-#line 10447 "configure"
+#line 10449 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 struct tm *(*func)() = localtime_r
 ; return 0; }
 EOF
-if { (eval echo configure:10454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     :
@@ -10468,14 +10470,14 @@
 fi
 rm -f conftest*
   cat > conftest.$ac_ext <<EOF
-#line 10472 "configure"
+#line 10474 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 struct tm *(*func)() = gmtime_r
 ; return 0; }
 EOF
-if { (eval echo configure:10479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     :
@@ -10493,14 +10495,14 @@
 fi
 rm -f conftest*
   cat > conftest.$ac_ext <<EOF
-#line 10497 "configure"
+#line 10499 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 char *(*func)() = asctime_r
 ; return 0; }
 EOF
-if { (eval echo configure:10504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     :
@@ -10518,14 +10520,14 @@
 fi
 rm -f conftest*
   cat > conftest.$ac_ext <<EOF
-#line 10522 "configure"
+#line 10524 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 char *(*func)() = ctime_r
 ; return 0; }
 EOF
-if { (eval echo configure:10529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     :
@@ -10543,14 +10545,14 @@
 fi
 rm -f conftest*
   cat > conftest.$ac_ext <<EOF
-#line 10547 "configure"
+#line 10549 "configure"
 #include "confdefs.h"
 #include <string.h>
 int main() {
 char *(*func)() = strtok_r
 ; return 0; }
 EOF
-if { (eval echo configure:10554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     :
@@ -10574,7 +10576,7 @@
 # Extract the first word of "sendmail", so it can be a program name with args.
 set dummy sendmail; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:10578: checking for $ac_word" >&5
+echo "configure:10580: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10615,7 +10617,7 @@
 
 
   echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6
-echo "configure:10619: checking whether system uses EBCDIC" >&5
+echo "configure:10621: checking whether system uses EBCDIC" >&5
 if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10626,7 +10628,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 10630 "configure"
+#line 10632 "configure"
 #include "confdefs.h"
 
 int main(void) { 
@@ -10634,7 +10636,7 @@
 } 
 
 EOF
-if { (eval echo configure:10638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   ac_cv_ebcdic=yes
@@ -10707,12 +10709,12 @@
   unset found
   
   echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:10711: checking for socket" >&5
+echo "configure:10713: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10716 "configure"
+#line 10718 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -10735,7 +10737,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -10753,12 +10755,12 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for __socket""... $ac_c" 1>&6
-echo "configure:10757: checking for __socket" >&5
+echo "configure:10759: checking for __socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10762 "configure"
+#line 10764 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __socket(); below.  */
@@ -10781,7 +10783,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___socket=yes"
 else
@@ -10819,7 +10821,7 @@
   unset ac_cv_lib_socket___socket
   unset found
   echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:10823: checking for socket in -lsocket" >&5
+echo "configure:10825: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10827,7 +10829,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10831 "configure"
+#line 10833 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10838,7 +10840,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:10842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10858,7 +10860,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6
-echo "configure:10862: checking for __socket in -lsocket" >&5
+echo "configure:10864: checking for __socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10866,7 +10868,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10870 "configure"
+#line 10872 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10877,7 +10879,7 @@
 __socket()
 ; return 0; }
 EOF
-if { (eval echo configure:10881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10909,11 +10911,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 10913 "configure"
+#line 10915 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:10917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -10964,12 +10966,12 @@
   unset found
   
   echo $ac_n "checking for htonl""... $ac_c" 1>&6
-echo "configure:10968: checking for htonl" >&5
+echo "configure:10970: checking for htonl" >&5
 if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10973 "configure"
+#line 10975 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char htonl(); below.  */
@@ -10992,7 +10994,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_htonl=yes"
 else
@@ -11010,12 +11012,12 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for __htonl""... $ac_c" 1>&6
-echo "configure:11014: checking for __htonl" >&5
+echo "configure:11016: checking for __htonl" >&5
 if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11019 "configure"
+#line 11021 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __htonl(); below.  */
@@ -11038,7 +11040,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___htonl=yes"
 else
@@ -11076,7 +11078,7 @@
   unset ac_cv_lib_socket___htonl
   unset found
   echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6
-echo "configure:11080: checking for htonl in -lsocket" >&5
+echo "configure:11082: checking for htonl in -lsocket" >&5
 ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11084,7 +11086,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11088 "configure"
+#line 11090 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11095,7 +11097,7 @@
 htonl()
 ; return 0; }
 EOF
-if { (eval echo configure:11099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11115,7 +11117,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6
-echo "configure:11119: checking for __htonl in -lsocket" >&5
+echo "configure:11121: checking for __htonl in -lsocket" >&5
 ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11123,7 +11125,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11127 "configure"
+#line 11129 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11134,7 +11136,7 @@
 __htonl()
 ; return 0; }
 EOF
-if { (eval echo configure:11138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11166,11 +11168,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 11170 "configure"
+#line 11172 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:11174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -11221,12 +11223,12 @@
   unset found
   
   echo $ac_n "checking for gethostname""... $ac_c" 1>&6
-echo "configure:11225: checking for gethostname" >&5
+echo "configure:11227: checking for gethostname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11230 "configure"
+#line 11232 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostname(); below.  */
@@ -11249,7 +11251,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostname=yes"
 else
@@ -11267,12 +11269,12 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
-echo "configure:11271: checking for __gethostname" >&5
+echo "configure:11273: checking for __gethostname" >&5
 if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11276 "configure"
+#line 11278 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __gethostname(); below.  */
@@ -11295,7 +11297,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___gethostname=yes"
 else
@@ -11333,7 +11335,7 @@
   unset ac_cv_lib_nsl___gethostname
   unset found
   echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:11337: checking for gethostname in -lnsl" >&5
+echo "configure:11339: checking for gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11341,7 +11343,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11345 "configure"
+#line 11347 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11352,7 +11354,7 @@
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:11356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11372,7 +11374,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:11376: checking for __gethostname in -lnsl" >&5
+echo "configure:11378: checking for __gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11380,7 +11382,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11384 "configure"
+#line 11386 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11391,7 +11393,7 @@
 __gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:11395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11423,11 +11425,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 11427 "configure"
+#line 11429 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:11431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -11478,12 +11480,12 @@
   unset found
   
   echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
-echo "configure:11482: checking for gethostbyaddr" >&5
+echo "configure:11484: checking for gethostbyaddr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11487 "configure"
+#line 11489 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyaddr(); below.  */
@@ -11506,7 +11508,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyaddr=yes"
 else
@@ -11524,12 +11526,12 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6
-echo "configure:11528: checking for __gethostbyaddr" >&5
+echo "configure:11530: checking for __gethostbyaddr" >&5
 if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11533 "configure"
+#line 11535 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __gethostbyaddr(); below.  */
@@ -11552,7 +11554,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___gethostbyaddr=yes"
 else
@@ -11590,7 +11592,7 @@
   unset ac_cv_lib_nsl___gethostbyaddr
   unset found
   echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
-echo "configure:11594: checking for gethostbyaddr in -lnsl" >&5
+echo "configure:11596: checking for gethostbyaddr in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11598,7 +11600,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11602 "configure"
+#line 11604 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11609,7 +11611,7 @@
 gethostbyaddr()
 ; return 0; }
 EOF
-if { (eval echo configure:11613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11629,7 +11631,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6
-echo "configure:11633: checking for __gethostbyaddr in -lnsl" >&5
+echo "configure:11635: checking for __gethostbyaddr in -lnsl" >&5
 ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11637,7 +11639,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11641 "configure"
+#line 11643 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11648,7 +11650,7 @@
 __gethostbyaddr()
 ; return 0; }
 EOF
-if { (eval echo configure:11652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11680,11 +11682,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 11684 "configure"
+#line 11686 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:11688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -11735,12 +11737,12 @@
   unset found
   
   echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6
-echo "configure:11739: checking for yp_get_default_domain" >&5
+echo "configure:11741: checking for yp_get_default_domain" >&5
 if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11744 "configure"
+#line 11746 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char yp_get_default_domain(); below.  */
@@ -11763,7 +11765,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_yp_get_default_domain=yes"
 else
@@ -11781,12 +11783,12 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6
-echo "configure:11785: checking for __yp_get_default_domain" >&5
+echo "configure:11787: checking for __yp_get_default_domain" >&5
 if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11790 "configure"
+#line 11792 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __yp_get_default_domain(); below.  */
@@ -11809,7 +11811,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___yp_get_default_domain=yes"
 else
@@ -11847,7 +11849,7 @@
   unset ac_cv_lib_nsl___yp_get_default_domain
   unset found
   echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
-echo "configure:11851: checking for yp_get_default_domain in -lnsl" >&5
+echo "configure:11853: checking for yp_get_default_domain in -lnsl" >&5
 ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11855,7 +11857,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11859 "configure"
+#line 11861 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11866,7 +11868,7 @@
 yp_get_default_domain()
 ; return 0; }
 EOF
-if { (eval echo configure:11870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11886,7 +11888,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6
-echo "configure:11890: checking for __yp_get_default_domain in -lnsl" >&5
+echo "configure:11892: checking for __yp_get_default_domain in -lnsl" >&5
 ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11894,7 +11896,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11898 "configure"
+#line 11900 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11905,7 +11907,7 @@
 __yp_get_default_domain()
 ; return 0; }
 EOF
-if { (eval echo configure:11909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11937,11 +11939,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 11941 "configure"
+#line 11943 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:11945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -11993,12 +11995,12 @@
   unset found
   
   echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:11997: checking for dlopen" >&5
+echo "configure:11999: checking for dlopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12002 "configure"
+#line 12004 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
@@ -12021,7 +12023,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dlopen=yes"
 else
@@ -12039,12 +12041,12 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for __dlopen""... $ac_c" 1>&6
-echo "configure:12043: checking for __dlopen" >&5
+echo "configure:12045: checking for __dlopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12048 "configure"
+#line 12050 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __dlopen(); below.  */
@@ -12067,7 +12069,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___dlopen=yes"
 else
@@ -12105,7 +12107,7 @@
   unset ac_cv_lib_dl___dlopen
   unset found
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:12109: checking for dlopen in -ldl" >&5
+echo "configure:12111: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12113,7 +12115,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12117 "configure"
+#line 12119 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12124,7 +12126,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:12128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12144,7 +12146,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:12148: checking for __dlopen in -ldl" >&5
+echo "configure:12150: checking for __dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12152,7 +12154,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12156 "configure"
+#line 12158 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12163,7 +12165,7 @@
 __dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:12167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12195,11 +12197,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 12199 "configure"
+#line 12201 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:12203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -12251,7 +12253,7 @@
 
 fi
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:12255: checking for sin in -lm" >&5
+echo "configure:12257: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12259,7 +12261,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12263 "configure"
+#line 12265 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12270,7 +12272,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:12274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12304,12 +12306,12 @@
   unset found
   
   echo $ac_n "checking for res_search""... $ac_c" 1>&6
-echo "configure:12308: checking for res_search" >&5
+echo "configure:12310: checking for res_search" >&5
 if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12313 "configure"
+#line 12315 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_search(); below.  */
@@ -12332,7 +12334,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_res_search=yes"
 else
@@ -12350,12 +12352,12 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for __res_search""... $ac_c" 1>&6
-echo "configure:12354: checking for __res_search" >&5
+echo "configure:12356: checking for __res_search" >&5
 if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12359 "configure"
+#line 12361 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __res_search(); below.  */
@@ -12378,7 +12380,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___res_search=yes"
 else
@@ -12416,7 +12418,7 @@
   unset ac_cv_lib_resolv___res_search
   unset found
   echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
-echo "configure:12420: checking for res_search in -lresolv" >&5
+echo "configure:12422: checking for res_search in -lresolv" >&5
 ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12424,7 +12426,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12428 "configure"
+#line 12430 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12435,7 +12437,7 @@
 res_search()
 ; return 0; }
 EOF
-if { (eval echo configure:12439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12455,7 +12457,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
-echo "configure:12459: checking for __res_search in -lresolv" >&5
+echo "configure:12461: checking for __res_search in -lresolv" >&5
 ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12463,7 +12465,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12467 "configure"
+#line 12469 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12474,7 +12476,7 @@
 __res_search()
 ; return 0; }
 EOF
-if { (eval echo configure:12478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12506,11 +12508,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 12510 "configure"
+#line 12512 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:12514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -12552,7 +12554,7 @@
   unset ac_cv_lib_bind___res_search
   unset found
   echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
-echo "configure:12556: checking for res_search in -lbind" >&5
+echo "configure:12558: checking for res_search in -lbind" >&5
 ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12560,7 +12562,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12564 "configure"
+#line 12566 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12571,7 +12573,7 @@
 res_search()
 ; return 0; }
 EOF
-if { (eval echo configure:12575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12591,7 +12593,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
-echo "configure:12595: checking for __res_search in -lbind" >&5
+echo "configure:12597: checking for __res_search in -lbind" >&5
 ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12599,7 +12601,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12603 "configure"
+#line 12605 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12610,7 +12612,7 @@
 __res_search()
 ; return 0; }
 EOF
-if { (eval echo configure:12614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12642,11 +12644,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 12646 "configure"
+#line 12648 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:12650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -12688,7 +12690,7 @@
   unset ac_cv_lib_socket___res_search
   unset found
   echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
-echo "configure:12692: checking for res_search in -lsocket" >&5
+echo "configure:12694: checking for res_search in -lsocket" >&5
 ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12696,7 +12698,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12700 "configure"
+#line 12702 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12707,7 +12709,7 @@
 res_search()
 ; return 0; }
 EOF
-if { (eval echo configure:12711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12727,7 +12729,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
-echo "configure:12731: checking for __res_search in -lsocket" >&5
+echo "configure:12733: checking for __res_search in -lsocket" >&5
 ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12735,7 +12737,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12739 "configure"
+#line 12741 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12746,7 +12748,7 @@
 __res_search()
 ; return 0; }
 EOF
-if { (eval echo configure:12750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12778,11 +12780,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 12782 "configure"
+#line 12784 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:12786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -12840,12 +12842,12 @@
   unset found
   
   echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
-echo "configure:12844: checking for inet_aton" >&5
+echo "configure:12846: checking for inet_aton" >&5
 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12849 "configure"
+#line 12851 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char inet_aton(); below.  */
@@ -12868,7 +12870,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_inet_aton=yes"
 else
@@ -12886,12 +12888,12 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6
-echo "configure:12890: checking for __inet_aton" >&5
+echo "configure:12892: checking for __inet_aton" >&5
 if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12895 "configure"
+#line 12897 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __inet_aton(); below.  */
@@ -12914,7 +12916,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___inet_aton=yes"
 else
@@ -12952,7 +12954,7 @@
   unset ac_cv_lib_resolv___inet_aton
   unset found
   echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:12956: checking for inet_aton in -lresolv" >&5
+echo "configure:12958: checking for inet_aton in -lresolv" >&5
 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12960,7 +12962,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12964 "configure"
+#line 12966 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12971,7 +12973,7 @@
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:12975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12991,7 +12993,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:12995: checking for __inet_aton in -lresolv" >&5
+echo "configure:12997: checking for __inet_aton in -lresolv" >&5
 ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12999,7 +13001,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13003 "configure"
+#line 13005 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13010,7 +13012,7 @@
 __inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:13014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13042,11 +13044,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 13046 "configure"
+#line 13048 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:13050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -13088,7 +13090,7 @@
   unset ac_cv_lib_bind___inet_aton
   unset found
   echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
-echo "configure:13092: checking for inet_aton in -lbind" >&5
+echo "configure:13094: checking for inet_aton in -lbind" >&5
 ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13096,7 +13098,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13100 "configure"
+#line 13102 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13107,7 +13109,7 @@
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:13111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13127,7 +13129,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
-echo "configure:13131: checking for __inet_aton in -lbind" >&5
+echo "configure:13133: checking for __inet_aton in -lbind" >&5
 ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13135,7 +13137,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13139 "configure"
+#line 13141 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13146,7 +13148,7 @@
 __inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:13150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13178,11 +13180,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 13182 "configure"
+#line 13184 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:13186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -13236,12 +13238,12 @@
   unset found
   
   echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
-echo "configure:13240: checking for dn_skipname" >&5
+echo "configure:13242: checking for dn_skipname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13245 "configure"
+#line 13247 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dn_skipname(); below.  */
@@ -13264,7 +13266,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dn_skipname=yes"
 else
@@ -13282,12 +13284,12 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
-echo "configure:13286: checking for __dn_skipname" >&5
+echo "configure:13288: checking for __dn_skipname" >&5
 if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13291 "configure"
+#line 13293 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __dn_skipname(); below.  */
@@ -13310,7 +13312,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___dn_skipname=yes"
 else
@@ -13348,7 +13350,7 @@
   unset ac_cv_lib_resolv___dn_skipname
   unset found
   echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
-echo "configure:13352: checking for dn_skipname in -lresolv" >&5
+echo "configure:13354: checking for dn_skipname in -lresolv" >&5
 ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13356,7 +13358,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13360 "configure"
+#line 13362 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13367,7 +13369,7 @@
 dn_skipname()
 ; return 0; }
 EOF
-if { (eval echo configure:13371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13387,7 +13389,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
-echo "configure:13391: checking for __dn_skipname in -lresolv" >&5
+echo "configure:13393: checking for __dn_skipname in -lresolv" >&5
 ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13395,7 +13397,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13399 "configure"
+#line 13401 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13406,7 +13408,7 @@
 __dn_skipname()
 ; return 0; }
 EOF
-if { (eval echo configure:13410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13438,11 +13440,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 13442 "configure"
+#line 13444 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:13446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -13484,7 +13486,7 @@
   unset ac_cv_lib_bind___dn_skipname
   unset found
   echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
-echo "configure:13488: checking for dn_skipname in -lbind" >&5
+echo "configure:13490: checking for dn_skipname in -lbind" >&5
 ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13492,7 +13494,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13496 "configure"
+#line 13498 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13503,7 +13505,7 @@
 dn_skipname()
 ; return 0; }
 EOF
-if { (eval echo configure:13507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13523,7 +13525,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
-echo "configure:13527: checking for __dn_skipname in -lbind" >&5
+echo "configure:13529: checking for __dn_skipname in -lbind" >&5
 ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13531,7 +13533,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13535 "configure"
+#line 13537 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13542,7 +13544,7 @@
 __dn_skipname()
 ; return 0; }
 EOF
-if { (eval echo configure:13546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13574,11 +13576,11 @@
   found=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 13578 "configure"
+#line 13580 "configure"
 #include "confdefs.h"
 main() { return (0); }
 EOF
-if { (eval echo configure:13582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   found=yes
 else
@@ -13630,12 +13632,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:13634: checking for ANSI C header files" >&5
+echo "configure:13636: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13639 "configure"
+#line 13641 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -13643,7 +13645,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13649: \"$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*
@@ -13660,7 +13662,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 13664 "configure"
+#line 13666 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -13678,7 +13680,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 13682 "configure"
+#line 13684 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -13699,7 +13701,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 13703 "configure"
+#line 13705 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -13710,7 +13712,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:13714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -13738,12 +13740,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:13742: checking for $ac_hdr that defines DIR" >&5
+echo "configure:13744: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13747 "configure"
+#line 13749 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -13751,7 +13753,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:13755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -13776,7 +13778,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:13780: checking for opendir in -ldir" >&5
+echo "configure:13782: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13784,7 +13786,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13788 "configure"
+#line 13790 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13795,7 +13797,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:13799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13817,7 +13819,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:13821: checking for opendir in -lx" >&5
+echo "configure:13823: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13825,7 +13827,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13829 "configure"
+#line 13831 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13836,7 +13838,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:13840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13861,16 +13863,16 @@
 
 
   echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6
-echo "configure:13865: checking for fclose declaration" >&5
+echo "configure:13867: checking for fclose declaration" >&5
   cat > conftest.$ac_ext <<EOF
-#line 13867 "configure"
+#line 13869 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 int (*func)() = fclose
 ; return 0; }
 EOF
-if { (eval echo configure:13874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     cat >> confdefs.h <<\EOF
@@ -13947,17 +13949,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13951: checking for $ac_hdr" >&5
+echo "configure:13953: 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 13956 "configure"
+#line 13958 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13963: \"$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*
@@ -13986,12 +13988,12 @@
 
 
        echo $ac_n "checking for fopencookie""... $ac_c" 1>&6
-echo "configure:13990: checking for fopencookie" >&5
+echo "configure:13992: checking for fopencookie" >&5
 if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13995 "configure"
+#line 13997 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char fopencookie(); below.  */
@@ -14014,7 +14016,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_fopencookie=yes"
 else
@@ -14036,7 +14038,7 @@
 
        if test "$have_glibc_fopencookie" = "yes" ; then
                                          cat > conftest.$ac_ext <<EOF
-#line 14040 "configure"
+#line 14042 "configure"
 #include "confdefs.h"
  #define _GNU_SOURCE
                        #include <stdio.h>
@@ -14045,7 +14047,7 @@
  cookie_io_functions_t cookie; 
 ; return 0; }
 EOF
-if { (eval echo configure:14049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    have_cookie_io_functions_t=yes 
 else
@@ -14065,7 +14067,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 14069 "configure"
+#line 14071 "configure"
 #include "confdefs.h"
 
 #define _GNU_SOURCE
@@ -14097,7 +14099,7 @@
 
                                           
 EOF
-if { (eval echo configure:14101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
    cookie_io_functions_use_off64_t=yes 
 else
@@ -14112,7 +14114,7 @@
                
       else
                                    cat > conftest.$ac_ext <<EOF
-#line 14116 "configure"
+#line 14118 "configure"
 #include "confdefs.h"
  #define _GNU_SOURCE
                        #include <stdio.h>
@@ -14121,7 +14123,7 @@
  _IO_cookie_io_functions_t cookie; 
 ; return 0; }
 EOF
-if { (eval echo configure:14125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    have_IO_cookie_io_functions_t=yes 
 else
@@ -14158,7 +14160,7 @@
 
 
   echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6
-echo "configure:14162: checking for broken getcwd" >&5
+echo "configure:14164: checking for broken getcwd" >&5
   os=`uname -sr 2>/dev/null`
   case $os in
     SunOS*)
@@ -14173,14 +14175,14 @@
 
 
   echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6
-echo "configure:14177: checking for broken libc stdio" >&5
+echo "configure:14179: checking for broken libc stdio" >&5
   if eval "test \"`echo '$''{'have_broken_glibc_fopen_append'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
   if test "$cross_compiling" = yes; then
   cat > conftest.$ac_ext <<EOF
-#line 14184 "configure"
+#line 14186 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -14193,7 +14195,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_broken_glibc_fopen_append=yes
 else
@@ -14206,7 +14208,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 14210 "configure"
+#line 14212 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14234,7 +14236,7 @@
 }
 
 EOF
-if { (eval echo configure:14238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   have_broken_glibc_fopen_append=no
 else
@@ -14262,12 +14264,12 @@
 
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:14266: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:14268: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14271 "configure"
+#line 14273 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -14275,7 +14277,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:14279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -14296,12 +14298,12 @@
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:14300: checking for tm_zone in struct tm" >&5
+echo "configure:14302: checking for tm_zone in struct tm" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14305 "configure"
+#line 14307 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -14309,7 +14311,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:14313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -14329,12 +14331,12 @@
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:14333: checking for tzname" >&5
+echo "configure:14335: checking for tzname" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14338 "configure"
+#line 14340 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -14344,7 +14346,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:14348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -14368,12 +14370,12 @@
 
 
 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:14372: checking for tm_gmtoff in struct tm" >&5
+echo "configure:14374: checking for tm_gmtoff in struct tm" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14377 "configure"
+#line 14379 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -14381,7 +14383,7 @@
 struct tm tm; tm.tm_gmtoff;
 ; return 0; }
 EOF
-if { (eval echo configure:14385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_gmtoff=yes
 else
@@ -14404,12 +14406,12 @@
 
 
 echo $ac_n "checking for struct flock""... $ac_c" 1>&6
-echo "configure:14408: checking for struct flock" >&5
+echo "configure:14410: checking for struct flock" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14413 "configure"
+#line 14415 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -14419,7 +14421,7 @@
 struct flock x;
 ; return 0; }
 EOF
-if { (eval echo configure:14423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
           ac_cv_struct_flock=yes
@@ -14446,12 +14448,12 @@
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:14450: checking for socklen_t" >&5
+echo "configure:14452: checking for socklen_t" >&5
 if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14455 "configure"
+#line 14457 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14463,7 +14465,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
   ac_cv_socklen_t=yes
@@ -14489,7 +14491,7 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:14493: checking size of long" >&5
+echo "configure:14495: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14497,9 +14499,10 @@
   ac_cv_sizeof_long=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 14501 "configure"
+#line 14503 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -14508,7 +14511,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:14512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -14528,7 +14531,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:14532: checking size of int" >&5
+echo "configure:14535: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14536,9 +14539,10 @@
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 14540 "configure"
+#line 14543 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -14547,7 +14551,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:14551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -14568,12 +14572,12 @@
 
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:14572: checking for st_blksize in struct stat" >&5
+echo "configure:14576: checking for st_blksize in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14577 "configure"
+#line 14581 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -14581,7 +14585,7 @@
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:14585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -14603,12 +14607,12 @@
 
 if test "`uname -s 2>/dev/null`" != "QNX"; then
   echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:14607: checking for st_blocks in struct stat" >&5
+echo "configure:14611: checking for st_blocks in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14612 "configure"
+#line 14616 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -14616,7 +14620,7 @@
 struct stat s; s.st_blocks;
 ; return 0; }
 EOF
-if { (eval echo configure:14620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blocks=yes
 else
@@ -14643,12 +14647,12 @@
   WARNING_LEVEL=0
 fi
 echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:14647: checking for st_rdev in struct stat" >&5
+echo "configure:14651: checking for st_rdev in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14652 "configure"
+#line 14656 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -14656,7 +14660,7 @@
 struct stat s; s.st_rdev;
 ; return 0; }
 EOF
-if { (eval echo configure:14660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_rdev=yes
 else
@@ -14678,12 +14682,12 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:14682: checking for size_t" >&5
+echo "configure:14686: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14687 "configure"
+#line 14691 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -14711,12 +14715,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:14715: checking for uid_t in sys/types.h" >&5
+echo "configure:14719: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14720 "configure"
+#line 14724 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -14746,12 +14750,12 @@
 
 
 echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
-echo "configure:14750: checking for struct sockaddr_storage" >&5
+echo "configure:14754: checking for struct sockaddr_storage" >&5
 if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14755 "configure"
+#line 14759 "configure"
 #include "confdefs.h"
  #include <sys/types.h>
 #include <sys/socket.h>
@@ -14759,7 +14763,7 @@
 struct sockaddr_storage s; s
 ; return 0; }
 EOF
-if { (eval echo configure:14763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sockaddr_storage=yes
 else
@@ -14781,7 +14785,7 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 14785 "configure"
+#line 14789 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14791,7 +14795,7 @@
 static struct sockaddr sa; int n = (int) sa.sa_len; return n
 ; return 0; }
 EOF
-if { (eval echo configure:14795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_SOCKADDR_LEN 1
@@ -14804,12 +14808,12 @@
 rm -f conftest*
 
 echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6
-echo "configure:14808: checking for IPv6 support" >&5
+echo "configure:14812: checking for IPv6 support" >&5
 if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14813 "configure"
+#line 14817 "configure"
 #include "confdefs.h"
  #include <sys/types.h>
 #include <sys/socket.h>
@@ -14818,7 +14822,7 @@
 struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:14822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_ipv6_support=yes
 else
@@ -14836,12 +14840,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:14840: checking for vprintf" >&5
+echo "configure:14844: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14845 "configure"
+#line 14849 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -14864,7 +14868,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -14888,12 +14892,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:14892: checking for _doprnt" >&5
+echo "configure:14896: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14897 "configure"
+#line 14901 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -14916,7 +14920,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -15008,12 +15012,12 @@
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15012: checking for $ac_func" >&5
+echo "configure:15016: 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 15017 "configure"
+#line 15021 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15036,7 +15040,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15044: \"$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
@@ -15062,25 +15066,25 @@
 
 
 echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
-echo "configure:15066: checking for getaddrinfo" >&5
+echo "configure:15070: checking for getaddrinfo" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15071 "configure"
+#line 15075 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
 ; return 0; }
 EOF
-if { (eval echo configure:15078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 15084 "configure"
+#line 15088 "configure"
 #include "confdefs.h"
 
 #include <netdb.h>
@@ -15120,7 +15124,7 @@
 }
   
 EOF
-if { (eval echo configure:15124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_getaddrinfo=yes
 else
@@ -15152,12 +15156,12 @@
 for ac_func in strlcat strlcpy getopt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15156: checking for $ac_func" >&5
+echo "configure:15160: 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 15161 "configure"
+#line 15165 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15180,7 +15184,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15188: \"$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
@@ -15207,7 +15211,7 @@
 
 
 echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
-echo "configure:15211: checking whether utime accepts a null argument" >&5
+echo "configure:15215: checking whether utime accepts a null argument" >&5
 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -15217,7 +15221,7 @@
   ac_cv_func_utime_null=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 15221 "configure"
+#line 15225 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -15228,7 +15232,7 @@
 && t.st_mtime - s.st_mtime < 120));
 }
 EOF
-if { (eval echo configure:15232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_utime_null=yes
 else
@@ -15254,19 +15258,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:15258: checking for working alloca.h" >&5
+echo "configure:15262: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15263 "configure"
+#line 15267 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:15270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -15287,12 +15291,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:15291: checking for alloca" >&5
+echo "configure:15295: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15296 "configure"
+#line 15300 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -15320,7 +15324,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:15324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -15352,12 +15356,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:15356: checking whether alloca needs Cray hooks" >&5
+echo "configure:15360: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15361 "configure"
+#line 15365 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -15382,12 +15386,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15386: checking for $ac_func" >&5
+echo "configure:15390: 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 15391 "configure"
+#line 15395 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15410,7 +15414,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15418: \"$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
@@ -15437,7 +15441,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:15441: checking stack direction for C alloca" >&5
+echo "configure:15445: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -15445,7 +15449,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 15449 "configure"
+#line 15453 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -15464,7 +15468,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:15468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -15487,13 +15491,13 @@
 
 
   echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
-echo "configure:15491: checking for declared timezone" >&5
+echo "configure:15495: checking for declared timezone" >&5
 if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 15497 "configure"
+#line 15501 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15508,7 +15512,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
   ac_cv_declared_timezone=yes
@@ -15534,7 +15538,7 @@
 
 
 echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6
-echo "configure:15538: checking for type of reentrant time-related functions" >&5
+echo "configure:15542: checking for type of reentrant time-related functions" >&5
 if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -15545,7 +15549,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 15549 "configure"
+#line 15553 "configure"
 #include "confdefs.h"
 
 #include <time.h>
@@ -15563,7 +15567,7 @@
 }
 
 EOF
-if { (eval echo configure:15567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   ac_cv_time_r_type=hpux
@@ -15577,7 +15581,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 15581 "configure"
+#line 15585 "configure"
 #include "confdefs.h"
 
 #include <time.h>
@@ -15593,7 +15597,7 @@
 }
   
 EOF
-if { (eval echo configure:15597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_time_r_type=irix
@@ -15631,12 +15635,12 @@
 
 
     echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
-echo "configure:15635: checking for readdir_r" >&5
+echo "configure:15639: checking for readdir_r" >&5
 if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15640 "configure"
+#line 15644 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char readdir_r(); below.  */
@@ -15659,7 +15663,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_readdir_r=yes"
 else
@@ -15681,7 +15685,7 @@
 
   if test "$ac_cv_func_readdir_r" = "yes"; then
   echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6
-echo "configure:15685: checking for type of readdir_r" >&5
+echo "configure:15689: checking for type of readdir_r" >&5
 if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -15692,7 +15696,7 @@
    
 else
   cat > conftest.$ac_ext <<EOF
-#line 15696 "configure"
+#line 15700 "configure"
 #include "confdefs.h"
 
 #define _REENTRANT
@@ -15717,7 +15721,7 @@
 }
     
 EOF
-if { (eval echo configure:15721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
       ac_cv_what_readdir_r=POSIX
@@ -15728,7 +15732,7 @@
   rm -fr conftest*
   
       cat > conftest.$ac_ext <<EOF
-#line 15732 "configure"
+#line 15736 "configure"
 #include "confdefs.h"
 
 #define _REENTRANT
@@ -15738,7 +15742,7 @@
         
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15746: \"$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*
@@ -15783,7 +15787,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15787 "configure"
+#line 15791 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -15835,7 +15839,7 @@
 
 
 echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6
-echo "configure:15839: checking whether to include debugging symbols" >&5
+echo "configure:15843: checking whether to include debugging symbols" >&5
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -15868,7 +15872,7 @@
 
 
 echo $ac_n "checking layout of installed files""... $ac_c" 1>&6
-echo "configure:15872: checking layout of installed files" >&5
+echo "configure:15876: checking layout of installed files" >&5
 # Check whether --with-layout or --without-layout was given.
 if test "${with_layout+set}" = set; then
   withval="$with_layout"
@@ -15902,7 +15906,7 @@
 
 
 echo $ac_n "checking path to configuration file""... $ac_c" 1>&6
-echo "configure:15906: checking path to configuration file" >&5
+echo "configure:15910: checking path to configuration file" >&5
 # Check whether --with-config-file-path or --without-config-file-path was given.
 if test "${with_config_file_path+set}" = set; then
   withval="$with_config_file_path"
@@ -15938,7 +15942,7 @@
 
 
 echo $ac_n "checking directory to be scanned for configuration files""... $ac_c" 1>&6
-echo "configure:15942: checking directory to be scanned for configuration files" >&5
+echo "configure:15946: checking directory to be scanned for configuration files" >&5
 # Check whether --with-config-file-scan-dir or --without-config-file-scan-dir was given.
 if test "${with_config_file_scan_dir+set}" = set; then
   withval="$with_config_file_scan_dir"
@@ -15968,7 +15972,7 @@
 
 
 echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6
-echo "configure:15972: checking whether to enable safe mode by default" >&5
+echo "configure:15976: checking whether to enable safe mode by default" >&5
 # Check whether --enable-safe-mode or --disable-safe-mode was given.
 if test "${enable_safe_mode+set}" = set; then
   enableval="$enable_safe_mode"
@@ -16003,7 +16007,7 @@
 fi
 
 echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6
-echo "configure:16007: checking for safe mode exec dir" >&5
+echo "configure:16011: checking for safe mode exec dir" >&5
 # Check whether --with-exec-dir or --without-exec-dir was given.
 if test "${with_exec_dir+set}" = set; then
   withval="$with_exec_dir"
@@ -16044,7 +16048,7 @@
 
 
 echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6
-echo "configure:16048: checking whether to enable PHP's own SIGCHLD handler" >&5
+echo "configure:16052: checking whether to enable PHP's own SIGCHLD handler" >&5
 # Check whether --enable-sigchild or --disable-sigchild was given.
 if test "${enable_sigchild+set}" = set; then
   enableval="$enable_sigchild"
@@ -16081,7 +16085,7 @@
 
 
 echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6
-echo "configure:16085: checking whether to enable magic quotes by default" >&5
+echo "configure:16089: checking whether to enable magic quotes by default" >&5
 # Check whether --enable-magic-quotes or --disable-magic-quotes was given.
 if test "${enable_magic_quotes+set}" = set; then
   enableval="$enable_magic_quotes"
@@ -16118,7 +16122,7 @@
 
 
 echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6
-echo "configure:16122: checking whether to enable runpaths" >&5
+echo "configure:16126: checking whether to enable runpaths" >&5
 # Check whether --enable-rpath or --disable-rpath was given.
 if test "${enable_rpath+set}" = set; then
   enableval="$enable_rpath"
@@ -16143,7 +16147,7 @@
 
 
 echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6
-echo "configure:16147: checking whether to explicitly link against libgcc" >&5
+echo "configure:16151: checking whether to explicitly link against libgcc" >&5
 # Check whether --enable-libgcc or --disable-libgcc was given.
 if test "${enable_libgcc+set}" = set; then
   enableval="$enable_libgcc"
@@ -16222,7 +16226,7 @@
 
 
 echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6
-echo "configure:16226: checking whether to enable short tags by default" >&5
+echo "configure:16230: checking whether to enable short tags by default" >&5
 # Check whether --enable-short-tags or --disable-short-tags was given.
 if test "${enable_short_tags+set}" = set; then
   enableval="$enable_short_tags"
@@ -16259,7 +16263,7 @@
 
 
 echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6
-echo "configure:16263: checking whether to enable dmalloc" >&5
+echo "configure:16267: checking whether to enable dmalloc" >&5
 # Check whether --enable-dmalloc or --disable-dmalloc was given.
 if test "${enable_dmalloc+set}" = set; then
   enableval="$enable_dmalloc"
@@ -16284,7 +16288,7 @@
 if test "$PHP_DMALLOC" = "yes"; then
   
   echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6
-echo "configure:16288: checking for dmalloc_error in -ldmalloc" >&5
+echo "configure:16292: checking for dmalloc_error in -ldmalloc" >&5
 ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16292,7 +16296,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16296 "configure"
+#line 16300 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16303,7 +16307,7 @@
 dmalloc_error()
 ; return 0; }
 EOF
-if { (eval echo configure:16307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16347,7 +16351,7 @@
 
 
 echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
-echo "configure:16351: checking whether to enable IPv6 support" >&5
+echo "configure:16355: checking whether to enable IPv6 support" >&5
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
   enableval="$enable_ipv6"
@@ -16377,7 +16381,7 @@
 fi
 
 echo $ac_n "checking whether to enable versioning""... $ac_c" 1>&6
-echo "configure:16381: checking whether to enable versioning" >&5
+echo "configure:16385: checking whether to enable versioning" >&5
 # Check whether --enable-versioning or --disable-versioning was given.
 if test "${enable_versioning+set}" = set; then
   enableval="$enable_versioning"
@@ -16429,7 +16433,7 @@
 
 
 echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6
-echo "configure:16433: checking for OpenSSL support" >&5
+echo "configure:16437: checking for OpenSSL support" >&5
 # Check whether --with-openssl or --without-openssl was given.
 if test "${with_openssl+set}" = set; then
   withval="$with_openssl"
@@ -16475,7 +16479,7 @@
 
 
 echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6
-echo "configure:16479: checking for Kerberos support" >&5
+echo "configure:16483: checking for Kerberos support" >&5
 # Check whether --with-kerberos or --without-kerberos was given.
 if test "${with_kerberos+set}" = set; then
   withval="$with_kerberos"
@@ -16733,7 +16737,7 @@
     # Extract the first word of "krb5-config", so it can be a program name with args.
 set dummy krb5-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16737: checking for $ac_word" >&5
+echo "configure:16741: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -17089,7 +17093,7 @@
     # 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:17093: checking for $ac_word" >&5
+echo "configure:17097: 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
@@ -17277,9 +17281,9 @@
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
     echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:17281: checking for OpenSSL version" >&5
+echo "configure:17285: checking for OpenSSL version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 17283 "configure"
+#line 17287 "configure"
 #include "confdefs.h"
 
 #include <openssl/opensslv.h>
@@ -17417,7 +17421,7 @@
   done
 
   echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:17421: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:17425: checking for CRYPTO_free in -lcrypto" >&5
 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17425,7 +17429,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17429 "configure"
+#line 17433 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -17436,7 +17440,7 @@
 CRYPTO_free()
 ; return 0; }
 EOF
-if { (eval echo configure:17440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -17576,7 +17580,7 @@
   done
 
   echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:17580: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:17584: checking for SSL_CTX_set_ssl_version in -lssl" >&5
 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17584,7 +17588,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lssl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17588 "configure"
+#line 17592 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -17595,7 +17599,7 @@
 SSL_CTX_set_ssl_version()
 ; return 0; }
 EOF
-if { (eval echo configure:17599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -17721,7 +17725,7 @@
 
 
 echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6
-echo "configure:17725: checking for ZLIB support" >&5
+echo "configure:17729: checking for ZLIB support" >&5
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
   withval="$with_zlib"
@@ -17767,7 +17771,7 @@
 
 
 echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6
-echo "configure:17771: checking if the location of ZLIB install directory is defined" >&5
+echo "configure:17775: checking if the location of ZLIB install directory is defined" >&5
 # Check whether --with-zlib-dir or --without-zlib-dir was given.
 if test "${with_zlib_dir+set}" = set; then
   withval="$with_zlib_dir"
@@ -18120,7 +18124,7 @@
   done
 
   echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
-echo "configure:18124: checking for gzgets in -lz" >&5
+echo "configure:18128: checking for gzgets in -lz" >&5
 ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18128,7 +18132,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 18132 "configure"
+#line 18136 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -18139,7 +18143,7 @@
 gzgets()
 ; return 0; }
 EOF
-if { (eval echo configure:18143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -18277,7 +18281,7 @@
 
 
 echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
-echo "configure:18281: checking whether to enable bc style precision math functions" >&5
+echo "configure:18285: checking whether to enable bc style precision math functions" >&5
 # Check whether --enable-bcmath or --disable-bcmath was given.
 if test "${enable_bcmath+set}" = set; then
   enableval="$enable_bcmath"
@@ -18571,7 +18575,7 @@
 
 
 echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
-echo "configure:18575: checking for BZip2 support" >&5
+echo "configure:18579: checking for BZip2 support" >&5
 # Check whether --with-bz2 or --without-bz2 was given.
 if test "${with_bz2+set}" = set; then
   withval="$with_bz2"
@@ -18619,7 +18623,7 @@
     BZIP_DIR=$PHP_BZ2
   else
     echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
-echo "configure:18623: checking for BZip2 in default path" >&5
+echo "configure:18627: checking for BZip2 in default path" >&5
     for i in /usr/local /usr; do
       if test -r $i/include/bzlib.h; then
         BZIP_DIR=$i
@@ -18715,7 +18719,7 @@
   done
 
   echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
-echo "configure:18719: checking for BZ2_bzerror in -lbz2" >&5
+echo "configure:18723: checking for BZ2_bzerror in -lbz2" >&5
 ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18723,7 +18727,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbz2  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 18727 "configure"
+#line 18731 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -18734,7 +18738,7 @@
 BZ2_bzerror()
 ; return 0; }
 EOF
-if { (eval echo configure:18738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -19129,7 +19133,7 @@
 
 
 echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
-echo "configure:19133: checking whether to enable calendar conversion support" >&5
+echo "configure:19137: checking whether to enable calendar conversion support" >&5
 # Check whether --enable-calendar or --disable-calendar was given.
 if test "${enable_calendar+set}" = set; then
   enableval="$enable_calendar"
@@ -19408,7 +19412,7 @@
 
 
 echo $ac_n "checking for cpdflib support""... $ac_c" 1>&6
-echo "configure:19412: checking for cpdflib support" >&5
+echo "configure:19416: checking for cpdflib support" >&5
 # Check whether --with-cpdflib or --without-cpdflib was given.
 if test "${with_cpdflib+set}" = set; then
   withval="$with_cpdflib"
@@ -19771,7 +19775,7 @@
   done
 
   echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:19775: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:19779: checking for jpeg_read_header in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19779,7 +19783,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 19783 "configure"
+#line 19787 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -19790,7 +19794,7 @@
 jpeg_read_header()
 ; return 0; }
 EOF
-if { (eval echo configure:19794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -20018,7 +20022,7 @@
   done
 
   echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:20022: checking for TIFFOpen in -ltiff" >&5
+echo "configure:20026: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20026,7 +20030,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 20030 "configure"
+#line 20034 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -20037,7 +20041,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:20041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -20256,7 +20260,7 @@
   done
 
   echo $ac_n "checking for cpdf_open in -lcpdf""... $ac_c" 1>&6
-echo "configure:20260: checking for cpdf_open in -lcpdf" >&5
+echo "configure:20264: checking for cpdf_open in -lcpdf" >&5
 ac_lib_var=`echo cpdf'_'cpdf_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20264,7 +20268,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcpdf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 20268 "configure"
+#line 20272 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -20275,7 +20279,7 @@
 cpdf_open()
 ; return 0; }
 EOF
-if { (eval echo configure:20279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -20385,7 +20389,7 @@
   done
 
   echo $ac_n "checking for cpdf_open in -lcpdfm""... $ac_c" 1>&6
-echo "configure:20389: checking for cpdf_open in -lcpdfm" >&5
+echo "configure:20393: checking for cpdf_open in -lcpdfm" >&5
 ac_lib_var=`echo cpdfm'_'cpdf_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20393,7 +20397,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcpdfm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 20397 "configure"
+#line 20401 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -20404,7 +20408,7 @@
 cpdf_open()
 ; return 0; }
 EOF
-if { (eval echo configure:20408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -20587,7 +20591,7 @@
 
 
 echo $ac_n "checking for CRACKlib support""... $ac_c" 1>&6
-echo "configure:20591: checking for CRACKlib support" >&5
+echo "configure:20595: checking for CRACKlib support" >&5
 # Check whether --with-crack or --without-crack was given.
 if test "${with_crack+set}" = set; then
   withval="$with_crack"
@@ -21011,7 +21015,7 @@
 
 
 echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
-echo "configure:21015: checking whether to enable ctype functions" >&5
+echo "configure:21019: checking whether to enable ctype functions" >&5
 # Check whether --enable-ctype or --disable-ctype was given.
 if test "${enable_ctype+set}" = set; then
   enableval="$enable_ctype"
@@ -21286,7 +21290,7 @@
 
 
 echo $ac_n "checking for CURL support""... $ac_c" 1>&6
-echo "configure:21290: checking for CURL support" >&5
+echo "configure:21294: checking for CURL support" >&5
 # Check whether --with-curl or --without-curl was given.
 if test "${with_curl+set}" = set; then
   withval="$with_curl"
@@ -21335,7 +21339,7 @@
     CURL_DIR=$PHP_CURL
   else
     echo $ac_n "checking for CURL in default path""... $ac_c" 1>&6
-echo "configure:21339: checking for CURL in default path" >&5
+echo "configure:21343: checking for CURL in default path" >&5
     for i in /usr/local /usr; do
       if test -r $i/include/curl/easy.h; then
         CURL_DIR=$i
@@ -21353,7 +21357,7 @@
 
   CURL_CONFIG="curl-config"
   echo $ac_n "checking for cURL 7.9.8 or greater""... $ac_c" 1>&6
-echo "configure:21357: checking for cURL 7.9.8 or greater" >&5
+echo "configure:21361: checking for cURL 7.9.8 or greater" >&5
 
   if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
     CURL_CONFIG=${CURL_DIR}/bin/curl-config
@@ -21653,7 +21657,7 @@
   done
 
   echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
-echo "configure:21657: checking for curl_easy_perform in -lcurl" >&5
+echo "configure:21661: checking for curl_easy_perform in -lcurl" >&5
 ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -21661,7 +21665,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 21665 "configure"
+#line 21669 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -21672,7 +21676,7 @@
 curl_easy_perform()
 ; return 0; }
 EOF
-if { (eval echo configure:21676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -21791,7 +21795,7 @@
   done
 
   echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6
-echo "configure:21795: checking for curl_version_info in -lcurl" >&5
+echo "configure:21799: checking for curl_version_info in -lcurl" >&5
 ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -21799,7 +21803,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 21803 "configure"
+#line 21807 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -21810,7 +21814,7 @@
 curl_version_info()
 ; return 0; }
 EOF
-if { (eval echo configure:21814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -22077,7 +22081,7 @@
 
 
 echo $ac_n "checking for cyrus imap support""... $ac_c" 1>&6
-echo "configure:22081: checking for cyrus imap support" >&5
+echo "configure:22085: checking for cyrus imap support" >&5
 # Check whether --with-cyrus or --without-cyrus was given.
 if test "${with_cyrus+set}" = set; then
   withval="$with_cyrus"
@@ -22263,7 +22267,7 @@
     old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$CYRUS_INCPATH
   cat > conftest.$ac_ext <<EOF
-#line 22267 "configure"
+#line 22271 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <cyrus/imclient.h>
@@ -22271,7 +22275,7 @@
 imclient_connect(0,0,0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:22275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:22279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -23002,7 +23006,7 @@
 
 
 echo $ac_n "checking for xDBM support""... $ac_c" 1>&6
-echo "configure:23006: checking for xDBM support" >&5
+echo "configure:23010: checking for xDBM support" >&5
 # Check whether --with-db or --without-db was given.
 if test "${with_db+set}" = set; then
   withval="$with_db"
@@ -23049,7 +23053,7 @@
 
   
   echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:23053: checking for gdbm_open in -lgdbm" >&5
+echo "configure:23057: checking for gdbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -23057,7 +23061,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgdbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 23061 "configure"
+#line 23065 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -23068,7 +23072,7 @@
 gdbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:23072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -23090,7 +23094,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dbm_open in -lc""... $ac_c" 1>&6
-echo "configure:23094: checking for dbm_open in -lc" >&5
+echo "configure:23098: checking for dbm_open in -lc" >&5
 ac_lib_var=`echo c'_'dbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -23098,7 +23102,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 23102 "configure"
+#line 23106 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -23109,7 +23113,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:23113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -23131,7 +23135,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:23135: checking for dbm_open in -ldbm" >&5
+echo "configure:23139: checking for dbm_open in -ldbm" >&5
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -23139,7 +23143,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 23143 "configure"
+#line 23147 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -23150,7 +23154,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:23154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -23172,7 +23176,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6
-echo "configure:23176: checking for dbm_open in -ldb" >&5
+echo "configure:23180: checking for dbm_open in -ldb" >&5
 ac_lib_var=`echo db'_'dbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -23180,7 +23184,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 23184 "configure"
+#line 23188 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -23191,7 +23195,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:23195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -23225,7 +23229,7 @@
 fi
 
   echo $ac_n "checking preferred dbm library""... $ac_c" 1>&6
-echo "configure:23229: checking preferred dbm library" >&5
+echo "configure:23233: checking preferred dbm library" >&5
   if test "a$DBM_TYPE" = a; then
     echo "$ac_t""none found" 1>&6
     echo "configure: warning: No dbm library found - using built-in flatfile support" 1>&2
@@ -23243,17 +23247,17 @@
   if test "$DBM_LIB" = "-lgdbm"; then
     ac_safe=`echo "gdbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6
-echo "configure:23247: checking for gdbm.h" >&5
+echo "configure:23251: checking for gdbm.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 23252 "configure"
+#line 23256 "configure"
 #include "confdefs.h"
 #include <gdbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:23257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:23261: \"$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*
@@ -23276,17 +23280,17 @@
       echo "$ac_t"""Try /usr/local/include/gdbm.h"" 1>&6; 
       ac_safe=`echo "/usr/local/include/gdbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for /usr/local/include/gdbm.h""... $ac_c" 1>&6
-echo "configure:23280: checking for /usr/local/include/gdbm.h" >&5
+echo "configure:23284: checking for /usr/local/include/gdbm.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 23285 "configure"
+#line 23289 "configure"
 #include "confdefs.h"
 #include </usr/local/include/gdbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:23290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:23294: \"$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*
@@ -23309,17 +23313,17 @@
         echo "$ac_t"""Try /opt/local/include/gdbm.h"" 1>&6;
         ac_safe=`echo "/opt/local/include/gdbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for /opt/local/include/gdbm.h""... $ac_c" 1>&6
-echo "configure:23313: checking for /opt/local/include/gdbm.h" >&5
+echo "configure:23317: checking for /opt/local/include/gdbm.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 23318 "configure"
+#line 23322 "configure"
 #include "confdefs.h"
 #include </opt/local/include/gdbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:23323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:23327: \"$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*
@@ -23342,17 +23346,17 @@
                     echo "$ac_t"""Try /usr/pkg/include/gdbm.h"" 1>&6;
           ac_safe=`echo "/usr/pkg/include/gdbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for /usr/pkg/include/gdbm.h""... $ac_c" 1>&6
-echo "configure:23346: checking for /usr/pkg/include/gdbm.h" >&5
+echo "configure:23350: checking for /usr/pkg/include/gdbm.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 23351 "configure"
+#line 23355 "configure"
 #include "confdefs.h"
 #include </usr/pkg/include/gdbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:23356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:23360: \"$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*
@@ -23633,7 +23637,7 @@
 
 
 echo $ac_n "checking whether to enable DBA""... $ac_c" 1>&6
-echo "configure:23637: checking whether to enable DBA" >&5
+echo "configure:23641: checking whether to enable DBA" >&5
 # Check whether --enable-dba or --disable-dba was given.
 if test "${enable_dba+set}" = set; then
   enableval="$enable_dba"
@@ -23772,7 +23776,7 @@
   done
 
   echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:23776: checking for gdbm_open in -lgdbm" >&5
+echo "configure:23780: checking for gdbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -23780,7 +23784,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgdbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 23784 "configure"
+#line 23788 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -23791,7 +23795,7 @@
 gdbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:23795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -23958,7 +23962,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:23962: checking for $THIS_FULL_NAME support" >&5
+echo "configure:23966: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
     { echo "configure: error: " 1>&2; exit 1; }
   fi
@@ -24073,7 +24077,7 @@
   done
 
   echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
-echo "configure:24077: checking for dbm_open in -l$LIB" >&5
+echo "configure:24081: checking for dbm_open in -l$LIB" >&5
 ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -24081,7 +24085,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 24085 "configure"
+#line 24089 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -24092,7 +24096,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:24096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -24263,7 +24267,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:24267: checking for $THIS_FULL_NAME support" >&5
+echo "configure:24271: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
     { echo "configure: error: " 1>&2; exit 1; }
   fi
@@ -24320,7 +24324,7 @@
   LIBS="-l$LIB $LIBS"
   
         cat > conftest.$ac_ext <<EOF
-#line 24324 "configure"
+#line 24328 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -24331,11 +24335,11 @@
         
 ; return 0; }
 EOF
-if { (eval echo configure:24335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
           cat > conftest.$ac_ext <<EOF
-#line 24339 "configure"
+#line 24343 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -24368,14 +24372,14 @@
   done
   if test -z "$THIS_LIBS"; then
        echo $ac_n "checking for db4 major version""... $ac_c" 1>&6
-echo "configure:24372: checking for db4 major version" >&5
+echo "configure:24376: checking for db4 major version" >&5
     { echo "configure: error: Header contains different version" 1>&2; exit 1; }
   fi
   if test "4" = "4"; then
     echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6
-echo "configure:24377: checking for db4 minor version and patch level" >&5
+echo "configure:24381: checking for db4 minor version and patch level" >&5
     cat > conftest.$ac_ext <<EOF
-#line 24379 "configure"
+#line 24383 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -24401,9 +24405,9 @@
   fi
   if test "$ext_shared" = "yes"; then
     echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
-echo "configure:24405: checking if dba can be used as shared extension" >&5
+echo "configure:24409: checking if dba can be used as shared extension" >&5
     cat > conftest.$ac_ext <<EOF
-#line 24407 "configure"
+#line 24411 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -24565,7 +24569,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:24569: checking for $THIS_FULL_NAME support" >&5
+echo "configure:24573: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
     { echo "configure: error: " 1>&2; exit 1; }
   fi
@@ -24596,7 +24600,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:24600: checking for $THIS_FULL_NAME support" >&5
+echo "configure:24604: checking for $THIS_FULL_NAME support" >&5
   if test -n "You cannot combine --with-db3 with --with-db4"; then
     { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; }
   fi
@@ -24643,7 +24647,7 @@
   LIBS="-l$LIB $LIBS"
   
         cat > conftest.$ac_ext <<EOF
-#line 24647 "configure"
+#line 24651 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -24654,11 +24658,11 @@
         
 ; return 0; }
 EOF
-if { (eval echo configure:24658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
           cat > conftest.$ac_ext <<EOF
-#line 24662 "configure"
+#line 24666 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -24691,14 +24695,14 @@
   done
   if test -z "$THIS_LIBS"; then
        echo $ac_n "checking for db3 major version""... $ac_c" 1>&6
-echo "configure:24695: checking for db3 major version" >&5
+echo "configure:24699: checking for db3 major version" >&5
     { echo "configure: error: Header contains different version" 1>&2; exit 1; }
   fi
   if test "3" = "4"; then
     echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6
-echo "configure:24700: checking for db4 minor version and patch level" >&5
+echo "configure:24704: checking for db4 minor version and patch level" >&5
     cat > conftest.$ac_ext <<EOF
-#line 24702 "configure"
+#line 24706 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -24724,9 +24728,9 @@
   fi
   if test "$ext_shared" = "yes"; then
     echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
-echo "configure:24728: checking if dba can be used as shared extension" >&5
+echo "configure:24732: checking if dba can be used as shared extension" >&5
     cat > conftest.$ac_ext <<EOF
-#line 24730 "configure"
+#line 24734 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -24888,7 +24892,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:24892: checking for $THIS_FULL_NAME support" >&5
+echo "configure:24896: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
     { echo "configure: error: " 1>&2; exit 1; }
   fi
@@ -24919,7 +24923,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:24923: checking for $THIS_FULL_NAME support" >&5
+echo "configure:24927: checking for $THIS_FULL_NAME support" >&5
   if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
     { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; }
   fi
@@ -24966,7 +24970,7 @@
   LIBS="-l$LIB $LIBS"
   
         cat > conftest.$ac_ext <<EOF
-#line 24970 "configure"
+#line 24974 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -24977,11 +24981,11 @@
         
 ; return 0; }
 EOF
-if { (eval echo configure:24981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
           cat > conftest.$ac_ext <<EOF
-#line 24985 "configure"
+#line 24989 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -25014,14 +25018,14 @@
   done
   if test -z "$THIS_LIBS"; then
        echo $ac_n "checking for db2 major version""... $ac_c" 1>&6
-echo "configure:25018: checking for db2 major version" >&5
+echo "configure:25022: checking for db2 major version" >&5
     { echo "configure: error: Header contains different version" 1>&2; exit 1; }
   fi
   if test "2" = "4"; then
     echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6
-echo "configure:25023: checking for db4 minor version and patch level" >&5
+echo "configure:25027: checking for db4 minor version and patch level" >&5
     cat > conftest.$ac_ext <<EOF
-#line 25025 "configure"
+#line 25029 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -25047,9 +25051,9 @@
   fi
   if test "$ext_shared" = "yes"; then
     echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
-echo "configure:25051: checking if dba can be used as shared extension" >&5
+echo "configure:25055: checking if dba can be used as shared extension" >&5
     cat > conftest.$ac_ext <<EOF
-#line 25053 "configure"
+#line 25057 "configure"
 #include "confdefs.h"
 
 #include "$THIS_INCLUDE"
@@ -25211,7 +25215,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:25215: checking for $THIS_FULL_NAME support" >&5
+echo "configure:25219: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
     { echo "configure: error: " 1>&2; exit 1; }
   fi
@@ -25326,7 +25330,7 @@
   done
 
   echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
-echo "configure:25330: checking for dbminit in -l$LIB" >&5
+echo "configure:25334: checking for dbminit in -l$LIB" >&5
 ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -25334,7 +25338,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 25338 "configure"
+#line 25342 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -25345,7 +25349,7 @@
 dbminit()
 ; return 0; }
 EOF
-if { (eval echo configure:25349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:25353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -25365,7 +25369,7 @@
     ext_shared=$save_ext_shared
     
           echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6
-echo "configure:25369: checking for DBM using GDBM" >&5
+echo "configure:25373: checking for DBM using GDBM" >&5
           cat >> confdefs.h <<EOF
 #define DBM_INCLUDE_FILE "$THIS_INCLUDE"
 EOF
@@ -25531,7 +25535,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:25535: checking for $THIS_FULL_NAME support" >&5
+echo "configure:25539: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
     { echo "configure: error: " 1>&2; exit 1; }
   fi
@@ -25661,7 +25665,7 @@
   done
 
   echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6
-echo "configure:25665: checking for cdb_read in -l$LIB" >&5
+echo "configure:25669: checking for cdb_read in -l$LIB" >&5
 ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -25669,7 +25673,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 25673 "configure"
+#line 25677 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -25680,7 +25684,7 @@
 cdb_read()
 ; return 0; }
 EOF
-if { (eval echo configure:25684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:25688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -25872,7 +25876,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:25876: checking for $THIS_FULL_NAME support" >&5
+echo "configure:25880: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
     { echo "configure: error: " 1>&2; exit 1; }
   fi
@@ -25926,7 +25930,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:25930: checking for $THIS_FULL_NAME support" >&5
+echo "configure:25934: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
     { echo "configure: error: " 1>&2; exit 1; }
   fi
@@ -25980,7 +25984,7 @@
     THIS_FULL_NAME="$THIS_NAME"
   fi
   echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:25984: checking for $THIS_FULL_NAME support" >&5
+echo "configure:25988: checking for $THIS_FULL_NAME support" >&5
   if test -n ""; then
     { echo "configure: error: " 1>&2; exit 1; }
   fi
@@ -25995,7 +25999,7 @@
 
 
 echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
-echo "configure:25999: checking whether to enable DBA interface" >&5
+echo "configure:26003: checking whether to enable DBA interface" >&5
 if test "$HAVE_DBA" = "1"; then
   echo "$ac_t""yes" 1>&6
   cat >> confdefs.h <<\EOF
@@ -26250,7 +26254,7 @@
 
 
 echo $ac_n "checking whether to enable dbase support""... $ac_c" 1>&6
-echo "configure:26254: checking whether to enable dbase support" >&5
+echo "configure:26258: checking whether to enable dbase support" >&5
 # Check whether --enable-dbase or --disable-dbase was given.
 if test "${enable_dbase+set}" = set; then
   enableval="$enable_dbase"
@@ -26525,7 +26529,7 @@
 
 
 echo $ac_n "checking whether to enable dbx support""... $ac_c" 1>&6
-echo "configure:26529: checking whether to enable dbx support" >&5
+echo "configure:26533: checking whether to enable dbx support" >&5
 # Check whether --enable-dbx or --disable-dbx was given.
 if test "${enable_dbx+set}" = set; then
   enableval="$enable_dbx"
@@ -26796,7 +26800,7 @@
 
 
 echo $ac_n "checking whether to enable direct I/O support""... $ac_c" 1>&6
-echo "configure:26800: checking whether to enable direct I/O support" >&5
+echo "configure:26804: checking whether to enable direct I/O support" >&5
 # Check whether --enable-dio or --disable-dio was given.
 if test "${enable_dio+set}" = set; then
   enableval="$enable_dio"
@@ -27069,7 +27073,7 @@
 
 
 echo $ac_n "checking for DOM support""... $ac_c" 1>&6
-echo "configure:27073: checking for DOM support" >&5
+echo "configure:27077: checking for DOM support" >&5
 # Check whether --with-dom or --without-dom was given.
 if test "${with_dom+set}" = set; then
   withval="$with_dom"
@@ -27116,7 +27120,7 @@
   
 
 echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:27120: checking for the location of libz" >&5
+echo "configure:27124: 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"
@@ -27163,9 +27167,9 @@
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$DOMXML_DIR/include$DOMXML_DIR_ADD
   echo $ac_n "checking for libxml version""... $ac_c" 1>&6
-echo "configure:27167: checking for libxml version" >&5
+echo "configure:27171: checking for libxml version" >&5
   cat > conftest.$ac_ext <<EOF
-#line 27169 "configure"
+#line 27173 "configure"
 #include "confdefs.h"
 
 #include <libxml/xmlversion.h>
@@ -27742,7 +27746,7 @@
 
 
 echo $ac_n "checking for DOM XSLT support""... $ac_c" 1>&6
-echo "configure:27746: checking for DOM XSLT support" >&5
+echo "configure:27750: checking for DOM XSLT support" >&5
 # Check whether --with-dom-xslt or --without-dom-xslt was given.
 if test "${with_dom_xslt+set}" = set; then
   withval="$with_dom_xslt"
@@ -27767,7 +27771,7 @@
 
 
 echo $ac_n "checking for DOM EXSLT support""... $ac_c" 1>&6
-echo "configure:27771: checking for DOM EXSLT support" >&5
+echo "configure:27775: checking for DOM EXSLT support" >&5
 # Check whether --with-dom-exslt or --without-dom-exslt was given.
 if test "${with_dom_exslt+set}" = set; then
   withval="$with_dom_exslt"
@@ -27808,9 +27812,9 @@
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$DOMXSLT_DIR/include
   echo $ac_n "checking for libxslt version""... $ac_c" 1>&6
-echo "configure:27812: checking for libxslt version" >&5
+echo "configure:27816: checking for libxslt version" >&5
   cat > conftest.$ac_ext <<EOF
-#line 27814 "configure"
+#line 27818 "configure"
 #include "confdefs.h"
 
 #include <libxslt/xsltconfig.h>
@@ -28238,9 +28242,9 @@
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$DOMEXSLT_DIR/include
   echo $ac_n "checking for libexslt version""... $ac_c" 1>&6
-echo "configure:28242: checking for libexslt version" >&5
+echo "configure:28246: checking for libexslt version" >&5
   cat > conftest.$ac_ext <<EOF
-#line 28244 "configure"
+#line 28248 "configure"
 #include "confdefs.h"
 
 #include <libexslt/exsltconfig.h>
@@ -28410,7 +28414,7 @@
 
 
 echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6
-echo "configure:28414: checking whether to enable EXIF (metadata from images) support" >&5
+echo "configure:28418: checking whether to enable EXIF (metadata from images) support" >&5
 # Check whether --enable-exif or --disable-exif was given.
 if test "${enable_exif+set}" = set; then
   enableval="$enable_exif"
@@ -28685,7 +28689,7 @@
 
 
 echo $ac_n "checking for FrontBase SQL92 (fbsql) support""... $ac_c" 1>&6
-echo "configure:28689: checking for FrontBase SQL92 (fbsql) support" >&5
+echo "configure:28693: checking for FrontBase SQL92 (fbsql) support" >&5
 # Check whether --with-fbsql or --without-fbsql was given.
 if test "${with_fbsql+set}" = set; then
   withval="$with_fbsql"
@@ -29119,7 +29123,7 @@
 
 
 echo $ac_n "checking for FDF support""... $ac_c" 1>&6
-echo "configure:29123: checking for FDF support" >&5
+echo "configure:29127: checking for FDF support" >&5
 # Check whether --with-fdftk or --without-fdftk was given.
 if test "${with_fdftk+set}" = set; then
   withval="$with_fdftk"
@@ -29320,7 +29324,7 @@
   done
 
   echo $ac_n "checking for FDFOpen in -l$file""... $ac_c" 1>&6
-echo "configure:29324: checking for FDFOpen in -l$file" >&5
+echo "configure:29328: checking for FDFOpen in -l$file" >&5
 ac_lib_var=`echo $file'_'FDFOpen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -29328,7 +29332,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$file  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 29332 "configure"
+#line 29336 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -29339,7 +29343,7 @@
 FDFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:29343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:29347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -29449,7 +29453,7 @@
   done
 
   echo $ac_n "checking for FDFGetFDFVersion in -l$file""... $ac_c" 1>&6
-echo "configure:29453: checking for FDFGetFDFVersion in -l$file" >&5
+echo "configure:29457: checking for FDFGetFDFVersion in -l$file" >&5
 ac_lib_var=`echo $file'_'FDFGetFDFVersion | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -29457,7 +29461,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$file  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 29461 "configure"
+#line 29465 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -29468,7 +29472,7 @@
 FDFGetFDFVersion()
 ; return 0; }
 EOF
-if { (eval echo configure:29472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:29476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -29843,7 +29847,7 @@
 
 
 echo $ac_n "checking whether to enable the bundled filePro support""... $ac_c" 1>&6
-echo "configure:29847: checking whether to enable the bundled filePro support" >&5
+echo "configure:29851: checking whether to enable the bundled filePro support" >&5
 # Check whether --enable-filepro or --disable-filepro was given.
 if test "${enable_filepro+set}" = set; then
   enableval="$enable_filepro"
@@ -30118,7 +30122,7 @@
 
 
 echo $ac_n "checking for FriBidi support""... $ac_c" 1>&6
-echo "configure:30122: checking for FriBidi support" >&5
+echo "configure:30126: checking for FriBidi support" >&5
 # Check whether --with-fribidi or --without-fribidi was given.
 if test "${with_fribidi+set}" = set; then
   withval="$with_fribidi"
@@ -30167,7 +30171,7 @@
     # Extract the first word of "fribidi-config", so it can be a program name with args.
 set dummy fribidi-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:30171: checking for $ac_word" >&5
+echo "configure:30175: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_FRIBIDI_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -30204,7 +30208,7 @@
   fi
 
     echo $ac_n "checking for FriBidi version""... $ac_c" 1>&6
-echo "configure:30208: checking for FriBidi version" >&5
+echo "configure:30212: checking for FriBidi version" >&5
 
   if test ! -x "$FRIBIDI_CONFIG"; then
     { echo "configure: error: fribidi-config not found." 1>&2; exit 1; }
@@ -30573,7 +30577,7 @@
 
 
 echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6
-echo "configure:30577: checking whether to enable FTP support" >&5
+echo "configure:30581: checking whether to enable FTP support" >&5
 # Check whether --enable-ftp or --disable-ftp was given.
 if test "${enable_ftp+set}" = set; then
   enableval="$enable_ftp"
@@ -30849,7 +30853,7 @@
 
 
 echo $ac_n "checking for GD support""... $ac_c" 1>&6
-echo "configure:30853: checking for GD support" >&5
+echo "configure:30857: checking for GD support" >&5
 # Check whether --with-gd or --without-gd was given.
 if test "${with_gd+set}" = set; then
   withval="$with_gd"
@@ -30896,7 +30900,7 @@
   
 
 echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
-echo "configure:30900: checking for the location of libjpeg" >&5
+echo "configure:30904: checking for the location of libjpeg" >&5
 # Check whether --with-jpeg-dir or --without-jpeg-dir was given.
 if test "${with_jpeg_dir+set}" = set; then
   withval="$with_jpeg_dir"
@@ -30923,7 +30927,7 @@
   
 
 echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
-echo "configure:30927: checking for the location of libpng" >&5
+echo "configure:30931: checking for the location of libpng" >&5
 # Check whether --with-png-dir or --without-png-dir was given.
 if test "${with_png_dir+set}" = set; then
   withval="$with_png_dir"
@@ -30950,7 +30954,7 @@
   
 
 echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:30954: checking for the location of libz" >&5
+echo "configure:30958: 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"
@@ -30976,7 +30980,7 @@
 
 
 echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6
-echo "configure:30980: checking for the location of libXpm" >&5
+echo "configure:30984: checking for the location of libXpm" >&5
 # Check whether --with-xpm-dir or --without-xpm-dir was given.
 if test "${with_xpm_dir+set}" = set; then
   withval="$with_xpm_dir"
@@ -31001,7 +31005,7 @@
 
 
 echo $ac_n "checking for FreeType 1.x support""... $ac_c" 1>&6
-echo "configure:31005: checking for FreeType 1.x support" >&5
+echo "configure:31009: checking for FreeType 1.x support" >&5
 # Check whether --with-ttf or --without-ttf was given.
 if test "${with_ttf+set}" = set; then
   withval="$with_ttf"
@@ -31026,7 +31030,7 @@
 
 
 echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6
-echo "configure:31030: checking for FreeType 2" >&5
+echo "configure:31034: checking for FreeType 2" >&5
 # Check whether --with-freetype-dir or --without-freetype-dir was given.
 if test "${with_freetype_dir+set}" = set; then
   withval="$with_freetype_dir"
@@ -31051,7 +31055,7 @@
 
 
 echo $ac_n "checking for T1lib support""... $ac_c" 1>&6
-echo "configure:31055: checking for T1lib support" >&5
+echo "configure:31059: checking for T1lib support" >&5
 # Check whether --with-t1lib or --without-t1lib was given.
 if test "${with_t1lib+set}" = set; then
   withval="$with_t1lib"
@@ -31076,7 +31080,7 @@
 
 
 echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6
-echo "configure:31080: checking whether to enable truetype string function in GD" >&5
+echo "configure:31084: checking whether to enable truetype string function in GD" >&5
 # Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given.
 if test "${enable_gd_native_ttf+set}" = set; then
   enableval="$enable_gd_native_ttf"
@@ -31101,7 +31105,7 @@
 
 
 echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6
-echo "configure:31105: checking whether to enable JIS-mapped Japanese font support in GD" >&5
+echo "configure:31109: checking whether to enable JIS-mapped Japanese font support in GD" >&5
 # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given.
 if test "${enable_gd_jis_conv+set}" = set; then
   enableval="$enable_gd_jis_conv"
@@ -31155,12 +31159,12 @@
   for ac_func in fabsf floorf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:31159: checking for $ac_func" >&5
+echo "configure:31163: 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 31164 "configure"
+#line 31168 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -31183,7 +31187,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:31187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:31191: \"$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
@@ -31315,7 +31319,7 @@
   done
 
   echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:31319: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:31323: checking for jpeg_read_header in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -31323,7 +31327,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 31327 "configure"
+#line 31331 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -31334,7 +31338,7 @@
 jpeg_read_header()
 ; return 0; }
 EOF
-if { (eval echo configure:31338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:31342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -31598,7 +31602,7 @@
   done
 
   echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
-echo "configure:31602: checking for png_write_image in -lpng" >&5
+echo "configure:31606: checking for png_write_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -31606,7 +31610,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 31610 "configure"
+#line 31614 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -31617,7 +31621,7 @@
 png_write_image()
 ; return 0; }
 EOF
-if { (eval echo configure:31621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:31625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -31978,7 +31982,7 @@
   done
 
   echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
-echo "configure:31982: checking for XpmFreeXpmImage in -lXpm" >&5
+echo "configure:31986: checking for XpmFreeXpmImage in -lXpm" >&5
 ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -31986,7 +31990,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 31990 "configure"
+#line 31994 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -31997,7 +32001,7 @@
 XpmFreeXpmImage()
 ; return 0; }
 EOF
-if { (eval echo configure:32001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:32005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -32695,7 +32699,7 @@
   done
 
   echo $ac_n "checking for T1_LoadFont in -lt1""... $ac_c" 1>&6
-echo "configure:32699: checking for T1_LoadFont in -lt1" >&5
+echo "configure:32703: checking for T1_LoadFont in -lt1" >&5
 ac_lib_var=`echo t1'_'T1_LoadFont | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -32703,7 +32707,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lt1  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 32707 "configure"
+#line 32711 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -32714,7 +32718,7 @@
 T1_LoadFont()
 ; return 0; }
 EOF
-if { (eval echo configure:32718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:32722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -33107,7 +33111,7 @@
   done
 
   echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:33111: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:33115: checking for jpeg_read_header in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -33115,7 +33119,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 33119 "configure"
+#line 33123 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -33126,7 +33130,7 @@
 jpeg_read_header()
 ; return 0; }
 EOF
-if { (eval echo configure:33130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:33134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -33390,7 +33394,7 @@
   done
 
   echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
-echo "configure:33394: checking for png_write_image in -lpng" >&5
+echo "configure:33398: checking for png_write_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -33398,7 +33402,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 33402 "configure"
+#line 33406 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -33409,7 +33413,7 @@
 png_write_image()
 ; return 0; }
 EOF
-if { (eval echo configure:33413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:33417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -33770,7 +33774,7 @@
   done
 
   echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
-echo "configure:33774: checking for XpmFreeXpmImage in -lXpm" >&5
+echo "configure:33778: checking for XpmFreeXpmImage in -lXpm" >&5
 ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -33778,7 +33782,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 33782 "configure"
+#line 33786 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -33789,7 +33793,7 @@
 XpmFreeXpmImage()
 ; return 0; }
 EOF
-if { (eval echo configure:33793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:33797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -34487,7 +34491,7 @@
   done
 
   echo $ac_n "checking for T1_LoadFont in -lt1""... $ac_c" 1>&6
-echo "configure:34491: checking for T1_LoadFont in -lt1" >&5
+echo "configure:34495: checking for T1_LoadFont in -lt1" >&5
 ac_lib_var=`echo t1'_'T1_LoadFont | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -34495,7 +34499,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lt1  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 34499 "configure"
+#line 34503 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -34506,7 +34510,7 @@
 T1_LoadFont()
 ; return 0; }
 EOF
-if { (eval echo configure:34510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:34514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -34862,7 +34866,7 @@
   done
 
   echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
-echo "configure:34866: checking for gdImageString16 in -lgd" >&5
+echo "configure:34870: checking for gdImageString16 in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -34870,7 +34874,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 34874 "configure"
+#line 34878 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -34881,7 +34885,7 @@
 gdImageString16()
 ; return 0; }
 EOF
-if { (eval echo configure:34885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:34889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -34993,7 +34997,7 @@
   done
 
   echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6
-echo "configure:34997: checking for gdImagePaletteCopy in -lgd" >&5
+echo "configure:35001: checking for gdImagePaletteCopy in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -35001,7 +35005,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 35005 "configure"
+#line 35009 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -35012,7 +35016,7 @@
 gdImagePaletteCopy()
 ; return 0; }
 EOF
-if { (eval echo configure:35016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -35124,7 +35128,7 @@
   done
 
   echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
-echo "configure:35128: checking for gdImageCreateFromPng in -lgd" >&5
+echo "configure:35132: checking for gdImageCreateFromPng in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -35132,7 +35136,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 35136 "configure"
+#line 35140 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -35143,7 +35147,7 @@
 gdImageCreateFromPng()
 ; return 0; }
 EOF
-if { (eval echo configure:35147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -35255,7 +35259,7 @@
   done
 
   echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
-echo "configure:35259: checking for gdImageCreateFromGif in -lgd" >&5
+echo "configure:35263: checking for gdImageCreateFromGif in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -35263,7 +35267,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 35267 "configure"
+#line 35271 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -35274,7 +35278,7 @@
 gdImageCreateFromGif()
 ; return 0; }
 EOF
-if { (eval echo configure:35278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -35386,7 +35390,7 @@
   done
 
   echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
-echo "configure:35390: checking for gdImageGif in -lgd" >&5
+echo "configure:35394: checking for gdImageGif in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -35394,7 +35398,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 35398 "configure"
+#line 35402 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -35405,7 +35409,7 @@
 gdImageGif()
 ; return 0; }
 EOF
-if { (eval echo configure:35409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -35517,7 +35521,7 @@
   done
 
   echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6
-echo "configure:35521: checking for gdImageWBMP in -lgd" >&5
+echo "configure:35525: checking for gdImageWBMP in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -35525,7 +35529,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 35529 "configure"
+#line 35533 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -35536,7 +35540,7 @@
 gdImageWBMP()
 ; return 0; }
 EOF
-if { (eval echo configure:35540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -35648,7 +35652,7 @@
   done
 
   echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
-echo "configure:35652: checking for gdImageCreateFromJpeg in -lgd" >&5
+echo "configure:35656: checking for gdImageCreateFromJpeg in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -35656,7 +35660,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 35660 "configure"
+#line 35664 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -35667,7 +35671,7 @@
 gdImageCreateFromJpeg()
 ; return 0; }
 EOF
-if { (eval echo configure:35671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -35779,7 +35783,7 @@
   done
 
   echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6
-echo "configure:35783: checking for gdImageCreateFromXpm in -lgd" >&5
+echo "configure:35787: checking for gdImageCreateFromXpm in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -35787,7 +35791,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 35791 "configure"
+#line 35795 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -35798,7 +35802,7 @@
 gdImageCreateFromXpm()
 ; return 0; }
 EOF
-if { (eval echo configure:35802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -35910,7 +35914,7 @@
   done
 
   echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6
-echo "configure:35914: checking for gdImageCreateFromGd2 in -lgd" >&5
+echo "configure:35918: checking for gdImageCreateFromGd2 in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -35918,7 +35922,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 35922 "configure"
+#line 35926 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -35929,7 +35933,7 @@
 gdImageCreateFromGd2()
 ; return 0; }
 EOF
-if { (eval echo configure:35933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -36041,7 +36045,7 @@
   done
 
   echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6
-echo "configure:36045: checking for gdImageCreateTrueColor in -lgd" >&5
+echo "configure:36049: checking for gdImageCreateTrueColor in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -36049,7 +36053,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 36053 "configure"
+#line 36057 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -36060,7 +36064,7 @@
 gdImageCreateTrueColor()
 ; return 0; }
 EOF
-if { (eval echo configure:36064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -36172,7 +36176,7 @@
   done
 
   echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6
-echo "configure:36176: checking for gdImageSetTile in -lgd" >&5
+echo "configure:36180: checking for gdImageSetTile in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -36180,7 +36184,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 36184 "configure"
+#line 36188 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -36191,7 +36195,7 @@
 gdImageSetTile()
 ; return 0; }
 EOF
-if { (eval echo configure:36195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -36303,7 +36307,7 @@
   done
 
   echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6
-echo "configure:36307: checking for gdImageEllipse in -lgd" >&5
+echo "configure:36311: checking for gdImageEllipse in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -36311,7 +36315,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 36315 "configure"
+#line 36319 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -36322,7 +36326,7 @@
 gdImageEllipse()
 ; return 0; }
 EOF
-if { (eval echo configure:36326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -36434,7 +36438,7 @@
   done
 
   echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6
-echo "configure:36438: checking for gdImageSetBrush in -lgd" >&5
+echo "configure:36442: checking for gdImageSetBrush in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -36442,7 +36446,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 36446 "configure"
+#line 36450 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -36453,7 +36457,7 @@
 gdImageSetBrush()
 ; return 0; }
 EOF
-if { (eval echo configure:36457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -36565,7 +36569,7 @@
   done
 
   echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6
-echo "configure:36569: checking for gdImageStringTTF in -lgd" >&5
+echo "configure:36573: checking for gdImageStringTTF in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -36573,7 +36577,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 36577 "configure"
+#line 36581 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -36584,7 +36588,7 @@
 gdImageStringTTF()
 ; return 0; }
 EOF
-if { (eval echo configure:36588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -36696,7 +36700,7 @@
   done
 
   echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6
-echo "configure:36700: checking for gdImageStringFT in -lgd" >&5
+echo "configure:36704: checking for gdImageStringFT in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -36704,7 +36708,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 36708 "configure"
+#line 36712 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -36715,7 +36719,7 @@
 gdImageStringFT()
 ; return 0; }
 EOF
-if { (eval echo configure:36719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -36827,7 +36831,7 @@
   done
 
   echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6
-echo "configure:36831: checking for gdImageStringFTEx in -lgd" >&5
+echo "configure:36835: checking for gdImageStringFTEx in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -36835,7 +36839,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 36839 "configure"
+#line 36843 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -36846,7 +36850,7 @@
 gdImageStringFTEx()
 ; return 0; }
 EOF
-if { (eval echo configure:36850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -36958,7 +36962,7 @@
   done
 
   echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6
-echo "configure:36962: checking for gdImageColorClosestHWB in -lgd" >&5
+echo "configure:36966: checking for gdImageColorClosestHWB in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -36966,7 +36970,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 36970 "configure"
+#line 36974 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -36977,7 +36981,7 @@
 gdImageColorClosestHWB()
 ; return 0; }
 EOF
-if { (eval echo configure:36981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -37089,7 +37093,7 @@
   done
 
   echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
-echo "configure:37093: checking for gdImageColorResolve in -lgd" >&5
+echo "configure:37097: checking for gdImageColorResolve in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -37097,7 +37101,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 37101 "configure"
+#line 37105 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -37108,7 +37112,7 @@
 gdImageColorResolve()
 ; return 0; }
 EOF
-if { (eval echo configure:37112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -37220,7 +37224,7 @@
   done
 
   echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6
-echo "configure:37224: checking for gdImageGifCtx in -lgd" >&5
+echo "configure:37228: checking for gdImageGifCtx in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -37228,7 +37232,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 37232 "configure"
+#line 37236 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -37239,7 +37243,7 @@
 gdImageGifCtx()
 ; return 0; }
 EOF
-if { (eval echo configure:37243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -37351,7 +37355,7 @@
   done
 
   echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
-echo "configure:37355: checking for gdCacheCreate in -lgd" >&5
+echo "configure:37359: checking for gdCacheCreate in -lgd" >&5
 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -37359,7 +37363,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 37363 "configure"
+#line 37367 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -37370,7 +37374,7 @@
 gdCacheCreate()
 ; return 0; }
 EOF
-if { (eval echo configure:37374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -37482,7 +37486,7 @@
   done
 
   echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6
-echo "configure:37486: checking for gdFontCacheShutdown in -lgd" >&5
+echo "configure:37490: checking for gdFontCacheShutdown in -lgd" >&5
 ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -37490,7 +37494,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 37494 "configure"
+#line 37498 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -37501,7 +37505,7 @@
 gdFontCacheShutdown()
 ; return 0; }
 EOF
-if { (eval echo configure:37505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -37613,7 +37617,7 @@
   done
 
   echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6
-echo "configure:37617: checking for gdFreeFontCache in -lgd" >&5
+echo "configure:37621: checking for gdFreeFontCache in -lgd" >&5
 ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -37621,7 +37625,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 37625 "configure"
+#line 37629 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -37632,7 +37636,7 @@
 gdFreeFontCache()
 ; return 0; }
 EOF
-if { (eval echo configure:37636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -37744,7 +37748,7 @@
   done
 
   echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6
-echo "configure:37748: checking for gdNewDynamicCtxEx in -lgd" >&5
+echo "configure:37752: checking for gdNewDynamicCtxEx in -lgd" >&5
 ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -37752,7 +37756,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 37756 "configure"
+#line 37760 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -37763,7 +37767,7 @@
 gdNewDynamicCtxEx()
 ; return 0; }
 EOF
-if { (eval echo configure:37767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -37818,7 +37822,7 @@
         old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$GD_INCLUDE
   cat > conftest.$ac_ext <<EOF
-#line 37822 "configure"
+#line 37826 "configure"
 #include "confdefs.h"
 
 #include <gd.h>
@@ -37832,7 +37836,7 @@
   
 ; return 0; }
 EOF
-if { (eval echo configure:37836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:37840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     cat >> confdefs.h <<\EOF
@@ -38191,7 +38195,7 @@
   done
 
   echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
-echo "configure:38195: checking for gdImageCreate in -lgd" >&5
+echo "configure:38199: checking for gdImageCreate in -lgd" >&5
 ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -38199,7 +38203,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 38203 "configure"
+#line 38207 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -38210,7 +38214,7 @@
 gdImageCreate()
 ; return 0; }
 EOF
-if { (eval echo configure:38214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -38256,7 +38260,7 @@
 
 
 echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6
-echo "configure:38260: checking for GNU gettext support" >&5
+echo "configure:38264: checking for GNU gettext support" >&5
 # Check whether --with-gettext or --without-gettext was given.
 if test "${with_gettext+set}" = set; then
   withval="$with_gettext"
@@ -38314,7 +38318,7 @@
   O_LDFLAGS=$LDFLAGS
   LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
   echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:38318: checking for bindtextdomain in -lintl" >&5
+echo "configure:38322: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -38322,7 +38326,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 38326 "configure"
+#line 38330 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -38333,7 +38337,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:38337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -38355,7 +38359,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
-echo "configure:38359: checking for bindtextdomain in -lc" >&5
+echo "configure:38363: checking for bindtextdomain in -lc" >&5
 ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -38363,7 +38367,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 38367 "configure"
+#line 38371 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -38374,7 +38378,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:38378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -38766,7 +38770,7 @@
 
 
   echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:38770: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:38774: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -38774,7 +38778,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 38778 "configure"
+#line 38782 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -38785,7 +38789,7 @@
 ngettext()
 ; return 0; }
 EOF
-if { (eval echo configure:38789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -38809,7 +38813,7 @@
 fi
 
   echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:38813: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:38817: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -38817,7 +38821,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 38821 "configure"
+#line 38825 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -38828,7 +38832,7 @@
 dngettext()
 ; return 0; }
 EOF
-if { (eval echo configure:38832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -38852,7 +38856,7 @@
 fi
 
   echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:38856: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:38860: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -38860,7 +38864,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 38864 "configure"
+#line 38868 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -38871,7 +38875,7 @@
 dcngettext()
 ; return 0; }
 EOF
-if { (eval echo configure:38875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -38895,7 +38899,7 @@
 fi
 
   echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:38899: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:38903: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -38903,7 +38907,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 38907 "configure"
+#line 38911 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -38914,7 +38918,7 @@
 bind_textdomain_codeset()
 ; return 0; }
 EOF
-if { (eval echo configure:38918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -38944,7 +38948,7 @@
 
 
 echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6
-echo "configure:38948: checking for GNU MP support" >&5
+echo "configure:38952: checking for GNU MP support" >&5
 # Check whether --with-gmp or --without-gmp was given.
 if test "${with_gmp+set}" = set; then
   withval="$with_gmp"
@@ -39078,7 +39082,7 @@
   done
 
   echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
-echo "configure:39082: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
+echo "configure:39086: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
 ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -39086,7 +39090,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 39090 "configure"
+#line 39094 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -39097,7 +39101,7 @@
 __gmp_randinit_lc_2exp_size()
 ; return 0; }
 EOF
-if { (eval echo configure:39101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -39205,7 +39209,7 @@
   done
 
   echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
-echo "configure:39209: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
+echo "configure:39213: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
 ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -39213,7 +39217,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 39217 "configure"
+#line 39221 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -39224,7 +39228,7 @@
 gmp_randinit_lc_2exp_size()
 ; return 0; }
 EOF
-if { (eval echo configure:39228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -39623,7 +39627,7 @@
 
 
 echo $ac_n "checking for hwapi support""... $ac_c" 1>&6
-echo "configure:39627: checking for hwapi support" >&5
+echo "configure:39631: checking for hwapi support" >&5
 # Check whether --with-hwapi or --without-hwapi was given.
 if test "${with_hwapi+set}" = set; then
   withval="$with_hwapi"
@@ -39671,7 +39675,7 @@
     HWAPI_DIR=$PHP_HWAPI
   else
     echo $ac_n "checking for HWAPI in default path""... $ac_c" 1>&6
-echo "configure:39675: checking for HWAPI in default path" >&5
+echo "configure:39679: checking for HWAPI in default path" >&5
     for i in /usr/local /usr; do
       if test -r $i/include/hwapi/sdk/api/object.h; then
         HWAPI_DIR=$i
@@ -39827,7 +39831,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:39831: checking for $ac_word" >&5
+echo "configure:39835: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -39859,7 +39863,7 @@
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:39863: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:39867: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -39870,12 +39874,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 39874 "configure"
+#line 39878 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:39879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -39901,12 +39905,12 @@
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:39905: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:39909: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:39910: checking whether we are using GNU C++" >&5
+echo "configure:39914: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -39915,7 +39919,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:39919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:39923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -39934,7 +39938,7 @@
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:39938: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:39942: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -39966,7 +39970,7 @@
 fi
 
     echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:39970: checking how to run the C++ preprocessor" >&5
+echo "configure:39974: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -39979,12 +39983,12 @@
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 39983 "configure"
+#line 39987 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:39988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:39992: \"$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
   :
@@ -40297,7 +40301,7 @@
 
 
 echo $ac_n "checking for Hyperwave support""... $ac_c" 1>&6
-echo "configure:40301: checking for Hyperwave support" >&5
+echo "configure:40305: checking for Hyperwave support" >&5
 # Check whether --with-hyperwave or --without-hyperwave was given.
 if test "${with_hyperwave+set}" = set; then
   withval="$with_hyperwave"
@@ -40552,7 +40556,7 @@
 
 
 echo $ac_n "checking for iconv support""... $ac_c" 1>&6
-echo "configure:40556: checking for iconv support" >&5
+echo "configure:40560: checking for iconv support" >&5
 # Check whether --with-iconv or --without-iconv was given.
 if test "${with_iconv+set}" = set; then
   withval="$with_iconv"
@@ -40615,12 +40619,12 @@
 
         if test "$PHP_ICONV" = "yes"; then
     echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:40619: checking for iconv" >&5
+echo "configure:40623: checking for iconv" >&5
 if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 40624 "configure"
+#line 40628 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char iconv(); below.  */
@@ -40643,7 +40647,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:40647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_iconv=yes"
 else
@@ -40667,12 +40671,12 @@
   echo "$ac_t""no" 1>&6
 
       echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:40671: checking for libiconv" >&5
+echo "configure:40675: checking for libiconv" >&5
 if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 40676 "configure"
+#line 40680 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char libiconv(); below.  */
@@ -40695,7 +40699,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:40699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_libiconv=yes"
 else
@@ -40830,7 +40834,7 @@
   done
 
   echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:40834: checking for libiconv in -l$iconv_lib_name" >&5
+echo "configure:40838: checking for libiconv in -l$iconv_lib_name" >&5
 ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -40838,7 +40842,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 40842 "configure"
+#line 40846 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -40849,7 +40853,7 @@
 libiconv()
 ; return 0; }
 EOF
-if { (eval echo configure:40853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -40962,7 +40966,7 @@
   done
 
   echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:40966: checking for iconv in -l$iconv_lib_name" >&5
+echo "configure:40970: checking for iconv in -l$iconv_lib_name" >&5
 ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -40970,7 +40974,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 40974 "configure"
+#line 40978 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -40981,7 +40985,7 @@
 iconv()
 ; return 0; }
 EOF
-if { (eval echo configure:40985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -41187,16 +41191,16 @@
 
     if test -z "$iconv_lib_name"; then
       echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6
-echo "configure:41191: checking if iconv is glibc's" >&5
+echo "configure:41195: checking if iconv is glibc's" >&5
       cat > conftest.$ac_ext <<EOF
-#line 41193 "configure"
+#line 41197 "configure"
 #include "confdefs.h"
 #include <gnu/libc-version.h>
 int main() {
 gnu_get_libc_version();
 ; return 0; }
 EOF
-if { (eval echo configure:41200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
         echo "$ac_t""yes" 1>&6
@@ -41215,16 +41219,16 @@
       case "$iconv_lib_name" in
         iconv )
           echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6
-echo "configure:41219: checking if iconv is Konstantin Chuguev's" >&5
+echo "configure:41223: checking if iconv is Konstantin Chuguev's" >&5
           cat > conftest.$ac_ext <<EOF
-#line 41221 "configure"
+#line 41225 "configure"
 #include "confdefs.h"
 #include <iconv.h>
 int main() {
 iconv_ccs_init(NULL, NULL);
 ; return 0; }
 EOF
-if { (eval echo configure:41228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
             echo "$ac_t""yes" 1>&6
@@ -41302,12 +41306,12 @@
     esac
 
     echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
-echo "configure:41306: checking if iconv supports errno" >&5
+echo "configure:41310: checking if iconv supports errno" >&5
     if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 41311 "configure"
+#line 41315 "configure"
 #include "confdefs.h"
 
 #include <$PHP_ICONV_H_PATH>
@@ -41328,7 +41332,7 @@
 }
     
 EOF
-if { (eval echo configure:41332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:41336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
       echo "$ac_t""yes" 1>&6
@@ -41360,9 +41364,9 @@
 
 
     echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6
-echo "configure:41364: checking if your cpp allows macro usage in include lines" >&5
+echo "configure:41368: checking if your cpp allows macro usage in include lines" >&5
     cat > conftest.$ac_ext <<EOF
-#line 41366 "configure"
+#line 41370 "configure"
 #include "confdefs.h"
 
 #define FOO <$PHP_ICONV_H_PATH>
@@ -41372,7 +41376,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:41376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:41380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
       echo "$ac_t""yes" 1>&6
@@ -41641,7 +41645,7 @@
 
 
 echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
-echo "configure:41645: checking for IMAP support" >&5
+echo "configure:41649: checking for IMAP support" >&5
 # Check whether --with-imap or --without-imap was given.
 if test "${with_imap+set}" = set; then
   withval="$with_imap"
@@ -41687,7 +41691,7 @@
 
 
 echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
-echo "configure:41691: checking for IMAP Kerberos support" >&5
+echo "configure:41695: checking for IMAP Kerberos support" >&5
 # Check whether --with-kerberos or --without-kerberos was given.
 if test "${with_kerberos+set}" = set; then
   withval="$with_kerberos"
@@ -41712,7 +41716,7 @@
 
 
 echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
-echo "configure:41716: checking for IMAP SSL support" >&5
+echo "configure:41720: checking for IMAP SSL support" >&5
 # Check whether --with-imap-ssl or --without-imap-ssl was given.
 if test "${with_imap_ssl+set}" = set; then
   withval="$with_imap_ssl"
@@ -42048,7 +42052,7 @@
     done
 
         cat > conftest.$ac_ext <<EOF
-#line 42052 "configure"
+#line 42056 "configure"
 #include "confdefs.h"
 #include <$IMAP_INC_DIR/mail.h>
 EOF
@@ -42068,7 +42072,7 @@
         old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$IMAP_INC_DIR
     cat > conftest.$ac_ext <<EOF
-#line 42072 "configure"
+#line 42076 "configure"
 #include "confdefs.h"
 
 #include "imap4r1.h"
@@ -42170,7 +42174,7 @@
   done
 
   echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
-echo "configure:42174: checking for pam_start in -lpam" >&5
+echo "configure:42178: checking for pam_start in -lpam" >&5
 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -42178,7 +42182,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpam  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 42182 "configure"
+#line 42186 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -42189,7 +42193,7 @@
 pam_start()
 ; return 0; }
 EOF
-if { (eval echo configure:42193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -42327,7 +42331,7 @@
   done
 
   echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:42331: checking for crypt in -lcrypt" >&5
+echo "configure:42335: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -42335,7 +42339,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 42339 "configure"
+#line 42343 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -42346,7 +42350,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:42350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -42549,7 +42553,7 @@
     # Extract the first word of "krb5-config", so it can be a program name with args.
 set dummy krb5-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:42553: checking for $ac_word" >&5
+echo "configure:42557: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -42900,7 +42904,7 @@
 
   else
     cat > conftest.$ac_ext <<EOF
-#line 42904 "configure"
+#line 42908 "configure"
 #include "confdefs.h"
 #include <$IMAP_INC_DIR/linkage.h>
 EOF
@@ -42935,7 +42939,7 @@
     # 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:42939: checking for $ac_word" >&5
+echo "configure:42943: 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
@@ -43123,9 +43127,9 @@
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
     echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:43127: checking for OpenSSL version" >&5
+echo "configure:43131: checking for OpenSSL version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 43129 "configure"
+#line 43133 "configure"
 #include "confdefs.h"
 
 #include <openssl/opensslv.h>
@@ -43263,7 +43267,7 @@
   done
 
   echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:43267: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:43271: checking for CRYPTO_free in -lcrypto" >&5
 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -43271,7 +43275,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 43275 "configure"
+#line 43279 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -43282,7 +43286,7 @@
 CRYPTO_free()
 ; return 0; }
 EOF
-if { (eval echo configure:43286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -43422,7 +43426,7 @@
   done
 
   echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:43426: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:43430: checking for SSL_CTX_set_ssl_version in -lssl" >&5
 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -43430,7 +43434,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lssl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 43434 "configure"
+#line 43438 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -43441,7 +43445,7 @@
 SSL_CTX_set_ssl_version()
 ; return 0; }
 EOF
-if { (eval echo configure:43445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -43559,7 +43563,7 @@
 
   elif test -f "$IMAP_INC_DIR/linkage.c"; then
     cat > conftest.$ac_ext <<EOF
-#line 43563 "configure"
+#line 43567 "configure"
 #include "confdefs.h"
 #include <$IMAP_INC_DIR/linkage.c>
 EOF
@@ -43587,7 +43591,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 43591 "configure"
+#line 43595 "configure"
 #include "confdefs.h"
 
     void mm_log(void){}
@@ -43612,7 +43616,7 @@
     }
   
 EOF
-if { (eval echo configure:43616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:43620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     LIBS=$old_LIBS
@@ -43638,7 +43642,7 @@
 
 
     echo $ac_n "checking whether IMAP works""... $ac_c" 1>&6
-echo "configure:43642: checking whether IMAP works" >&5
+echo "configure:43646: checking whether IMAP works" >&5
     
   old_LIBS=$LIBS
   LIBS="$TST_LIBS $LIBS"
@@ -43646,7 +43650,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 43650 "configure"
+#line 43654 "configure"
 #include "confdefs.h"
 
     void mm_log(void){}
@@ -43671,7 +43675,7 @@
     }
   
 EOF
-if { (eval echo configure:43675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:43679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     LIBS=$old_LIBS
@@ -43701,7 +43705,7 @@
 
 
 echo $ac_n "checking for Informix support""... $ac_c" 1>&6
-echo "configure:43705: checking for Informix support" >&5
+echo "configure:43709: checking for Informix support" >&5
 # Check whether --with-informix or --without-informix was given.
 if test "${with_informix+set}" = set; then
   withval="$with_informix"
@@ -43923,7 +43927,7 @@
   esac
 
   echo $ac_n "checking Informix version""... $ac_c" 1>&6
-echo "configure:43927: checking Informix version" >&5
+echo "configure:43931: checking Informix version" >&5
   IFX_VERSION=`$INFORMIXDIR/bin/esql -V | grep "ESQL Version" | sed -ne '1 s/\(.*\)ESQL Version \([0-9]*\)\.\([0-9]*\).*/\2\3/p'`
   echo "$ac_t""$IFX_VERSION" 1>&6
   cat >> confdefs.h <<EOF
@@ -44301,7 +44305,7 @@
 
 
 echo $ac_n "checking for Ingres II support""... $ac_c" 1>&6
-echo "configure:44305: checking for Ingres II support" >&5
+echo "configure:44309: checking for Ingres II support" >&5
 # Check whether --with-ingres or --without-ingres was given.
 if test "${with_ingres+set}" = set; then
   withval="$with_ingres"
@@ -44821,7 +44825,7 @@
 
 
 echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
-echo "configure:44825: checking for InterBase support" >&5
+echo "configure:44829: checking for InterBase support" >&5
 # Check whether --with-interbase or --without-interbase was given.
 if test "${with_interbase+set}" = set; then
   withval="$with_interbase"
@@ -44954,7 +44958,7 @@
   done
 
   echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
-echo "configure:44958: checking for isc_detach_database in -lgds" >&5
+echo "configure:44962: 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
@@ -44962,7 +44966,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgds  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 44966 "configure"
+#line 44970 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -44973,7 +44977,7 @@
 isc_detach_database()
 ; return 0; }
 EOF
-if { (eval echo configure:44977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -45083,7 +45087,7 @@
   done
 
   echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
-echo "configure:45087: checking for isc_detach_database in -lib_util" >&5
+echo "configure:45091: 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
@@ -45091,7 +45095,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lib_util  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 45095 "configure"
+#line 45099 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -45102,7 +45106,7 @@
 isc_detach_database()
 ; return 0; }
 EOF
-if { (eval echo configure:45106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:45110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -45502,7 +45506,7 @@
 
 
 echo $ac_n "checking for IRCG support""... $ac_c" 1>&6
-echo "configure:45506: checking for IRCG support" >&5
+echo "configure:45510: checking for IRCG support" >&5
 # Check whether --with-ircg or --without-ircg was given.
 if test "${with_ircg+set}" = set; then
   withval="$with_ircg"
@@ -45995,7 +45999,7 @@
 
 
 echo $ac_n "checking for Java support""... $ac_c" 1>&6
-echo "configure:45999: checking for Java support" >&5
+echo "configure:46003: checking for Java support" >&5
 # Check whether --with-java or --without-java was given.
 if test "${with_java+set}" = set; then
   withval="$with_java"
@@ -46048,7 +46052,7 @@
   esac  
   
  echo $ac_n "checking Java Jar location""... $ac_c" 1>&6
-echo "configure:46052: checking Java Jar location" >&5
+echo "configure:46056: checking Java Jar location" >&5
   if test "$PHP_JAVA" = "yes"; then
     if JAVA_JAR=`which jar 2>/dev/null`; then
       JAVA_JAR="$JAVA_JAR cf"
@@ -46074,7 +46078,7 @@
 
   
  echo $ac_n "checking Java C location""... $ac_c" 1>&6
-echo "configure:46078: checking Java C location" >&5
+echo "configure:46082: checking Java C location" >&5
  if test "$PHP_JAVA" = "yes"; then
    JAVA_C=`which javac`
  else
@@ -46101,17 +46105,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:46105: checking for $ac_hdr" >&5
+echo "configure:46109: 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 46110 "configure"
+#line 46114 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:46115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:46119: \"$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*
@@ -46141,17 +46145,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:46145: checking for $ac_hdr" >&5
+echo "configure:46149: 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 46150 "configure"
+#line 46154 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:46155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:46159: \"$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*
@@ -46181,7 +46185,7 @@
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="-framework "JavaVM" $LDFLAGS"
         echo $ac_n "checking for JNI_CreateJavaVM in -lc""... $ac_c" 1>&6
-echo "configure:46185: checking for JNI_CreateJavaVM in -lc" >&5
+echo "configure:46189: checking for JNI_CreateJavaVM in -lc" >&5
 ac_lib_var=`echo c'_'JNI_CreateJavaVM | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -46189,7 +46193,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 46193 "configure"
+#line 46197 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -46200,7 +46204,7 @@
 JNI_CreateJavaVM()
 ; return 0; }
 EOF
-if { (eval echo configure:46204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:46208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -46253,7 +46257,7 @@
   else
     
  echo $ac_n "checking Checking for libjava""... $ac_c" 1>&6
-echo "configure:46257: checking Checking for libjava" >&5
+echo "configure:46261: checking Checking for libjava" >&5
  if test -d $PHP_JAVA/lib/kaffe; then
    
   if test "$PHP_JAVA/lib" != "/usr/lib"; then
@@ -46791,7 +46795,7 @@
 
 
 echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
-echo "configure:46795: checking for LDAP support" >&5
+echo "configure:46799: checking for LDAP support" >&5
 # Check whether --with-ldap or --without-ldap was given.
 if test "${with_ldap+set}" = set; then
   withval="$with_ldap"
@@ -49062,19 +49066,19 @@
   LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
 
   echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6
-echo "configure:49066: checking for 3 arg ldap_set_rebind_proc" >&5
+echo "configure:49070: checking for 3 arg ldap_set_rebind_proc" >&5
 if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 49071 "configure"
+#line 49075 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 int main() {
 ldap_set_rebind_proc(0,0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:49078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:49082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_3arg_setrebindproc=yes
 else
@@ -49098,12 +49102,12 @@
       for ac_func in ldap_parse_reference ldap_start_tls_s
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:49102: checking for $ac_func" >&5
+echo "configure:49106: 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 49107 "configure"
+#line 49111 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -49126,7 +49130,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:49130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:49134: \"$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
@@ -49174,7 +49178,7 @@
 
 
 echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
-echo "configure:49178: checking whether to enable multibyte string support" >&5
+echo "configure:49182: checking whether to enable multibyte string support" >&5
 # Check whether --enable-mbstring or --disable-mbstring was given.
 if test "${enable_mbstring+set}" = set; then
   enableval="$enable_mbstring"
@@ -49220,7 +49224,7 @@
 
 
 echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
-echo "configure:49224: checking whether to enable multibyte regex support" >&5
+echo "configure:49228: checking whether to enable multibyte regex support" >&5
 # Check whether --enable-mbregex or --disable-mbregex was given.
 if test "${enable_mbregex+set}" = set; then
   enableval="$enable_mbregex"
@@ -49245,7 +49249,7 @@
 
 
 echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
-echo "configure:49249: checking for external libmbfl" >&5
+echo "configure:49253: checking for external libmbfl" >&5
 # Check whether --with-libmbfl or --without-libmbfl was given.
 if test "${with_libmbfl+set}" = set; then
   withval="$with_libmbfl"
@@ -49525,7 +49529,7 @@
   done
 
   echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
-echo "configure:49529: checking for mbfl_buffer_converter_new in -lmbfl" >&5
+echo "configure:49533: checking for mbfl_buffer_converter_new in -lmbfl" >&5
 ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -49533,7 +49537,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmbfl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 49537 "configure"
+#line 49541 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -49544,7 +49548,7 @@
 mbfl_buffer_converter_new()
 ; return 0; }
 EOF
-if { (eval echo configure:49548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:49552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -49966,7 +49970,7 @@
 
 
 echo $ac_n "checking for MCAL support""... $ac_c" 1>&6
-echo "configure:49970: checking for MCAL support" >&5
+echo "configure:49974: checking for MCAL support" >&5
 # Check whether --with-mcal or --without-mcal was given.
 if test "${with_mcal+set}" = set; then
   withval="$with_mcal"
@@ -50375,7 +50379,7 @@
 
 
 echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
-echo "configure:50379: checking for mcrypt support" >&5
+echo "configure:50383: checking for mcrypt support" >&5
 # Check whether --with-mcrypt or --without-mcrypt was given.
 if test "${with_mcrypt+set}" = set; then
   withval="$with_mcrypt"
@@ -50508,7 +50512,7 @@
   done
 
   echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
-echo "configure:50512: checking for mcrypt_module_open in -lmcrypt" >&5
+echo "configure:50516: checking for mcrypt_module_open in -lmcrypt" >&5
 ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -50516,7 +50520,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 50520 "configure"
+#line 50524 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -50527,7 +50531,7 @@
 mcrypt_module_open()
 ; return 0; }
 EOF
-if { (eval echo configure:50531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:50535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -50655,7 +50659,7 @@
   done
 
   echo $ac_n "checking for mcrypt_generic_deinit in -lmcrypt""... $ac_c" 1>&6
-echo "configure:50659: checking for mcrypt_generic_deinit in -lmcrypt" >&5
+echo "configure:50663: checking for mcrypt_generic_deinit in -lmcrypt" >&5
 ac_lib_var=`echo mcrypt'_'mcrypt_generic_deinit | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -50663,7 +50667,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 50667 "configure"
+#line 50671 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -50674,7 +50678,7 @@
 mcrypt_generic_deinit()
 ; return 0; }
 EOF
-if { (eval echo configure:50678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:50682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -50800,7 +50804,7 @@
   done
 
   echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
-echo "configure:50804: checking for mcrypt_module_open in -lmcrypt" >&5
+echo "configure:50808: checking for mcrypt_module_open in -lmcrypt" >&5
 ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -50808,7 +50812,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 50812 "configure"
+#line 50816 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -50819,7 +50823,7 @@
 mcrypt_module_open()
 ; return 0; }
 EOF
-if { (eval echo configure:50823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:50827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -50924,7 +50928,7 @@
   done
 
   echo $ac_n "checking for mcrypt_generic_deinit in -lmcrypt""... $ac_c" 1>&6
-echo "configure:50928: checking for mcrypt_generic_deinit in -lmcrypt" >&5
+echo "configure:50932: checking for mcrypt_generic_deinit in -lmcrypt" >&5
 ac_lib_var=`echo mcrypt'_'mcrypt_generic_deinit | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -50932,7 +50936,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 50936 "configure"
+#line 50940 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -50943,7 +50947,7 @@
 mcrypt_generic_deinit()
 ; return 0; }
 EOF
-if { (eval echo configure:50947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:50951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -51068,7 +51072,7 @@
   done
 
   echo $ac_n "checking for init_mcrypt in -lmcrypt""... $ac_c" 1>&6
-echo "configure:51072: checking for init_mcrypt in -lmcrypt" >&5
+echo "configure:51076: checking for init_mcrypt in -lmcrypt" >&5
 ac_lib_var=`echo mcrypt'_'init_mcrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -51076,7 +51080,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 51080 "configure"
+#line 51084 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -51087,7 +51091,7 @@
 init_mcrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:51091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:51095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -51495,7 +51499,7 @@
 
 
 echo $ac_n "checking for MCVE support""... $ac_c" 1>&6
-echo "configure:51499: checking for MCVE support" >&5
+echo "configure:51503: checking for MCVE support" >&5
 # Check whether --with-mcve or --without-mcve was given.
 if test "${with_mcve+set}" = set; then
   withval="$with_mcve"
@@ -51541,7 +51545,7 @@
 
 
 echo $ac_n "checking OpenSSL dir for MCVE""... $ac_c" 1>&6
-echo "configure:51545: checking OpenSSL dir for MCVE" >&5
+echo "configure:51549: checking OpenSSL dir for MCVE" >&5
 # Check whether --with-openssl-dir or --without-openssl-dir was given.
 if test "${with_openssl_dir+set}" = set; then
   withval="$with_openssl_dir"
@@ -51567,7 +51571,7 @@
     # Extract the first word of "egrep", so it can be a program name with args.
 set dummy egrep; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:51571: checking for $ac_word" >&5
+echo "configure:51575: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_EGREP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -51612,7 +51616,7 @@
     # 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:51616: checking for $ac_word" >&5
+echo "configure:51620: 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
@@ -51800,9 +51804,9 @@
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
     echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:51804: checking for OpenSSL version" >&5
+echo "configure:51808: checking for OpenSSL version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 51806 "configure"
+#line 51810 "configure"
 #include "confdefs.h"
 
 #include <openssl/opensslv.h>
@@ -51940,7 +51944,7 @@
   done
 
   echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:51944: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:51948: checking for CRYPTO_free in -lcrypto" >&5
 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -51948,7 +51952,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 51952 "configure"
+#line 51956 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -51959,7 +51963,7 @@
 CRYPTO_free()
 ; return 0; }
 EOF
-if { (eval echo configure:51963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:51967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -52099,7 +52103,7 @@
   done
 
   echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:52103: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:52107: checking for SSL_CTX_set_ssl_version in -lssl" >&5
 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -52107,7 +52111,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lssl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 52111 "configure"
+#line 52115 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -52118,7 +52122,7 @@
 SSL_CTX_set_ssl_version()
 ; return 0; }
 EOF
-if { (eval echo configure:52122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:52126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -52250,9 +52254,9 @@
 
     saved_CPPFLAGS=$CPPFLAGS
   echo $ac_n "checking for correct libmcve version""... $ac_c" 1>&6
-echo "configure:52254: checking for correct libmcve version" >&5
+echo "configure:52258: checking for correct libmcve version" >&5
   cat > conftest.$ac_ext <<EOF
-#line 52256 "configure"
+#line 52260 "configure"
 #include "confdefs.h"
 
 #include "$MCVE_DIR/include/mcve.h"
@@ -52277,9 +52281,9 @@
 
 
   echo $ac_n "checking for correct libmonetra 4.2 or higher""... $ac_c" 1>&6
-echo "configure:52281: checking for correct libmonetra 4.2 or higher" >&5
+echo "configure:52285: checking for correct libmonetra 4.2 or higher" >&5
   cat > conftest.$ac_ext <<EOF
-#line 52283 "configure"
+#line 52287 "configure"
 #include "confdefs.h"
 
 #include "$MCVE_DIR/include/mcve.h"
@@ -52520,7 +52524,7 @@
   done
 
   echo $ac_n "checking for MCVE_DestroyEngine in -lmcve""... $ac_c" 1>&6
-echo "configure:52524: checking for MCVE_DestroyEngine in -lmcve" >&5
+echo "configure:52528: checking for MCVE_DestroyEngine in -lmcve" >&5
 ac_lib_var=`echo mcve'_'MCVE_DestroyEngine | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -52528,7 +52532,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmcve  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 52532 "configure"
+#line 52536 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -52539,7 +52543,7 @@
 MCVE_DestroyEngine()
 ; return 0; }
 EOF
-if { (eval echo configure:52543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:52547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -52656,7 +52660,7 @@
   done
 
   echo $ac_n "checking for M_DestroyEngine in -lmcve""... $ac_c" 1>&6
-echo "configure:52660: checking for M_DestroyEngine in -lmcve" >&5
+echo "configure:52664: checking for M_DestroyEngine in -lmcve" >&5
 ac_lib_var=`echo mcve'_'M_DestroyEngine | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -52664,7 +52668,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmcve  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 52668 "configure"
+#line 52672 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -52675,7 +52679,7 @@
 M_DestroyEngine()
 ; return 0; }
 EOF
-if { (eval echo configure:52679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:52683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -52950,7 +52954,7 @@
 
 
 echo $ac_n "checking for mhash support""... $ac_c" 1>&6
-echo "configure:52954: checking for mhash support" >&5
+echo "configure:52958: checking for mhash support" >&5
 # Check whether --with-mhash or --without-mhash was given.
 if test "${with_mhash+set}" = set; then
   withval="$with_mhash"
@@ -53364,7 +53368,7 @@
 
 
 echo $ac_n "checking whether to include mime_magic support""... $ac_c" 1>&6
-echo "configure:53368: checking whether to include mime_magic support" >&5
+echo "configure:53372: checking whether to include mime_magic support" >&5
 # Check whether --with-mime-magic or --without-mime-magic was given.
 if test "${with_mime_magic+set}" = set; then
   withval="$with_mime_magic"
@@ -53661,7 +53665,7 @@
 
 
 echo $ac_n "checking for MING support""... $ac_c" 1>&6
-echo "configure:53665: checking for MING support" >&5
+echo "configure:53669: checking for MING support" >&5
 # Check whether --with-ming or --without-ming was given.
 if test "${with_ming+set}" = set; then
   withval="$with_ming"
@@ -53706,7 +53710,7 @@
 
 if test "$PHP_MING" != "no"; then
   echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:53710: checking for sin in -lm" >&5
+echo "configure:53714: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -53714,7 +53718,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 53718 "configure"
+#line 53722 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -53725,7 +53729,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:53729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:53733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -53854,7 +53858,7 @@
   done
 
   echo $ac_n "checking for Ming_useSWFVersion in -lming""... $ac_c" 1>&6
-echo "configure:53858: checking for Ming_useSWFVersion in -lming" >&5
+echo "configure:53862: checking for Ming_useSWFVersion in -lming" >&5
 ac_lib_var=`echo ming'_'Ming_useSWFVersion | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -53862,7 +53866,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lming  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 53866 "configure"
+#line 53870 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -53873,7 +53877,7 @@
 Ming_useSWFVersion()
 ; return 0; }
 EOF
-if { (eval echo configure:53877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:53881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -54040,14 +54044,14 @@
 
 
   echo $ac_n "checking for destroySWFBlock""... $ac_c" 1>&6
-echo "configure:54044: checking for destroySWFBlock" >&5
+echo "configure:54048: checking for destroySWFBlock" >&5
   if test "$cross_compiling" = yes; then
   
     echo "$ac_t""unknown" 1>&6
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 54051 "configure"
+#line 54055 "configure"
 #include "confdefs.h"
 
 #include "ming.h"
@@ -54059,7 +54063,7 @@
 }
   
 EOF
-if { (eval echo configure:54063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:54067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     echo "$ac_t""missing" 1>&6
@@ -54083,7 +54087,7 @@
     old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$MING_INC_DIR
   cat > conftest.$ac_ext <<EOF
-#line 54087 "configure"
+#line 54091 "configure"
 #include "confdefs.h"
 
 #include <ming.h>
@@ -54340,7 +54344,7 @@
 
 
 echo $ac_n "checking for mnoGoSearch support""... $ac_c" 1>&6
-echo "configure:54344: checking for mnoGoSearch support" >&5
+echo "configure:54348: checking for mnoGoSearch support" >&5
 # Check whether --with-mnogosearch or --without-mnogosearch was given.
 if test "${with_mnogosearch+set}" = set; then
   withval="$with_mnogosearch"
@@ -54396,7 +54400,7 @@
     fi
     
     echo $ac_n "checking for mnoGoSearch version""... $ac_c" 1>&6
-echo "configure:54400: checking for mnoGoSearch version" >&5    
+echo "configure:54404: checking for mnoGoSearch version" >&5    
     
     if test -x "$MNOGOSEARCH_BINDIR/udm-config"; then
        MNOGOSEARCH_VERSION=`$MNOGOSEARCH_BINDIR/udm-config --version`
@@ -54758,7 +54762,7 @@
 
 
 echo $ac_n "checking for msession support""... $ac_c" 1>&6
-echo "configure:54762: checking for msession support" >&5
+echo "configure:54766: checking for msession support" >&5
 # Check whether --with-msession or --without-msession was given.
 if test "${with_msession+set}" = set; then
   withval="$with_msession"
@@ -54806,7 +54810,7 @@
                PHOENIX_DIR=$PHP_MSESSION
        else
                echo $ac_n "checking for msession in default path""... $ac_c" 1>&6
-echo "configure:54810: checking for msession in default path" >&5
+echo "configure:54814: checking for msession in default path" >&5
                for i in /usr/local/phoenix /usr/local /usr; do
                        if test -r $i/lib/libphoenix.a; then
                                PHOENIX_DIR=$i
@@ -55156,7 +55160,7 @@
 
 
 echo $ac_n "checking for mSQL support""... $ac_c" 1>&6
-echo "configure:55160: checking for mSQL support" >&5
+echo "configure:55164: checking for mSQL support" >&5
 # Check whether --with-msql or --without-msql was given.
 if test "${with_msql+set}" = set; then
   withval="$with_msql"
@@ -55564,11 +55568,11 @@
 
     
   echo $ac_n "checking mSQL version""... $ac_c" 1>&6
-echo "configure:55568: checking mSQL version" >&5
+echo "configure:55572: checking mSQL version" >&5
   ac_php_oldcppflags=$CPPFLAGS
   CPPFLAGS="$INCLUDES $CPPFLAGS"
   cat > conftest.$ac_ext <<EOF
-#line 55572 "configure"
+#line 55576 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include "msql.h"
@@ -55576,7 +55580,7 @@
 int i = IDX_TYPE
 ; return 0; }
 EOF
-if { (eval echo configure:55580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:55584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     cat >> confdefs.h <<\EOF
@@ -55607,7 +55611,7 @@
 
 
 echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
-echo "configure:55611: checking for MSSQL support via FreeTDS" >&5
+echo "configure:55615: checking for MSSQL support via FreeTDS" >&5
 # Check whether --with-mssql or --without-mssql was given.
 if test "${with_mssql+set}" = set; then
   withval="$with_mssql"
@@ -56032,7 +56036,7 @@
 
 
   echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:56036: checking for dnet_addr in -ldnet_stub" >&5
+echo "configure:56040: 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
@@ -56040,7 +56044,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 56044 "configure"
+#line 56048 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -56051,7 +56055,7 @@
 dnet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:56055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:56059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -56233,7 +56237,7 @@
 
 
 echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
-echo "configure:56237: checking for MySQL support" >&5
+echo "configure:56241: checking for MySQL support" >&5
 # Check whether --with-mysql or --without-mysql was given.
 if test "${with_mysql+set}" = set; then
   withval="$with_mysql"
@@ -56279,7 +56283,7 @@
 
 
 echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
-echo "configure:56283: checking for specified location of the MySQL UNIX socket" >&5
+echo "configure:56287: 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"
@@ -56305,7 +56309,7 @@
   
 
 echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:56309: checking for the location of libz" >&5
+echo "configure:56313: 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"
@@ -56336,7 +56340,7 @@
 
 
   echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
-echo "configure:56340: checking for MySQL UNIX socket location" >&5
+echo "configure:56344: 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
@@ -56383,7 +56387,7 @@
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:56387: checking for $ac_word" >&5
+echo "configure:56391: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -56411,21 +56415,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:56415: checking for inline" >&5
+echo "configure:56419: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 56422 "configure"
+#line 56426 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:56429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:56433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -56451,12 +56455,12 @@
 esac
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:56455: checking return type of signal handlers" >&5
+echo "configure:56459: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 56460 "configure"
+#line 56464 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -56473,7 +56477,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:56477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:56481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -56504,12 +56508,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:56508: checking for ANSI C header files" >&5
+echo "configure:56512: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 56513 "configure"
+#line 56517 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -56517,7 +56521,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:56521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:56525: \"$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*
@@ -56534,7 +56538,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 56538 "configure"
+#line 56542 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -56552,7 +56556,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 56556 "configure"
+#line 56560 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -56573,7 +56577,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 56577 "configure"
+#line 56581 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -56584,7 +56588,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:56588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:56592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -56617,17 +56621,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:56621: checking for $ac_hdr" >&5
+echo "configure:56625: 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 56626 "configure"
+#line 56630 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:56631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:56635: \"$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*
@@ -56659,7 +56663,7 @@
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:56663: checking size of char" >&5
+echo "configure:56667: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -56667,9 +56671,10 @@
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 56671 "configure"
+#line 56675 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -56678,7 +56683,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:56682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:56687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
 else
@@ -56699,7 +56704,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:56703: checking size of int" >&5
+echo "configure:56708: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -56707,9 +56712,10 @@
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 56711 "configure"
+#line 56716 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -56718,7 +56724,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:56722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:56728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -56738,7 +56744,7 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:56742: checking size of long" >&5
+echo "configure:56748: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -56746,9 +56752,10 @@
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 56750 "configure"
+#line 56756 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -56757,7 +56764,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:56761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:56768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -56777,7 +56784,7 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:56781: checking size of long long" >&5
+echo "configure:56788: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -56785,9 +56792,10 @@
   ac_cv_sizeof_long_long=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 56789 "configure"
+#line 56796 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -56796,7 +56804,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:56800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:56808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -56816,12 +56824,12 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:56820: checking for size_t" >&5
+echo "configure:56828: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 56825 "configure"
+#line 56833 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -56849,12 +56857,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:56853: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:56861: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 56858 "configure"
+#line 56866 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -56863,7 +56871,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:56867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:56875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -56884,12 +56892,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:56888: checking for uid_t in sys/types.h" >&5
+echo "configure:56896: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 56893 "configure"
+#line 56901 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -56919,7 +56927,7 @@
 
 
 echo $ac_n "checking for type ulong""... $ac_c" 1>&6
-echo "configure:56923: checking for type ulong" >&5
+echo "configure:56931: checking for type ulong" >&5
 if eval "test \"`echo '$''{'ac_cv_ulong'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -56927,7 +56935,7 @@
   ac_cv_ulong=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 56931 "configure"
+#line 56939 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -56938,7 +56946,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:56942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:56950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_ulong=yes
 else
@@ -56962,7 +56970,7 @@
 fi
 
 echo $ac_n "checking for type uchar""... $ac_c" 1>&6
-echo "configure:56966: checking for type uchar" >&5
+echo "configure:56974: checking for type uchar" >&5
 if eval "test \"`echo '$''{'ac_cv_uchar'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -56970,7 +56978,7 @@
   ac_cv_uchar=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 56974 "configure"
+#line 56982 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -56981,7 +56989,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:56985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:56993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_uchar=yes
 else
@@ -57005,7 +57013,7 @@
 fi
 
 echo $ac_n "checking for type uint""... $ac_c" 1>&6
-echo "configure:57009: checking for type uint" >&5
+echo "configure:57017: checking for type uint" >&5
 if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -57013,7 +57021,7 @@
   ac_cv_uint=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 57017 "configure"
+#line 57025 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -57024,7 +57032,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:57028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:57036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_uint=yes
 else
@@ -57048,7 +57056,7 @@
 fi
 
 echo $ac_n "checking for type ushort""... $ac_c" 1>&6
-echo "configure:57052: checking for type ushort" >&5
+echo "configure:57060: checking for type ushort" >&5
 if eval "test \"`echo '$''{'ac_cv_ushort'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -57056,7 +57064,7 @@
   ac_cv_ushort=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 57060 "configure"
+#line 57068 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -57067,7 +57075,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:57071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:57079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_ushort=yes
 else
@@ -57091,7 +57099,7 @@
 fi
 
 echo $ac_n "checking for int8""... $ac_c" 1>&6
-echo "configure:57095: checking for int8" >&5
+echo "configure:57103: checking for int8" >&5
 if eval "test \"`echo '$''{'ac_cv_int8'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -57099,7 +57107,7 @@
   ac_cv_int8=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 57103 "configure"
+#line 57111 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -57121,7 +57129,7 @@
 }
 
 EOF
-if { (eval echo configure:57125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:57133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_int8=yes
 else
@@ -57147,7 +57155,7 @@
 
 ac_save_CXXFLAGS="$CXXFLAGS"
 echo $ac_n "checking base type of last arg to accept""... $ac_c" 1>&6
-echo "configure:57151: checking base type of last arg to accept" >&5
+echo "configure:57159: checking base type of last arg to accept" >&5
 if eval "test \"`echo '$''{'mysql_cv_btype_last_arg_accept'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -57165,7 +57173,7 @@
 fi
 mysql_cv_btype_last_arg_accept=none
 cat > conftest.$ac_ext <<EOF
-#line 57169 "configure"
+#line 57177 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <sys/types.h>
@@ -57175,7 +57183,7 @@
 int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0);
 ; return 0; }
 EOF
-if { (eval echo configure:57179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:57187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_btype_last_arg_accept=socklen_t
 else
@@ -57185,7 +57193,7 @@
 rm -f conftest*
 if test $mysql_cv_btype_last_arg_accept = none; then
 cat > conftest.$ac_ext <<EOF
-#line 57189 "configure"
+#line 57197 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <sys/types.h>
@@ -57195,7 +57203,7 @@
 int a = accept(1, (struct sockaddr *) 0, (size_t *) 0);
 ; return 0; }
 EOF
-if { (eval echo configure:57199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:57207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_btype_last_arg_accept=size_t
 else
@@ -57224,12 +57232,12 @@
 CXXFLAGS="$ac_save_CXXFLAGS"
 
 echo $ac_n "checking return type of qsort""... $ac_c" 1>&6
-echo "configure:57228: checking return type of qsort" >&5
+echo "configure:57236: checking return type of qsort" >&5
 if eval "test \"`echo '$''{'mysql_cv_type_qsort'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 57233 "configure"
+#line 57241 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #ifdef __cplusplus
@@ -57242,7 +57250,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:57246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:57254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_type_qsort=void
 else
@@ -57292,12 +57300,12 @@
  crypt dlopen dlerror fchmod getpass getpassphrase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:57296: checking for $ac_func" >&5
+echo "configure:57304: 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 57301 "configure"
+#line 57309 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -57320,7 +57328,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:57324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:57332: \"$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
@@ -57349,12 +57357,12 @@
 for ac_func in strtok_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:57353: checking for $ac_func" >&5
+echo "configure:57361: 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 57358 "configure"
+#line 57366 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -57377,7 +57385,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:57381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:57389: \"$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
@@ -57406,7 +57414,7 @@
 # Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
 ac_save_CXXFLAGS="$CXXFLAGS"
 echo $ac_n "checking style of gethostname_r routines""... $ac_c" 1>&6
-echo "configure:57410: checking style of gethostname_r routines" >&5
+echo "configure:57418: checking style of gethostname_r routines" >&5
 if eval "test \"`echo '$''{'mysql_cv_gethostname_style'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -57423,7 +57431,7 @@
   CXXFLAGS="$CXXFLAGS -Werror"
 fi
 cat > conftest.$ac_ext <<EOF
-#line 57427 "configure"
+#line 57435 "configure"
 #include "confdefs.h"
 #if !defined(SCO) && !defined(__osf__)
 #define _REENTRANT
@@ -57441,7 +57449,7 @@
   (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);
 ; return 0; }
 EOF
-if { (eval echo configure:57445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:57453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_gethostname_style=glibc2
 else
@@ -57473,7 +57481,7 @@
 # Check 3rd argument of getthostbyname_r
 ac_save_CXXFLAGS="$CXXFLAGS"
 echo $ac_n "checking 3 argument to gethostname_r routines""... $ac_c" 1>&6
-echo "configure:57477: checking 3 argument to gethostname_r routines" >&5
+echo "configure:57485: checking 3 argument to gethostname_r routines" >&5
 if eval "test \"`echo '$''{'mysql_cv_gethostname_arg'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -57490,7 +57498,7 @@
   CXXFLAGS="$CXXFLAGS -Werror"
 fi
 cat > conftest.$ac_ext <<EOF
-#line 57494 "configure"
+#line 57502 "configure"
 #include "confdefs.h"
 #if !defined(SCO) && !defined(__osf__)
 #define _REENTRANT
@@ -57507,7 +57515,7 @@
  skr = gethostbyname_r((const char *) 0, (struct hostent*) 0, (hostent_data*) 0);
 ; return 0; }
 EOF
-if { (eval echo configure:57511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:57519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_gethostname_arg=hostent_data
 else
@@ -57540,12 +57548,12 @@
 
   # Check definition of pthread_getspecific
   echo $ac_n "checking "args to pthread_getspecific"""... $ac_c" 1>&6
-echo "configure:57544: checking "args to pthread_getspecific"" >&5
+echo "configure:57552: checking "args to pthread_getspecific"" >&5
 if eval "test \"`echo '$''{'mysql_cv_getspecific_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 57549 "configure"
+#line 57557 "configure"
 #include "confdefs.h"
 #ifndef SCO
 #define _REENTRANT
@@ -57557,7 +57565,7 @@
 pthread_getspecific((pthread_key_t) NULL); 
 ; return 0; }
 EOF
-if { (eval echo configure:57561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:57569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_getspecific_args=POSIX
 else
@@ -57581,12 +57589,12 @@
 
   # Check definition of pthread_mutex_init
   echo $ac_n "checking "args to pthread_mutex_init"""... $ac_c" 1>&6
-echo "configure:57585: checking "args to pthread_mutex_init"" >&5
+echo "configure:57593: checking "args to pthread_mutex_init"" >&5
 if eval "test \"`echo '$''{'mysql_cv_mutex_init_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 57590 "configure"
+#line 57598 "configure"
 #include "confdefs.h"
 #ifndef SCO
 #define _REENTRANT
@@ -57600,7 +57608,7 @@
   pthread_mutex_init(&mp,&attr); 
 ; return 0; }
 EOF
-if { (eval echo configure:57604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:57612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_mutex_init_args=POSIX
 else
@@ -57624,12 +57632,12 @@
 
 # Check definition of readdir_r
 echo $ac_n "checking "args to readdir_r"""... $ac_c" 1>&6
-echo "configure:57628: checking "args to readdir_r"" >&5
+echo "configure:57636: checking "args to readdir_r"" >&5
 if eval "test \"`echo '$''{'mysql_cv_readdir_r'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 57633 "configure"
+#line 57641 "configure"
 #include "confdefs.h"
 #ifndef SCO
 #define _REENTRANT
@@ -57642,7 +57650,7 @@
 readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL); 
 ; return 0; }
 EOF
-if { (eval echo configure:57646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:57654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   mysql_cv_readdir_r=POSIX
 else
@@ -57666,12 +57674,12 @@
 
 # Check definition av posix sigwait()
 echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6
-echo "configure:57670: checking "style of sigwait"" >&5
+echo "configure:57678: checking "style of sigwait"" >&5
 if eval "test \"`echo '$''{'mysql_cv_sigwait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 57675 "configure"
+#line 57683 "configure"
 #include "confdefs.h"
 #ifndef SCO
 #define _REENTRANT
@@ -57687,7 +57695,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:57691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:57699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   mysql_cv_sigwait=POSIX
 else
@@ -57713,12 +57721,12 @@
 unset mysql_cv_sigwait
 # Check definition av posix sigwait()
 echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6
-echo "configure:57717: checking "style of sigwait"" >&5
+echo "configure:57725: checking "style of sigwait"" >&5
 if eval "test \"`echo '$''{'mysql_cv_sigwait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 57722 "configure"
+#line 57730 "configure"
 #include "confdefs.h"
 #ifndef SCO
 #define _REENTRANT
@@ -57732,7 +57740,7 @@
 sigwait(&set);
 ; return 0; }
 EOF
-if { (eval echo configure:57736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:57744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   mysql_cv_sigwait=NONPOSIX
 else
@@ -58000,7 +58008,7 @@
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:58004: checking size of char" >&5
+echo "configure:58012: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58008,9 +58016,10 @@
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 58012 "configure"
+#line 58020 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -58019,7 +58028,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:58023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:58032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
 else
@@ -58040,7 +58049,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:58044: checking size of int" >&5
+echo "configure:58053: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58048,9 +58057,10 @@
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 58052 "configure"
+#line 58061 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -58059,7 +58069,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:58063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:58073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -58079,7 +58089,7 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:58083: checking size of long" >&5
+echo "configure:58093: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58087,9 +58097,10 @@
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 58091 "configure"
+#line 58101 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -58098,7 +58109,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:58102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:58113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -58118,7 +58129,7 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:58122: checking size of long long" >&5
+echo "configure:58133: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58126,9 +58137,10 @@
   ac_cv_sizeof_long_long=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 58130 "configure"
+#line 58141 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -58137,7 +58149,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:58141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:58153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -58157,12 +58169,12 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:58161: checking for size_t" >&5
+echo "configure:58173: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 58166 "configure"
+#line 58178 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -58190,12 +58202,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:58194: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:58206: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 58199 "configure"
+#line 58211 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -58204,7 +58216,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:58208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:58220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -58225,12 +58237,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:58229: checking for uid_t in sys/types.h" >&5
+echo "configure:58241: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 58234 "configure"
+#line 58246 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -58260,7 +58272,7 @@
 
 
 echo $ac_n "checking for type ulong""... $ac_c" 1>&6
-echo "configure:58264: checking for type ulong" >&5
+echo "configure:58276: checking for type ulong" >&5
 if eval "test \"`echo '$''{'ac_cv_ulong'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58268,7 +58280,7 @@
   ac_cv_ulong=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 58272 "configure"
+#line 58284 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -58279,7 +58291,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:58283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:58295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_ulong=yes
 else
@@ -58303,7 +58315,7 @@
 fi
 
 echo $ac_n "checking for type uchar""... $ac_c" 1>&6
-echo "configure:58307: checking for type uchar" >&5
+echo "configure:58319: checking for type uchar" >&5
 if eval "test \"`echo '$''{'ac_cv_uchar'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58311,7 +58323,7 @@
   ac_cv_uchar=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 58315 "configure"
+#line 58327 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -58322,7 +58334,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:58326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:58338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_uchar=yes
 else
@@ -58346,7 +58358,7 @@
 fi
 
 echo $ac_n "checking for type uint""... $ac_c" 1>&6
-echo "configure:58350: checking for type uint" >&5
+echo "configure:58362: checking for type uint" >&5
 if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58354,7 +58366,7 @@
   ac_cv_uint=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 58358 "configure"
+#line 58370 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -58365,7 +58377,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:58369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:58381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_uint=yes
 else
@@ -58389,7 +58401,7 @@
 fi
 
 echo $ac_n "checking for type ushort""... $ac_c" 1>&6
-echo "configure:58393: checking for type ushort" >&5
+echo "configure:58405: checking for type ushort" >&5
 if eval "test \"`echo '$''{'ac_cv_ushort'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58397,7 +58409,7 @@
   ac_cv_ushort=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 58401 "configure"
+#line 58413 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -58408,7 +58420,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:58412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:58424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_ushort=yes
 else
@@ -58432,7 +58444,7 @@
 fi
 
 echo $ac_n "checking for int8""... $ac_c" 1>&6
-echo "configure:58436: checking for int8" >&5
+echo "configure:58448: checking for int8" >&5
 if eval "test \"`echo '$''{'ac_cv_int8'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58440,7 +58452,7 @@
   ac_cv_int8=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 58444 "configure"
+#line 58456 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -58462,7 +58474,7 @@
 }
 
 EOF
-if { (eval echo configure:58466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:58478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_int8=yes
 else
@@ -58488,7 +58500,7 @@
 
 ac_save_CXXFLAGS="$CXXFLAGS"
 echo $ac_n "checking base type of last arg to accept""... $ac_c" 1>&6
-echo "configure:58492: checking base type of last arg to accept" >&5
+echo "configure:58504: checking base type of last arg to accept" >&5
 if eval "test \"`echo '$''{'mysql_cv_btype_last_arg_accept'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -58506,7 +58518,7 @@
 fi
 mysql_cv_btype_last_arg_accept=none
 cat > conftest.$ac_ext <<EOF
-#line 58510 "configure"
+#line 58522 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <sys/types.h>
@@ -58516,7 +58528,7 @@
 int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0);
 ; return 0; }
 EOF
-if { (eval echo configure:58520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:58532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_btype_last_arg_accept=socklen_t
 else
@@ -58526,7 +58538,7 @@
 rm -f conftest*
 if test $mysql_cv_btype_last_arg_accept = none; then
 cat > conftest.$ac_ext <<EOF
-#line 58530 "configure"
+#line 58542 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <sys/types.h>
@@ -58536,7 +58548,7 @@
 int a = accept(1, (struct sockaddr *) 0, (size_t *) 0);
 ; return 0; }
 EOF
-if { (eval echo configure:58540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:58552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_btype_last_arg_accept=size_t
 else
@@ -58565,12 +58577,12 @@
 CXXFLAGS="$ac_save_CXXFLAGS"
 
 echo $ac_n "checking return type of qsort""... $ac_c" 1>&6
-echo "configure:58569: checking return type of qsort" >&5
+echo "configure:58581: checking return type of qsort" >&5
 if eval "test \"`echo '$''{'mysql_cv_type_qsort'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 58574 "configure"
+#line 58586 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #ifdef __cplusplus
@@ -58583,7 +58595,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:58587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:58599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   mysql_cv_type_qsort=void
 else
@@ -58947,7 +58959,7 @@
   done
 
   echo $ac_n "checking for mysql_close in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:58951: checking for mysql_close in -lmysqlclient" >&5
+echo "configure:58963: checking for mysql_close in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'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
@@ -58955,7 +58967,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 58959 "configure"
+#line 58971 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -58966,7 +58978,7 @@
 mysql_close()
 ; return 0; }
 EOF
-if { (eval echo configure:58970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:58982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -59171,7 +59183,7 @@
   done
 
   echo $ac_n "checking for mysql_error in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:59175: checking for mysql_error in -lmysqlclient" >&5
+echo "configure:59187: checking for mysql_error in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'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
@@ -59179,7 +59191,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 59183 "configure"
+#line 59195 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -59190,7 +59202,7 @@
 mysql_error()
 ; return 0; }
 EOF
-if { (eval echo configure:59194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -59328,7 +59340,7 @@
   done
 
   echo $ac_n "checking for mysql_errno in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:59332: checking for mysql_errno in -lmysqlclient" >&5
+echo "configure:59344: checking for mysql_errno in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'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
@@ -59336,7 +59348,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 59340 "configure"
+#line 59352 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -59347,7 +59359,7 @@
 mysql_errno()
 ; return 0; }
 EOF
-if { (eval echo configure:59351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -59547,7 +59559,7 @@
 
 
 echo $ac_n "checking for ncurses support""... $ac_c" 1>&6
-echo "configure:59551: checking for ncurses support" >&5
+echo "configure:59563: checking for ncurses support" >&5
 # Check whether --with-ncurses or --without-ncurses was given.
 if test "${with_ncurses+set}" = set; then
   withval="$with_ncurses"
@@ -59737,7 +59749,7 @@
   done
 
   echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
-echo "configure:59741: checking for $LIBSYMBOL in -l$LIBNAME" >&5
+echo "configure:59753: 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
@@ -59745,7 +59757,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$LIBNAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 59749 "configure"
+#line 59761 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -59756,7 +59768,7 @@
 $LIBSYMBOL()
 ; return 0; }
 EOF
-if { (eval echo configure:59760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -59957,7 +59969,7 @@
   done
 
   echo $ac_n "checking for new_panel in -lpanel""... $ac_c" 1>&6
-echo "configure:59961: checking for new_panel in -lpanel" >&5
+echo "configure:59973: checking for new_panel in -lpanel" >&5
 ac_lib_var=`echo panel'_'new_panel | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -59965,7 +59977,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpanel  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 59969 "configure"
+#line 59981 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -59976,7 +59988,7 @@
 new_panel()
 ; return 0; }
 EOF
-if { (eval echo configure:59980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -60123,7 +60135,7 @@
 
  
    echo $ac_n "checking for color_set in -l$LIBNAME""... $ac_c" 1>&6
-echo "configure:60127: checking for color_set in -l$LIBNAME" >&5
+echo "configure:60139: checking for color_set in -l$LIBNAME" >&5
 ac_lib_var=`echo $LIBNAME'_'color_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
@@ -60131,7 +60143,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$LIBNAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 60135 "configure"
+#line 60147 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -60142,7 +60154,7 @@
 color_set()
 ; return 0; }
 EOF
-if { (eval echo configure:60146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:60158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -60166,7 +60178,7 @@
 fi
 
    echo $ac_n "checking for slk_color in -l$LIBNAME""... $ac_c" 1>&6
-echo "configure:60170: checking for slk_color in -l$LIBNAME" >&5
+echo "configure:60182: checking for slk_color in -l$LIBNAME" >&5
 ac_lib_var=`echo $LIBNAME'_'slk_color | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -60174,7 +60186,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$LIBNAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 60178 "configure"
+#line 60190 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -60185,7 +60197,7 @@
 slk_color()
 ; return 0; }
 EOF
-if { (eval echo configure:60189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:60201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -60209,7 +60221,7 @@
 fi
 
    echo $ac_n "checking for assume_default_colors in -l$LIBNAME""... $ac_c" 1>&6
-echo "configure:60213: checking for assume_default_colors in -l$LIBNAME" >&5
+echo "configure:60225: checking for assume_default_colors in -l$LIBNAME" >&5
 ac_lib_var=`echo $LIBNAME'_'assume_default_colors | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -60217,7 +60229,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$LIBNAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 60221 "configure"
+#line 60233 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -60228,7 +60240,7 @@
 assume_default_colors()
 ; return 0; }
 EOF
-if { (eval echo configure:60232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:60244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -60252,7 +60264,7 @@
 fi
 
    echo $ac_n "checking for use_extended_names in -l$LIBNAME""... $ac_c" 1>&6
-echo "configure:60256: checking for use_extended_names in -l$LIBNAME" >&5
+echo "configure:60268: checking for use_extended_names in -l$LIBNAME" >&5
 ac_lib_var=`echo $LIBNAME'_'use_extended_names | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -60260,7 +60272,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$LIBNAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 60264 "configure"
+#line 60276 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -60271,7 +60283,7 @@
 use_extended_names()
 ; return 0; }
 EOF
-if { (eval echo configure:60275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:60287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -60532,7 +60544,7 @@
 
 
 echo $ac_n "checking for Oracle (OCI8) support using ORACLE_HOME installation""... $ac_c" 1>&6
-echo "configure:60536: checking for Oracle (OCI8) support using ORACLE_HOME installation" >&5
+echo "configure:60548: checking for Oracle (OCI8) support using ORACLE_HOME installation" >&5
 # Check whether --with-oci8 or --without-oci8 was given.
 if test "${with_oci8+set}" = set; then
   withval="$with_oci8"
@@ -60579,7 +60591,7 @@
   
 
 echo $ac_n "checking for Oracle (OCI8) support using Oracle Instant Client""... $ac_c" 1>&6
-echo "configure:60583: checking for Oracle (OCI8) support using Oracle Instant Client" >&5
+echo "configure:60595: checking for Oracle (OCI8) support using Oracle Instant Client" >&5
 # Check whether --with-oci8-instant-client or --without-oci8-instant-client was given.
 if test "${with_oci8_instant_client+set}" = set; then
   withval="$with_oci8_instant_client"
@@ -60632,7 +60644,7 @@
   fi
 
   echo $ac_n "checking Oracle Install Directory""... $ac_c" 1>&6
-echo "configure:60636: checking Oracle Install Directory" >&5
+echo "configure:60648: checking Oracle Install Directory" >&5
   if test "$PHP_OCI8" = "yes"; then
     OCI8_DIR=$ORACLE_HOME
   else
@@ -60927,7 +60939,7 @@
 
   
   echo $ac_n "checking Oracle version""... $ac_c" 1>&6
-echo "configure:60931: checking Oracle version" >&5
+echo "configure:60943: checking Oracle version" >&5
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
     OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
     test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
@@ -61404,7 +61416,7 @@
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=$OCI8_INCLUDES
   cat > conftest.$ac_ext <<EOF
-#line 61408 "configure"
+#line 61420 "configure"
 #include "confdefs.h"
 
 #include <oci.h>
@@ -61581,7 +61593,7 @@
   done
 
   echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
-echo "configure:61585: checking for OCIEnvNlsCreate in -lclntsh" >&5
+echo "configure:61597: 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
@@ -61589,7 +61601,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 61593 "configure"
+#line 61605 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -61600,7 +61612,7 @@
 OCIEnvNlsCreate()
 ; return 0; }
 EOF
-if { (eval echo configure:61604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:61616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -61700,7 +61712,7 @@
   done
 
   echo $ac_n "checking for OCINlsCharSetNameToId in -lclntsh""... $ac_c" 1>&6
-echo "configure:61704: checking for OCINlsCharSetNameToId in -lclntsh" >&5
+echo "configure:61716: checking for OCINlsCharSetNameToId in -lclntsh" >&5
 ac_lib_var=`echo clntsh'_'OCINlsCharSetNameToId | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -61708,7 +61720,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 61712 "configure"
+#line 61724 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -61719,7 +61731,7 @@
 OCINlsCharSetNameToId()
 ; return 0; }
 EOF
-if { (eval echo configure:61723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:61735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -61934,7 +61946,7 @@
   done
 
   echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
-echo "configure:61938: checking for OCILobIsTemporary in -lclntsh" >&5
+echo "configure:61950: 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
@@ -61942,7 +61954,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 61946 "configure"
+#line 61958 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -61953,7 +61965,7 @@
 OCILobIsTemporary()
 ; return 0; }
 EOF
-if { (eval echo configure:61957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:61969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -62066,7 +62078,7 @@
   done
 
   echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
-echo "configure:62070: checking for OCILobIsTemporary in -locijdbc8" >&5
+echo "configure:62082: 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
@@ -62074,7 +62086,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-locijdbc8  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 62078 "configure"
+#line 62090 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -62085,7 +62097,7 @@
 OCILobIsTemporary()
 ; return 0; }
 EOF
-if { (eval echo configure:62089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:62101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -62229,7 +62241,7 @@
   done
 
   echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
-echo "configure:62233: checking for OCICollAssign in -lclntsh" >&5
+echo "configure:62245: 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
@@ -62237,7 +62249,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lclntsh  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 62241 "configure"
+#line 62253 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -62248,7 +62260,7 @@
 OCICollAssign()
 ; return 0; }
 EOF
-if { (eval echo configure:62252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:62264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -62533,7 +62545,7 @@
 elif test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
 
   echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
-echo "configure:62537: checking Oracle Instant Client directory" >&5
+echo "configure:62549: checking Oracle Instant Client directory" >&5
   if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
     PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib  2> /dev/null | tail -1`
     if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
@@ -62545,7 +62557,7 @@
   OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
 
   echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
-echo "configure:62549: checking Oracle Instant Client SDK header directory" >&5
+echo "configure:62561: checking Oracle Instant Client SDK header directory" >&5
 
   OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e 's!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'`
 
@@ -62701,7 +62713,7 @@
 
   
   echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
-echo "configure:62705: checking Oracle Instant Client version" >&5
+echo "configure:62717: checking Oracle Instant Client version" >&5
   if test -f $PHP_OCI8_INSTANT_CLIENT/libociei.$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
@@ -63063,7 +63075,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
-echo "configure:63067: checking for Adabas support" >&5
+echo "configure:63079: checking for Adabas support" >&5
 # Check whether --with-adabas or --without-adabas was given.
 if test "${with_adabas+set}" = set; then
   withval="$with_adabas"
@@ -63256,7 +63268,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
-echo "configure:63260: checking for SAP DB support" >&5
+echo "configure:63272: checking for SAP DB support" >&5
 # Check whether --with-sapdb or --without-sapdb was given.
 if test "${with_sapdb+set}" = set; then
   withval="$with_sapdb"
@@ -63386,7 +63398,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for Solid support""... $ac_c" 1>&6
-echo "configure:63390: checking for Solid support" >&5
+echo "configure:63402: checking for Solid support" >&5
 # Check whether --with-solid or --without-solid was given.
 if test "${with_solid+set}" = set; then
   withval="$with_solid"
@@ -63444,7 +63456,7 @@
     echo "$ac_t""yes" 1>&6
     
   echo $ac_n "checking Solid library file""... $ac_c" 1>&6
-echo "configure:63448: checking Solid library file" >&5  
+echo "configure:63460: 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
@@ -63530,7 +63542,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
-echo "configure:63534: checking for IBM DB2 support" >&5
+echo "configure:63546: checking for IBM DB2 support" >&5
 # Check whether --with-ibm-db2 or --without-ibm-db2 was given.
 if test "${with_ibm_db2+set}" = set; then
   withval="$with_ibm_db2"
@@ -63602,7 +63614,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for Empress support""... $ac_c" 1>&6
-echo "configure:63606: checking for Empress support" >&5
+echo "configure:63618: checking for Empress support" >&5
 # Check whether --with-empress or --without-empress was given.
 if test "${with_empress+set}" = set; then
   withval="$with_empress"
@@ -63651,7 +63663,7 @@
     echo "$ac_t""yes" 1>&6
     
   echo $ac_n "checking Empress library file""... $ac_c" 1>&6
-echo "configure:63655: checking Empress library file" >&5
+echo "configure:63667: 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`
@@ -63672,7 +63684,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
-echo "configure:63676: checking for Empress local access support" >&5
+echo "configure:63688: checking for Empress local access support" >&5
 # Check whether --with-empress-bcs or --without-empress-bcs was given.
 if test "${with_empress_bcs+set}" = set; then
   withval="$with_empress_bcs"
@@ -63737,7 +63749,7 @@
     echo "$ac_t""yes" 1>&6
     
   echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
-echo "configure:63741: checking Empress local access library file" >&5
+echo "configure:63753: 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`
@@ -63758,7 +63770,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
-echo "configure:63762: checking for Birdstep support" >&5
+echo "configure:63774: checking for Birdstep support" >&5
 # Check whether --with-birdstep or --without-birdstep was given.
 if test "${with_birdstep+set}" = set; then
   withval="$with_birdstep"
@@ -63822,7 +63834,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
-echo "configure:63826: checking for a custom ODBC support" >&5
+echo "configure:63838: checking for a custom ODBC support" >&5
 # Check whether --with-custom-odbc or --without-custom-odbc was given.
 if test "${with_custom_odbc+set}" = set; then
   withval="$with_custom_odbc"
@@ -63856,7 +63868,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
-echo "configure:63860: checking for iODBC support" >&5
+echo "configure:63872: checking for iODBC support" >&5
 # Check whether --with-iodbc or --without-iodbc was given.
 if test "${with_iodbc+set}" = set; then
   withval="$with_iodbc"
@@ -63998,7 +64010,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
-echo "configure:64002: checking for Easysoft ODBC-ODBC Bridge support" >&5
+echo "configure:64014: checking for Easysoft ODBC-ODBC Bridge support" >&5
 # Check whether --with-esoob or --without-esoob was given.
 if test "${with_esoob+set}" = set; then
   withval="$with_esoob"
@@ -64058,7 +64070,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
-echo "configure:64062: checking for unixODBC support" >&5
+echo "configure:64074: checking for unixODBC support" >&5
 # Check whether --with-unixODBC or --without-unixODBC was given.
 if test "${with_unixODBC+set}" = set; then
   withval="$with_unixODBC"
@@ -64118,7 +64130,7 @@
 
 if test -z "$ODBC_TYPE"; then
 echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
-echo "configure:64122: checking for DBMaker support" >&5
+echo "configure:64134: checking for DBMaker support" >&5
 # Check whether --with-dbmaker or --without-dbmaker was given.
 if test "${with_dbmaker+set}" = set; then
   withval="$with_dbmaker"
@@ -64636,7 +64648,7 @@
 
 
 echo $ac_n "checking for Oracle-ORACLE support""... $ac_c" 1>&6
-echo "configure:64640: checking for Oracle-ORACLE support" >&5
+echo "configure:64652: checking for Oracle-ORACLE support" >&5
 # Check whether --with-oracle or --without-oracle was given.
 if test "${with_oracle+set}" = set; then
   withval="$with_oracle"
@@ -64681,7 +64693,7 @@
 
 if test "$PHP_ORACLE" != "no"; then
   echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
-echo "configure:64685: checking Oracle Install-Dir" >&5
+echo "configure:64697: checking Oracle Install-Dir" >&5
   if test "$PHP_ORACLE" = "yes"; then
        ORACLE_DIR=$ORACLE_HOME
   else
@@ -64972,7 +64984,7 @@
 
   
   echo $ac_n "checking Oracle version""... $ac_c" 1>&6
-echo "configure:64976: checking Oracle version" >&5
+echo "configure:64988: checking Oracle version" >&5
   if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
        ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
        test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
@@ -69669,7 +69681,7 @@
 
 
 echo $ac_n "checking whether to enable user-space object overloading support""... $ac_c" 1>&6
-echo "configure:69673: checking whether to enable user-space object overloading support" >&5
+echo "configure:69685: checking whether to enable user-space object overloading support" >&5
 # Check whether --enable-overload or --disable-overload was given.
 if test "${enable_overload+set}" = set; then
   enableval="$enable_overload"
@@ -69944,7 +69956,7 @@
 
 
 echo $ac_n "checking for Ovrimos SQL Server support""... $ac_c" 1>&6
-echo "configure:69948: checking for Ovrimos SQL Server support" >&5
+echo "configure:69960: checking for Ovrimos SQL Server support" >&5
 # Check whether --with-ovrimos or --without-ovrimos was given.
 if test "${with_ovrimos+set}" = set; then
   withval="$with_ovrimos"
@@ -70029,7 +70041,7 @@
 
   LDFLAGS="$LDFLAGS $ld_runpath_switch$OVRIMOS_DIR/lib -L$OVRIMOS_DIR/lib"
   echo $ac_n "checking for main in -lsqlcli""... $ac_c" 1>&6
-echo "configure:70033: checking for main in -lsqlcli" >&5
+echo "configure:70045: checking for main in -lsqlcli" >&5
 ac_lib_var=`echo sqlcli'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -70037,14 +70049,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsqlcli  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 70041 "configure"
+#line 70053 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:70048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -70403,7 +70415,7 @@
 
 
 echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
-echo "configure:70407: checking whether to enable pcntl support" >&5
+echo "configure:70419: 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"
@@ -70451,12 +70463,12 @@
   for ac_func in fork
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:70455: checking for $ac_func" >&5
+echo "configure:70467: 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 70460 "configure"
+#line 70472 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -70479,7 +70491,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:70483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -70510,12 +70522,12 @@
   for ac_func in waitpid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:70514: checking for $ac_func" >&5
+echo "configure:70526: 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 70519 "configure"
+#line 70531 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -70538,7 +70550,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:70542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70554: \"$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
@@ -70569,12 +70581,12 @@
   for ac_func in sigaction
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:70573: checking for $ac_func" >&5
+echo "configure:70585: 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 70578 "configure"
+#line 70590 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -70597,7 +70609,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:70601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70613: \"$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
@@ -70854,7 +70866,7 @@
 
 
 echo $ac_n "checking for PCRE support""... $ac_c" 1>&6
-echo "configure:70858: checking for PCRE support" >&5
+echo "configure:70870: checking for PCRE support" >&5
 # Check whether --with-pcre-regex or --without-pcre-regex was given.
 if test "${with_pcre_regex+set}" = set; then
   withval="$with_pcre_regex"
@@ -71520,7 +71532,7 @@
 
 
 echo $ac_n "checking for PDFlib support""... $ac_c" 1>&6
-echo "configure:71524: checking for PDFlib support" >&5
+echo "configure:71536: checking for PDFlib support" >&5
 # Check whether --with-pdflib or --without-pdflib was given.
 if test "${with_pdflib+set}" = set; then
   withval="$with_pdflib"
@@ -71567,7 +71579,7 @@
   
 
 echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
-echo "configure:71571: checking for the location of libjpeg" >&5
+echo "configure:71583: checking for the location of libjpeg" >&5
 # Check whether --with-jpeg-dir or --without-jpeg-dir was given.
 if test "${with_jpeg_dir+set}" = set; then
   withval="$with_jpeg_dir"
@@ -71594,7 +71606,7 @@
   
 
 echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
-echo "configure:71598: checking for the location of libpng" >&5
+echo "configure:71610: checking for the location of libpng" >&5
 # Check whether --with-png-dir or --without-png-dir was given.
 if test "${with_png_dir+set}" = set; then
   withval="$with_png_dir"
@@ -71621,7 +71633,7 @@
   
 
 echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:71625: checking for the location of libz" >&5
+echo "configure:71637: 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"
@@ -71647,7 +71659,7 @@
 
 
 echo $ac_n "checking for the location of libtiff""... $ac_c" 1>&6
-echo "configure:71651: checking for the location of libtiff" >&5
+echo "configure:71663: checking for the location of libtiff" >&5
 # Check whether --with-tiff-dir or --without-tiff-dir was given.
 if test "${with_tiff_dir+set}" = set; then
   withval="$with_tiff_dir"
@@ -71979,7 +71991,7 @@
   done
 
   echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:71983: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:71995: checking for jpeg_read_header in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -71987,7 +71999,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 71991 "configure"
+#line 72003 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -71998,7 +72010,7 @@
 jpeg_read_header()
 ; return 0; }
 EOF
-if { (eval echo configure:72002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -72213,7 +72225,7 @@
   done
 
   echo $ac_n "checking for png_create_info_struct in -lpng""... $ac_c" 1>&6
-echo "configure:72217: checking for png_create_info_struct in -lpng" >&5
+echo "configure:72229: checking for png_create_info_struct in -lpng" >&5
 ac_lib_var=`echo png'_'png_create_info_struct | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -72221,7 +72233,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 72225 "configure"
+#line 72237 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -72232,7 +72244,7 @@
 png_create_info_struct()
 ; return 0; }
 EOF
-if { (eval echo configure:72236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -72447,7 +72459,7 @@
   done
 
   echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:72451: checking for TIFFOpen in -ltiff" >&5
+echo "configure:72463: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -72455,7 +72467,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 72459 "configure"
+#line 72471 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -72466,7 +72478,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:72470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -72600,7 +72612,7 @@
   fi
 
     echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
-echo "configure:72604: checking for the location of zlib" >&5
+echo "configure:72616: checking for the location of zlib" >&5
   if test "$PHP_ZLIB_DIR" = "no"; then
     echo "$ac_t""no. If configure fails, try --with-zlib-dir=<DIR>" 1>&6
   else           
@@ -72748,7 +72760,7 @@
   case $PHP_PDFLIB in
     yes)
       echo $ac_n "checking for PDF_show_boxed in -lpdf""... $ac_c" 1>&6
-echo "configure:72752: checking for PDF_show_boxed in -lpdf" >&5
+echo "configure:72764: checking for PDF_show_boxed in -lpdf" >&5
 ac_lib_var=`echo pdf'_'PDF_show_boxed | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -72756,7 +72768,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpdf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 72760 "configure"
+#line 72772 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -72767,7 +72779,7 @@
 PDF_show_boxed()
 ; return 0; }
 EOF
-if { (eval echo configure:72771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -72907,7 +72919,7 @@
   done
 
   echo $ac_n "checking for PDF_show_boxed in -lpdf""... $ac_c" 1>&6
-echo "configure:72911: checking for PDF_show_boxed in -lpdf" >&5
+echo "configure:72923: checking for PDF_show_boxed in -lpdf" >&5
 ac_lib_var=`echo pdf'_'PDF_show_boxed | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -72915,7 +72927,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpdf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 72919 "configure"
+#line 72931 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -72926,7 +72938,7 @@
 PDF_show_boxed()
 ; return 0; }
 EOF
-if { (eval echo configure:72930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -73105,7 +73117,7 @@
 
 
 echo $ac_n "checking for Verisign Payflow Pro support""... $ac_c" 1>&6
-echo "configure:73109: checking for Verisign Payflow Pro support" >&5
+echo "configure:73121: checking for Verisign Payflow Pro support" >&5
 # Check whether --with-pfpro or --without-pfpro was given.
 if test "${with_pfpro+set}" = set; then
   withval="$with_pfpro"
@@ -73265,7 +73277,7 @@
   done
 
   echo $ac_n "checking for pfproInit in -lpfpro""... $ac_c" 1>&6
-echo "configure:73269: checking for pfproInit in -lpfpro" >&5
+echo "configure:73281: checking for pfproInit in -lpfpro" >&5
 ac_lib_var=`echo pfpro'_'pfproInit | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -73273,7 +73285,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpfpro  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 73277 "configure"
+#line 73289 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -73284,7 +73296,7 @@
 pfproInit()
 ; return 0; }
 EOF
-if { (eval echo configure:73288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:73300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -73394,7 +73406,7 @@
   done
 
   echo $ac_n "checking for PNInit in -lpfpro""... $ac_c" 1>&6
-echo "configure:73398: checking for PNInit in -lpfpro" >&5
+echo "configure:73410: checking for PNInit in -lpfpro" >&5
 ac_lib_var=`echo pfpro'_'PNInit | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -73402,7 +73414,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpfpro  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 73406 "configure"
+#line 73418 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -73413,7 +73425,7 @@
 PNInit()
 ; return 0; }
 EOF
-if { (eval echo configure:73417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:73429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -73818,7 +73830,7 @@
 
 
 echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
-echo "configure:73822: checking for PostgreSQL support" >&5
+echo "configure:73834: checking for PostgreSQL support" >&5
 # Check whether --with-pgsql or --without-pgsql was given.
 if test "${with_pgsql+set}" = set; then
   withval="$with_pgsql"
@@ -73921,7 +73933,7 @@
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
   echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
-echo "configure:73925: checking for PQescapeString in -lpq" >&5
+echo "configure:73937: 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
@@ -73929,7 +73941,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 73933 "configure"
+#line 73945 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -73940,7 +73952,7 @@
 PQescapeString()
 ; return 0; }
 EOF
-if { (eval echo configure:73944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:73956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -73964,7 +73976,7 @@
 fi
 
   echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
-echo "configure:73968: checking for PQsetnonblocking in -lpq" >&5
+echo "configure:73980: 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
@@ -73972,7 +73984,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 73976 "configure"
+#line 73988 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -73983,7 +73995,7 @@
 PQsetnonblocking()
 ; return 0; }
 EOF
-if { (eval echo configure:73987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:73999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -74007,7 +74019,7 @@
 fi
 
   echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:74011: checking for PQcmdTuples in -lpq" >&5
+echo "configure:74023: 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
@@ -74015,7 +74027,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 74019 "configure"
+#line 74031 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -74026,7 +74038,7 @@
 PQcmdTuples()
 ; return 0; }
 EOF
-if { (eval echo configure:74030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -74050,7 +74062,7 @@
 fi
 
   echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
-echo "configure:74054: checking for PQoidValue in -lpq" >&5
+echo "configure:74066: 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
@@ -74058,7 +74070,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 74062 "configure"
+#line 74074 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -74069,7 +74081,7 @@
 PQoidValue()
 ; return 0; }
 EOF
-if { (eval echo configure:74073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -74093,7 +74105,7 @@
 fi
 
   echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
-echo "configure:74097: checking for PQclientEncoding in -lpq" >&5
+echo "configure:74109: 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
@@ -74101,7 +74113,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 74105 "configure"
+#line 74117 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -74112,7 +74124,7 @@
 PQclientEncoding()
 ; return 0; }
 EOF
-if { (eval echo configure:74116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -74136,7 +74148,7 @@
 fi
 
   echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
-echo "configure:74140: checking for pg_encoding_to_char in -lpq" >&5
+echo "configure:74152: 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
@@ -74144,7 +74156,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 74148 "configure"
+#line 74160 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -74155,7 +74167,7 @@
 pg_encoding_to_char()
 ; return 0; }
 EOF
-if { (eval echo configure:74159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -74542,7 +74554,7 @@
 
 
 echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
-echo "configure:74546: checking whether to enable POSIX-like functions" >&5
+echo "configure:74558: checking whether to enable POSIX-like functions" >&5
 # Check whether --enable-posix or --disable-posix was given.
 if test "${enable_posix+set}" = set; then
   enableval="$enable_posix"
@@ -74815,12 +74827,12 @@
   for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo getrlimit
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:74819: checking for $ac_func" >&5
+echo "configure:74831: 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 74824 "configure"
+#line 74836 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -74843,7 +74855,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:74847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74859: \"$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
@@ -74873,7 +74885,7 @@
 
 
 echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
-echo "configure:74877: checking for PSPELL support" >&5
+echo "configure:74889: checking for PSPELL support" >&5
 # Check whether --with-pspell or --without-pspell was given.
 if test "${with_pspell+set}" = set; then
   withval="$with_pspell"
@@ -75337,7 +75349,7 @@
   done
 
   echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
-echo "configure:75341: checking for new_aspell_config in -laspell" >&5
+echo "configure:75353: checking for new_aspell_config in -laspell" >&5
 ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -75345,7 +75357,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-laspell  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 75349 "configure"
+#line 75361 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -75356,7 +75368,7 @@
 new_aspell_config()
 ; return 0; }
 EOF
-if { (eval echo configure:75360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -75528,7 +75540,7 @@
 
 
 echo $ac_n "checking for QtDOM support""... $ac_c" 1>&6
-echo "configure:75532: checking for QtDOM support" >&5
+echo "configure:75544: checking for QtDOM support" >&5
 # Check whether --with-qtdom or --without-qtdom was given.
 if test "${with_qtdom+set}" = set; then
   withval="$with_qtdom"
@@ -75956,7 +75968,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:75960: checking for $ac_word" >&5
+echo "configure:75972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -75988,7 +76000,7 @@
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:75992: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:76004: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -75999,12 +76011,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 76003 "configure"
+#line 76015 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:76008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -76030,12 +76042,12 @@
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:76034: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:76046: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:76039: checking whether we are using GNU C++" >&5
+echo "configure:76051: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -76044,7 +76056,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:76048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:76060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -76063,7 +76075,7 @@
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:76067: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:76079: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -76095,7 +76107,7 @@
 fi
 
     echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:76099: checking how to run the C++ preprocessor" >&5
+echo "configure:76111: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -76108,12 +76120,12 @@
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 76112 "configure"
+#line 76124 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:76117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:76129: \"$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
   :
@@ -76146,7 +76158,7 @@
 
 
 echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
-echo "configure:76150: checking for libedit readline replacement" >&5
+echo "configure:76162: checking for libedit readline replacement" >&5
 # Check whether --with-libedit or --without-libedit was given.
 if test "${with_libedit+set}" = set; then
   withval="$with_libedit"
@@ -76192,7 +76204,7 @@
 
 
 echo $ac_n "checking for readline support""... $ac_c" 1>&6
-echo "configure:76196: checking for readline support" >&5
+echo "configure:76208: checking for readline support" >&5
 # Check whether --with-readline or --without-readline was given.
 if test "${with_readline+set}" = set; then
   withval="$with_readline"
@@ -76277,7 +76289,7 @@
 
 
   echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:76281: checking for tgetent in -lncurses" >&5
+echo "configure:76293: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -76285,7 +76297,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 76289 "configure"
+#line 76301 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -76296,7 +76308,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:76300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -76340,7 +76352,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:76344: checking for tgetent in -ltermcap" >&5
+echo "configure:76356: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -76348,7 +76360,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 76352 "configure"
+#line 76364 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -76359,7 +76371,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:76363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -76488,7 +76500,7 @@
   done
 
   echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:76492: checking for readline in -lreadline" >&5
+echo "configure:76504: checking for readline in -lreadline" >&5
 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -76496,7 +76508,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 76500 "configure"
+#line 76512 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -76507,7 +76519,7 @@
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:76511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -76718,7 +76730,7 @@
   done
 
   echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:76722: checking for add_history in -lhistory" >&5
+echo "configure:76734: checking for add_history in -lhistory" >&5
 ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -76726,7 +76738,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lhistory  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 76730 "configure"
+#line 76742 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -76737,7 +76749,7 @@
 add_history()
 ; return 0; }
 EOF
-if { (eval echo configure:76741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -77139,7 +77151,7 @@
 
 
   echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:77143: checking for tgetent in -lncurses" >&5
+echo "configure:77155: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -77147,7 +77159,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 77151 "configure"
+#line 77163 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -77158,7 +77170,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:77162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:77174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -77202,7 +77214,7 @@
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:77206: checking for tgetent in -ltermcap" >&5
+echo "configure:77218: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -77210,7 +77222,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 77214 "configure"
+#line 77226 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -77221,7 +77233,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:77225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:77237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -77350,7 +77362,7 @@
   done
 
   echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
-echo "configure:77354: checking for readline in -ledit" >&5
+echo "configure:77366: checking for readline in -ledit" >&5
 ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -77358,7 +77370,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ledit  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 77362 "configure"
+#line 77374 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -77369,7 +77381,7 @@
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:77373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:77385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -77733,7 +77745,7 @@
 
 
 echo $ac_n "checking for recode support""... $ac_c" 1>&6
-echo "configure:77737: checking for recode support" >&5
+echo "configure:77749: checking for recode support" >&5
 # Check whether --with-recode or --without-recode was given.
 if test "${with_recode+set}" = set; then
   withval="$with_recode"
@@ -77883,7 +77895,7 @@
   done
 
   echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
-echo "configure:77887: checking for recode_format_table in -lrecode" >&5
+echo "configure:77899: checking for recode_format_table in -lrecode" >&5
 ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -77891,7 +77903,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrecode  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 77895 "configure"
+#line 77907 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -77902,7 +77914,7 @@
 recode_format_table()
 ; return 0; }
 EOF
-if { (eval echo configure:77906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:77918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -78031,7 +78043,7 @@
     LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
     LIBS="$LIBS -lrecode"
     cat > conftest.$ac_ext <<EOF
-#line 78035 "configure"
+#line 78047 "configure"
 #include "confdefs.h"
 
 char *program_name;
@@ -78042,7 +78054,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:78046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
       
@@ -78204,17 +78216,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:78208: checking for $ac_hdr" >&5
+echo "configure:78220: 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 78213 "configure"
+#line 78225 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:78218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:78230: \"$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*
@@ -78467,7 +78479,7 @@
 
 
 echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
-echo "configure:78471: checking whether to enable PHP sessions" >&5
+echo "configure:78483: checking whether to enable PHP sessions" >&5
 # Check whether --enable-session or --disable-session was given.
 if test "${enable_session+set}" = set; then
   enableval="$enable_session"
@@ -78513,7 +78525,7 @@
 
 
 echo $ac_n "checking for mm support""... $ac_c" 1>&6
-echo "configure:78517: checking for mm support" >&5
+echo "configure:78529: checking for mm support" >&5
 # Check whether --with-mm or --without-mm was given.
 if test "${with_mm+set}" = set; then
   withval="$with_mm"
@@ -78538,7 +78550,7 @@
 if test "$PHP_SESSION" != "no"; then
   
   echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
-echo "configure:78542: checking whether pwrite works" >&5
+echo "configure:78554: checking whether pwrite works" >&5
 if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -78550,7 +78562,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 78554 "configure"
+#line 78566 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -78571,7 +78583,7 @@
 
   
 EOF
-if { (eval echo configure:78575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:78587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_pwrite=yes
@@ -78596,7 +78608,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 78600 "configure"
+#line 78612 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -78617,7 +78629,7 @@
 
   
 EOF
-if { (eval echo configure:78621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:78633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_pwrite=yes
@@ -78658,7 +78670,7 @@
 
   
   echo $ac_n "checking whether pread works""... $ac_c" 1>&6
-echo "configure:78662: checking whether pread works" >&5
+echo "configure:78674: checking whether pread works" >&5
 if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -78671,7 +78683,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 78675 "configure"
+#line 78687 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -78691,7 +78703,7 @@
     }
   
 EOF
-if { (eval echo configure:78695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:78707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_pread=yes
@@ -78718,7 +78730,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 78722 "configure"
+#line 78734 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -78738,7 +78750,7 @@
     }
   
 EOF
-if { (eval echo configure:78742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:78754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_pread=yes
@@ -79153,7 +79165,7 @@
 
 
 echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
-echo "configure:79157: checking whether to enable shmop support" >&5
+echo "configure:79169: checking whether to enable shmop support" >&5
 # Check whether --enable-shmop or --disable-shmop was given.
 if test "${enable_shmop+set}" = set; then
   enableval="$enable_shmop"
@@ -79428,7 +79440,7 @@
 
 
 echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
-echo "configure:79432: checking for SNMP support" >&5
+echo "configure:79444: checking for SNMP support" >&5
 # Check whether --with-snmp or --without-snmp was given.
 if test "${with_snmp+set}" = set; then
   withval="$with_snmp"
@@ -79474,7 +79486,7 @@
 
 
 echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
-echo "configure:79478: checking OpenSSL dir for SNMP" >&5
+echo "configure:79490: checking OpenSSL dir for SNMP" >&5
 # Check whether --with-openssl-dir or --without-openssl-dir was given.
 if test "${with_openssl_dir+set}" = set; then
   withval="$with_openssl_dir"
@@ -79502,7 +79514,7 @@
     # Extract the first word of "net-snmp-config", so it can be a program name with args.
 set dummy net-snmp-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:79506: checking for $ac_word" >&5
+echo "configure:79518: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -79686,17 +79698,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:79690: checking for $ac_hdr" >&5
+echo "configure:79702: 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 79695 "configure"
+#line 79707 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:79700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:79712: \"$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*
@@ -79724,9 +79736,9 @@
 
     if test "$ac_cv_header_default_store_h" = "yes"; then
       echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
-echo "configure:79728: checking for OpenSSL support in SNMP libraries" >&5
+echo "configure:79740: checking for OpenSSL support in SNMP libraries" >&5
       cat > conftest.$ac_ext <<EOF
-#line 79730 "configure"
+#line 79742 "configure"
 #include "confdefs.h"
 
 #include <ucd-snmp-config.h>
@@ -79778,7 +79790,7 @@
     # 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:79782: checking for $ac_word" >&5
+echo "configure:79794: 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
@@ -79966,9 +79978,9 @@
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
     echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:79970: checking for OpenSSL version" >&5
+echo "configure:79982: checking for OpenSSL version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 79972 "configure"
+#line 79984 "configure"
 #include "confdefs.h"
 
 #include <openssl/opensslv.h>
@@ -80106,7 +80118,7 @@
   done
 
   echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:80110: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:80122: checking for CRYPTO_free in -lcrypto" >&5
 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -80114,7 +80126,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 80118 "configure"
+#line 80130 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -80125,7 +80137,7 @@
 CRYPTO_free()
 ; return 0; }
 EOF
-if { (eval echo configure:80129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:80141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -80265,7 +80277,7 @@
   done
 
   echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:80269: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:80281: checking for SSL_CTX_set_ssl_version in -lssl" >&5
 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -80273,7 +80285,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lssl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 80277 "configure"
+#line 80289 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -80284,7 +80296,7 @@
 SSL_CTX_set_ssl_version()
 ; return 0; }
 EOF
-if { (eval echo configure:80288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:80300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -80396,7 +80408,7 @@
     fi
 
     echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
-echo "configure:80400: checking for kstat_read in -lkstat" >&5
+echo "configure:80412: checking for kstat_read in -lkstat" >&5
 ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -80404,7 +80416,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lkstat  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 80408 "configure"
+#line 80420 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -80415,7 +80427,7 @@
 kstat_read()
 ; return 0; }
 EOF
-if { (eval echo configure:80419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:80431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -80668,7 +80680,7 @@
   done
 
   echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
-echo "configure:80672: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
+echo "configure:80684: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
 ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -80676,7 +80688,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 80680 "configure"
+#line 80692 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -80687,7 +80699,7 @@
 snmp_parse_oid()
 ; return 0; }
 EOF
-if { (eval echo configure:80691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:80703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -80804,7 +80816,7 @@
   done
 
   echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
-echo "configure:80808: checking for init_snmp in -l$SNMP_LIBNAME" >&5
+echo "configure:80820: checking for init_snmp in -l$SNMP_LIBNAME" >&5
 ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -80812,7 +80824,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 80816 "configure"
+#line 80828 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -80823,7 +80835,7 @@
 init_snmp()
 ; return 0; }
 EOF
-if { (eval echo configure:80827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:80839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -81089,7 +81101,7 @@
 
 
 echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
-echo "configure:81093: checking whether to enable UCD SNMP hack" >&5
+echo "configure:81105: checking whether to enable UCD SNMP hack" >&5
 # Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
 if test "${enable_ucd_snmp_hack+set}" = set; then
   enableval="$enable_ucd_snmp_hack"
@@ -81115,7 +81127,7 @@
 
 
 echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
-echo "configure:81119: checking whether to enable sockets support" >&5
+echo "configure:81131: checking whether to enable sockets support" >&5
 # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then
   enableval="$enable_sockets"
@@ -81160,13 +81172,13 @@
 
 if test "$PHP_SOCKETS" != "no"; then
     echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
-echo "configure:81164: checking for struct cmsghdr" >&5
+echo "configure:81176: checking for struct cmsghdr" >&5
 if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 81170 "configure"
+#line 81182 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -81175,7 +81187,7 @@
 struct cmsghdr s; s
 ; return 0; }
 EOF
-if { (eval echo configure:81179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:81191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cmsghdr=yes
 else
@@ -81200,12 +81212,12 @@
   for ac_func in hstrerror set_h_errno
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:81204: checking for $ac_func" >&5
+echo "configure:81216: 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 81209 "configure"
+#line 81221 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -81228,7 +81240,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:81232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:81244: \"$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
@@ -81256,17 +81268,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:81260: checking for $ac_hdr" >&5
+echo "configure:81272: 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 81265 "configure"
+#line 81277 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:81270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:81282: \"$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*
@@ -81293,7 +81305,7 @@
 done
 
   cat > conftest.$ac_ext <<EOF
-#line 81297 "configure"
+#line 81309 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -81303,7 +81315,7 @@
 static struct msghdr tp; int n = (int) tp.msg_flags; return n
 ; return 0; }
 EOF
-if { (eval echo configure:81307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:81319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -81547,18 +81559,1049 @@
 
 
 
+echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
+echo "configure:81564: checking for sqlite support" >&5
+# Check whether --with-sqlite or --without-sqlite was given.
+if test "${with_sqlite+set}" = set; then
+  withval="$with_sqlite"
+  PHP_SQLITE=$withval
+else
+  
+  PHP_SQLITE=no
+
+  if test "$PHP_ENABLE_ALL" && test "yes" = "yes"; then
+    PHP_SQLITE=$PHP_ENABLE_ALL
+  fi
+
+fi
+
+
+
+ext_output="yes, shared"
+ext_shared=yes
+case $PHP_SQLITE in
+shared,*)
+  PHP_SQLITE=`echo "$PHP_SQLITE"|sed 's/^shared,//'`
+  ;;
+shared)
+  PHP_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_SQLITE" != "no"; then
+
+  if test "$PHP_SQLITE" != "yes"; then
+    SEARCH_PATH="/usr/local /usr"
+    SEARCH_FOR="/include/sqlite.h"
+    if test -r $PHP_SQLITE/; then # path given as parameter
+        SQLITE_DIR=$PHP_SQLITE
+    else # search default path list
+        echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
+echo "configure:81616: checking for sqlite files in default path" >&5
+        for i in $SEARCH_PATH ; do
+        if test -r $i/$SEARCH_FOR; then
+            SQLITE_DIR=$i
+            echo "$ac_t""found in $i" 1>&6
+        fi
+        done
+    fi
+  
+    if test -z "$SQLITE_DIR"; then
+        echo "$ac_t""not found" 1>&6
+        { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; }
+    fi
+
+    
+  if test "$SQLITE_DIR/include" != "/usr/include"; then
+    
+  if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then
+    ai_p=$SQLITE_DIR/include
+  else
+    
+    ep_dir="`echo $SQLITE_DIR/include|sed 's%/*[^/][^/]*/*$%%'`"
+    
+    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`"
+  fi
+
+    
+  
+  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
+  
+  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "INCLUDEPATH$unique=set"
+    
+      if test ""; then
+        INCLUDES="-I$ai_p $INCLUDES"
+      else
+        INCLUDES="$INCLUDES -I$ai_p"
+      fi
+    
+  fi
+
+  fi
+
+
+    LIBNAME=sqlite
+    LIBSYMBOL=sqlite_open
+
+    
+  save_old_LDFLAGS=$LDFLAGS
+  ac_stuff="
+        -L$SQLITE_DIR/lib -lm -ldl
+    "
+  
+  save_ext_shared=$ext_shared
+  ext_shared=yes
+  
+  for ac_i in $ac_stuff; do
+    case $ac_i in
+    -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/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="$ld_runpath_switch$ai_p -L$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:81746: 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 81754 "configure"
+#include "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:81765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+    LDFLAGS=$save_old_LDFLAGS
+    ext_shared=$save_ext_shared
+    
+        
+
+  if test "$ext_shared" = "yes"; then
+    SQLITE_SHARED_LIBADD="-l$LIBNAME $SQLITE_SHARED_LIBADD"
+    if test -n "$SQLITE_DIR/lib"; then
+      
+  if test "$SQLITE_DIR/lib" != "/usr/lib"; then
+    
+  if test -z "$SQLITE_DIR/lib" || echo "$SQLITE_DIR/lib" | grep '^/' >/dev/null ; then
+    ai_p=$SQLITE_DIR/lib
+  else
+    
+    ep_dir="`echo $SQLITE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    
+    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/lib\"`"
+  fi
+
+    
+      if test "$ext_shared" = "yes"; then
+        SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $SQLITE_SHARED_LIBADD"
+      else
+        
+  
+  
+  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
+  
+  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "LIBPATH$unique=set"
+    
+    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+    LDFLAGS="$LDFLAGS -L$ai_p"
+    PHP_RPATHS="$PHP_RPATHS $ai_p"
+  
+  fi
+
+
+      fi
+    
+  fi
+
+    fi
+  else
+    
+
+  if test -n "$SQLITE_DIR/lib"; then
+    
+  if test "$SQLITE_DIR/lib" != "/usr/lib"; then
+    
+  if test -z "$SQLITE_DIR/lib" || echo "$SQLITE_DIR/lib" | grep '^/' >/dev/null ; then
+    ai_p=$SQLITE_DIR/lib
+  else
+    
+    ep_dir="`echo $SQLITE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    
+    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/lib\"`"
+  fi
+
+    
+      
+  
+  
+  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
+  
+  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "LIBPATH$unique=set"
+    
+    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+    LDFLAGS="$LDFLAGS -L$ai_p"
+    PHP_RPATHS="$PHP_RPATHS $ai_p"
+  
+  fi
+
+
+    
+  fi
+
+  fi
+  
+  
+  case $LIBNAME in
+  c|c_r|pthread*) ;;
+  *) 
+      LIBS="-l$LIBNAME $LIBS" 
+   ;;
+  esac
+
+
+
+
+  fi
+
+
+        cat >> confdefs.h <<\EOF
+#define HAVE_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
+
+ 
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD"
+
+    
+  ext_builddir=ext/sqlite
+  ext_srcdir=$abs_srcdir/ext/sqlite
+
+  ac_extra=
+
+  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+
+    
+  
+  case ext/sqlite in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+  
+  
+
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  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 sqlite.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" ;;
+         *.cpp) 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 sqlite"
+    if test "$ext_shared" != "nocli"; then
+      EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
+    fi
+  else
+    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
+      
+  case ext/sqlite in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+  
+  
+
+  b_c_pre=$shared_c_pre
+  b_cxx_pre=$shared_cxx_pre
+  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 sqlite.c; do
+  
+      IFS=.
+      set $ac_src
+      ac_obj=$1
+      IFS=$old_IFS
+      
+      shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo"
+
+      case $ac_src in
+         *.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" ;;
+         *.cpp) 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
+
+      
+  install_modules="install-modules"
+
+  case $host_alias in
+    *darwin*)
+      suffix=so
+      link_cmd='$(CC) -dynamic -flat_namespace -bundle -undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_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_sqlite) $(SQLITE_SHARED_LIBADD)'
+      ;;
+  esac
+
+  PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix"
+  
+  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
+
+  cat >>Makefile.objects<<EOF
+\$(phplibdir)/sqlite.$suffix: $ext_builddir/sqlite.$suffix
+       \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite.$suffix \$(phplibdir)
+
+$ext_builddir/sqlite.$suffix: \$(shared_objects_sqlite) \$(SQLITE_SHARED_DEPENDENCIES)
+       $link_cmd
+
+EOF
+
+      cat >> confdefs.h <<EOF
+#define COMPILE_DL_SQLITE 1
+EOF
+
+    fi
+  fi
+
+  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
+    if test "$PHP_SAPI" = "cgi"; then
+      
+  
+  case ext/sqlite in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+  
+  
+
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  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 sqlite.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" ;;
+         *.cpp) 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 sqlite"
+    else
+      
+  
+  case ext/sqlite in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+  
+  
+
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  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 sqlite.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" ;;
+         *.cpp) 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_CLI_STATIC="$EXT_CLI_STATIC sqlite"
+  fi
+  
+  BUILD_DIR="$BUILD_DIR $ext_builddir"
+
+
+  else
+    # use bundled library
+
+    PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src"
+
+    sources="libsqlite/src/opcodes.c
+        libsqlite/src/parse.c libsqlite/src/encode.c \
+        libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
+        libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
+        libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
+        libsqlite/src/os.c libsqlite/src/pager.c \
+        libsqlite/src/printf.c libsqlite/src/random.c \
+        libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
+        libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
+        libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \
+        libsqlite/src/vacuum.c libsqlite/src/copy.c \
+        libsqlite/src/where.c libsqlite/src/trigger.c"
+    
+    
+  ext_builddir=ext/sqlite
+  ext_srcdir=$abs_srcdir/ext/sqlite
+
+  ac_extra=`echo "$PHP_SQLITE_CFLAGS"|sed s#@ext_srcdir@#$ext_srcdir#g`
+
+  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+
+    
+  
+  case ext/sqlite in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+  
+  
+
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  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 sqlite.c $sources; do
+  
+      IFS=.
+      set $ac_src
+      ac_obj=$1
+      IFS=$old_IFS
+      
+      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
+
+      case $ac_src in
+         *.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" ;;
+         *.cpp) 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 sqlite"
+    if test "$ext_shared" != "nocli"; then
+      EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
+    fi
+  else
+    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
+      
+  case ext/sqlite in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+  
+  
+
+  b_c_pre=$shared_c_pre
+  b_cxx_pre=$shared_cxx_pre
+  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 sqlite.c $sources; do
+  
+      IFS=.
+      set $ac_src
+      ac_obj=$1
+      IFS=$old_IFS
+      
+      shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo"
+
+      case $ac_src in
+         *.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" ;;
+         *.cpp) 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
+
+      
+  install_modules="install-modules"
+
+  case $host_alias in
+    *darwin*)
+      suffix=so
+      link_cmd='$(CC) -dynamic -flat_namespace -bundle -undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_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_sqlite) $(SQLITE_SHARED_LIBADD)'
+      ;;
+  esac
+
+  PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix"
+  
+  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
+
+  cat >>Makefile.objects<<EOF
+\$(phplibdir)/sqlite.$suffix: $ext_builddir/sqlite.$suffix
+       \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite.$suffix \$(phplibdir)
+
+$ext_builddir/sqlite.$suffix: \$(shared_objects_sqlite) \$(SQLITE_SHARED_DEPENDENCIES)
+       $link_cmd
+
+EOF
+
+      cat >> confdefs.h <<EOF
+#define COMPILE_DL_SQLITE 1
+EOF
+
+    fi
+  fi
+
+  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
+    if test "$PHP_SAPI" = "cgi"; then
+      
+  
+  case ext/sqlite in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+  
+  
+
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  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 sqlite.c $sources; do
+  
+      IFS=.
+      set $ac_src
+      ac_obj=$1
+      IFS=$old_IFS
+      
+      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
+
+      case $ac_src in
+         *.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" ;;
+         *.cpp) 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 sqlite"
+    else
+      
+  
+  case ext/sqlite in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+  
+  
+
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  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 sqlite.c $sources; 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" ;;
+         *.cpp) 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_CLI_STATIC="$EXT_CLI_STATIC sqlite"
+  fi
+  
+  BUILD_DIR="$BUILD_DIR $ext_builddir"
+
+
+    
+  BUILD_DIR="$BUILD_DIR $ext_builddir/libsqlite"
+
+    
+  BUILD_DIR="$BUILD_DIR $ext_builddir/libsqlite/src"
+
+    echo $ac_n "checking size of char *""... $ac_c" 1>&6
+echo "configure:82369: checking size of char *" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_char_p=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 82377 "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(char *));
+  exit(0);
+}
+EOF
+if { (eval echo configure:82389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_char_p=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_char_p=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+EOF
+
+
+    cat >> confdefs.h <<\EOF
+#define SQLITE_PTR_SZ SIZEOF_CHAR_P
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define OS_UNIX 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define OS_WIN 0
+EOF
+
+            SQLITE_ENCODING="ISO8859"
+            
+  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING"
+
+
+    # Extract the first word of "lemon", so it can be a program name with args.
+set dummy lemon; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:82428: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_LEMON'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$LEMON" in
+  /*)
+  ac_cv_path_LEMON="$LEMON" # Let the user override the test with a path.
+  ;;
+  ?:/*)                         
+  ac_cv_path_LEMON="$LEMON" # 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_LEMON="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_LEMON" && ac_cv_path_LEMON="no"
+  ;;
+esac
+fi
+LEMON="$ac_cv_path_LEMON"
+if test -n "$LEMON"; then
+  echo "$ac_t""$LEMON" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON"
+
+
+    SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
+    
+  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION"
+
+
+    if test "$ext_shared" = "no"; then
+      echo '#include "php_config.h"' > $ext_srcdir/libsqlite/src/config.h
+    else
+      echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/libsqlite/src/config.h
+    fi
+    
+    cat >> $ext_srcdir/libsqlite/src/config.h <<EOF
+#if ZTS
+# define THREADSAFE 1
+#endif
+#if !ZEND_DEBUG
+# define NDEBUG
+#endif
+EOF
+
+    
+  src=$ext_srcdir/Makefile.frag
+  ac_srcdir=$ext_srcdir
+  ac_builddir=$ext_builddir
+  sed -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
+
+
+  fi
+
+  for ac_func in usleep nanosleep
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:82497: 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 82502 "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:82525: \"$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:82553: 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 82558 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:82563: \"$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
+
+
+
+
 
 
 
 for ac_func in getcwd getwd asinh acosh atanh log1p hypot
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:81557: checking for $ac_func" >&5
+echo "configure:82600: 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 81562 "configure"
+#line 82605 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -81581,7 +82624,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:81585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:82628: \"$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
@@ -81610,7 +82653,7 @@
 
   if test "$ac_cv_func_crypt" = "no"; then
   echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:81614: checking for crypt in -lcrypt" >&5
+echo "configure:82657: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -81618,7 +82661,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 81622 "configure"
+#line 82665 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -81629,7 +82672,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:81633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:82676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -81658,7 +82701,7 @@
   fi
   
   echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
-echo "configure:81662: checking for standard DES crypt" >&5
+echo "configure:82705: checking for standard DES crypt" >&5
 if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -81669,7 +82712,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 81673 "configure"
+#line 82716 "configure"
 #include "confdefs.h"
 
 #if HAVE_UNISTD_H
@@ -81688,7 +82731,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:81692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:82735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_crypt_des=yes
@@ -81719,7 +82762,7 @@
 
 
   echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
-echo "configure:81723: checking for extended DES crypt" >&5
+echo "configure:82766: checking for extended DES crypt" >&5
 if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -81730,7 +82773,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 81734 "configure"
+#line 82777 "configure"
 #include "confdefs.h"
 
 #if HAVE_UNISTD_H
@@ -81749,7 +82792,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:81753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:82796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_crypt_ext_des=yes
@@ -81780,7 +82823,7 @@
 
 
   echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
-echo "configure:81784: checking for MD5 crypt" >&5
+echo "configure:82827: checking for MD5 crypt" >&5
 if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -81791,7 +82834,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 81795 "configure"
+#line 82838 "configure"
 #include "confdefs.h"
 
 #if HAVE_UNISTD_H
@@ -81819,7 +82862,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:81823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:82866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_crypt_md5=yes
@@ -81879,7 +82922,7 @@
 
 
   echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
-echo "configure:81883: checking for Blowfish crypt" >&5
+echo "configure:82926: checking for Blowfish crypt" >&5
 if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -81890,7 +82933,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 81894 "configure"
+#line 82937 "configure"
 #include "confdefs.h"
 
 #if HAVE_UNISTD_H
@@ -81915,7 +82958,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:81919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:82962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_crypt_blowfish=yes
@@ -81947,7 +82990,7 @@
 
 
   echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
-echo "configure:81951: checking whether flush should be called explicitly after a buffered io" >&5
+echo "configure:82994: checking whether flush should be called explicitly after a buffered io" >&5
 if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -81958,7 +83001,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 81962 "configure"
+#line 83005 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -81996,7 +83039,7 @@
 }
 
 EOF
-if { (eval echo configure:82000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:83043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   ac_cv_flush_io=no
@@ -82115,12 +83158,12 @@
 fi
 
 echo $ac_n "checking which regex library to use""... $ac_c" 1>&6
-echo "configure:82119: checking which regex library to use" >&5
+echo "configure:83162: checking which regex library to use" >&5
 echo "$ac_t""$REGEX_TYPE" 1>&6
 
 
 echo $ac_n "checking whether rounding works as expected""... $ac_c" 1>&6
-echo "configure:82124: checking whether rounding works as expected" >&5
+echo "configure:83167: checking whether rounding works as expected" >&5
 if test "$cross_compiling" = yes; then
   
   PHP_ROUND_FUZZ=0.50000000001
@@ -82128,7 +83171,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 82132 "configure"
+#line 83175 "configure"
 #include "confdefs.h"
 
 #include <math.h>
@@ -82137,7 +83180,7 @@
   }
 
 EOF
-if { (eval echo configure:82141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:83184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   PHP_ROUND_FUZZ=0.5
@@ -82161,7 +83204,7 @@
 
 
 echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
-echo "configure:82165: checking for working fnmatch" >&5
+echo "configure:83208: checking for working fnmatch" >&5
 if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -82172,11 +83215,11 @@
   ac_cv_func_fnmatch_works=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 82176 "configure"
+#line 83219 "configure"
 #include "confdefs.h"
 main() { exit (fnmatch ("a*", "abc", 0) != 0); }
 EOF
-if { (eval echo configure:82180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:83223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_fnmatch_works=yes
 else
@@ -82203,12 +83246,12 @@
 for ac_func in glob strfmon
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:82207: checking for $ac_func" >&5
+echo "configure:83250: 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 82212 "configure"
+#line 83255 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -82231,7 +83274,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:82235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:83278: \"$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
@@ -82266,12 +83309,12 @@
 for ac_func in fpclass isinf isnan
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:82270: checking for $ac_func" >&5
+echo "configure:83313: 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 82275 "configure"
+#line 83318 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -82294,7 +83337,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:82298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:83341: \"$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
@@ -82320,7 +83363,7 @@
 
 
 echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
-echo "configure:82324: checking whether atof() accepts NAN" >&5
+echo "configure:83367: checking whether atof() accepts NAN" >&5
 if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -82331,7 +83374,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 82335 "configure"
+#line 83378 "configure"
 #include "confdefs.h"
 
 #include <math.h>
@@ -82351,7 +83394,7 @@
 }
   
 EOF
-if { (eval echo configure:82355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:83398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
       ac_cv_atof_accept_nan=yes
@@ -82379,7 +83422,7 @@
 fi
 
 echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
-echo "configure:82383: checking whether atof() accepts INF" >&5
+echo "configure:83426: checking whether atof() accepts INF" >&5
 if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -82390,7 +83433,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 82394 "configure"
+#line 83437 "configure"
 #include "confdefs.h"
 
 #include <math.h>
@@ -82413,7 +83456,7 @@
 }
   
 EOF
-if { (eval echo configure:82417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:83460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
       ac_cv_atof_accept_inf=yes
@@ -82441,7 +83484,7 @@
 fi
 
 echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
-echo "configure:82445: checking whether HUGE_VAL == INF" >&5
+echo "configure:83488: checking whether HUGE_VAL == INF" >&5
 if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -82452,7 +83495,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 82456 "configure"
+#line 83499 "configure"
 #include "confdefs.h"
 
 #include <math.h>
@@ -82475,7 +83518,7 @@
 }
   
 EOF
-if { (eval echo configure:82479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:83522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
       ac_cv_huge_val_inf=yes
@@ -82503,7 +83546,7 @@
 fi
 
 echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
-echo "configure:82507: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
+echo "configure:83550: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
 if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -82514,7 +83557,7 @@
   
 else
   cat > conftest.$ac_ext <<EOF
-#line 82518 "configure"
+#line 83561 "configure"
 #include "confdefs.h"
 
 #include <math.h>
@@ -82539,7 +83582,7 @@
 }
   
 EOF
-if { (eval echo configure:82543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:83586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
       ac_cv_huge_val_nan=yes
@@ -82835,7 +83878,7 @@
 
 
 echo $ac_n "checking for libswf support""... $ac_c" 1>&6
-echo "configure:82839: checking for libswf support" >&5
+echo "configure:83882: checking for libswf support" >&5
 # Check whether --with-swf or --without-swf was given.
 if test "${with_swf+set}" = set; then
   withval="$with_swf"
@@ -82883,7 +83926,7 @@
     SWF_DIR=$PHP_SWF
   else
     echo $ac_n "checking for libswf in default path""... $ac_c" 1>&6
-echo "configure:82887: checking for libswf in default path" >&5
+echo "configure:83930: checking for libswf in default path" >&5
     for i in /usr/local /usr; do
       if test -r $i/lib/libswf.a; then
         SWF_DIR=$i
@@ -83262,7 +84305,7 @@
 
 
 echo $ac_n "checking for Sybase support""... $ac_c" 1>&6
-echo "configure:83266: checking for Sybase support" >&5
+echo "configure:84309: checking for Sybase support" >&5
 # Check whether --with-sybase or --without-sybase was given.
 if test "${with_sybase+set}" = set; then
   withval="$with_sybase"
@@ -83663,7 +84706,7 @@
 
 
   echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:83667: checking for dnet_addr in -ldnet_stub" >&5
+echo "configure:84710: 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
@@ -83671,7 +84714,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 83675 "configure"
+#line 84718 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -83682,7 +84725,7 @@
 dnet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:83686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:84729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -83807,7 +84850,7 @@
 EOF
 
   echo $ac_n "checking for tdsdbopen in -lsybdb""... $ac_c" 1>&6
-echo "configure:83811: checking for tdsdbopen in -lsybdb" >&5
+echo "configure:84854: checking for tdsdbopen in -lsybdb" >&5
 ac_lib_var=`echo sybdb'_'tdsdbopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -83815,7 +84858,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsybdb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 83819 "configure"
+#line 84862 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -83826,7 +84869,7 @@
 tdsdbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:83830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:84873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -83863,7 +84906,7 @@
 
 
 echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
-echo "configure:83867: checking for Sybase-CT support" >&5
+echo "configure:84910: checking for Sybase-CT support" >&5
 # Check whether --with-sybase-ct or --without-sybase-ct was given.
 if test "${with_sybase_ct+set}" = set; then
   withval="$with_sybase_ct"
@@ -84424,7 +85467,7 @@
   done
 
   echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
-echo "configure:84428: checking for netg_errstr in -ltcl" >&5
+echo "configure:85471: checking for netg_errstr in -ltcl" >&5
 ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -84432,7 +85475,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltcl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 84436 "configure"
+#line 85479 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -84443,7 +85486,7 @@
 netg_errstr()
 ; return 0; }
 EOF
-if { (eval echo configure:84447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:85490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -84601,7 +85644,7 @@
   done
 
   echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
-echo "configure:84605: checking for insck__getVdate in -linsck" >&5
+echo "configure:85648: checking for insck__getVdate in -linsck" >&5
 ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -84609,7 +85652,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-linsck  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 84613 "configure"
+#line 85656 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -84620,7 +85663,7 @@
 insck__getVdate()
 ; return 0; }
 EOF
-if { (eval echo configure:84624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:85667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -84751,7 +85794,7 @@
   done
 
   echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
-echo "configure:84755: checking for bsd_tcp in -linsck" >&5
+echo "configure:85798: checking for bsd_tcp in -linsck" >&5
 ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -84759,7 +85802,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-linsck  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 84763 "configure"
+#line 85806 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -84770,7 +85813,7 @@
 bsd_tcp()
 ; return 0; }
 EOF
-if { (eval echo configure:84774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:85817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -84829,7 +85872,7 @@
 
 
 echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
-echo "configure:84833: checking whether to enable System V IPC support" >&5
+echo "configure:85876: checking whether to enable System V IPC support" >&5
 # Check whether --enable-sysvmsg or --disable-sysvmsg was given.
 if test "${enable_sysvmsg+set}" = set; then
   enableval="$enable_sysvmsg"
@@ -85104,7 +86147,7 @@
 
 
 echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
-echo "configure:85108: checking whether to enable System V semaphore support" >&5
+echo "configure:86151: checking whether to enable System V semaphore support" >&5
 # Check whether --enable-sysvsem or --disable-sysvsem was given.
 if test "${enable_sysvsem+set}" = set; then
   enableval="$enable_sysvsem"
@@ -85374,12 +86417,12 @@
 EOF
 
  echo $ac_n "checking for union semun""... $ac_c" 1>&6
-echo "configure:85378: checking for union semun" >&5
+echo "configure:86421: checking for union semun" >&5
 if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 85383 "configure"
+#line 86426 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -85390,7 +86433,7 @@
 union semun x;
 ; return 0; }
 EOF
-if { (eval echo configure:85394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:86437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
      php_cv_semun=yes
@@ -85425,7 +86468,7 @@
 
 
 echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
-echo "configure:85429: checking whether to enable System V shared memory support" >&5
+echo "configure:86472: checking whether to enable System V shared memory support" >&5
 # Check whether --enable-sysvshm or --disable-sysvshm was given.
 if test "${enable_sysvshm+set}" = set; then
   enableval="$enable_sysvshm"
@@ -85701,7 +86744,7 @@
 
 
 echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
-echo "configure:85705: checking whether to enable tokenizer support" >&5
+echo "configure:86748: checking whether to enable tokenizer support" >&5
 # Check whether --enable-tokenizer or --disable-tokenizer was given.
 if test "${enable_tokenizer+set}" = set; then
   enableval="$enable_tokenizer"
@@ -85978,7 +87021,7 @@
 
 
 echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
-echo "configure:85982: checking whether to enable WDDX support" >&5
+echo "configure:87025: checking whether to enable WDDX support" >&5
 # Check whether --enable-wddx or --disable-wddx was given.
 if test "${enable_wddx+set}" = set; then
   enableval="$enable_wddx"
@@ -86255,7 +87298,7 @@
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:86259: checking whether byte ordering is bigendian" >&5
+echo "configure:87302: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -86265,7 +87308,7 @@
   ac_cv_c_bigendian_php=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 86269 "configure"
+#line 87312 "configure"
 #include "confdefs.h"
 
 int main(void)
@@ -86281,7 +87324,7 @@
 }
   
 EOF
-if { (eval echo configure:86285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian_php=yes
 else
@@ -86314,7 +87357,7 @@
 
 
 echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
-echo "configure:86318: checking whether to enable XML support" >&5
+echo "configure:87361: checking whether to enable XML support" >&5
 # Check whether --enable-xml or --disable-xml was given.
 if test "${enable_xml+set}" = set; then
   enableval="$enable_xml"
@@ -86360,7 +87403,7 @@
 
 
 echo $ac_n "checking external libexpat install dir""... $ac_c" 1>&6
-echo "configure:86364: checking external libexpat install dir" >&5
+echo "configure:87407: checking external libexpat install dir" >&5
 # Check whether --with-expat-dir or --without-expat-dir was given.
 if test "${with_expat_dir+set}" = set; then
   withval="$with_expat_dir"
@@ -87043,7 +88086,7 @@
 
 
 echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
-echo "configure:87047: checking for XMLRPC-EPI support" >&5
+echo "configure:88090: checking for XMLRPC-EPI support" >&5
 # Check whether --with-xmlrpc or --without-xmlrpc was given.
 if test "${with_xmlrpc+set}" = set; then
   withval="$with_xmlrpc"
@@ -87089,7 +88132,7 @@
 
 
 echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
-echo "configure:87093: checking libexpat dir for XMLRPC-EPI" >&5
+echo "configure:88136: checking libexpat dir for XMLRPC-EPI" >&5
 # Check whether --with-expat-dir or --without-expat-dir was given.
 if test "${with_expat_dir+set}" = set; then
   withval="$with_expat_dir"
@@ -87114,7 +88157,7 @@
 
 
 echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
-echo "configure:87118: checking iconv dir for XMLRPC-EPI" >&5
+echo "configure:88161: checking iconv dir for XMLRPC-EPI" >&5
 # Check whether --with-iconv-dir or --without-iconv-dir was given.
 if test "${with_iconv_dir+set}" = set; then
   withval="$with_iconv_dir"
@@ -87315,12 +88358,12 @@
 
         if test "$PHP_ICONV" = "yes"; then
     echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:87319: checking for iconv" >&5
+echo "configure:88362: checking for iconv" >&5
 if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 87324 "configure"
+#line 88367 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char iconv(); below.  */
@@ -87343,7 +88386,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:87347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_iconv=yes"
 else
@@ -87367,12 +88410,12 @@
   echo "$ac_t""no" 1>&6
 
       echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:87371: checking for libiconv" >&5
+echo "configure:88414: checking for libiconv" >&5
 if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 87376 "configure"
+#line 88419 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char libiconv(); below.  */
@@ -87395,7 +88438,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:87399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_libiconv=yes"
 else
@@ -87530,7 +88573,7 @@
   done
 
   echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:87534: checking for libiconv in -l$iconv_lib_name" >&5
+echo "configure:88577: checking for libiconv in -l$iconv_lib_name" >&5
 ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -87538,7 +88581,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 87542 "configure"
+#line 88585 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -87549,7 +88592,7 @@
 libiconv()
 ; return 0; }
 EOF
-if { (eval echo configure:87553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -87662,7 +88705,7 @@
   done
 
   echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:87666: checking for iconv in -l$iconv_lib_name" >&5
+echo "configure:88709: checking for iconv in -l$iconv_lib_name" >&5
 ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -87670,7 +88713,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 87674 "configure"
+#line 88717 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -87681,7 +88724,7 @@
 iconv()
 ; return 0; }
 EOF
-if { (eval echo configure:87685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -87880,12 +88923,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:87884: checking for ANSI C header files" >&5
+echo "configure:88927: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 87889 "configure"
+#line 88932 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -87893,7 +88936,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:87897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:88940: \"$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*
@@ -87910,7 +88953,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 87914 "configure"
+#line 88957 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -87928,7 +88971,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 87932 "configure"
+#line 88975 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -87949,7 +88992,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 87953 "configure"
+#line 88996 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -87960,7 +89003,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:87964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -87987,17 +89030,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:87991: checking for $ac_hdr" >&5
+echo "configure:89034: 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 87996 "configure"
+#line 89039 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:88001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:89044: \"$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*
@@ -88029,7 +89072,7 @@
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:88033: checking size of char" >&5
+echo "configure:89076: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -88037,9 +89080,10 @@
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 88041 "configure"
+#line 89084 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -88048,7 +89092,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:88052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
 else
@@ -88069,7 +89113,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:88073: checking size of int" >&5
+echo "configure:89117: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -88077,9 +89121,10 @@
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 88081 "configure"
+#line 89125 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -88088,7 +89133,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:88092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -88108,7 +89153,7 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:88112: checking size of long" >&5
+echo "configure:89157: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -88116,9 +89161,10 @@
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 88120 "configure"
+#line 89165 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -88127,7 +89173,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:88131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -88147,7 +89193,7 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:88151: checking size of long long" >&5
+echo "configure:89197: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -88155,9 +89201,10 @@
   ac_cv_sizeof_long_long=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 88159 "configure"
+#line 89205 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -88166,7 +89213,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:88170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -88186,12 +89233,12 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:88190: checking for size_t" >&5
+echo "configure:89237: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 88195 "configure"
+#line 89242 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -88219,12 +89266,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:88223: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:89270: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 88228 "configure"
+#line 89275 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -88233,7 +89280,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:88237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:89284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -88254,12 +89301,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:88258: checking for uid_t in sys/types.h" >&5
+echo "configure:89305: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 88263 "configure"
+#line 89310 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -88299,12 +89346,12 @@
  memcpy memmove
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:88303: checking for $ac_func" >&5
+echo "configure:89350: 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 88308 "configure"
+#line 89355 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -88327,7 +89374,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:88331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89378: \"$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
@@ -88608,7 +89655,7 @@
     XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
   else
     echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
-echo "configure:88612: checking for XMLRPC-EPI in default path" >&5
+echo "configure:89659: checking for XMLRPC-EPI in default path" >&5
     for i in /usr/local /usr; do
       if test -r $i/include/xmlrpc.h; then
         XMLRPC_DIR=$i/include
@@ -88756,7 +89803,7 @@
 
 
 echo $ac_n "checking whether to enable xslt support""... $ac_c" 1>&6
-echo "configure:88760: checking whether to enable xslt support" >&5
+echo "configure:89807: checking whether to enable xslt support" >&5
 # Check whether --enable-xslt or --disable-xslt was given.
 if test "${enable_xslt+set}" = set; then
   enableval="$enable_xslt"
@@ -88802,7 +89849,7 @@
 
 
 echo $ac_n "checking for XSLT Sablotron backend""... $ac_c" 1>&6
-echo "configure:88806: checking for XSLT Sablotron backend" >&5
+echo "configure:89853: checking for XSLT Sablotron backend" >&5
 # Check whether --with-xslt-sablot or --without-xslt-sablot was given.
 if test "${with_xslt_sablot+set}" = set; then
   withval="$with_xslt_sablot"
@@ -88827,7 +89874,7 @@
 
 
 echo $ac_n "checking for libexpat dir for Sablotron XSL support""... $ac_c" 1>&6
-echo "configure:88831: checking for libexpat dir for Sablotron XSL support" >&5
+echo "configure:89878: checking for libexpat dir for Sablotron XSL support" >&5
 # Check whether --with-expat-dir or --without-expat-dir was given.
 if test "${with_expat_dir+set}" = set; then
   withval="$with_expat_dir"
@@ -88852,7 +89899,7 @@
 
 
 echo $ac_n "checking for iconv dir for Sablotron XSL support""... $ac_c" 1>&6
-echo "configure:88856: checking for iconv dir for Sablotron XSL support" >&5
+echo "configure:89903: checking for iconv dir for Sablotron XSL support" >&5
 # Check whether --with-iconv-dir or --without-iconv-dir was given.
 if test "${with_iconv_dir+set}" = set; then
   withval="$with_iconv_dir"
@@ -88877,7 +89924,7 @@
 
 
 echo $ac_n "checking for JavaScript for Sablotron XSL support""... $ac_c" 1>&6
-echo "configure:88881: checking for JavaScript for Sablotron XSL support" >&5
+echo "configure:89928: checking for JavaScript for Sablotron XSL support" >&5
 # Check whether --with-sablot-js or --without-sablot-js was given.
 if test "${with_sablot_js+set}" = set; then
   withval="$with_sablot_js"
@@ -89144,7 +90191,7 @@
     XSLT_DIR=$XSLT_CHECK_DIR
   else
     echo $ac_n "checking for $XSLT_BACKEND_NAME libraries in the default path""... $ac_c" 1>&6
-echo "configure:89148: checking for $XSLT_BACKEND_NAME libraries in the default path" >&5
+echo "configure:90195: checking for $XSLT_BACKEND_NAME libraries in the default path" >&5
     for i in /usr/local /usr; do
       condition="$i$XSLT_TEST_FILE"
       if test -r $condition; then
@@ -89161,7 +90208,7 @@
                                
   if test "$PHP_XSLT_SABLOT" != "no"; then
     echo $ac_n "checking for sablot-config""... $ac_c" 1>&6
-echo "configure:89165: checking for sablot-config" >&5
+echo "configure:90212: checking for sablot-config" >&5
     if test -x $XSLT_DIR/bin/sablot-config ; then
        echo "$ac_t""found" 1>&6
        cat >> confdefs.h <<\EOF
@@ -89179,14 +90226,14 @@
        echo "$ac_t""not found" 1>&6
     fi
     echo $ac_n "checking for Sablotron version""... $ac_c" 1>&6
-echo "configure:89183: checking for Sablotron version" >&5
+echo "configure:90230: checking for Sablotron version" >&5
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS -I$XSLT_DIR/include"
     if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 89190 "configure"
+#line 90237 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -89204,7 +90251,7 @@
 }
     
 EOF
-if { (eval echo configure:89208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
       echo "$ac_t"">= 0.96" 1>&6
@@ -89391,12 +90438,12 @@
 
         if test "$PHP_ICONV" = "yes"; then
     echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:89395: checking for iconv" >&5
+echo "configure:90442: checking for iconv" >&5
 if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 89400 "configure"
+#line 90447 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char iconv(); below.  */
@@ -89419,7 +90466,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:89423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_iconv=yes"
 else
@@ -89443,12 +90490,12 @@
   echo "$ac_t""no" 1>&6
 
       echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:89447: checking for libiconv" >&5
+echo "configure:90494: checking for libiconv" >&5
 if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 89452 "configure"
+#line 90499 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char libiconv(); below.  */
@@ -89471,7 +90518,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:89475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_libiconv=yes"
 else
@@ -89606,7 +90653,7 @@
   done
 
   echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:89610: checking for libiconv in -l$iconv_lib_name" >&5
+echo "configure:90657: checking for libiconv in -l$iconv_lib_name" >&5
 ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -89614,7 +90661,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 89618 "configure"
+#line 90665 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -89625,7 +90672,7 @@
 libiconv()
 ; return 0; }
 EOF
-if { (eval echo configure:89629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -89738,7 +90785,7 @@
   done
 
   echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:89742: checking for iconv in -l$iconv_lib_name" >&5
+echo "configure:90789: checking for iconv in -l$iconv_lib_name" >&5
 ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -89746,7 +90793,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$iconv_lib_name  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 89750 "configure"
+#line 90797 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -89757,7 +90804,7 @@
 iconv()
 ; return 0; }
 EOF
-if { (eval echo configure:89761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -90029,7 +91076,7 @@
   done
 
   echo $ac_n "checking for JS_GetRuntime in -ljs""... $ac_c" 1>&6
-echo "configure:90033: checking for JS_GetRuntime in -ljs" >&5
+echo "configure:91080: checking for JS_GetRuntime in -ljs" >&5
 ac_lib_var=`echo js'_'JS_GetRuntime | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -90037,7 +91084,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljs  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 90041 "configure"
+#line 91088 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -90048,7 +91095,7 @@
 JS_GetRuntime()
 ; return 0; }
 EOF
-if { (eval echo configure:90052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:91099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -90261,7 +91308,7 @@
   done
 
   echo $ac_n "checking for SablotSetEncoding in -lsablot""... $ac_c" 1>&6
-echo "configure:90265: checking for SablotSetEncoding in -lsablot" >&5
+echo "configure:91312: checking for SablotSetEncoding in -lsablot" >&5
 ac_lib_var=`echo sablot'_'SablotSetEncoding | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -90269,7 +91316,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsablot  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 90273 "configure"
+#line 91320 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -90280,7 +91327,7 @@
 SablotSetEncoding()
 ; return 0; }
 EOF
-if { (eval echo configure:90284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:91331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -90397,7 +91444,7 @@
   done
 
   echo $ac_n "checking for SablotGetOptions in -lsablot""... $ac_c" 1>&6
-echo "configure:90401: checking for SablotGetOptions in -lsablot" >&5
+echo "configure:91448: checking for SablotGetOptions in -lsablot" >&5
 ac_lib_var=`echo sablot'_'SablotGetOptions | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -90405,7 +91452,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsablot  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 90409 "configure"
+#line 91456 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -90416,7 +91463,7 @@
 SablotGetOptions()
 ; return 0; }
 EOF
-if { (eval echo configure:90420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:91467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -90596,7 +91643,7 @@
 
 
 echo $ac_n "checking for YAZ support""... $ac_c" 1>&6
-echo "configure:90600: checking for YAZ support" >&5
+echo "configure:91647: checking for YAZ support" >&5
 # Check whether --with-yaz or --without-yaz was given.
 if test "${with_yaz+set}" = set; then
   withval="$with_yaz"
@@ -90646,7 +91693,7 @@
     # Extract the first word of "yaz-config", so it can be a program name with args.
 set dummy yaz-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:90650: checking for $ac_word" >&5
+echo "configure:91697: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_yazconfig'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -90695,7 +91742,7 @@
     . $yazconfig
 
         echo $ac_n "checking for YAZ version""... $ac_c" 1>&6
-echo "configure:90699: checking for YAZ version" >&5
+echo "configure:91746: checking for YAZ version" >&5
     yaz_version=`echo $YAZVERSION | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
     if test "$yaz_version" -ge 1009000; then
       echo "$ac_t""$YAZVERSION" 1>&6
@@ -91120,7 +92167,7 @@
 
 
 echo $ac_n "checking whether to include YP support""... $ac_c" 1>&6
-echo "configure:91124: checking whether to include YP support" >&5
+echo "configure:92171: checking whether to include YP support" >&5
 # Check whether --enable-yp or --disable-yp was given.
 if test "${enable_yp+set}" = set; then
   enableval="$enable_yp"
@@ -91166,7 +92213,7 @@
 if test "$PHP_YP" != "no"; then
 
   echo $ac_n "checking for yp_match in -lnsl""... $ac_c" 1>&6
-echo "configure:91170: checking for yp_match in -lnsl" >&5
+echo "configure:92217: checking for yp_match in -lnsl" >&5
 ac_lib_var=`echo nsl'_'yp_match | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -91174,7 +92221,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 91178 "configure"
+#line 92225 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -91185,7 +92232,7 @@
 yp_match()
 ; return 0; }
 EOF
-if { (eval echo configure:91189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:92236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -91207,7 +92254,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for yp_match in -lc""... $ac_c" 1>&6
-echo "configure:91211: checking for yp_match in -lc" >&5
+echo "configure:92258: checking for yp_match in -lc" >&5
 ac_lib_var=`echo c'_'yp_match | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -91215,7 +92262,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 91219 "configure"
+#line 92266 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -91226,7 +92273,7 @@
 yp_match()
 ; return 0; }
 EOF
-if { (eval echo configure:91230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:92277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -91601,7 +92648,7 @@
 
 
 echo $ac_n "checking for ZIP support""... $ac_c" 1>&6
-echo "configure:91605: checking for ZIP support" >&5
+echo "configure:92652: checking for ZIP support" >&5
 # Check whether --with-zip or --without-zip was given.
 if test "${with_zip+set}" = set; then
   withval="$with_zip"
@@ -91749,7 +92796,7 @@
   done
 
   echo $ac_n "checking for zzip_open in -lzzip""... $ac_c" 1>&6
-echo "configure:91753: checking for zzip_open in -lzzip" >&5
+echo "configure:92800: checking for zzip_open in -lzzip" >&5
 ac_lib_var=`echo zzip'_'zzip_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -91757,7 +92804,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lzzip  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 91761 "configure"
+#line 92808 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -91768,7 +92815,7 @@
 zzip_open()
 ; return 0; }
 EOF
-if { (eval echo configure:91772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:92819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -92226,7 +93273,7 @@
 
 
 echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6
-echo "configure:92230: checking whether to install PEAR" >&5
+echo "configure:93277: checking whether to install PEAR" >&5
 # Check whether --with-pear or --without-pear was given.
 if test "${with_pear+set}" = set; then
   withval="$with_pear"
@@ -92332,7 +93379,7 @@
     echo "configure: warning: You will need bison if you want to regenerate the Zend parser." 1>&2
 else
     echo $ac_n "checking bison version""... $ac_c" 1>&6
-echo "configure:92336: checking bison version" >&5
+echo "configure:93383: checking bison version" >&5
     set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /' | tr -d 'a-z'`
     if test "${1}" = "1" -a "${2}" -lt "28"; then
         echo "configure: warning: You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2})." 1>&2
@@ -92367,17 +93414,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:92371: checking for $ac_hdr" >&5
+echo "configure:93418: 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 92376 "configure"
+#line 93423 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:92381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:93428: \"$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*
@@ -92405,12 +93452,12 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:92409: checking for size_t" >&5
+echo "configure:93456: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 92414 "configure"
+#line 93461 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -92438,12 +93485,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:92442: checking return type of signal handlers" >&5
+echo "configure:93489: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 92447 "configure"
+#line 93494 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -92460,7 +93507,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:92464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:93511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -92480,12 +93527,12 @@
 
 
 echo $ac_n "checking for uint""... $ac_c" 1>&6
-echo "configure:92484: checking for uint" >&5
+echo "configure:93531: checking for uint" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 92489 "configure"
+#line 93536 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -92513,12 +93560,12 @@
 fi
 
 echo $ac_n "checking for ulong""... $ac_c" 1>&6
-echo "configure:92517: checking for ulong" >&5
+echo "configure:93564: checking for ulong" >&5
 if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 92522 "configure"
+#line 93569 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -92548,9 +93595,9 @@
 
 
 echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:92552: checking for int32_t" >&5
+echo "configure:93599: checking for int32_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 92554 "configure"
+#line 93601 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_TYPES_H  
@@ -92569,7 +93616,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:92573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:93620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
   cat >> confdefs.h <<EOF
@@ -92588,9 +93635,9 @@
 rm -f conftest*
 
 echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
-echo "configure:92592: checking for uint32_t" >&5
+echo "configure:93639: checking for uint32_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 92594 "configure"
+#line 93641 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_TYPES_H  
@@ -92609,7 +93656,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:92613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:93660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
   cat >> confdefs.h <<EOF
@@ -92628,12 +93675,12 @@
 rm -f conftest*
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:92632: checking for vprintf" >&5
+echo "configure:93679: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 92637 "configure"
+#line 93684 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -92656,7 +93703,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:92660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:93707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -92680,12 +93727,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:92684: checking for _doprnt" >&5
+echo "configure:93731: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 92689 "configure"
+#line 93736 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -92708,7 +93755,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:92712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:93759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -92733,7 +93780,7 @@
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:92737: checking for 8-bit clean memcmp" >&5
+echo "configure:93784: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -92741,7 +93788,7 @@
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 92745 "configure"
+#line 93792 "configure"
 #include "confdefs.h"
 
 main()
@@ -92751,7 +93798,7 @@
 }
 
 EOF
-if { (eval echo configure:92755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:93802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -92771,19 +93818,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:92775: checking for working alloca.h" >&5
+echo "configure:93822: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 92780 "configure"
+#line 93827 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:92787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:93834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -92804,12 +93851,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:92808: checking for alloca" >&5
+echo "configure:93855: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 92813 "configure"
+#line 93860 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -92837,7 +93884,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:92841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:93888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -92869,12 +93916,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:92873: checking whether alloca needs Cray hooks" >&5
+echo "configure:93920: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 92878 "configure"
+#line 93925 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -92899,12 +93946,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:92903: checking for $ac_func" >&5
+echo "configure:93950: 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 92908 "configure"
+#line 93955 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -92927,7 +93974,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:92931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:93978: \"$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
@@ -92954,7 +94001,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:92958: checking stack direction for C alloca" >&5
+echo "configure:94005: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -92962,7 +94009,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 92966 "configure"
+#line 94013 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -92981,7 +94028,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:92985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:94032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -93005,12 +94052,12 @@
 for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:93009: checking for $ac_func" >&5
+echo "configure:94056: 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 93014 "configure"
+#line 94061 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -93033,7 +94080,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:93037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:94084: \"$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
@@ -93061,12 +94108,12 @@
 for ac_func in finite isfinite isinf isnan
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:93065: checking for $ac_func" >&5
+echo "configure:94112: 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 93070 "configure"
+#line 94117 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -93089,7 +94136,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:93093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:94140: \"$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
@@ -93116,13 +94163,13 @@
 
 
   echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6
-echo "configure:93120: checking whether fp_except is defined" >&5
+echo "configure:94167: checking whether fp_except is defined" >&5
 if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 93126 "configure"
+#line 94173 "configure"
 #include "confdefs.h"
 
 #include <floatingpoint.h>
@@ -93133,7 +94180,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:93137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:94184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
      ac_cv_type_fp_except=yes
@@ -93163,17 +94210,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:93167: checking for $ac_hdr" >&5
+echo "configure:94214: 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 93172 "configure"
+#line 94219 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:93177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:94224: \"$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*
@@ -93202,14 +94249,14 @@
 
 
 echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6
-echo "configure:93206: checking whether dlsym() requires a leading underscore in symbol names" >&5
+echo "configure:94253: checking whether dlsym() requires a leading underscore in symbol names" >&5
 if test "$cross_compiling" = yes; then :
   
 else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 93213 "configure"
+#line 94260 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -93270,7 +94317,7 @@
     exit (status);
 }
 EOF
-  if { (eval echo configure:93274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo configure:94321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -93353,23 +94400,23 @@
 
 
 echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6
-echo "configure:93357: checking whether to enable thread-safety" >&5
+echo "configure:94404: checking whether to enable thread-safety" >&5
 echo "$ac_t""$ZEND_EXPERIMENTAL_ZTS" 1>&6
 
 echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6
-echo "configure:93361: checking whether to enable inline optimization for GCC" >&5
+echo "configure:94408: checking whether to enable inline optimization for GCC" >&5
 echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6
 
 echo $ac_n "checking whether to enable a memory limit""... $ac_c" 1>&6
-echo "configure:93365: checking whether to enable a memory limit" >&5
+echo "configure:94412: checking whether to enable a memory limit" >&5
 echo "$ac_t""$ZEND_MEMORY_LIMIT" 1>&6
 
 echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6
-echo "configure:93369: checking whether to enable Zend debugging" >&5
+echo "configure:94416: checking whether to enable Zend debugging" >&5
 echo "$ac_t""$ZEND_DEBUG" 1>&6
 
 echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6
-echo "configure:93373: checking whether to enable Zend multibyte" >&5
+echo "configure:94420: checking whether to enable Zend multibyte" >&5
 echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
 
 if test "$ZEND_DEBUG" = "yes"; then
@@ -93429,21 +94476,21 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:93433: checking for inline" >&5
+echo "configure:94480: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 93440 "configure"
+#line 94487 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:93447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:94494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -93513,17 +94560,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:93517: checking for $ac_hdr" >&5
+echo "configure:94564: 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 93522 "configure"
+#line 94569 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:93527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:94574: \"$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*
@@ -93600,7 +94647,7 @@
   
 
 echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6
-echo "configure:93604: checking for GNU Pth" >&5
+echo "configure:94651: checking for GNU Pth" >&5
 PTH_PREFIX="`$TSRM_PTH --prefix`"
 if test -z "$PTH_PREFIX"; then
   echo "$ac_t""Please check your Pth installation" 1>&6
@@ -93630,17 +94677,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:93634: checking for $ac_hdr" >&5
+echo "configure:94681: 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 93639 "configure"
+#line 94686 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:93644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:94691: \"$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*
@@ -93670,7 +94717,7 @@
 
   LIBS="$LIBS -lst"
   echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6
-echo "configure:93674: checking for SGI's State Threads" >&5
+echo "configure:94721: checking for SGI's State Threads" >&5
   echo "$ac_t""yes" 1>&6
   cat >> confdefs.h <<\EOF
 #define TSRM_ST 1
@@ -93702,7 +94749,7 @@
   pthreads_working=no 
 else
   cat > conftest.$ac_ext <<EOF
-#line 93706 "configure"
+#line 94753 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -93720,7 +94767,7 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 } 
 EOF
-if { (eval echo configure:93724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:94771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   pthreads_working=yes
@@ -93740,7 +94787,7 @@
   CFLAGS=$save_CFLAGS
 
   echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
-echo "configure:93744: checking for pthreads_cflags" >&5
+echo "configure:94791: checking for pthreads_cflags" >&5
 if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -93755,7 +94802,7 @@
   pthreads_working=no 
 else
   cat > conftest.$ac_ext <<EOF
-#line 93759 "configure"
+#line 94806 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -93773,7 +94820,7 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 } 
 EOF
-if { (eval echo configure:93777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:94824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   pthreads_working=yes
@@ -93803,7 +94850,7 @@
 echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
 
 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
-echo "configure:93807: checking for pthreads_lib" >&5
+echo "configure:94854: checking for pthreads_lib" >&5
 if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -93818,7 +94865,7 @@
   pthreads_working=no 
 else
   cat > conftest.$ac_ext <<EOF
-#line 93822 "configure"
+#line 94869 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -93836,7 +94883,7 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 } 
 EOF
-if { (eval echo configure:93840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:94887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
   pthreads_working=yes
@@ -93887,7 +94934,7 @@
 
 
   echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
-echo "configure:93891: checking for POSIX threads" >&5
+echo "configure:94938: checking for POSIX threads" >&5
   echo "$ac_t""yes" 1>&6
 fi
 
@@ -94412,12 +95459,12 @@
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:94416: checking for Cygwin environment" >&5
+echo "configure:95463: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 94421 "configure"
+#line 95468 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -94428,7 +95475,7 @@
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:94432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:95479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -94445,19 +95492,19 @@
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:94449: checking for mingw32 environment" >&5
+echo "configure:95496: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 94454 "configure"
+#line 95501 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:94461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:95508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -94543,7 +95590,7 @@
 fi
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:94547: checking build system type" >&5
+echo "configure:95594: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -94572,7 +95619,7 @@
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:94576: checking for ld used by GCC" >&5
+echo "configure:95623: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -94602,10 +95649,10 @@
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:94606: checking for GNU ld" >&5
+echo "configure:95653: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:94609: checking for non-GNU ld" >&5
+echo "configure:95656: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -94640,7 +95687,7 @@
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:94644: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:95691: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -94657,7 +95704,7 @@
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:94661: checking for $LD option to reload object files" >&5
+echo "configure:95708: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -94669,7 +95716,7 @@
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:94673: checking for BSD-compatible nm" >&5
+echo "configure:95720: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -94707,7 +95754,7 @@
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
-echo "configure:94711: checking for a sed that does not truncate output" >&5
+echo "configure:95758: checking for a sed that does not truncate output" >&5
 if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -94791,7 +95838,7 @@
 echo "$ac_t""$SED" 1>&6
 
 echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
-echo "configure:94795: checking how to recognise dependent libraries" >&5
+echo "configure:95842: checking how to recognise dependent libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -94978,13 +96025,13 @@
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:94982: checking for object suffix" >&5
+echo "configure:96029: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:94988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:96035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -95004,7 +96051,7 @@
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:95008: checking for executable suffix" >&5
+echo "configure:96055: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95014,10 +96061,10 @@
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:95018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:96065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.$ac_ext | *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -95045,7 +96092,7 @@
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:95049: checking command to parse $NM output" >&5
+echo "configure:96096: checking command to parse $NM output" >&5
 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95128,10 +96175,10 @@
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo configure:95132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:96179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo configure:95135: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+    if { (eval echo configure:96182: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
        mv -f "$nlist"T "$nlist"
@@ -95182,7 +96229,7 @@
          save_CFLAGS="$CFLAGS"
          LIBS="conftstm.$ac_objext"
          CFLAGS="$CFLAGS$no_builtin_flag"
-         if { (eval echo configure:95186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+         if { (eval echo configure:96233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
            pipe_works=yes
          fi
          LIBS="$save_LIBS"
@@ -95236,7 +96283,7 @@
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:95240: checking for ${ac_tool_prefix}file" >&5
+echo "configure:96287: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95298,7 +96345,7 @@
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:95302: checking for file" >&5
+echo "configure:96349: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95369,7 +96416,7 @@
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:95373: checking for $ac_word" >&5
+echo "configure:96420: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95401,7 +96448,7 @@
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:95405: checking for $ac_word" >&5
+echo "configure:96452: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95436,7 +96483,7 @@
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:95440: checking for $ac_word" >&5
+echo "configure:96487: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95468,7 +96515,7 @@
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:95472: checking for $ac_word" >&5
+echo "configure:96519: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95517,8 +96564,8 @@
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 95521 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:95522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 96568 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:96569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -95539,7 +96586,7 @@
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:95543: checking whether the C compiler needs -belf" >&5
+echo "configure:96590: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95552,14 +96599,14 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 95556 "configure"
+#line 96603 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:95563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:96610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -95681,7 +96728,7 @@
 ## FIXME: this should be a separate macro
 ##
 echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:95685: checking for objdir" >&5
+echo "configure:96732: checking for objdir" >&5
 rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
@@ -95712,7 +96759,7 @@
 # in isolation, and that seeing it set (from the cache) indicates that
 # the associated values are set (in the cache) correctly too.
 echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:95716: checking for $compiler option to produce PIC" >&5
+echo "configure:96763: checking for $compiler option to produce PIC" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95860,21 +96907,21 @@
 
   # Check to make sure the pic_flag actually works.
   echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-echo "configure:95864: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo "configure:96911: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
   if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
       save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
     cat > conftest.$ac_ext <<EOF
-#line 95871 "configure"
+#line 96918 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:95878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:96925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
         case $host_os in
       hpux9* | hpux10* | hpux11*)
@@ -95930,7 +96977,7 @@
 ## FIXME: this should be a separate macro
 ##
 echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-echo "configure:95934: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo "configure:96981: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95938,14 +96985,14 @@
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
   cat > conftest.$ac_ext <<EOF
-#line 95942 "configure"
+#line 96989 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:95949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:96996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_prog_cc_static_works=yes
 else
@@ -95976,7 +97023,7 @@
 ##
 # Check to see if options -o and -c are simultaneously supported by compiler
 echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:95980: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:97027: checking if $compiler supports -c -o file.$ac_objext" >&5
 if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -95995,7 +97042,7 @@
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:95999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:97046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -96024,7 +97071,7 @@
 if test x"$compiler_c_o" = x"yes"; then
   # Check to see if we can write to a .lo
   echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-echo "configure:96028: checking if $compiler supports -c -o file.lo" >&5
+echo "configure:97075: checking if $compiler supports -c -o file.lo" >&5
   if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -96035,14 +97082,14 @@
   save_objext="$ac_objext"
   ac_objext=lo
   cat > conftest.$ac_ext <<EOF
-#line 96039 "configure"
+#line 97086 "configure"
 #include "confdefs.h"
 
 int main() {
 int some_variable = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:96046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:97093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -96077,7 +97124,7 @@
 if test "$compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
   echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:96081: checking if we can lock with hard links" >&5
+echo "configure:97128: checking if we can lock with hard links" >&5
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -96100,20 +97147,20 @@
 if test "$GCC" = yes; then
   # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
   echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:96104: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo "configure:97151: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
   echo "int some_variable = 0;" > conftest.$ac_ext
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
   compiler_rtti_exceptions=no
   cat > conftest.$ac_ext <<EOF
-#line 96110 "configure"
+#line 97157 "configure"
 #include "confdefs.h"
 
 int main() {
 int some_variable = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:96117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:97164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -96144,7 +97191,7 @@
 ##
 # See if the linker supports building shared libraries.
 echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:96148: checking whether the linker ($LD) supports shared libraries" >&5
+echo "configure:97195: checking whether the linker ($LD) supports shared libraries" >&5
 
 allow_undefined_flag=
 no_undefined_flag=
@@ -96835,7 +97882,7 @@
 ##
 # Check hardcoding attributes.
 echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:96839: checking how to hardcode library paths into programs" >&5
+echo "configure:97886: checking how to hardcode library paths into programs" >&5
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var"; then
@@ -96867,7 +97914,7 @@
 striplib=
 old_striplib=
 echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:96871: checking whether stripping libraries is possible" >&5
+echo "configure:97918: checking whether stripping libraries is possible" >&5
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
@@ -96885,7 +97932,7 @@
 ##
 # PORTME Fill in your ld.so characteristics
 echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:96889: checking dynamic linker characteristics" >&5
+echo "configure:97936: checking dynamic linker characteristics" >&5
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -97144,8 +98191,8 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*)
-    echo '#line 97148 "configure"' > conftest.$ac_ext
-    if { (eval echo configure:97149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    echo '#line 98195 "configure"' > conftest.$ac_ext
+    if { (eval echo configure:98196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
       case `/usr/bin/file conftest.$ac_objext` in
       *64-bit*)
         libsuff=64
@@ -97320,7 +98367,7 @@
 ##
 # Report the final consequences.
 echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:97324: checking if libtool supports shared libraries" >&5
+echo "configure:98371: checking if libtool supports shared libraries" >&5
 echo "$ac_t""$can_build_shared" 1>&6
 ##
 ## END FIXME
@@ -97328,7 +98375,7 @@
 ## FIXME: this should be a separate macro
 ##
 echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-echo "configure:97332: checking whether to build shared libraries" >&5
+echo "configure:98379: checking whether to build shared libraries" >&5
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -97355,7 +98402,7 @@
 ## FIXME: this should be a separate macro
 ##
 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-echo "configure:97359: checking whether to build static libraries" >&5
+echo "configure:98406: checking whether to build static libraries" >&5
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
 echo "$ac_t""$enable_static" 1>&6
@@ -97398,12 +98445,12 @@
 
   *)
     echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:97402: checking for shl_load" >&5
+echo "configure:98449: checking for shl_load" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 97407 "configure"
+#line 98454 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load(); below.  */
@@ -97426,7 +98473,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:97430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:98477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shl_load=yes"
 else
@@ -97444,7 +98491,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:97448: checking for shl_load in -ldld" >&5
+echo "configure:98495: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -97452,7 +98499,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 97456 "configure"
+#line 98503 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -97463,7 +98510,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:97467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:98514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -97482,12 +98529,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:97486: checking for dlopen" >&5
+echo "configure:98533: checking for dlopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 97491 "configure"
+#line 98538 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
@@ -97510,7 +98557,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:97514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:98561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dlopen=yes"
 else
@@ -97528,7 +98575,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:97532: checking for dlopen in -ldl" >&5
+echo "configure:98579: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -97536,7 +98583,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 97540 "configure"
+#line 98587 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -97547,7 +98594,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:97551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:98598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -97566,7 +98613,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:97570: checking for dlopen in -lsvld" >&5
+echo "configure:98617: checking for dlopen in -lsvld" >&5
 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -97574,7 +98621,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsvld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 97578 "configure"
+#line 98625 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -97585,7 +98632,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:97589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:98636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -97604,7 +98651,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:97608: checking for dld_link in -ldld" >&5
+echo "configure:98655: checking for dld_link in -ldld" >&5
 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -97612,7 +98659,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 97616 "configure"
+#line 98663 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -97623,7 +98670,7 @@
 dld_link()
 ; return 0; }
 EOF
-if { (eval echo configure:97627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:98674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -97679,7 +98726,7 @@
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:97683: checking whether a program can dlopen itself" >&5
+echo "configure:98730: checking whether a program can dlopen itself" >&5
 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -97689,7 +98736,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 97693 "configure"
+#line 98740 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -97750,7 +98797,7 @@
     exit (status);
 }
 EOF
-  if { (eval echo configure:97754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo configure:98801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -97773,7 +98820,7 @@
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
       echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:97777: checking whether a statically linked program can dlopen itself" >&5
+echo "configure:98824: checking whether a statically linked program can dlopen itself" >&5
 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -97783,7 +98830,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 97787 "configure"
+#line 98834 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -97844,7 +98891,7 @@
     exit (status);
 }
 EOF
-  if { (eval echo configure:97848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo configure:98895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -97895,14 +98942,14 @@
     # systems, -lgcc has to come before -lc. If gcc already passes -lc
     # to ld, don't add -lc before -lgcc.
     echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:97899: checking whether -lc should be explicitly linked in" >&5
+echo "configure:98946: checking whether -lc should be explicitly linked in" >&5
     if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   $rm conftest*
     echo 'static int dummy;' > conftest.$ac_ext
 
-    if { (eval echo configure:97906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    if { (eval echo configure:98953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
       soname=conftest
       lib=conftest
       libobjs=conftest.$ac_objext
@@ -97915,7 +98962,7 @@
       libname=conftest
       save_allow_undefined_flag=$allow_undefined_flag
       allow_undefined_flag=
-      if { (eval echo configure:97919: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+      if { (eval echo configure:98966: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
       then
        lt_cv_archive_cmds_need_lc=no
       else
@@ -99147,6 +100194,7 @@
 s%@ORACLE_DIR@%$ORACLE_DIR%g
 s%@ORACLE_VERSION@%$ORACLE_VERSION%g
 s%@SNMP_CONFIG@%$SNMP_CONFIG%g
+s%@LEMON@%$LEMON%g
 s%@yazconfig@%$yazconfig%g
 s%@INLINE_CFLAGS@%$INLINE_CFLAGS%g
 s%@INCLUDE_PATH@%$INCLUDE_PATH%g
diff -ruN php-4.3.11-old/ext/sqlite/CREDITS php-4.3.11-new/ext/sqlite/CREDITS
--- php-4.3.11-old/ext/sqlite/CREDITS   1970-01-01 01:00:00.000000000 +0100
+++ php-4.3.11-new/ext/sqlite/CREDITS   2003-05-13 17:52:16.000000000 +0200
@@ -0,0 +1,2 @@
+sqlite
+Wez Furlong, Tal Peer, Marcus Börger
diff -ruN php-4.3.11-old/ext/sqlite/README php-4.3.11-new/ext/sqlite/README
--- php-4.3.11-old/ext/sqlite/README    1970-01-01 01:00:00.000000000 +0100
+++ php-4.3.11-new/ext/sqlite/README    2003-04-17 03:33:52.000000000 +0200
@@ -0,0 +1,14 @@
+This is an extension for the SQLite Embeddable SQL Database Engine.
+http://www.sqlite.org/
+
+SQLite is a C library that implements an embeddable SQL database engine.
+Programs that link with the SQLite library can have SQL database access
+without running a separate RDBMS process.
+
+SQLite is not a client library used to connect to a big database server.
+SQLite is the server. The SQLite library reads and writes directly to and from
+the database files on disk
+
+
+
+vim:tw=78:et
diff -ruN php-4.3.11-old/ext/sqlite/TODO php-4.3.11-new/ext/sqlite/TODO
--- php-4.3.11-old/ext/sqlite/TODO      1970-01-01 01:00:00.000000000 +0100
+++ php-4.3.11-new/ext/sqlite/TODO      2003-04-20 17:11:15.000000000 +0200
@@ -0,0 +1,22 @@
+- Transparent binary encoding of return values from PHP callback functions.
+
+- Add user-space callback for the authorizer function (this is potentially
+  very slow, so it needs to be implemented carefully).
+
+- Add user-space callback to handle busy databases.
+
+- Test-suite
+
+  o Test how robust we are when a user-space function is registered as
+    a callback for a persistent connection in script A, then script B is
+       called that doesn't register the callback but does make use of the
+       function in an SQL query.
+       --> Our test suite doesn't allow us to test persistent connections
+           at this time :/
+
+- If building a ZTS build, -DTHREADSAFE while compiling libsqlite
+
+- If building a non-debug build, -DNDEBUG will disable the expensive
+  asserts in the inner loop. (and double performance)
+
+vim:tw=78
diff -ruN php-4.3.11-old/ext/sqlite/config.m4 php-4.3.11-new/ext/sqlite/config.m4
--- php-4.3.11-old/ext/sqlite/config.m4 1970-01-01 01:00:00.000000000 +0100
+++ php-4.3.11-new/ext/sqlite/config.m4 2005-07-04 17:22:39.000000000 +0200
@@ -0,0 +1,106 @@
+dnl $Id$
+dnl config.m4 for extension sqlite
+dnl vim:et:ts=2:sw=2
+
+PHP_ARG_WITH(sqlite, for sqlite support,
+[  --with-sqlite           Include sqlite support])
+
+if test "$PHP_SQLITE" != "no"; then
+
+  if test "$PHP_SQLITE" != "yes"; then
+    SEARCH_PATH="/usr/local /usr"
+    SEARCH_FOR="/include/sqlite.h"
+    if test -r $PHP_SQLITE/; then # path given as parameter
+        SQLITE_DIR=$PHP_SQLITE
+    else # search default path list
+        AC_MSG_CHECKING([for sqlite files in default path])
+        for i in $SEARCH_PATH ; do
+        if test -r $i/$SEARCH_FOR; then
+            SQLITE_DIR=$i
+            AC_MSG_RESULT(found in $i)
+        fi
+        done
+    fi
+  
+    if test -z "$SQLITE_DIR"; then
+        AC_MSG_RESULT([not found])
+        AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org])
+    fi
+
+    PHP_ADD_INCLUDE($SQLITE_DIR/include)
+
+    LIBNAME=sqlite
+    LIBSYMBOL=sqlite_open
+
+    PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
+    [
+        PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/lib, SQLITE_SHARED_LIBADD)
+        AC_DEFINE(HAVE_SQLITELIB,1,[ ])
+    ],[
+        AC_MSG_ERROR([wrong sqlite lib version or lib not found])
+    ],[
+        -L$SQLITE_DIR/lib -lm -ldl
+    ])
+ 
+    PHP_SUBST(SQLITE_SHARED_LIBADD)
+    PHP_NEW_EXTENSION(sqlite, sqlite.c, $ext_shared)
+  else
+    # use bundled library
+
+    PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src"
+
+    sources="libsqlite/src/opcodes.c
+        libsqlite/src/parse.c libsqlite/src/encode.c \
+        libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
+        libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
+        libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
+        libsqlite/src/os.c libsqlite/src/pager.c \
+        libsqlite/src/printf.c libsqlite/src/random.c \
+        libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
+        libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
+        libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \
+        libsqlite/src/vacuum.c libsqlite/src/copy.c \
+        libsqlite/src/where.c libsqlite/src/trigger.c"
+    
+    PHP_NEW_EXTENSION(sqlite, sqlite.c $sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
+    PHP_ADD_BUILD_DIR($ext_builddir/libsqlite)
+    PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
+    AC_CHECK_SIZEOF(char *,4)
+    AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
+    AC_DEFINE(OS_UNIX, 1, [if this is unix])
+    AC_DEFINE(OS_WIN, 0, [if this is windows])
+    dnl use latin 1 for now; the utf-8 handling in funcs.c uses assert(),
+    dnl which is a bit silly and something we want to avoid
+    SQLITE_ENCODING="ISO8859"
+    dnl SQLITE_ENCODING="UTF-8"
+    dnl AC_DEFINE(SQLITE_UTF8,1,[if SQLite should use utf-8 encoding])
+    PHP_SUBST(SQLITE_ENCODING)
+
+    AC_PATH_PROG(LEMON,lemon,no)
+    PHP_SUBST(LEMON)
+
+    SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
+    PHP_SUBST(SQLITE_VERSION)
+
+    if test "$ext_shared" = "no"; then
+      echo '#include "php_config.h"' > $ext_srcdir/libsqlite/src/config.h
+    else
+      echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/libsqlite/src/config.h
+    fi
+    
+    cat >> $ext_srcdir/libsqlite/src/config.h <<EOF
+#if ZTS
+# define THREADSAFE 1
+#endif
+#if !ZEND_DEBUG
+# define NDEBUG
+#endif
+EOF
+
+    PHP_ADD_MAKEFILE_FRAGMENT
+
+  fi
+
+  AC_CHECK_FUNCS(usleep nanosleep)
+  AC_CHECK_HEADERS(time.h)
+fi
diff -ruN php-4.3.11-old/ext/sqlite/php_sqlite.def php-4.3.11-new/ext/sqlite/php_sqlite.def
--- php-4.3.11-old/ext/sqlite/php_sqlite.def    1970-01-01 01:00:00.000000000 +0100
+++ php-4.3.11-new/ext/sqlite/php_sqlite.def    2003-06-13 01:22:33.000000000 +0200
@@ -0,0 +1,37 @@
+EXPORTS
+sqlite_open
+sqlite_close
+sqlite_exec
+sqlite_last_insert_rowid
+sqlite_changes
+sqlite_error_string
+sqlite_interrupt
+sqlite_complete
+sqlite_busy_handler
+sqlite_busy_timeout
+sqlite_get_table
+sqlite_free_table
+sqlite_exec_printf
+sqlite_exec_vprintf
+sqlite_get_table_printf
+sqlite_get_table_vprintf
+sqlite_mprintf
+sqlite_vmprintf
+sqlite_freemem
+sqlite_libversion
+sqlite_libencoding
+sqlite_create_function
+sqlite_create_aggregate
+sqlite_function_type
+sqlite_set_result_string
+sqlite_set_result_int
+sqlite_set_result_double
+sqlite_set_result_error
+sqlite_user_data
+sqlite_aggregate_context
+sqlite_aggregate_count
+sqlite_set_authorizer
+sqlite_trace
+sqlite_compile
+sqlite_step
+sqlite_finalize
diff -ruN php-4.3.11-old/ext/sqlite/php_sqlite.h php-4.3.11-new/ext/sqlite/php_sqlite.h
--- php-4.3.11-old/ext/sqlite/php_sqlite.h      1970-01-01 01:00:00.000000000 +0100
+++ php-4.3.11-new/ext/sqlite/php_sqlite.h      2003-06-21 14:29:32.000000000 +0200
@@ -0,0 +1,103 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2003 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.0 of the PHP license,       |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_0.txt.                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
+   |          Tal Peer <tal@php.net>                                      |
+   |          Marcus Boerger <helly@php.net>                              |
+   +----------------------------------------------------------------------+
+
+   $Id$ 
+*/
+
+#ifndef PHP_SQLITE_H
+#define PHP_SQLITE_H
+
+extern zend_module_entry sqlite_module_entry;
+#define phpext_sqlite_ptr &sqlite_module_entry
+
+#ifdef PHP_WIN32
+#define PHP_SQLITE_API __declspec(dllexport)
+#else
+#define PHP_SQLITE_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+PHP_MINIT_FUNCTION(sqlite);
+PHP_MSHUTDOWN_FUNCTION(sqlite);
+PHP_RINIT_FUNCTION(sqlite);
+PHP_RSHUTDOWN_FUNCTION(sqlite);
+PHP_MINFO_FUNCTION(sqlite);
+
+PHP_FUNCTION(sqlite_open);
+PHP_FUNCTION(sqlite_popen);
+PHP_FUNCTION(sqlite_close);
+PHP_FUNCTION(sqlite_query);
+PHP_FUNCTION(sqlite_unbuffered_query);
+PHP_FUNCTION(sqlite_array_query);
+
+PHP_FUNCTION(sqlite_fetch_array);
+PHP_FUNCTION(sqlite_fetch_string);
+PHP_FUNCTION(sqlite_fetch_all);
+PHP_FUNCTION(sqlite_current);
+PHP_FUNCTION(sqlite_column);
+
+PHP_FUNCTION(sqlite_num_rows);
+PHP_FUNCTION(sqlite_num_fields);
+PHP_FUNCTION(sqlite_field_name);
+PHP_FUNCTION(sqlite_seek);
+PHP_FUNCTION(sqlite_rewind);
+PHP_FUNCTION(sqlite_next);
+PHP_FUNCTION(sqlite_has_more);
+
+PHP_FUNCTION(sqlite_libversion);
+PHP_FUNCTION(sqlite_libencoding);
+
+PHP_FUNCTION(sqlite_changes);
+PHP_FUNCTION(sqlite_last_insert_rowid);
+
+PHP_FUNCTION(sqlite_escape_string);
+
+PHP_FUNCTION(sqlite_busy_timeout);
+
+PHP_FUNCTION(sqlite_last_error);
+PHP_FUNCTION(sqlite_error_string);
+
+PHP_FUNCTION(sqlite_create_aggregate);
+PHP_FUNCTION(sqlite_create_function);
+PHP_FUNCTION(sqlite_udf_decode_binary);
+PHP_FUNCTION(sqlite_udf_encode_binary);
+
+ZEND_BEGIN_MODULE_GLOBALS(sqlite)
+        long assoc_case;
+ZEND_END_MODULE_GLOBALS(sqlite)
+
+#ifdef ZTS
+#define SQLITE_G(v) TSRMG(sqlite_globals_id, zend_sqlite_globals *, v)
+#else
+#define SQLITE_G(v) (sqlite_globals.v)
+#endif
+
+#endif
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
diff -ruN php-4.3.11-old/ext/sqlite/sqlite.c php-4.3.11-new/ext/sqlite/sqlite.c
--- php-4.3.11-old/ext/sqlite/sqlite.c  1970-01-01 01:00:00.000000000 +0100
+++ php-4.3.11-new/ext/sqlite/sqlite.c  2003-06-21 15:29:26.000000000 +0200
@@ -0,0 +1,1879 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2003 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.0 of the PHP license,       |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_0.txt.                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
+   |          Tal Peer <tal@php.net>                                      |
+   |          Marcus Boerger <helly@php.net>                              |
+   +----------------------------------------------------------------------+
+
+   $Id$ 
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define PHP_SQLITE_MODULE_VERSION      "1.0"
+
+#include "php.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
+#include "php_sqlite.h"
+
+#if HAVE_TIME_H
+# include <time.h>
+#endif
+#include <unistd.h>
+
+#include <sqlite.h>
+
+#ifndef safe_emalloc
+# define safe_emalloc(a,b,c) emalloc((a)*(b)+(c))
+#endif
+
+#ifndef ZEND_ENGINE_2
+# define OnUpdateLong OnUpdateInt
+#endif
+
+ZEND_DECLARE_MODULE_GLOBALS(sqlite)
+
+extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out);
+extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out);
+
+static unsigned char arg3_force_ref[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
+
+static int le_sqlite_db, le_sqlite_result, le_sqlite_pdb;
+
+static inline void php_sqlite_strtoupper(char *s)
+{
+       while (*s!='\0') {
+               *s = toupper(*s);
+               s++;
+       }
+}
+
+static inline void php_sqlite_strtolower(char *s)
+{
+       while (*s!='\0') {
+               *s = tolower(*s);
+               s++;
+       }
+}
+
+/* {{{ PHP_INI
+ */
+PHP_INI_BEGIN()
+STD_PHP_INI_ENTRY_EX("sqlite.assoc_case", "0", PHP_INI_ALL, OnUpdateLong, assoc_case, zend_sqlite_globals, sqlite_globals, display_link_numbers)
+PHP_INI_END()
+/* }}} */
+
+
+#define DB_FROM_ZVAL(db, zv)   ZEND_FETCH_RESOURCE2(db, struct php_sqlite_db *, zv, -1, "sqlite database", le_sqlite_db, le_sqlite_pdb)
+
+struct php_sqlite_result {
+       struct php_sqlite_db *db;
+       sqlite_vm *vm;
+       int buffered;
+       int ncolumns;
+       int nrows;
+       int curr_row;
+       char **col_names;
+       int alloc_rows;
+       char **table;
+       int mode;
+};
+
+struct php_sqlite_db {
+       sqlite *db;
+       int last_err_code;
+       int is_persistent;
+       int rsrc_id;
+
+       HashTable callbacks;
+};
+
+struct php_sqlite_agg_functions {
+       struct php_sqlite_db *db;
+       int is_valid;
+       zval *step;
+       zval *fini;
+};
+
+
+enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM };
+
+function_entry sqlite_functions[] = {
+       PHP_FE(sqlite_open, arg3_force_ref)
+       PHP_FE(sqlite_popen, arg3_force_ref)
+       PHP_FE(sqlite_close, NULL)
+       PHP_FE(sqlite_query, NULL)
+       PHP_FE(sqlite_array_query, NULL)
+       PHP_FE(sqlite_fetch_array, NULL)
+       PHP_FE(sqlite_fetch_string, NULL)
+       PHP_FE(sqlite_fetch_all, NULL)
+       PHP_FE(sqlite_current, NULL)
+       PHP_FE(sqlite_column, NULL)
+       PHP_FE(sqlite_libversion, NULL)
+       PHP_FE(sqlite_libencoding, NULL)
+       PHP_FE(sqlite_changes, NULL)
+       PHP_FE(sqlite_last_insert_rowid, NULL)
+       PHP_FE(sqlite_num_rows, NULL)
+       PHP_FE(sqlite_num_fields, NULL)
+       PHP_FE(sqlite_field_name, NULL)
+       PHP_FE(sqlite_seek, NULL)
+       PHP_FE(sqlite_rewind, NULL)
+       PHP_FE(sqlite_next, NULL)
+       PHP_FE(sqlite_has_more, NULL)
+       PHP_FE(sqlite_escape_string, NULL)
+       PHP_FE(sqlite_busy_timeout, NULL)
+       PHP_FE(sqlite_last_error, NULL)
+       PHP_FE(sqlite_error_string, NULL)
+       PHP_FE(sqlite_unbuffered_query, NULL)
+       PHP_FE(sqlite_create_aggregate, NULL)
+       PHP_FE(sqlite_create_function, NULL)
+       PHP_FE(sqlite_udf_encode_binary, NULL)
+       PHP_FE(sqlite_udf_decode_binary, NULL)
+       {NULL, NULL, NULL}
+};
+
+
+zend_module_entry sqlite_module_entry = {
+#if ZEND_MODULE_API_NO >= 20010901
+       STANDARD_MODULE_HEADER,
+#endif
+       "sqlite",
+       sqlite_functions,
+       PHP_MINIT(sqlite),
+       NULL,
+       NULL,
+       PHP_RSHUTDOWN(sqlite),
+       PHP_MINFO(sqlite),
+#if ZEND_MODULE_API_NO >= 20010901
+       PHP_SQLITE_MODULE_VERSION,
+#endif
+       STANDARD_MODULE_PROPERTIES
+};
+
+
+#ifdef COMPILE_DL_SQLITE
+ZEND_GET_MODULE(sqlite)
+#endif
+
+static int php_sqlite_callback_invalidator(struct php_sqlite_agg_functions *funcs TSRMLS_DC)
+{
+       if (!funcs->is_valid) {
+               return 0;
+       }
+
+       if (funcs->step) {
+               zval_ptr_dtor(&funcs->step);
+               funcs->step = NULL;
+       }
+
+       if (funcs->fini) {
+               zval_ptr_dtor(&funcs->fini);
+               funcs->fini = NULL;
+       }
+
+       funcs->is_valid = 0;
+
+       return 0;
+}
+
+
+static void php_sqlite_callback_dtor(void *pDest)
+{
+       struct php_sqlite_agg_functions *funcs = (struct php_sqlite_agg_functions*)pDest;
+
+       if (funcs->is_valid) {
+               TSRMLS_FETCH();
+
+               php_sqlite_callback_invalidator(funcs TSRMLS_CC);
+       }
+}
+       
+static ZEND_RSRC_DTOR_FUNC(php_sqlite_db_dtor)
+{
+       if (rsrc->ptr) {
+               struct php_sqlite_db *db = (struct php_sqlite_db*)rsrc->ptr;
+               sqlite_close(db->db);
+
+               zend_hash_destroy(&db->callbacks);
+               
+               pefree(db, db->is_persistent);
+
+               rsrc->ptr = NULL;
+       }
+}
+
+static void real_result_dtor(struct php_sqlite_result *res TSRMLS_DC)
+{
+       int i, j, base;
+
+       if (res->vm) {
+               sqlite_finalize(res->vm, NULL);
+       }
+
+       if (res->table) {
+               if (!res->buffered && res->nrows) {
+                       res->nrows = 1; /* only one row is stored */
+               }
+               for (i = 0; i < res->nrows; i++) {
+                       base = i * res->ncolumns;
+                       for (j = 0; j < res->ncolumns; j++) {
+                               if (res->table[base + j] != NULL) {
+                                       efree(res->table[base + j]);
+                               }
+                       }
+               }
+               efree(res->table);
+       }
+       if (res->col_names) {
+               for (j = 0; j < res->ncolumns; j++) {
+                       efree(res->col_names[j]);
+               }
+               efree(res->col_names);
+       }
+
+       zend_list_delete(res->db->rsrc_id);
+       efree(res);
+}
+
+static ZEND_RSRC_DTOR_FUNC(php_sqlite_result_dtor)
+{
+       struct php_sqlite_result *res = (struct php_sqlite_result *)rsrc->ptr;
+       real_result_dtor(res TSRMLS_CC);
+}
+
+static int php_sqlite_forget_persistent_id_numbers(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+       struct php_sqlite_db *db;
+
+       if (Z_TYPE_P(rsrc) != le_sqlite_pdb) {
+               return 0;
+       }
+
+       db = (struct php_sqlite_db*)rsrc->ptr;
+
+       db->rsrc_id = FAILURE;
+
+       /* don't leave pending commits hanging around */
+       sqlite_exec(db->db, "ROLLBACK", NULL, NULL, NULL);
+       
+       /* prevent bad mojo if someone tries to use a previously registered function in the next request */
+       zend_hash_apply(&db->callbacks, (apply_func_t)php_sqlite_callback_invalidator TSRMLS_CC);
+       
+       return 0;
+}
+
+PHP_RSHUTDOWN_FUNCTION(sqlite)
+{
+       zend_hash_apply(&EG(persistent_list), (apply_func_t)php_sqlite_forget_persistent_id_numbers TSRMLS_CC);
+       return SUCCESS;
+}
+
+/* {{{ PHP Function interface */
+static void php_sqlite_generic_function_callback(sqlite_func *func, int argc, const char **argv)
+{
+       zval *retval = NULL;
+       zval ***zargs = NULL;
+       zval funcname;
+       int i, res;
+       char *callable = NULL, *errbuf=NULL;
+       TSRMLS_FETCH();
+
+       /* sanity check the args */
+       if (argc == 0) {
+               sqlite_set_result_error(func, "not enough parameters", -1);
+               return;
+       }
+       
+       ZVAL_STRING(&funcname, (char*)argv[0], 0);
+
+       if (!zend_is_callable(&funcname, 0, &callable)) {
+               spprintf(&errbuf, 0, "function `%s' is not callable", callable);
+               sqlite_set_result_error(func, errbuf, -1);
+               efree(errbuf);
+               efree(callable);
+               return;
+       }
+       efree(callable);
+       
+       if (argc > 1) {
+               zargs = (zval ***)safe_emalloc((argc - 1), sizeof(zval **), 0);
+               
+               for (i = 0; i < argc-1; i++) {
+                       zargs[i] = emalloc(sizeof(zval *));
+                       MAKE_STD_ZVAL(*zargs[i]);
+                       ZVAL_STRING(*zargs[i], (char*)argv[i+1], 1);
+               }
+       }
+
+       res = call_user_function_ex(EG(function_table),
+                       NULL,
+                       &funcname,
+                       &retval,
+                       argc-1,
+                       zargs,
+                       0, NULL TSRMLS_CC);
+
+       if (res == SUCCESS) {
+               if (retval == NULL) {
+                       sqlite_set_result_string(func, NULL, 0);
+               } else {
+                       switch (Z_TYPE_P(retval)) {
+                               case IS_STRING:
+                                       sqlite_set_result_string(func, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+                                       break;
+                               case IS_LONG:
+                               case IS_BOOL:
+                                       sqlite_set_result_int(func, Z_LVAL_P(retval));
+                                       break;
+                               case IS_DOUBLE:
+                                       sqlite_set_result_double(func, Z_DVAL_P(retval));
+                                       break;
+                               case IS_NULL:
+                               default:
+                                       sqlite_set_result_string(func, NULL, 0);
+                       }
+               }
+       } else {
+               sqlite_set_result_error(func, "call_user_function_ex failed", -1);
+       }
+
+       if (retval) {
+               zval_ptr_dtor(&retval);
+       }
+
+       if (zargs) {
+               for (i = 0; i < argc-1; i++) {
+                       zval_ptr_dtor(zargs[i]);
+                       efree(zargs[i]);
+               }
+               efree(zargs);
+       }
+}
+/* }}} */
+
+/* {{{ callback for sqlite_create_function */
+static void php_sqlite_function_callback(sqlite_func *func, int argc, const char **argv)
+{
+       zval *retval = NULL;
+       zval ***zargs = NULL;
+       int i, res;
+       struct php_sqlite_agg_functions *funcs = sqlite_user_data(func);
+       TSRMLS_FETCH();
+
+       if (!funcs->is_valid) {
+               sqlite_set_result_error(func, "this function has not been correctly defined for this request", -1);
+               return;
+       }
+
+       if (argc > 0) {
+               zargs = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
+               
+               for (i = 0; i < argc; i++) {
+                       zargs[i] = emalloc(sizeof(zval *));
+                       MAKE_STD_ZVAL(*zargs[i]);
+
+                       if (argv[i] == NULL) {
+                               ZVAL_NULL(*zargs[i]);
+                       } else {
+                               ZVAL_STRING(*zargs[i], (char*)argv[i], 1);
+                       }
+               }
+       }
+
+       res = call_user_function_ex(EG(function_table),
+                       NULL,
+                       funcs->step,
+                       &retval,
+                       argc,
+                       zargs,
+                       0, NULL TSRMLS_CC);
+
+       if (res == SUCCESS) {
+               if (retval == NULL) {
+                       sqlite_set_result_string(func, NULL, 0);
+               } else {
+                       switch (Z_TYPE_P(retval)) {
+                               case IS_STRING:
+                                       /* TODO: for binary results, need to encode the string */
+                                       sqlite_set_result_string(func, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+                                       break;
+                               case IS_LONG:
+                               case IS_BOOL:
+                                       sqlite_set_result_int(func, Z_LVAL_P(retval));
+                                       break;
+                               case IS_DOUBLE:
+                                       sqlite_set_result_double(func, Z_DVAL_P(retval));
+                                       break;
+                               case IS_NULL:
+                               default:
+                                       sqlite_set_result_string(func, NULL, 0);
+                       }
+               }
+       } else {
+               sqlite_set_result_error(func, "call_user_function_ex failed", -1);
+       }
+
+       if (retval) {
+               zval_ptr_dtor(&retval);
+       }
+
+       if (zargs) {
+               for (i = 0; i < argc; i++) {
+                       zval_ptr_dtor(zargs[i]);
+                       efree(zargs[i]);
+               }
+               efree(zargs);
+       }
+}
+/* }}} */
+
+/* {{{ callback for sqlite_create_aggregate: step function */
+static void php_sqlite_agg_step_function_callback(sqlite_func *func, int argc, const char **argv)
+{
+       zval *retval = NULL;
+       zval ***zargs;
+       zval **context_p;
+       int i, res, zargc;
+       struct php_sqlite_agg_functions *funcs = sqlite_user_data(func);
+       TSRMLS_FETCH();
+
+       if (!funcs->is_valid) {
+               sqlite_set_result_error(func, "this function has not been correctly defined for this request", -1);
+               return;
+       }
+
+       /* sanity check the args */
+       if (argc < 1) {
+               return;
+       }
+       
+       zargc = argc + 1;
+       zargs = (zval ***)safe_emalloc(zargc, sizeof(zval **), 0);
+               
+       /* first arg is always the context zval */
+       context_p = (zval **)sqlite_aggregate_context(func, sizeof(*context_p));
+
+       if (*context_p == NULL) {
+               MAKE_STD_ZVAL(*context_p);
+               (*context_p)->is_ref = 1;
+               Z_TYPE_PP(context_p) = IS_NULL;
+       }
+
+       zargs[0] = context_p;
+
+       /* copy the other args */
+       for (i = 0; i < argc; i++) {
+               zargs[i+1] = emalloc(sizeof(zval *));
+               MAKE_STD_ZVAL(*zargs[i+1]);
+               if (argv[i] == NULL) {
+                       ZVAL_NULL(*zargs[i+1]);
+               } else {
+                       ZVAL_STRING(*zargs[i+1], (char*)argv[i], 1);
+               }
+       }
+
+       res = call_user_function_ex(EG(function_table),
+                       NULL,
+                       funcs->step,
+                       &retval,
+                       zargc,
+                       zargs,
+                       0, NULL TSRMLS_CC);
+
+       if (res != SUCCESS) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "call_user_function_ex failed");
+       }
+
+       if (retval) {
+               zval_ptr_dtor(&retval);
+       }
+
+       if (zargs) {
+               for (i = 1; i < zargc; i++) {
+                       zval_ptr_dtor(zargs[i]);
+                       efree(zargs[i]);
+               }
+               efree(zargs);
+       }
+}
+/* }}} */
+
+/* {{{ callback for sqlite_create_aggregate: finalize function */
+static void php_sqlite_agg_fini_function_callback(sqlite_func *func)
+{
+       zval *retval = NULL;
+       int res;
+       struct php_sqlite_agg_functions *funcs = sqlite_user_data(func);
+       zval **context_p;
+       TSRMLS_FETCH();
+
+       if (!funcs->is_valid) {
+               sqlite_set_result_error(func, "this function has not been correctly defined for this request", -1);
+               return;
+       }
+       
+       context_p = (zval **)sqlite_aggregate_context(func, sizeof(*context_p));
+       
+       res = call_user_function_ex(EG(function_table),
+                       NULL,
+                       funcs->fini,
+                       &retval,
+                       1,
+                       &context_p,
+                       0, NULL TSRMLS_CC);
+
+       if (res == SUCCESS) {
+               if (retval == NULL) {
+                       sqlite_set_result_string(func, NULL, 0);
+               } else {
+                       switch (Z_TYPE_P(retval)) {
+                               case IS_STRING:
+                                       /* TODO: for binary results, need to encode the string */
+                                       sqlite_set_result_string(func, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+                                       break;
+                               case IS_LONG:
+                               case IS_BOOL:
+                                       sqlite_set_result_int(func, Z_LVAL_P(retval));
+                                       break;
+                               case IS_DOUBLE:
+                                       sqlite_set_result_double(func, Z_DVAL_P(retval));
+                                       break;
+                               case IS_NULL:
+                               default:
+                                       sqlite_set_result_string(func, NULL, 0);
+                       }
+               }
+       } else {
+               sqlite_set_result_error(func, "call_user_function_ex failed", -1);
+       }
+
+       if (retval) {
+               zval_ptr_dtor(&retval);
+       }
+
+       zval_ptr_dtor(context_p);
+}
+/* }}} */
+
+/* {{{ Authorization Callback */
+static int php_sqlite_authorizer(void *autharg, int access_type, const char *arg3, const char *arg4,
+               const char *arg5, const char *arg6)
+{
+       switch (access_type) {
+               case SQLITE_COPY:
+                       {
+                               TSRMLS_FETCH();
+                               if (PG(safe_mode) && (!php_checkuid(arg4, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+                                       return SQLITE_DENY;
+                               }
+
+                               if (php_check_open_basedir(arg4 TSRMLS_CC)) {
+                                       return SQLITE_DENY;
+                               }
+                       }
+                       return SQLITE_OK;
+#ifdef SQLITE_ATTACH
+               case SQLITE_ATTACH:
+                       {
+                               TSRMLS_FETCH();
+                               if (PG(safe_mode) && (!php_checkuid(arg3, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+                                       return SQLITE_DENY;
+                               }
+
+                               if (php_check_open_basedir(arg3 TSRMLS_CC)) {
+                                       return SQLITE_DENY;
+                               }
+                       }
+                       return SQLITE_OK;
+#endif
+
+               default:
+                       /* access allowed */
+                       return SQLITE_OK;
+       }
+}
+/* }}} */
+
+static int init_sqlite_globals(zend_sqlite_globals *g)
+{
+       g->assoc_case = 0;
+       return SUCCESS;
+}
+
+PHP_MINIT_FUNCTION(sqlite)
+{
+       ZEND_INIT_MODULE_GLOBALS(sqlite, init_sqlite_globals, NULL);
+       
+       REGISTER_INI_ENTRIES();
+
+       le_sqlite_db = zend_register_list_destructors_ex(php_sqlite_db_dtor, NULL, "sqlite database", module_number);
+       le_sqlite_pdb = zend_register_list_destructors_ex(NULL, php_sqlite_db_dtor, "sqlite database (persistent)", module_number);
+       le_sqlite_result = zend_register_list_destructors_ex(php_sqlite_result_dtor, NULL, "sqlite result", module_number);
+
+       REGISTER_LONG_CONSTANT("SQLITE_BOTH",   PHPSQLITE_BOTH, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_NUM",    PHPSQLITE_NUM, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_ASSOC",  PHPSQLITE_ASSOC, CONST_CS|CONST_PERSISTENT);
+       
+       REGISTER_LONG_CONSTANT("SQLITE_OK",                             SQLITE_OK, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_ERROR",                  SQLITE_ERROR, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_INTERNAL",               SQLITE_INTERNAL, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_PERM",                   SQLITE_PERM, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_ABORT",                  SQLITE_ABORT, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_BUSY",                   SQLITE_BUSY, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_LOCKED",                 SQLITE_LOCKED, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_NOMEM",                  SQLITE_NOMEM, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_READONLY",               SQLITE_READONLY, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_INTERRUPT",              SQLITE_INTERRUPT, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_IOERR",                  SQLITE_IOERR, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_CORRUPT",                SQLITE_CORRUPT, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_NOTFOUND",               SQLITE_NOTFOUND, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_FULL",                   SQLITE_FULL, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_CANTOPEN",               SQLITE_CANTOPEN, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_PROTOCOL",               SQLITE_PROTOCOL, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_EMPTY",                  SQLITE_EMPTY, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_SCHEMA",                 SQLITE_SCHEMA, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_TOOBIG",                 SQLITE_TOOBIG, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_CONSTRAINT",             SQLITE_CONSTRAINT, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_MISMATCH",               SQLITE_MISMATCH, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_MISUSE",                 SQLITE_MISUSE, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_NOLFS",                  SQLITE_NOLFS, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_AUTH",                   SQLITE_AUTH, CONST_CS|CONST_PERSISTENT);
+#ifdef SQLITE_FORMAT
+       REGISTER_LONG_CONSTANT("SQLITE_FORMAT",                 SQLITE_FORMAT, CONST_CS|CONST_PERSISTENT);
+#endif
+       REGISTER_LONG_CONSTANT("SQLITE_ROW",                    SQLITE_ROW, CONST_CS|CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SQLITE_DONE",                   SQLITE_DONE, CONST_CS|CONST_PERSISTENT);
+
+       return SUCCESS;
+}
+
+PHP_MINFO_FUNCTION(sqlite)
+{
+       php_info_print_table_start();
+       php_info_print_table_header(2, "SQLite support", "enabled");
+       php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id$");
+       php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
+       php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
+       php_info_print_table_end();
+
+       DISPLAY_INI_ENTRIES();
+}
+
+static struct php_sqlite_db *php_sqlite_open(char *filename, int mode, char *persistent_id, zval *return_value, zval *errmsg TSRMLS_DC)
+{
+       char *errtext = NULL;
+       sqlite *sdb = NULL;
+       struct php_sqlite_db *db = NULL;
+
+       sdb = sqlite_open(filename, mode, &errtext);
+
+       if (sdb == NULL) {
+
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
+
+               if (errmsg) {
+                       ZVAL_STRING(errmsg, errtext, 1);
+               }
+
+               sqlite_freemem(errtext);
+
+               RETVAL_FALSE;
+               return NULL;
+       }
+
+       db = (struct php_sqlite_db *)pemalloc(sizeof(struct php_sqlite_db), persistent_id ? 1 : 0);
+       db->is_persistent = persistent_id ? 1 : 0;
+       db->last_err_code = SQLITE_OK;
+       db->db = sdb;
+
+       zend_hash_init(&db->callbacks, 0, NULL, php_sqlite_callback_dtor, db->is_persistent);
+       
+       /* register the PHP functions */
+       sqlite_create_function(sdb, "php", -1, php_sqlite_generic_function_callback, 0);
+
+       /* set default busy handler; keep retrying up until 1 minute has passed,
+        * then fail with a busy status code */
+       sqlite_busy_timeout(sdb, 60000);
+
+       /* authorizer hook so we can enforce safe mode
+        * Note: the declaration of php_sqlite_authorizer is correct for 2.8.2 of libsqlite,
+        * and IS backwards binary compatible with earlier versions */
+       sqlite_set_authorizer(sdb, php_sqlite_authorizer, NULL);
+       
+       db->rsrc_id = ZEND_REGISTER_RESOURCE(return_value, db, persistent_id ? le_sqlite_pdb : le_sqlite_db);
+
+       if (persistent_id) {
+               list_entry le;
+
+               Z_TYPE(le) = le_sqlite_pdb;
+               le.ptr = db;
+
+               if (FAILURE == zend_hash_update(&EG(persistent_list), persistent_id,
+                                       strlen(persistent_id)+1,
+                                       (void *)&le, sizeof(le), NULL)) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to register persistent resource");
+               }
+       }
+       
+       return db;
+}
+
+/* {{{ proto resource sqlite_popen(string filename [, int mode, string &errmessage])
+   Opens a persistent handle to an SQLite database.  Will create the database if it does not exist */
+PHP_FUNCTION(sqlite_popen)
+{
+       int mode = 0666;
+       char *filename, *fullpath, *hashkey;
+       long filename_len, hashkeylen;
+       zval *errmsg = NULL;
+       struct php_sqlite_db *db = NULL;
+       list_entry *le;
+       
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/",
+                               &filename, &filename_len, &mode, &errmsg)) {
+               return;
+       }
+
+       if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
+               /* resolve the fully-qualified path name to use as the hash key */
+               fullpath = expand_filepath(filename, NULL TSRMLS_CC);
+       
+               if (PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+                       RETURN_FALSE;
+               }
+
+               if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+                       RETURN_FALSE;
+               }
+       } else {
+               fullpath = estrndup(filename, filename_len);
+       }
+
+       hashkeylen = spprintf(&hashkey, 0, "sqlite_pdb_%s:%d", fullpath, mode);
+       
+       /* do we have an existing persistent connection ? */
+       if (SUCCESS == zend_hash_find(&EG(persistent_list), hashkey, hashkeylen+1, (void*)&le)) {
+               if (Z_TYPE_P(le) == le_sqlite_pdb) {
+                       db = (struct php_sqlite_db*)le->ptr;
+                       
+                       if (db->rsrc_id == FAILURE) {
+                               /* give it a valid resource id for this request */
+                               db->rsrc_id = ZEND_REGISTER_RESOURCE(return_value, db, le_sqlite_pdb);
+                       } else {
+                               /* already accessed this request; map it */
+                               ZVAL_RESOURCE(return_value, db->rsrc_id);
+                       }
+
+                       /* all set */
+                       efree(fullpath);
+                       efree(hashkey);
+                       return;
+               }
+
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Some other type of persistent resource is using this hash key!?");
+               RETURN_FALSE;
+       }
+
+       /* now we need to open the database */
+       php_sqlite_open(fullpath, mode, hashkey, return_value, errmsg TSRMLS_CC);
+
+       efree(fullpath);
+       efree(hashkey);
+}
+/* }}} */
+
+/* {{{ proto resource sqlite_open(string filename [, int mode, string &errmessage])
+   Opens an SQLite database.  Will create the database if it does not exist */
+PHP_FUNCTION(sqlite_open)
+{
+       int mode = 0666;
+       char *filename;
+       long filename_len;
+       zval *errmsg = NULL;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/",
+                               &filename, &filename_len, &mode, &errmsg)) {
+               return;
+       }
+
+       if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
+               if (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+                       RETURN_FALSE;
+               }
+
+               if (php_check_open_basedir(filename TSRMLS_CC)) {
+                       RETURN_FALSE;
+               }
+       }
+       
+       php_sqlite_open(filename, mode, NULL, return_value, errmsg TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto void sqlite_busy_timeout(resource db, int ms)
+   Set busy timeout duration. If ms <= 0, all busy handlers are disabled */
+PHP_FUNCTION(sqlite_busy_timeout)
+{
+       zval *zdb;
+       struct php_sqlite_db *db;
+       long ms;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zdb, &ms)) {
+               return;
+       }
+
+       DB_FROM_ZVAL(db, &zdb);
+
+       sqlite_busy_timeout(db->db, ms);
+}
+/* }}} */
+
+/* {{{ proto void sqlite_close(resource db)
+   Closes an open sqlite database */
+PHP_FUNCTION(sqlite_close)
+{
+       zval *zdb;
+       struct php_sqlite_db *db;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
+               return;
+       }
+       DB_FROM_ZVAL(db, &zdb);
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
+               return;
+       }
+
+       DB_FROM_ZVAL(db, &zdb);
+
+       zend_list_delete(Z_RESVAL_P(zdb));
+}
+/* }}} */
+
+/* {{{ php_sqlite_fetch */
+int php_sqlite_fetch(struct php_sqlite_result *rres TSRMLS_DC)
+{
+       const char **rowdata, **colnames;
+       int ret, i, base;
+       char *errtext = NULL, *colname;
+
+next_row:
+       ret = sqlite_step(rres->vm, &rres->ncolumns, &rowdata, &colnames);
+       if (!rres->nrows) {
+               /* first row - lets copy the column names */
+               rres->col_names = safe_emalloc(rres->ncolumns, sizeof(char *), 0);
+               for (i = 0; i < rres->ncolumns; i++) {
+                       colname = strchr(colnames[i], '.');
+                       if (!colname++) {
+                               colname = (char*)colnames[i];
+                       }
+                       if (SQLITE_G(assoc_case) == 1) {
+                               php_sqlite_strtoupper(colname);
+                       } else if (SQLITE_G(assoc_case) == 2) {
+                               php_sqlite_strtolower(colname);
+                       }
+                       rres->col_names[i] = estrdup(colname);
+               }
+               if (!rres->buffered) {
+                       /* non buffered mode - also fetch memory for on single row */
+                       rres->table = safe_emalloc(rres->ncolumns, sizeof(char *), 0);
+               }
+       }
+
+       switch (ret) {
+               case SQLITE_ROW:
+                       if (rres->buffered) {
+                               /* add the row to our collection */
+                               if (rres->nrows + 1 >= rres->alloc_rows) {
+                                       rres->alloc_rows = rres->alloc_rows ? rres->alloc_rows * 2 : 16;
+                                       rres->table = erealloc(rres->table, rres->alloc_rows * rres->ncolumns * sizeof(char *));
+                               }
+                               base = rres->nrows * rres->ncolumns;
+                               for (i = 0; i < rres->ncolumns; i++) {
+                                       if (rowdata[i]) {
+                                               rres->table[base + i] = estrdup(rowdata[i]);
+                                       } else {
+                                               rres->table[base + i] = NULL;
+                                       }
+                               }
+                               rres->nrows++;
+                               goto next_row;
+                       } else {
+                               /* non buffered: only fetch one row but first free data if not first row */
+                               if (rres->nrows++) {
+                                       for (i = 0; i < rres->ncolumns; i++) {
+                                               if (rres->table[i]) {
+                                                       efree(rres->table[i]);
+                                               }
+                                       }
+                               }
+                               for (i = 0; i < rres->ncolumns; i++) {
+                                       if (rowdata[i]) {
+                                               rres->table[i] = estrdup(rowdata[i]);
+                                       } else {
+                                               rres->table[i] = NULL;
+                                       }
+                               }
+                       }
+                       ret = SQLITE_OK;
+                       break;
+
+               case SQLITE_BUSY:
+               case SQLITE_ERROR:
+               case SQLITE_MISUSE:
+               case SQLITE_DONE:
+               default:
+                       if (rres->vm) {
+                               ret = sqlite_finalize(rres->vm, &errtext);
+                       }
+                       rres->vm = NULL;
+                       if (ret != SQLITE_OK) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
+                               sqlite_freemem(errtext);
+                       }
+                       break;
+       }
+       rres->db->last_err_code = ret;
+
+       return ret;
+}
+/* }}} */
+
+/* {{{ sqlite_query */
+void sqlite_query(struct php_sqlite_db *db, char *sql, long sql_len, int mode, int buffered, zval *return_value, struct php_sqlite_result *rres TSRMLS_DC)
+{
+       struct php_sqlite_result res;
+       int ret;
+       char *errtext = NULL;
+       const char *tail;
+
+       memset(&res, 0, sizeof(res));
+       res.buffered = buffered;
+       res.mode = mode;
+
+       ret = sqlite_compile(db->db, sql, &tail, &res.vm, &errtext);
+       db->last_err_code = ret;
+
+       if (ret != SQLITE_OK) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
+               sqlite_freemem(errtext);
+               
+               RETURN_FALSE;
+       }
+
+       if (!rres) {
+               rres = (struct php_sqlite_result*)emalloc(sizeof(*rres));
+       }
+       memcpy(rres, &res, sizeof(*rres));
+       rres->db = db;
+       zend_list_addref(db->rsrc_id);
+       
+
+       /* now the result set is ready for stepping: get first row */
+       if (php_sqlite_fetch(rres TSRMLS_CC) != SQLITE_OK) {
+               real_result_dtor(rres TSRMLS_CC);
+               RETURN_FALSE;
+       }
+       
+       rres->curr_row = 0;
+
+       if (return_value) {
+               ZEND_REGISTER_RESOURCE(return_value, rres, le_sqlite_result);
+       }
+}
+/* }}} */
+
+/* {{{ proto resource sqlite_unbuffered_query(string query, resource db [ , int result_type ])
+   Execute a query that does not prefetch and buffer all data */
+PHP_FUNCTION(sqlite_unbuffered_query)
+{
+       zval *zdb;
+       struct php_sqlite_db *db;
+       char *sql;
+       long sql_len;
+       int mode = PHPSQLITE_BOTH;
+       char *errtext = NULL;
+
+       if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
+                               ZEND_NUM_ARGS() TSRMLS_CC, "sr|l", &sql, &sql_len, &zdb, &mode) && 
+                       FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &zdb, &sql, &sql_len, &mode)) {
+               return;
+       }
+
+       DB_FROM_ZVAL(db, &zdb);
+
+       /* avoid doing work if we can */
+       if (!return_value_used) {
+               db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
+
+               if (db->last_err_code != SQLITE_OK) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
+                       sqlite_freemem(errtext);
+               }
+               return;
+       }
+       
+       sqlite_query(db, sql, sql_len, mode, 0, return_value, NULL TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto resource sqlite_query(string query, resource db [ , int result_type ])
+   Executes a query against a given database and returns a result handle */
+PHP_FUNCTION(sqlite_query)
+{
+       zval *zdb;
+       struct php_sqlite_db *db;
+       char *sql;
+       long sql_len;
+       int mode = PHPSQLITE_BOTH;
+       char *errtext = NULL;
+
+       if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
+                       ZEND_NUM_ARGS() TSRMLS_CC, "sr|l", &sql, &sql_len, &zdb, &mode) && 
+               FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &zdb, &sql, &sql_len, &mode)) {
+               return;
+       }
+       DB_FROM_ZVAL(db, &zdb);
+
+       /* avoid doing work if we can */
+       if (!return_value_used) {
+               db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
+
+               if (db->last_err_code != SQLITE_OK) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
+                       sqlite_freemem(errtext);
+               }
+               return;
+       }
+       
+       sqlite_query(db, sql, sql_len, mode, 1, return_value, NULL TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ php_sqlite_fetch_array */
+static void php_sqlite_fetch_array(struct php_sqlite_result *res, int mode, zend_bool decode_binary, int move_next, zval *return_value TSRMLS_DC)
+{
+       int j, buffered = res->buffered;
+       const char **rowdata, **colnames;
+       
+       /* check range of the row */
+       if (res->curr_row >= res->nrows) {
+               /* no more */
+               RETURN_FALSE;
+       }
+       colnames = (const char**)res->col_names;
+       if (res->buffered) {
+               rowdata = (const char**)&res->table[res->curr_row * res->ncolumns];
+       } else {
+               rowdata = (const char**)res->table;
+       }
+
+       /* now populate the result */
+       array_init(return_value);
+
+       for (j = 0; j < res->ncolumns; j++) {
+               zval *decoded;
+               MAKE_STD_ZVAL(decoded);
+
+               if (rowdata[j] == NULL) {
+                       ZVAL_NULL(decoded);
+               } else if (decode_binary && rowdata[j][0] == '\x01') {
+                       Z_STRVAL_P(decoded) = emalloc(strlen(rowdata[j]));
+                       Z_STRLEN_P(decoded) = sqlite_decode_binary(rowdata[j]+1, Z_STRVAL_P(decoded));
+                       Z_STRVAL_P(decoded)[Z_STRLEN_P(decoded)] = '\0';
+                       Z_TYPE_P(decoded) = IS_STRING;
+                       if (!buffered) {
+                               efree((char*)rowdata[j]);
+                               rowdata[j] = NULL;
+                       }
+               } else {
+                       ZVAL_STRING(decoded, (char*)rowdata[j], buffered);
+                       if (!buffered) {
+                               rowdata[j] = NULL;
+                       }
+               }
+
+               if (mode & PHPSQLITE_NUM) {
+                       if (mode & PHPSQLITE_ASSOC) {
+                               add_index_zval(return_value, j, decoded);
+                               ZVAL_ADDREF(decoded);
+                               add_assoc_zval(return_value, (char*)colnames[j], decoded);
+                       } else {
+                               add_next_index_zval(return_value, decoded);
+                       }
+               } else {
+                       add_assoc_zval(return_value, (char*)colnames[j], decoded);
+               }
+       }
+
+       if (move_next) {
+               if (!res->buffered) {
+                       /* non buffered: fetch next row */
+                       php_sqlite_fetch(res TSRMLS_CC);
+               }
+               /* advance the row pointer */
+               res->curr_row++;
+       }
+}
+/* }}} */
+
+/* {{{ php_sqlite_fetch_column */
+static void php_sqlite_fetch_column(struct php_sqlite_result *res, zval *which, zend_bool decode_binary, zval *return_value TSRMLS_DC)
+{
+       int j;
+       const char **rowdata, **colnames;
+
+       /* check range of the row */
+       if (res->curr_row >= res->nrows) {
+               /* no more */
+               RETURN_FALSE;
+       }
+       colnames = (const char**)res->col_names;
+
+       if (Z_TYPE_P(which) == IS_LONG) {
+               j = Z_LVAL_P(which);
+       } else {
+               convert_to_string_ex(&which);
+               for (j = 0; j < res->ncolumns; j++) {
+                       if (!strcasecmp((char*)colnames[j], Z_STRVAL_P(which))) {
+                               break;
+                       }
+               }
+       }
+       if (j < 0 || j >= res->ncolumns) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such column %d", j);
+               RETURN_FALSE;
+       }
+
+       if (res->buffered) {
+               rowdata = (const char**)&res->table[res->curr_row * res->ncolumns];
+       } else {
+               rowdata = (const char**)res->table;
+       }
+
+       if (rowdata[j] == NULL) {
+               RETURN_NULL();
+       } else if (decode_binary && rowdata[j][0] == '\x01') {
+               int l = strlen(rowdata[j]);
+               char *decoded = emalloc(l);
+               l = sqlite_decode_binary(rowdata[j]+1, decoded);
+               decoded[l] = '\0';
+               RETVAL_STRINGL(decoded, l, 0);
+               if (!res->buffered) {
+                       efree((char*)rowdata[j]);
+                       rowdata[j] = NULL;
+               }
+       } else {
+               RETVAL_STRING((char*)rowdata[j], res->buffered);
+               if (!res->buffered) {
+                       rowdata[j] = NULL;
+               }
+       }
+}
+/* }}} */
+
+/* {{{ proto array sqlite_fetch_all(resource result [, int result_type, bool decode_binary])
+   Fetches all rows from a result set as an array */
+PHP_FUNCTION(sqlite_fetch_all)
+{
+       zval *zres, *ent;
+       int mode = PHPSQLITE_BOTH;
+       zend_bool decode_binary = 1;
+       struct php_sqlite_result *res;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lb", &zres, &mode, &decode_binary)) {
+               return;
+       }
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+       if (ZEND_NUM_ARGS() < 2) {
+               mode = res->mode;
+       }
+
+       if (res->curr_row >= res->nrows && res->nrows) {
+               if (!res->buffered) {
+                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "One or more rowsets were already returned");
+               } else {
+                       res->curr_row = 0;
+               }
+       }
+
+       array_init(return_value);
+
+       while (res->curr_row < res->nrows) {
+               MAKE_STD_ZVAL(ent);
+               php_sqlite_fetch_array(res, mode, decode_binary, 1, ent TSRMLS_CC);
+               add_next_index_zval(return_value, ent);
+       }
+}
+/* }}} */
+
+/* {{{ proto array sqlite_fetch_array(resource result [, int result_type, bool decode_binary])
+   Fetches the next row from a result set as an array */
+PHP_FUNCTION(sqlite_fetch_array)
+{
+       zval *zres;
+       int mode = PHPSQLITE_BOTH;
+       zend_bool decode_binary = 1;
+       struct php_sqlite_result *res;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lb", &zres, &mode, &decode_binary)) {
+               return;
+       }
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+       if (ZEND_NUM_ARGS() < 2) {
+               mode = res->mode;
+       }
+
+       php_sqlite_fetch_array(res, mode, decode_binary, 1, return_value TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto array sqlite_array_query(resource db, string query [ , int result_type, bool decode_binary ])
+   Executes a query against a given database and returns an array */
+PHP_FUNCTION(sqlite_array_query)
+{
+       zval *zdb, *ent;
+       struct php_sqlite_db *db;
+       struct php_sqlite_result *rres;
+       char *sql;
+       long sql_len;
+       int mode = PHPSQLITE_BOTH;
+       char *errtext = NULL;
+       zend_bool decode_binary = 1;
+
+       if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
+                       ZEND_NUM_ARGS() TSRMLS_CC, "sr|l", &sql, &sql_len, &zdb, &mode, &decode_binary) && 
+               FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &zdb, &sql, &sql_len, &mode, &decode_binary)) {
+               return;
+       }
+       DB_FROM_ZVAL(db, &zdb);
+
+       /* avoid doing work if we can */
+       if (!return_value_used) {
+               db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
+
+               if (db->last_err_code != SQLITE_OK) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
+                       sqlite_freemem(errtext);
+               }
+               return;
+       }
+
+       rres = (struct php_sqlite_result *)emalloc(sizeof(*rres));
+       sqlite_query(db, sql, sql_len, mode, 0, NULL, rres TSRMLS_CC);
+
+       array_init(return_value);
+
+       while (rres->curr_row < rres->nrows) {
+               MAKE_STD_ZVAL(ent);
+               php_sqlite_fetch_array(rres, mode, decode_binary, 1, ent TSRMLS_CC);
+               add_next_index_zval(return_value, ent);
+       }
+       real_result_dtor(rres TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto string sqlite_fetch_array(resource result [, bool decode_binary])
+   Fetches first column of a result set as a string */
+PHP_FUNCTION(sqlite_fetch_string)
+{
+       zval *zres;
+       zend_bool decode_binary = 1;
+       struct php_sqlite_result *res;
+       char *decoded = NULL;
+       int decoded_len;
+       const char **rowdata;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|b", &zres, &decode_binary)) {
+               return;
+       }
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+
+       /* check if there are any more rows on the cursor */
+       if (res->curr_row >= res->nrows) {
+               RETURN_FALSE;
+       }
+
+       if (res->buffered) {
+               rowdata = (const char**)&res->table[res->curr_row * res->ncolumns];
+       } else {
+               rowdata = (const char**)res->table;
+       }
+
+       if (decode_binary && rowdata[0] != NULL && rowdata[0][0] == '\x01') {
+               decoded = emalloc(strlen(rowdata[0]));
+               decoded_len = sqlite_decode_binary(rowdata[0]+1, decoded);
+               if (!res->buffered) {
+                       efree((char*)rowdata[0]);
+                       rowdata[0] = NULL;
+               }
+       } else {
+               if (rowdata[0]) {
+                       decoded_len = strlen((char*)rowdata[0]);
+                       if (res->buffered) {
+                               decoded = estrndup((char*)rowdata[0], decoded_len);
+                       } else {
+                               decoded = (char*)rowdata[0];
+                               rowdata[0] = NULL;
+                       }
+               } else {
+                       decoded_len = 0;
+                       decoded = NULL;
+               }
+       }
+
+       if (!res->buffered) {
+               /* non buffered: fetch next row */
+               php_sqlite_fetch(res TSRMLS_CC);
+       }
+       /* advance the row pointer */
+       res->curr_row++;
+
+       if (decoded == NULL) {
+               RETURN_NULL();
+       } else {
+               RETURN_STRINGL(decoded, decoded_len, 0);
+       }
+}
+/* }}} */
+
+/* {{{ proto array sqlite_fetch_array(resource result [, int result_type, bool decode_binary])
+   Fetches the current row from a result set as an array */
+PHP_FUNCTION(sqlite_current)
+{
+       zval *zres;
+       int mode = PHPSQLITE_BOTH;
+       zend_bool decode_binary = 1;
+       struct php_sqlite_result *res;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lb", &zres, &mode, &decode_binary)) {
+               return;
+       }
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+       if (ZEND_NUM_ARGS() < 2) {
+               mode = res->mode;
+       }
+
+       php_sqlite_fetch_array(res, mode, decode_binary, 0, return_value TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto mixed sqlite_column(resource result, mixed index_or_name [, bool decode_binary])
+   Fetches a column from the current row of a result set */
+PHP_FUNCTION(sqlite_column)
+{
+       zval *zres;
+       zval *which;
+       zend_bool decode_binary = 1;
+       struct php_sqlite_result *res;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|b", &zres, &which, &decode_binary)) {
+               return;
+       }
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+
+       php_sqlite_fetch_column(res, which, decode_binary, return_value TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto string sqlite_libversion()
+   Returns the version of the linked SQLite library */
+PHP_FUNCTION(sqlite_libversion)
+{
+       if (ZEND_NUM_ARGS() != 0) {
+               WRONG_PARAM_COUNT;
+       }
+       RETURN_STRING((char*)sqlite_libversion(), 1);
+}
+/* }}} */
+
+/* {{{ proto string sqlite_libencoding()
+   Returns the encoding (iso8859 or UTF-8) of the linked SQLite library */
+PHP_FUNCTION(sqlite_libencoding)
+{
+       if (ZEND_NUM_ARGS() != 0) {
+               WRONG_PARAM_COUNT;
+       }
+       RETURN_STRING((char*)sqlite_libencoding(), 1);
+}
+/* }}} */
+
+/* {{{ proto int sqlite_changes(resource db)
+   Returns the number of rows that were changed by the most recent SQL statement */
+PHP_FUNCTION(sqlite_changes)
+{
+       zval *zdb;
+       struct php_sqlite_db *db;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
+               return;
+       }
+
+       DB_FROM_ZVAL(db, &zdb);
+
+       RETURN_LONG(sqlite_changes(db->db));
+}
+/* }}} */
+
+/* {{{ proto int sqlite_last_insert_rowid(resource db)
+   Returns the rowid of the most recently inserted row */
+PHP_FUNCTION(sqlite_last_insert_rowid)
+{
+       zval *zdb;
+       struct php_sqlite_db *db;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
+               return;
+       }
+
+       DB_FROM_ZVAL(db, &zdb);
+
+       RETURN_LONG(sqlite_last_insert_rowid(db->db));
+}
+/* }}} */
+
+/* {{{ proto int sqlite_num_rows(resource result)
+   Returns the number of rows in a result set */
+PHP_FUNCTION(sqlite_num_rows)
+{
+       zval *zres;
+       struct php_sqlite_result *res;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
+               return;
+       }
+
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+
+       if (res->buffered) {
+               RETURN_LONG(res->nrows);
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Row count is not available for unbuffered queries");
+               RETURN_FALSE;
+       }
+}
+/* }}} */
+
+/* {{{ proto bool sqlite_has_more(resource result)
+   Returns whether or not more rows are available */
+PHP_FUNCTION(sqlite_has_more)
+{
+       zval *zres;
+       struct php_sqlite_result *res;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
+               return;
+       }
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+
+       RETURN_BOOL(res->nrows && res->curr_row < res->nrows); /* curr_row may be -1 */
+}
+/* }}} */
+
+/* {{{ proto int sqlite_num_fields(resource result)
+   Returns the number of fields in a result set */
+PHP_FUNCTION(sqlite_num_fields)
+{
+       zval *zres;
+       struct php_sqlite_result *res;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
+               return;
+       }
+
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+
+       RETURN_LONG(res->ncolumns);
+}
+/* }}} */
+
+/* {{{ proto string sqlite_field_name(resource result, int field)
+   Returns the name of a particular field */
+PHP_FUNCTION(sqlite_field_name)
+{
+       zval *zres;
+       struct php_sqlite_result *res;
+       int field;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zres, &field)) {
+               return;
+       }
+
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+
+       if (field < 0 || field >= res->ncolumns) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "field %d out of range", field);
+               RETURN_FALSE;
+       }
+
+       RETURN_STRING(res->col_names[field], 1);
+}
+/* }}} */
+
+/* {{{ proto bool sqlite_seek(resource result, int row)
+   Seek to a particular row number */
+PHP_FUNCTION(sqlite_seek)
+{
+       zval *zres;
+       struct php_sqlite_result *res;
+       int row;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zres, &row)) {
+               return;
+       }
+
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+
+       if (!res->buffered) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot seek an unbuffered result set");
+               RETURN_FALSE;
+       }
+       
+       if (row < 1 || row >= res->nrows) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "row %d out of range", row);
+               RETURN_FALSE;
+       }
+
+       res->curr_row = row;
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool sqlite_rewind(resource result)
+   Seek to first row number */
+PHP_FUNCTION(sqlite_rewind)
+{
+       zval *zres;
+       struct php_sqlite_result *res;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
+               return;
+       }
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+
+       if (!res->buffered) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot seek an unbuffered result set");
+               RETURN_FALSE;
+       }
+       
+       if (!res->nrows) {
+               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "no rows received");
+               RETURN_FALSE;
+       }
+
+       res->curr_row = 0;
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool sqlite_next(resource result)
+   Seek to next row number */
+PHP_FUNCTION(sqlite_next)
+{
+       zval *zres;
+       struct php_sqlite_result *res;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
+               return;
+       }
+       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
+
+       if (!res->buffered && res->vm) {
+               php_sqlite_fetch(res TSRMLS_CC);
+       }
+
+       if (res->curr_row >= res->nrows) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "no more rows available");
+               RETURN_FALSE;
+       }
+
+       res->curr_row++;
+
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string sqlite_escape_string(string item)
+   Escapes a string for use as a query parameter */
+PHP_FUNCTION(sqlite_escape_string)
+{
+       char *string = NULL;
+       long stringlen;
+       char *ret;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &stringlen)) {
+               return;
+       }
+
+       if (stringlen && (string[0] == '\x01' || memchr(string, '\0', stringlen) != NULL)) {
+               /* binary string */
+               int enclen;
+               
+               ret = emalloc( 1 + ((256 * stringlen + 1262) / 253) );
+               ret[0] = '\x01';
+               enclen = sqlite_encode_binary((const unsigned char*)string, stringlen, ret+1);
+               RETVAL_STRINGL(ret, enclen+1, 0);
+               
+       } else  {
+               ret = sqlite_mprintf("%q", string);
+               if (ret) {
+                       RETVAL_STRING(ret, 1);
+                       sqlite_freemem(ret);
+               }
+       }
+}
+/* }}} */
+
+/* {{{ proto int sqlite_last_error(resource db)
+   Returns the error code of the last error for a database */
+PHP_FUNCTION(sqlite_last_error)
+{
+       zval *zdb;
+       struct php_sqlite_db *db;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
+               return;
+       }
+
+       DB_FROM_ZVAL(db, &zdb);
+
+       RETURN_LONG(db->last_err_code);
+}
+/* }}} */
+
+/* {{{ proto string sqlite_error_string(int error_code)
+   Returns the textual description of an error code */
+PHP_FUNCTION(sqlite_error_string)
+{
+       long code;
+       const char *msg;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
+               return;
+       }
+       
+       msg = sqlite_error_string(code);
+
+       if (msg) {
+               RETURN_STRING((char*)msg, 1);
+       } else {
+               RETURN_NULL();
+       }
+}
+/* }}} */
+
+/* manages duplicate registrations of a particular function, and
+ * also handles the case where the db is using a persistent connection */
+enum callback_prep_t { DO_REG, SKIP_REG, ERR };
+
+static enum callback_prep_t prep_callback_struct(struct php_sqlite_db *db, int is_agg,
+               char *funcname,
+               zval *step, zval *fini, struct php_sqlite_agg_functions **funcs)
+{
+       struct php_sqlite_agg_functions *alloc_funcs, func_tmp;
+       char *hashkey;
+       int hashkeylen;
+       enum callback_prep_t ret;
+
+       hashkeylen = spprintf(&hashkey, 0, "%s-%s", is_agg ? "agg" : "reg", funcname);
+
+       /* is it already registered ? */
+       if (SUCCESS == zend_hash_find(&db->callbacks, hashkey, hashkeylen+1, (void*)&alloc_funcs)) {
+               /* override the previous definition */
+
+               if (alloc_funcs->is_valid) {
+                       /* release these */
+
+                       if (alloc_funcs->step) {
+                               zval_ptr_dtor(&alloc_funcs->step);
+                               alloc_funcs->step = NULL;
+                       }
+
+                       if (alloc_funcs->fini) {
+                               zval_ptr_dtor(&alloc_funcs->fini);
+                               alloc_funcs->fini = NULL;
+                       }
+               }
+
+               ret = SKIP_REG;
+       } else {
+               /* add a new one */
+               func_tmp.db = db;
+
+               ret = SUCCESS == zend_hash_update(&db->callbacks, hashkey, hashkeylen+1,
+                               (void*)&func_tmp, sizeof(func_tmp), (void**)&alloc_funcs) ? DO_REG : ERR;
+       }
+
+       efree(hashkey);
+
+       MAKE_STD_ZVAL(alloc_funcs->step);
+       *(alloc_funcs->step)  = *step;
+       zval_copy_ctor(alloc_funcs->step);
+
+       if (is_agg) {
+               MAKE_STD_ZVAL(alloc_funcs->fini);
+               *(alloc_funcs->fini) = *fini;
+               zval_copy_ctor(alloc_funcs->fini);
+       } else {
+               alloc_funcs->fini = NULL;
+       }
+       alloc_funcs->is_valid = 1;
+       *funcs = alloc_funcs;
+       
+       return ret;
+}
+
+
+/* {{{ proto bool sqlite_create_aggregate(resource db, string funcname, mixed step_func, mixed finalize_func[, long num_args])
+    Registers an aggregated function for queries*/
+PHP_FUNCTION(sqlite_create_aggregate)
+{
+       char *funcname = NULL;
+       long funcname_len;
+       zval *zstep, *zfinal, *zdb;
+       struct php_sqlite_db *db;
+       struct php_sqlite_agg_functions *funcs;
+       char *callable = NULL;
+       long num_args = -1;
+       
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rszz|l", &zdb, &funcname, &funcname_len, &zstep, &zfinal, &num_args)) {
+               return;
+       }
+       DB_FROM_ZVAL(db, &zdb);
+
+       if (!zend_is_callable(zstep, 0, &callable)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "step function `%s' is not callable", callable);
+               efree(callable);
+               return;
+       }
+       efree(callable);
+       
+       if (!zend_is_callable(zfinal, 0, &callable)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "finalize function `%s' is not callable", callable);
+               efree(callable);
+               return;
+       }
+       efree(callable);
+
+       if (prep_callback_struct(db, 1, funcname, zstep, zfinal, &funcs) == DO_REG) {
+               sqlite_create_aggregate(db->db, funcname, num_args,
+                               php_sqlite_agg_step_function_callback,
+                               php_sqlite_agg_fini_function_callback, funcs);
+       }
+       
+
+}
+/* }}} */
+
+/* {{{ proto bool sqlite_create_function(resource db, string funcname, mixed callback[, long num_args])
+    Registers a "regular" function for queries */
+PHP_FUNCTION(sqlite_create_function)
+{
+       char *funcname = NULL;
+       long funcname_len;
+       zval *zcall, *zdb;
+       struct php_sqlite_db *db;
+       struct php_sqlite_agg_functions *funcs;
+       char *callable = NULL;
+       long num_args = -1;
+       
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz|l", &zdb, &funcname, &funcname_len, &zcall, &num_args)) {
+               return;
+       }
+       DB_FROM_ZVAL(db, &zdb);
+
+       if (!zend_is_callable(zcall, 0, &callable)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "function `%s' is not callable", callable);
+               efree(callable);
+               return;
+       }
+       efree(callable);
+       
+       if (prep_callback_struct(db, 0, funcname, zcall, NULL, &funcs) == DO_REG) {
+               sqlite_create_function(db->db, funcname, num_args, php_sqlite_function_callback, funcs);
+       }
+}
+/* }}} */
+
+/* {{{ proto string sqlite_udf_encode_binary(string data)
+   Apply binary encoding (if required) to a string to return from an UDF */
+PHP_FUNCTION(sqlite_udf_encode_binary)
+{
+       char *data = NULL;
+       long datalen;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &data, &datalen)) {
+               return;
+       }
+
+       if (data == NULL) {
+               RETURN_NULL();
+       }
+       if (datalen && (data[0] == '\x01' || memchr(data, '\0', datalen) != NULL)) {
+               /* binary string */
+               int enclen;
+               char *ret;
+               
+               ret = emalloc( 1 + ((256 * datalen + 1262) / 253) );
+               ret[0] = '\x01';
+               enclen = sqlite_encode_binary((const unsigned char*)data, datalen, ret+1);
+               RETVAL_STRINGL(ret, enclen+1, 0);
+       } else {
+               RETVAL_STRINGL(data, datalen, 1);
+       }
+}
+/* }}} */
+
+/* {{{ proto string sqlite_udf_decode_binary(string data)
+   Decode binary encoding on a string parameter passed to an UDF */
+PHP_FUNCTION(sqlite_udf_decode_binary)
+{
+       char *data = NULL;
+       long datalen;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &data, &datalen)) {
+               return;
+       }
+
+       if (data == NULL) {
+               RETURN_NULL();
+       }
+       if (datalen && data[0] == '\x01') {
+               /* encoded string */
+               int enclen;
+               char *ret;
+               
+               ret = emalloc(datalen);
+               enclen = sqlite_decode_binary((const unsigned char*)data+1, ret);
+               ret[enclen] = '\0';
+               RETVAL_STRINGL(ret, enclen, 0);
+       } else {
+               RETVAL_STRINGL(data, datalen, 1);
+       }
+}
+/* }}} */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff -ruN php-4.3.11-old/ext/sqlite/sqlite.dsp php-4.3.11-new/ext/sqlite/sqlite.dsp
--- php-4.3.11-old/ext/sqlite/sqlite.dsp        1970-01-01 01:00:00.000000000 +0100
+++ php-4.3.11-new/ext/sqlite/sqlite.dsp        2003-06-16 16:13:58.000000000 +0200
@@ -0,0 +1,331 @@
+# Microsoft Developer Studio Project File - Name="sqlite" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=sqlite - Win32 Debug_TS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "sqlite.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sqlite.mak" CFG="sqlite - Win32 Debug_TS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sqlite - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "sqlite - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sqlite - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release_TS"
+# PROP BASE Intermediate_Dir "Release_TS"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_TS"
+# PROP Intermediate_Dir "Release_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\php_build" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS\php_sqlite.dll" /libpath:"..\..\..\php4\Release_TS" /libpath:"..\..\..\php4\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
+
+!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug_TS"
+# PROP BASE Intermediate_Dir "Debug_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_TS"
+# PROP Intermediate_Dir "Debug_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\php_build" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS\php_sqlite.dll" /pdbtype:sept /libpath:"..\..\..\php4\Debug_TS" /libpath:"..\..\..\php_build\release"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sqlite - Win32 Release_TS"
+# Name "sqlite - Win32 Debug_TS"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "libsqlite"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\libsqlite\src\attach.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\auth.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\btree.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\btree.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\btree_rb.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\build.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\copy.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\encode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\expr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\func.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\insert.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\main.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\opcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\opcodes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\os.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\os.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\pager.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\pager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\parse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\parse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\pragma.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\printf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\random.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\select.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\sqlite.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\sqlite.w32.h
+
+!IF  "$(CFG)" == "sqlite - Win32 Release_TS"
+
+# Begin Custom Build
+InputDir=.\libsqlite\src
+InputPath=.\libsqlite\src\sqlite.w32.h
+
+"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy $(InputPath) $(InputDir)\sqlite.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"
+
+# Begin Custom Build
+InputDir=.\libsqlite\src
+InputPath=.\libsqlite\src\sqlite.w32.h
+
+"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy $(InputPath) $(InputDir)\sqlite.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\sqlite_config.w32.h
+
+!IF  "$(CFG)" == "sqlite - Win32 Release_TS"
+
+# Begin Custom Build
+InputDir=.\libsqlite\src
+InputPath=.\libsqlite\src\sqlite_config.w32.h
+
+"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy $(InputPath) $(InputDir)\config.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"
+
+# Begin Custom Build
+InputDir=.\libsqlite\src
+InputPath=.\libsqlite\src\sqlite_config.w32.h
+
+"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy $(InputPath) $(InputDir)\config.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\sqliteInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\table.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\tokenize.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\trigger.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\update.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\util.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\vacuum.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\vdbe.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\vdbe.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\libsqlite\src\where.c
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\php_sqlite.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\sqlite.c
+# ADD CPP /I "libsqlite\src"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\php_sqlite.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff -ruN php-4.3.11-old/ext/sqlite/sqlite.php php-4.3.11-new/ext/sqlite/sqlite.php
--- php-4.3.11-old/ext/sqlite/sqlite.php        1970-01-01 01:00:00.000000000 +0100
+++ php-4.3.11-new/ext/sqlite/sqlite.php        2003-04-17 22:01:35.000000000 +0200
@@ -0,0 +1,33 @@
+<?php
+if (!extension_loaded("sqlite")) {
+       dl("sqlite.so");
+}
+
+debug_zval_dump(sqlite_libversion());
+debug_zval_dump(sqlite_libencoding());
+
+$s = sqlite_open("weztest.sqlite", 0666, $err);
+
+debug_zval_dump($err);
+debug_zval_dump($s);
+
+$r = sqlite_query("create table foo (a INTEGER PRIMARY KEY, b INTEGER )", $s);
+debug_zval_dump(sqlite_last_error($s));
+debug_zval_dump(sqlite_error_string(sqlite_last_error($s)));
+
+$r = sqlite_query("select *, php('md5', sql) as o from sqlite_master", $s);
+debug_zval_dump($r);
+debug_zval_dump(sqlite_num_rows($r));
+debug_zval_dump(sqlite_num_fields($r));
+
+for ($j = 0; $j < sqlite_num_fields($r); $j++) {
+       echo "Field $j is " . sqlite_field_name($r, $j) . "\n";
+}
+
+while ($row = sqlite_fetch_array($r, SQLITE_ASSOC)) {
+       print_r($row);
+}
+
+sqlite_close($s);
+
+?>
diff -ruN php-4.3.11-old/generated_lists php-4.3.11-new/generated_lists
--- php-4.3.11-old/generated_lists      2005-03-30 16:35:19.000000000 +0200
+++ php-4.3.11-new/generated_lists      2005-07-04 17:29:27.000000000 +0200
@@ -1,3 +1,3 @@
 makefile_am_files = Zend/Makefile.am TSRM/Makefile.am
 config_h_files = Zend/acconfig.h TSRM/acconfig.h
-config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/cpdf/config.m4 ext/crack/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/cyrus/config.m4 ext/db/config.m4 ext/dba/config.m4 ext/dbase/config.m4 ext/dbx/config.m4 ext/dio/config.m4 ext/domxml/config.m4 ext/exif/config.m4 ext/fbsql/config.m4 ext/fdf/config.m4 ext/filepro/config.m4 ext/fribidi/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hwapi/config.m4 ext/hyperwave/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/informix/config.m4 ext/ingres_ii/config.m4 ext/interbase/config.m4 ext/ircg/config.m4 ext/java/config.m4 ext/ldap/config.m4 ext/mbstring/config.m4 ext/mcal/config.m4 ext/mcrypt/config.m4 ext/mcve/config.m4 ext/mhash/config.m4 ext/mime_magic/config.m4 ext/ming/config.m4 ext/mnogosearch/config.m4 ext/msession/config.m4 ext/msql/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/ncurses/config.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/oracle/config.m4 ext/overload/config.m4 ext/ovrimos/config.m4 ext/pcntl/config.m4 ext/pcre/config.m4 ext/pdf/config.m4 ext/pfpro/config.m4 ext/pgsql/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/qtdom/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/snmp/config.m4 ext/sockets/config.m4 ext/standard/config.m4 ext/swf/config.m4 ext/sybase/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlrpc/config.m4 ext/xslt/config.m4 ext/yaz/config.m4 ext/yp/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/embed/config.m4 sapi/isapi/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/servlet/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4
+config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/cpdf/config.m4 ext/crack/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/cyrus/config.m4 ext/db/config.m4 ext/dba/config.m4 ext/dbase/config.m4 ext/dbx/config.m4 ext/dio/config.m4 ext/domxml/config.m4 ext/exif/config.m4 ext/fbsql/config.m4 ext/fdf/config.m4 ext/filepro/config.m4 ext/fribidi/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hwapi/config.m4 ext/hyperwave/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/informix/config.m4 ext/ingres_ii/config.m4 ext/interbase/config.m4 ext/ircg/config.m4 ext/java/config.m4 ext/ldap/config.m4 ext/mbstring/config.m4 ext/mcal/config.m4 ext/mcrypt/config.m4 ext/mcve/config.m4 ext/mhash/config.m4 ext/mime_magic/config.m4 ext/ming/config.m4 ext/mnogosearch/config.m4 ext/msession/config.m4 ext/msql/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/ncurses/config.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/oracle/config.m4 ext/overload/config.m4 ext/ovrimos/config.m4 ext/pcntl/config.m4 ext/pcre/config.m4 ext/pdf/config.m4 ext/pfpro/config.m4 ext/pgsql/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/qtdom/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/snmp/config.m4 ext/sockets/config.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/swf/config.m4 ext/sybase/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlrpc/config.m4 ext/xslt/config.m4 ext/yaz/config.m4 ext/yp/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/embed/config.m4 sapi/isapi/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/servlet/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4
diff -ruN php-4.3.11-old/main/php_config.h.in php-4.3.11-new/main/php_config.h.in
--- php-4.3.11-old/main/php_config.h.in 2005-03-30 16:35:47.000000000 +0200
+++ php-4.3.11-new/main/php_config.h.in 2005-07-04 17:29:44.000000000 +0200
@@ -1,4 +1,4 @@
-/* main/php_config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* main/php_config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
 /* Leave this file alone */
 #define ZEND_API
 #define ZEND_DLEXPORT
@@ -101,6 +101,9 @@
 /* The number of bytes in a char.  */
 #undef SIZEOF_CHAR
 
+/* The number of bytes in a char *.  */
+#undef SIZEOF_CHAR_P
+
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 
@@ -353,6 +356,9 @@
 /* Define if you have the mmap function.  */
 #undef HAVE_MMAP
 
+/* Define if you have the nanosleep function.  */
+#undef HAVE_NANOSLEEP
+
 /* Define if you have the nl_langinfo function.  */
 #undef HAVE_NL_LANGINFO
 
@@ -803,6 +809,9 @@
 /* Define if you have the <termios.h> header file.  */
 #undef HAVE_TERMIOS_H
 
+/* Define if you have the <time.h> header file.  */
+#undef HAVE_TIME_H
+
 /* Define if you have the <tuxmodule.h> header file.  */
 #undef HAVE_TUXMODULE_H
 
@@ -2302,6 +2311,24 @@
 #undef COMPILE_DL_SOCKETS
 
 /*   */
+#undef HAVE_SQLITELIB
+
+/* Whether to build sqlite as dynamic module */
+#undef COMPILE_DL_SQLITE
+
+/* Whether to build sqlite as dynamic module */
+#undef COMPILE_DL_SQLITE
+
+/* Size of a pointer */
+#undef SQLITE_PTR_SZ
+
+/* if this is unix */
+#undef OS_UNIX
+
+/* if this is windows */
+#undef OS_WIN
+
+/*   */
 #undef HAVE_CRYPT
 
 /* Whether the system supports standard DES salt */