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

   1 diff -ruN php-4.3.11-old/configure php-4.3.11-new/configure
   2 --- php-4.3.11-old/configure    2005-03-30 16:35:34.000000000 +0200
   3 +++ php-4.3.11-new/configure    2005-07-04 17:29:33.000000000 +0200
   4 @@ -827,6 +827,8 @@
   5  ac_help="$ac_help
   6    --enable-sockets        Enable sockets support"
   7  ac_help="$ac_help
   8 +  --with-sqlite           Include sqlite support"
   9 +ac_help="$ac_help
  10    --with-regex=TYPE       regex library type: system, apache, php. Default: php
  11                            WARNING: Do NOT use unless you know what you are doing!"
  12  ac_help="$ac_help
  13 @@ -1649,7 +1651,7 @@
  14  fi
  15
  16  echo $ac_n "checking host system type""... $ac_c" 1>&6
  17 -echo "configure:1653: checking host system type" >&5
  18 +echo "configure:1655: checking host system type" >&5
  19
  20  host_alias=$host
  21  case "$host_alias" in
  22 @@ -1749,7 +1751,7 @@
  23  # Extract the first word of "gcc", so it can be a program name with args.
  24  set dummy gcc; ac_word=$2
  25  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  26 -echo "configure:1753: checking for $ac_word" >&5
  27 +echo "configure:1755: checking for $ac_word" >&5
  28  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  29    echo $ac_n "(cached) $ac_c" 1>&6
  30  else
  31 @@ -1779,7 +1781,7 @@
  32    # Extract the first word of "cc", so it can be a program name with args.
  33  set dummy cc; ac_word=$2
  34  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  35 -echo "configure:1783: checking for $ac_word" >&5
  36 +echo "configure:1785: checking for $ac_word" >&5
  37  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  38    echo $ac_n "(cached) $ac_c" 1>&6
  39  else
  40 @@ -1830,7 +1832,7 @@
  41        # Extract the first word of "cl", so it can be a program name with args.
  42  set dummy cl; ac_word=$2
  43  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  44 -echo "configure:1834: checking for $ac_word" >&5
  45 +echo "configure:1836: checking for $ac_word" >&5
  46  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  47    echo $ac_n "(cached) $ac_c" 1>&6
  48  else
  49 @@ -1862,7 +1864,7 @@
  50  fi
  51
  52  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
  53 -echo "configure:1866: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  54 +echo "configure:1868: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  55
  56  ac_ext=c
  57  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  58 @@ -1873,12 +1875,12 @@
  59
  60  cat > conftest.$ac_ext << EOF
  61
  62 -#line 1877 "configure"
  63 +#line 1879 "configure"
  64  #include "confdefs.h"
  65
  66  main(){return(0);}
  67  EOF
  68 -if { (eval echo configure:1882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  69 +if { (eval echo configure:1884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  70    ac_cv_prog_cc_works=yes
  71    # If we can't run a trivial program, we are probably using a cross compiler.
  72    if (./conftest; exit) 2>/dev/null; then
  73 @@ -1904,12 +1906,12 @@
  74    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  75  fi
  76  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
  77 -echo "configure:1908: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  78 +echo "configure:1910: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  79  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  80  cross_compiling=$ac_cv_prog_cc_cross
  81
  82  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
  83 -echo "configure:1913: checking whether we are using GNU C" >&5
  84 +echo "configure:1915: checking whether we are using GNU C" >&5
  85  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
  86    echo $ac_n "(cached) $ac_c" 1>&6
  87  else
  88 @@ -1918,7 +1920,7 @@
  89    yes;
  90  #endif
  91  EOF
  92 -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
  93 +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
  94    ac_cv_prog_gcc=yes
  95  else
  96    ac_cv_prog_gcc=no
  97 @@ -1937,7 +1939,7 @@
  98  ac_save_CFLAGS="$CFLAGS"
  99  CFLAGS=
 100  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 101 -echo "configure:1941: checking whether ${CC-cc} accepts -g" >&5
 102 +echo "configure:1943: checking whether ${CC-cc} accepts -g" >&5
 103  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
 104    echo $ac_n "(cached) $ac_c" 1>&6
 105  else
 106 @@ -1970,10 +1972,10 @@
 107
 108  if test "x$CC" != xcc; then
 109    echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
 110 -echo "configure:1974: checking whether $CC and cc understand -c and -o together" >&5
 111 +echo "configure:1976: checking whether $CC and cc understand -c and -o together" >&5
 112  else
 113    echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
 114 -echo "configure:1977: checking whether cc understands -c and -o together" >&5
 115 +echo "configure:1979: checking whether cc understands -c and -o together" >&5
 116  fi
 117  set dummy $CC; ac_cc="`echo $2 |
 118                        sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
 119 @@ -1985,16 +1987,16 @@
 120  # We do the test twice because some compilers refuse to overwrite an
 121  # existing .o file with -o, though they will create one.
 122  ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
 123 -if { (eval echo configure:1989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 124 -   test -f conftest.o && { (eval echo configure:1990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 125 +if { (eval echo configure:1991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 126 +   test -f conftest.o && { (eval echo configure:1992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 127  then
 128    eval ac_cv_prog_cc_${ac_cc}_c_o=yes
 129    if test "x$CC" != xcc; then
 130      # Test first that cc exists at all.
 131 -    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
 132 +    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
 133        ac_try='cc -c conftest.c -o conftest.o 1>&5'
 134 -      if { (eval echo configure:1997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 135 -        test -f conftest.o && { (eval echo configure:1998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 136 +      if { (eval echo configure:1999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 137 +        test -f conftest.o && { (eval echo configure:2000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 138        then
 139          # cc works too.
 140          :
 141 @@ -2021,7 +2023,7 @@
 142  fi
 143
 144  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 145 -echo "configure:2025: checking how to run the C preprocessor" >&5
 146 +echo "configure:2027: checking how to run the C preprocessor" >&5
 147  # On Suns, sometimes $CPP names a directory.
 148  if test -n "$CPP" && test -d "$CPP"; then
 149    CPP=
 150 @@ -2036,13 +2038,13 @@
 151    # On the NeXT, cc -E runs the code through the compiler's parser,
 152    # not just through cpp.
 153    cat > conftest.$ac_ext <<EOF
 154 -#line 2040 "configure"
 155 +#line 2042 "configure"
 156  #include "confdefs.h"
 157  #include <assert.h>
 158  Syntax Error
 159  EOF
 160  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 161 -{ (eval echo configure:2046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 162 +{ (eval echo configure:2048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 163  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 164  if test -z "$ac_err"; then
 165    :
 166 @@ -2053,13 +2055,13 @@
 167    rm -rf conftest*
 168    CPP="${CC-cc} -E -traditional-cpp"
 169    cat > conftest.$ac_ext <<EOF
 170 -#line 2057 "configure"
 171 +#line 2059 "configure"
 172  #include "confdefs.h"
 173  #include <assert.h>
 174  Syntax Error
 175  EOF
 176  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 177 -{ (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 178 +{ (eval echo configure:2065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 179  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 180  if test -z "$ac_err"; then
 181    :
 182 @@ -2070,13 +2072,13 @@
 183    rm -rf conftest*
 184    CPP="${CC-cc} -nologo -E"
 185    cat > conftest.$ac_ext <<EOF
 186 -#line 2074 "configure"
 187 +#line 2076 "configure"
 188  #include "confdefs.h"
 189  #include <assert.h>
 190  Syntax Error
 191  EOF
 192  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 193 -{ (eval echo configure:2080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 194 +{ (eval echo configure:2082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 195  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 196  if test -z "$ac_err"; then
 197    :
 198 @@ -2102,9 +2104,9 @@
 199
 200
 201  echo $ac_n "checking for AIX""... $ac_c" 1>&6
 202 -echo "configure:2106: checking for AIX" >&5
 203 +echo "configure:2108: checking for AIX" >&5
 204  cat > conftest.$ac_ext <<EOF
 205 -#line 2108 "configure"
 206 +#line 2110 "configure"
 207  #include "confdefs.h"
 208  #ifdef _AIX
 209    yes
 210 @@ -2129,7 +2131,7 @@
 211
 212
 213  echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6
 214 -echo "configure:2133: checking if compiler supports -R" >&5
 215 +echo "configure:2135: checking if compiler supports -R" >&5
 216  if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then
 217    echo $ac_n "(cached) $ac_c" 1>&6
 218  else
 219 @@ -2137,14 +2139,14 @@
 220         SAVE_LIBS=$LIBS
 221         LIBS="-R /usr/lib $LIBS"
 222         cat > conftest.$ac_ext <<EOF
 223 -#line 2141 "configure"
 224 +#line 2143 "configure"
 225  #include "confdefs.h"
 226
 227  int main() {
 228
 229  ; return 0; }
 230  EOF
 231 -if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 232 +if { (eval echo configure:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 233    rm -rf conftest*
 234    php_cv_cc_dashr=yes
 235  else
 236 @@ -2162,7 +2164,7 @@
 237         ld_runpath_switch=-R
 238  else
 239         echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
 240 -echo "configure:2166: checking if compiler supports -Wl,-rpath," >&5
 241 +echo "configure:2168: checking if compiler supports -Wl,-rpath," >&5
 242         if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then
 243    echo $ac_n "(cached) $ac_c" 1>&6
 244  else
 245 @@ -2170,14 +2172,14 @@
 246                 SAVE_LIBS=$LIBS
 247                 LIBS="-Wl,-rpath,/usr/lib $LIBS"
 248                 cat > conftest.$ac_ext <<EOF
 249 -#line 2174 "configure"
 250 +#line 2176 "configure"
 251  #include "confdefs.h"
 252
 253  int main() {
 254
 255  ; return 0; }
 256  EOF
 257 -if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 258 +if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 259    rm -rf conftest*
 260    php_cv_cc_rpath=yes
 261  else
 262 @@ -2203,7 +2205,7 @@
 263    # Extract the first word of "re2c", so it can be a program name with args.
 264  set dummy re2c; ac_word=$2
 265  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 266 -echo "configure:2207: checking for $ac_word" >&5
 267 +echo "configure:2209: checking for $ac_word" >&5
 268  if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then
 269    echo $ac_n "(cached) $ac_c" 1>&6
 270  else
 271 @@ -2232,7 +2234,7 @@
 272
 273
 274  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
 275 -echo "configure:2236: checking whether ln -s works" >&5
 276 +echo "configure:2238: checking whether ln -s works" >&5
 277  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
 278    echo $ac_n "(cached) $ac_c" 1>&6
 279  else
 280 @@ -2257,7 +2259,7 @@
 281  # Extract the first word of "$ac_prog", so it can be a program name with args.
 282  set dummy $ac_prog; ac_word=$2
 283  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 284 -echo "configure:2261: checking for $ac_word" >&5
 285 +echo "configure:2263: checking for $ac_word" >&5
 286  if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
 287    echo $ac_n "(cached) $ac_c" 1>&6
 288  else
 289 @@ -2291,7 +2293,7 @@
 290  # Extract the first word of "$ac_prog", so it can be a program name with args.
 291  set dummy $ac_prog; ac_word=$2
 292  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 293 -echo "configure:2295: checking for $ac_word" >&5
 294 +echo "configure:2297: checking for $ac_word" >&5
 295  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
 296    echo $ac_n "(cached) $ac_c" 1>&6
 297  else
 298 @@ -2325,7 +2327,7 @@
 299      echo "configure: warning: You will need bison if you want to regenerate the PHP parsers." 1>&2
 300  else
 301      echo $ac_n "checking bison version""... $ac_c" 1>&6
 302 -echo "configure:2329: checking bison version" >&5
 303 +echo "configure:2331: checking bison version" >&5
 304      set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'|tr -d a-z`
 305      if test "${1}" -ne "1" -o "(" "${2}" != "28" -a "${2}" != "35" -a "${2}" != "75" -a "${2}" != "875" ")"; then
 306        echo "configure: warning: You will need bison 1.28" 1>&2
 307 @@ -2335,7 +2337,7 @@
 308  # Extract the first word of "flex", so it can be a program name with args.
 309  set dummy flex; ac_word=$2
 310  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 311 -echo "configure:2339: checking for $ac_word" >&5
 312 +echo "configure:2341: checking for $ac_word" >&5
 313  if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
 314    echo $ac_n "(cached) $ac_c" 1>&6
 315  else
 316 @@ -2369,7 +2371,7 @@
 317    *) ac_lib=l ;;
 318    esac
 319    echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
 320 -echo "configure:2373: checking for yywrap in -l$ac_lib" >&5
 321 +echo "configure:2375: checking for yywrap in -l$ac_lib" >&5
 322  ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 323  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 324    echo $ac_n "(cached) $ac_c" 1>&6
 325 @@ -2377,7 +2379,7 @@
 326    ac_save_LIBS="$LIBS"
 327  LIBS="-l$ac_lib  $LIBS"
 328  cat > conftest.$ac_ext <<EOF
 329 -#line 2381 "configure"
 330 +#line 2383 "configure"
 331  #include "confdefs.h"
 332  /* Override any gcc2 internal prototype to avoid an error.  */
 333  /* We use char because int might match the return type of a gcc2
 334 @@ -2388,7 +2390,7 @@
 335  yywrap()
 336  ; return 0; }
 337  EOF
 338 -if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 339 +if { (eval echo configure:2394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 340    rm -rf conftest*
 341    eval "ac_cv_lib_$ac_lib_var=yes"
 342  else
 343 @@ -2412,7 +2414,7 @@
 344
 345  if test -n "$LEX"; then
 346    echo $ac_n "checking lex output file root""... $ac_c" 1>&6
 347 -echo "configure:2416: checking lex output file root" >&5
 348 +echo "configure:2418: checking lex output file root" >&5
 349  if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
 350    echo $ac_n "(cached) $ac_c" 1>&6
 351  else
 352 @@ -2433,7 +2435,7 @@
 353  LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 354
 355  echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
 356 -echo "configure:2437: checking whether yytext is a pointer" >&5
 357 +echo "configure:2439: checking whether yytext is a pointer" >&5
 358  if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
 359    echo $ac_n "(cached) $ac_c" 1>&6
 360  else
 361 @@ -2445,14 +2447,14 @@
 362  ac_save_LIBS="$LIBS"
 363  LIBS="$LIBS $LEXLIB"
 364  cat > conftest.$ac_ext <<EOF
 365 -#line 2449 "configure"
 366 +#line 2451 "configure"
 367  #include "confdefs.h"
 368  `cat $LEX_OUTPUT_ROOT.c`
 369  int main() {
 370
 371  ; return 0; }
 372  EOF
 373 -if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 374 +if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 375    rm -rf conftest*
 376    ac_cv_prog_lex_yytext_pointer=yes
 377  else
 378 @@ -2476,12 +2478,12 @@
 379    :
 380  fi
 381  echo $ac_n "checking for working const""... $ac_c" 1>&6
 382 -echo "configure:2480: checking for working const" >&5
 383 +echo "configure:2482: checking for working const" >&5
 384  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
 385    echo $ac_n "(cached) $ac_c" 1>&6
 386  else
 387    cat > conftest.$ac_ext <<EOF
 388 -#line 2485 "configure"
 389 +#line 2487 "configure"
 390  #include "confdefs.h"
 391
 392  int main() {
 393 @@ -2530,7 +2532,7 @@
 394
 395  ; return 0; }
 396  EOF
 397 -if { (eval echo configure:2534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 398 +if { (eval echo configure:2536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 399    rm -rf conftest*
 400    ac_cv_c_const=yes
 401  else
 402 @@ -2555,7 +2557,7 @@
 403  fi
 404
 405  echo $ac_n "checking flex version""... $ac_c" 1>&6
 406 -echo "configure:2559: checking flex version" >&5
 407 +echo "configure:2561: checking flex version" >&5
 408  if test "$LEX" ;then
 409         flexvers=`echo "" | $LEX -V -v --version 2>/dev/null |
 410                 sed -e 's/^.* //' -e 's/\./ /g'`
 411 @@ -2571,7 +2573,7 @@
 412  fi
 413
 414  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
 415 -echo "configure:2575: checking whether byte ordering is bigendian" >&5
 416 +echo "configure:2577: checking whether byte ordering is bigendian" >&5
 417  if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
 418    echo $ac_n "(cached) $ac_c" 1>&6
 419  else
 420 @@ -2581,7 +2583,7 @@
 421    ac_cv_c_bigendian_php=unknown
 422  else
 423    cat > conftest.$ac_ext <<EOF
 424 -#line 2585 "configure"
 425 +#line 2587 "configure"
 426  #include "confdefs.h"
 427
 428  int main(void)
 429 @@ -2597,7 +2599,7 @@
 430  }
 431
 432  EOF
 433 -if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 434 +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 435  then
 436    ac_cv_c_bigendian_php=yes
 437  else
 438 @@ -2654,7 +2656,7 @@
 439  # Disable PIC mode by default where it is known to be safe to do so,
 440  # to avoid the performance hit from the lost register
 441  echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6
 442 -echo "configure:2658: checking whether to force non-PIC code in shared modules" >&5
 443 +echo "configure:2660: checking whether to force non-PIC code in shared modules" >&5
 444  case $host_alias in
 445  i?86-*-linux*|i?86-*-freebsd*)
 446      if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
 447 @@ -2753,7 +2755,7 @@
 448    pthreads_working=no
 449  else
 450    cat > conftest.$ac_ext <<EOF
 451 -#line 2757 "configure"
 452 +#line 2759 "configure"
 453  #include "confdefs.h"
 454
 455  #include <pthread.h>
 456 @@ -2771,7 +2773,7 @@
 457      return pthread_create(&thd, NULL, thread_routine, &data);
 458  }
 459  EOF
 460 -if { (eval echo configure:2775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 461 +if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 462  then
 463
 464    pthreads_working=yes
 465 @@ -2791,7 +2793,7 @@
 466    CFLAGS=$save_CFLAGS
 467
 468    echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
 469 -echo "configure:2795: checking for pthreads_cflags" >&5
 470 +echo "configure:2797: checking for pthreads_cflags" >&5
 471  if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
 472    echo $ac_n "(cached) $ac_c" 1>&6
 473  else
 474 @@ -2806,7 +2808,7 @@
 475    pthreads_working=no
 476  else
 477    cat > conftest.$ac_ext <<EOF
 478 -#line 2810 "configure"
 479 +#line 2812 "configure"
 480  #include "confdefs.h"
 481
 482  #include <pthread.h>
 483 @@ -2824,7 +2826,7 @@
 484      return pthread_create(&thd, NULL, thread_routine, &data);
 485  }
 486  EOF
 487 -if { (eval echo configure:2828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 488 +if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 489  then
 490
 491    pthreads_working=yes
 492 @@ -2854,7 +2856,7 @@
 493  echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
 494
 495  echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
 496 -echo "configure:2858: checking for pthreads_lib" >&5
 497 +echo "configure:2860: checking for pthreads_lib" >&5
 498  if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
 499    echo $ac_n "(cached) $ac_c" 1>&6
 500  else
 501 @@ -2869,7 +2871,7 @@
 502    pthreads_working=no
 503  else
 504    cat > conftest.$ac_ext <<EOF
 505 -#line 2873 "configure"
 506 +#line 2875 "configure"
 507  #include "confdefs.h"
 508
 509  #include <pthread.h>
 510 @@ -2887,7 +2889,7 @@
 511      return pthread_create(&thd, NULL, thread_routine, &data);
 512  }
 513  EOF
 514 -if { (eval echo configure:2891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 515 +if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 516  then
 517
 518    pthreads_working=yes
 519 @@ -2985,7 +2987,7 @@
 520
 521
 522  echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6
 523 -echo "configure:2989: checking for AOLserver support" >&5
 524 +echo "configure:2991: checking for AOLserver support" >&5
 525  # Check whether --with-aolserver or --without-aolserver was given.
 526  if test "${with_aolserver+set}" = set; then
 527    withval="$with_aolserver"
 528 @@ -3226,7 +3228,7 @@
 529
 530
 531  echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6
 532 -echo "configure:3230: checking for Apache 1.x module support via DSO through APXS" >&5
 533 +echo "configure:3232: checking for Apache 1.x module support via DSO through APXS" >&5
 534  # Check whether --with-apxs or --without-apxs was given.
 535  if test "${with_apxs+set}" = set; then
 536    withval="$with_apxs"
 537 @@ -3529,7 +3531,7 @@
 538
 539  if test "$PHP_SAPI" != "apache"; then
 540  echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6
 541 -echo "configure:3533: checking for Apache 1.x module support" >&5
 542 +echo "configure:3535: checking for Apache 1.x module support" >&5
 543  # Check whether --with-apache or --without-apache was given.
 544  if test "${with_apache+set}" = set; then
 545    withval="$with_apache"
 546 @@ -4364,7 +4366,7 @@
 547  fi
 548
 549  echo $ac_n "checking for mod_charset compatibility option""... $ac_c" 1>&6
 550 -echo "configure:4368: checking for mod_charset compatibility option" >&5
 551 +echo "configure:4370: checking for mod_charset compatibility option" >&5
 552  # Check whether --with-mod_charset or --without-mod_charset was given.
 553  if test "${with_mod_charset+set}" = set; then
 554    withval="$with_mod_charset"
 555 @@ -4388,7 +4390,7 @@
 556
 557    gcc_arg_name=ac_cv_gcc_arg_rdynamic
 558    echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
 559 -echo "configure:4392: checking whether $CC supports -rdynamic" >&5
 560 +echo "configure:4394: checking whether $CC supports -rdynamic" >&5
 561  if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
 562    echo $ac_n "(cached) $ac_c" 1>&6
 563  else
 564 @@ -4431,7 +4433,7 @@
 565
 566
 567  echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
 568 -echo "configure:4435: checking for member fd in BUFF *" >&5
 569 +echo "configure:4437: checking for member fd in BUFF *" >&5
 570  if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then
 571    echo $ac_n "(cached) $ac_c" 1>&6
 572  else
 573 @@ -4443,14 +4445,14 @@
 574      CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
 575    fi
 576    cat > conftest.$ac_ext <<EOF
 577 -#line 4447 "configure"
 578 +#line 4449 "configure"
 579  #include "confdefs.h"
 580  #include <httpd.h>
 581  int main() {
 582  conn_rec *c; int fd = c->client->fd;
 583  ; return 0; }
 584  EOF
 585 -if { (eval echo configure:4454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 586 +if { (eval echo configure:4456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 587    rm -rf conftest*
 588
 589      ac_cv_php_fd_in_buff=yes
 590 @@ -4501,7 +4503,7 @@
 591
 592
 593  echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6
 594 -echo "configure:4505: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
 595 +echo "configure:4507: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
 596  # Check whether --with-apxs2filter or --without-apxs2filter was given.
 597  if test "${with_apxs2filter+set}" = set; then
 598    withval="$with_apxs2filter"
 599 @@ -5323,7 +5325,7 @@
 600
 601
 602  echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6
 603 -echo "configure:5327: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
 604 +echo "configure:5329: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
 605  # Check whether --with-apxs2 or --without-apxs2 was given.
 606  if test "${with_apxs2+set}" = set; then
 607    withval="$with_apxs2"
 608 @@ -6146,7 +6148,7 @@
 609
 610  RESULT=no
 611  echo $ac_n "checking for Caudium support""... $ac_c" 1>&6
 612 -echo "configure:6150: checking for Caudium support" >&5
 613 +echo "configure:6152: checking for Caudium support" >&5
 614  # Check whether --with-caudium or --without-caudium was given.
 615  if test "${with_caudium+set}" = set; then
 616    withval="$with_caudium"
 617 @@ -6218,7 +6220,7 @@
 618                    PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE`
 619                 fi
 620                 echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6
 621 -echo "configure:6222: checking for C includes in $PIKE_C_INCLUDE" >&5
 622 +echo "configure:6224: checking for C includes in $PIKE_C_INCLUDE" >&5
 623                 if test -f $PIKE_C_INCLUDE/version.h; then
 624                   PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
 625                       ###### VERSION MATCH CHECK #######
 626 @@ -6476,7 +6478,7 @@
 627
 628
 629  echo $ac_n "checking for CLI build""... $ac_c" 1>&6
 630 -echo "configure:6480: checking for CLI build" >&5
 631 +echo "configure:6482: checking for CLI build" >&5
 632
 633  # Check whether --enable-cli or --disable-cli was given.
 634  if test "${enable_cli+set}" = set; then
 635 @@ -6536,7 +6538,7 @@
 636
 637
 638  echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6
 639 -echo "configure:6540: checking for embedded SAPI library support" >&5
 640 +echo "configure:6542: checking for embedded SAPI library support" >&5
 641
 642  # Check whether --enable-embed or --disable-embed was given.
 643  if test "${enable_embed+set}" = set; then
 644 @@ -6739,7 +6741,7 @@
 645
 646  RESULT=no
 647  echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6
 648 -echo "configure:6743: checking for Zeus ISAPI support" >&5
 649 +echo "configure:6745: checking for Zeus ISAPI support" >&5
 650  # Check whether --with-isapi or --without-isapi was given.
 651  if test "${with_isapi+set}" = set; then
 652    withval="$with_isapi"
 653 @@ -6969,7 +6971,7 @@
 654
 655
 656  echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6
 657 -echo "configure:6973: checking for NSAPI support" >&5
 658 +echo "configure:6975: checking for NSAPI support" >&5
 659  # Check whether --with-nsapi or --without-nsapi was given.
 660  if test "${with_nsapi+set}" = set; then
 661    withval="$with_nsapi"
 662 @@ -6989,7 +6991,7 @@
 663      { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/SunONE server using --with-nsapi=DIR" 1>&2; exit 1; }
 664    fi
 665    echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6
 666 -echo "configure:6993: checking for NSAPI include files" >&5
 667 +echo "configure:6995: checking for NSAPI include files" >&5
 668    if test -d $PHP_NSAPI/include ; then
 669      NSAPI_INCLUDE=$PHP_NSAPI/include
 670      echo "$ac_t""Netscape-Enterprise 3.x style" 1>&6
 671 @@ -6997,17 +6999,17 @@
 672  do
 673  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 674  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 675 -echo "configure:7001: checking for $ac_hdr" >&5
 676 +echo "configure:7003: checking for $ac_hdr" >&5
 677  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 678    echo $ac_n "(cached) $ac_c" 1>&6
 679  else
 680    cat > conftest.$ac_ext <<EOF
 681 -#line 7006 "configure"
 682 +#line 7008 "configure"
 683  #include "confdefs.h"
 684  #include <$ac_hdr>
 685  EOF
 686  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 687 -{ (eval echo configure:7011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 688 +{ (eval echo configure:7013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 689  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 690  if test -z "$ac_err"; then
 691    rm -rf conftest*
 692 @@ -7042,17 +7044,17 @@
 693  do
 694  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 695  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 696 -echo "configure:7046: checking for $ac_hdr" >&5
 697 +echo "configure:7048: checking for $ac_hdr" >&5
 698  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 699    echo $ac_n "(cached) $ac_c" 1>&6
 700  else
 701    cat > conftest.$ac_ext <<EOF
 702 -#line 7051 "configure"
 703 +#line 7053 "configure"
 704  #include "confdefs.h"
 705  #include <$ac_hdr>
 706  EOF
 707  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 708 -{ (eval echo configure:7056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 709 +{ (eval echo configure:7058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 710  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 711  if test -z "$ac_err"; then
 712    rm -rf conftest*
 713 @@ -7310,7 +7312,7 @@
 714
 715  RESULT=no
 716  echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6
 717 -echo "configure:7314: checking for PHTTPD support" >&5
 718 +echo "configure:7316: checking for PHTTPD support" >&5
 719  # Check whether --with-phttpd or --without-phttpd was given.
 720  if test "${with_phttpd+set}" = set; then
 721    withval="$with_phttpd"
 722 @@ -7539,7 +7541,7 @@
 723
 724  RESULT=no
 725  echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6
 726 -echo "configure:7543: checking for Pi3Web support" >&5
 727 +echo "configure:7545: checking for Pi3Web support" >&5
 728
 729  # Check whether --with-pi3web or --without-pi3web was given.
 730  if test "${with_pi3web+set}" = set; then
 731 @@ -7868,7 +7870,7 @@
 732
 733  RESULT=no
 734  echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6
 735 -echo "configure:7872: checking for Roxen/Pike support" >&5
 736 +echo "configure:7874: checking for Roxen/Pike support" >&5
 737  # Check whether --with-roxen or --without-roxen was given.
 738  if test "${with_roxen+set}" = set; then
 739    withval="$with_roxen"
 740 @@ -8110,7 +8112,7 @@
 741  if test "$RESULT" != "no" ; then
 742   RESULT=no
 743   echo $ac_n "checking if Roxen should use ZTS""... $ac_c" 1>&6
 744 -echo "configure:8114: checking if Roxen should use ZTS" >&5
 745 +echo "configure:8116: checking if Roxen should use ZTS" >&5
 746   # Check whether --enable-roxen-zts or --disable-roxen-zts was given.
 747  if test "${enable_roxen_zts+set}" = set; then
 748    enableval="$enable_roxen_zts"
 749 @@ -8137,7 +8139,7 @@
 750
 751
 752  echo $ac_n "checking for Servlet support""... $ac_c" 1>&6
 753 -echo "configure:8141: checking for Servlet support" >&5
 754 +echo "configure:8143: checking for Servlet support" >&5
 755  # Check whether --with-servlet or --without-servlet was given.
 756  if test "${with_servlet+set}" = set; then
 757    withval="$with_servlet"
 758 @@ -8448,7 +8450,7 @@
 759
 760    gcc_arg_name=ac_cv_gcc_arg_rdynamic
 761    echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
 762 -echo "configure:8452: checking whether $CC supports -rdynamic" >&5
 763 +echo "configure:8454: checking whether $CC supports -rdynamic" >&5
 764  if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
 765    echo $ac_n "(cached) $ac_c" 1>&6
 766  else
 767 @@ -8655,7 +8657,7 @@
 768
 769
 770  echo $ac_n "checking for thttpd""... $ac_c" 1>&6
 771 -echo "configure:8659: checking for thttpd" >&5
 772 +echo "configure:8661: checking for thttpd" >&5
 773  echo "$ac_t""$PHP_THTTPD" 1>&6
 774
 775
 776 @@ -8670,17 +8672,17 @@
 777  do
 778  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 779  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 780 -echo "configure:8674: checking for $ac_hdr" >&5
 781 +echo "configure:8676: checking for $ac_hdr" >&5
 782  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 783    echo $ac_n "(cached) $ac_c" 1>&6
 784  else
 785    cat > conftest.$ac_ext <<EOF
 786 -#line 8679 "configure"
 787 +#line 8681 "configure"
 788  #include "confdefs.h"
 789  #include <$ac_hdr>
 790  EOF
 791  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 792 -{ (eval echo configure:8684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 793 +{ (eval echo configure:8686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 794  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 795  if test -z "$ac_err"; then
 796    rm -rf conftest*
 797 @@ -8881,7 +8883,7 @@
 798
 799
 800  echo $ac_n "checking for TUX""... $ac_c" 1>&6
 801 -echo "configure:8885: checking for TUX" >&5
 802 +echo "configure:8887: checking for TUX" >&5
 803  echo "$ac_t""$PHP_TUX" 1>&6
 804
 805  unset PHP_TUX
 806 @@ -9115,7 +9117,7 @@
 807
 808
 809  echo $ac_n "checking for webjames""... $ac_c" 1>&6
 810 -echo "configure:9119: checking for webjames" >&5
 811 +echo "configure:9121: checking for webjames" >&5
 812  echo "$ac_t""$PHP_WEBJAMES" 1>&6
 813
 814
 815 @@ -9189,7 +9191,7 @@
 816
 817  if test "$PHP_SAPI" = "default"; then
 818    echo $ac_n "checking for CGI build""... $ac_c" 1>&6
 819 -echo "configure:9193: checking for CGI build" >&5
 820 +echo "configure:9195: checking for CGI build" >&5
 821    if test "$PHP_SAPI_CGI" != "no"; then
 822      echo "$ac_t""yes" 1>&6
 823
 824 @@ -9213,7 +9215,7 @@
 825
 826
 827    echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6
 828 -echo "configure:9217: checking whether writing to stdout works" >&5
 829 +echo "configure:9219: checking whether writing to stdout works" >&5
 830  if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then
 831    echo $ac_n "(cached) $ac_c" 1>&6
 832  else
 833 @@ -9224,7 +9226,7 @@
 834
 835  else
 836    cat > conftest.$ac_ext <<EOF
 837 -#line 9228 "configure"
 838 +#line 9230 "configure"
 839  #include "confdefs.h"
 840
 841  #ifdef HAVE_UNISTD_H
 842 @@ -9242,7 +9244,7 @@
 843  }
 844
 845  EOF
 846 -if { (eval echo configure:9246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 847 +if { (eval echo configure:9248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 848  then
 849
 850        ac_cv_write_stdout=yes
 851 @@ -9271,7 +9273,7 @@
 852
 853
 854      echo $ac_n "checking whether to force Apache CGI redirect""... $ac_c" 1>&6
 855 -echo "configure:9275: checking whether to force Apache CGI redirect" >&5
 856 +echo "configure:9277: checking whether to force Apache CGI redirect" >&5
 857      if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then
 858        REDIRECT=1
 859      else
 860 @@ -9285,7 +9287,7 @@
 861
 862
 863      echo $ac_n "checking whether to discard path_info + path_translated""... $ac_c" 1>&6
 864 -echo "configure:9289: checking whether to discard path_info + path_translated" >&5
 865 +echo "configure:9291: checking whether to discard path_info + path_translated" >&5
 866      if test "$PHP_DISCARD_PATH" = "yes"; then
 867        DISCARD_PATH=1
 868      else
 869 @@ -9298,7 +9300,7 @@
 870      echo "$ac_t""$PHP_DISCARD_PATH" 1>&6
 871
 872      echo $ac_n "checking whether to enable path info checking""... $ac_c" 1>&6
 873 -echo "configure:9302: checking whether to enable path info checking" >&5
 874 +echo "configure:9304: checking whether to enable path info checking" >&5
 875      if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then
 876        ENABLE_PATHINFO_CHECK=1
 877      else
 878 @@ -9311,7 +9313,7 @@
 879      echo "$ac_t""$PHP_ENABLE_PATHINFO_CHECK" 1>&6
 880
 881      echo $ac_n "checking whether to enable fastcgi support""... $ac_c" 1>&6
 882 -echo "configure:9315: checking whether to enable fastcgi support" >&5
 883 +echo "configure:9317: checking whether to enable fastcgi support" >&5
 884      PHP_LIBFCGI_DIR="$abs_srcdir/sapi/cgi/libfcgi"
 885      if test -z $PHP_LIBFCGI_DIR; then
 886        echo "$PHP_LIBFCGI_DIR does not exist"
 887 @@ -9536,7 +9538,7 @@
 888
 889
 890  echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6
 891 -echo "configure:9540: checking for chosen SAPI module" >&5
 892 +echo "configure:9542: checking for chosen SAPI module" >&5
 893  echo "$ac_t""$PHP_SAPI" 1>&6
 894
 895  if test "$enable_experimental_zts" = "yes"; then
 896 @@ -9639,7 +9641,7 @@
 897  #AC_LANG([C])
 898
 899  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
 900 -echo "configure:9643: checking for gethostbyname in -lnsl" >&5
 901 +echo "configure:9645: checking for gethostbyname in -lnsl" >&5
 902  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 903  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 904    echo $ac_n "(cached) $ac_c" 1>&6
 905 @@ -9647,7 +9649,7 @@
 906    ac_save_LIBS="$LIBS"
 907  LIBS="-lnsl  $LIBS"
 908  cat > conftest.$ac_ext <<EOF
 909 -#line 9651 "configure"
 910 +#line 9653 "configure"
 911  #include "confdefs.h"
 912  /* Override any gcc2 internal prototype to avoid an error.  */
 913  /* We use char because int might match the return type of a gcc2
 914 @@ -9658,7 +9660,7 @@
 915  gethostbyname()
 916  ; return 0; }
 917  EOF
 918 -if { (eval echo configure:9662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 919 +if { (eval echo configure:9664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 920    rm -rf conftest*
 921    eval "ac_cv_lib_$ac_lib_var=yes"
 922  else
 923 @@ -9686,7 +9688,7 @@
 924  fi
 925
 926  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
 927 -echo "configure:9690: checking for socket in -lsocket" >&5
 928 +echo "configure:9692: checking for socket in -lsocket" >&5
 929  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 930  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 931    echo $ac_n "(cached) $ac_c" 1>&6
 932 @@ -9694,7 +9696,7 @@
 933    ac_save_LIBS="$LIBS"
 934  LIBS="-lsocket  $LIBS"
 935  cat > conftest.$ac_ext <<EOF
 936 -#line 9698 "configure"
 937 +#line 9700 "configure"
 938  #include "confdefs.h"
 939  /* Override any gcc2 internal prototype to avoid an error.  */
 940  /* We use char because int might match the return type of a gcc2
 941 @@ -9705,7 +9707,7 @@
 942  socket()
 943  ; return 0; }
 944  EOF
 945 -if { (eval echo configure:9709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 946 +if { (eval echo configure:9711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 947    rm -rf conftest*
 948    eval "ac_cv_lib_$ac_lib_var=yes"
 949  else
 950 @@ -9741,17 +9743,17 @@
 951  # If it isn't, don't bother looking for the threads libraries.
 952  ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
 953  echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
 954 -echo "configure:9745: checking for pthread.h" >&5
 955 +echo "configure:9747: checking for pthread.h" >&5
 956  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 957    echo $ac_n "(cached) $ac_c" 1>&6
 958  else
 959    cat > conftest.$ac_ext <<EOF
 960 -#line 9750 "configure"
 961 +#line 9752 "configure"
 962  #include "confdefs.h"
 963  #include <pthread.h>
 964  EOF
 965  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 966 -{ (eval echo configure:9755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 967 +{ (eval echo configure:9757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 968  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 969  if test -z "$ac_err"; then
 970    rm -rf conftest*
 971 @@ -9788,9 +9790,9 @@
 972          save_LIBS="$LIBS"
 973          LIBS="$PTHREAD_LIBS $LIBS"
 974          echo $ac_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS""... $ac_c" 1>&6
 975 -echo "configure:9792: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
 976 +echo "configure:9794: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
 977          cat > conftest.$ac_ext <<EOF
 978 -#line 9794 "configure"
 979 +#line 9796 "configure"
 980  #include "confdefs.h"
 981  /* Override any gcc2 internal prototype to avoid an error.  */
 982  /* We use char because int might match the return type of a gcc2
 983 @@ -9801,7 +9803,7 @@
 984  pthread_join()
 985  ; return 0; }
 986  EOF
 987 -if { (eval echo configure:9805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 988 +if { (eval echo configure:9807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 989    rm -rf conftest*
 990    acx_pthread_ok=yes
 991  else
 992 @@ -9863,18 +9865,18 @@
 993          case $flag in
 994                  none)
 995                  echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6
 996 -echo "configure:9867: checking whether pthreads work without any flags" >&5
 997 +echo "configure:9869: checking whether pthreads work without any flags" >&5
 998                  ;;
 999
1000                  -*)
1001                  echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
1002 -echo "configure:9872: checking whether pthreads work with $flag" >&5
1003 +echo "configure:9874: checking whether pthreads work with $flag" >&5
1004                  PTHREAD_CFLAGS="$flag"
1005                  ;;
1006
1007                  *)
1008                  echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6
1009 -echo "configure:9878: checking for the pthreads library -l$flag" >&5
1010 +echo "configure:9880: checking for the pthreads library -l$flag" >&5
1011                  PTHREAD_LIBS="-l$flag"
1012                  ;;
1013          esac
1014 @@ -9894,7 +9896,7 @@
1015          # functions on Solaris that doesn't have a non-functional libc stub.
1016          # We try pthread_create on general principles.
1017          cat > conftest.$ac_ext <<EOF
1018 -#line 9898 "configure"
1019 +#line 9900 "configure"
1020  #include "confdefs.h"
1021  #include <pthread.h>
1022  int main() {
1023 @@ -9903,7 +9905,7 @@
1024                       pthread_create(0,0,0,0); pthread_cleanup_pop(0);
1025  ; return 0; }
1026  EOF
1027 -if { (eval echo configure:9907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1028 +if { (eval echo configure:9909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1029    rm -rf conftest*
1030    acx_pthread_ok=yes
1031  else
1032 @@ -9935,16 +9937,16 @@
1033          # Detect AIX lossage: threads are created detached by default
1034          # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
1035          echo $ac_n "checking for joinable pthread attribute""... $ac_c" 1>&6
1036 -echo "configure:9939: checking for joinable pthread attribute" >&5
1037 +echo "configure:9941: checking for joinable pthread attribute" >&5
1038          cat > conftest.$ac_ext <<EOF
1039 -#line 9941 "configure"
1040 +#line 9943 "configure"
1041  #include "confdefs.h"
1042  #include <pthread.h>
1043  int main() {
1044  int attr=PTHREAD_CREATE_JOINABLE;
1045  ; return 0; }
1046  EOF
1047 -if { (eval echo configure:9948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1048 +if { (eval echo configure:9950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1049    rm -rf conftest*
1050    ok=PTHREAD_CREATE_JOINABLE
1051  else
1052 @@ -9956,14 +9958,14 @@
1053  rm -f conftest*
1054          if test x"$ok" = xunknown; then
1055                  cat > conftest.$ac_ext <<EOF
1056 -#line 9960 "configure"
1057 +#line 9962 "configure"
1058  #include "confdefs.h"
1059  #include <pthread.h>
1060  int main() {
1061  int attr=PTHREAD_CREATE_UNDETACHED;
1062  ; return 0; }
1063  EOF
1064 -if { (eval echo configure:9967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1065 +if { (eval echo configure:9969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1066    rm -rf conftest*
1067    ok=PTHREAD_CREATE_UNDETACHED
1068  else
1069 @@ -9986,7 +9988,7 @@
1070          fi
1071
1072          echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
1073 -echo "configure:9990: checking if more special flags are required for pthreads" >&5
1074 +echo "configure:9992: checking if more special flags are required for pthreads" >&5
1075          flag=no
1076          case "${host_cpu}-${host_os}" in
1077                  *-aix* | *-freebsd*)     flag="-D_THREAD_SAFE";;
1078 @@ -10004,7 +10006,7 @@
1079          # Extract the first word of "cc_r", so it can be a program name with args.
1080  set dummy cc_r; ac_word=$2
1081  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1082 -echo "configure:10008: checking for $ac_word" >&5
1083 +echo "configure:10010: checking for $ac_word" >&5
1084  if eval "test \"`echo '$''{'ac_cv_prog_PTHREAD_CC'+set}'`\" = set"; then
1085    echo $ac_n "(cached) $ac_c" 1>&6
1086  else
1087 @@ -10053,9 +10055,9 @@
1088
1089
1090      echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6
1091 -echo "configure:10057: checking for sun_len in sys/un.h" >&5
1092 +echo "configure:10059: checking for sun_len in sys/un.h" >&5
1093      cat > conftest.$ac_ext <<EOF
1094 -#line 10059 "configure"
1095 +#line 10061 "configure"
1096  #include "confdefs.h"
1097  #include <sys/un.h>
1098  EOF
1099 @@ -10075,9 +10077,9 @@
1100
1101
1102      echo $ac_n "checking for fpos_t in stdio.h""... $ac_c" 1>&6
1103 -echo "configure:10079: checking for fpos_t in stdio.h" >&5
1104 +echo "configure:10081: checking for fpos_t in stdio.h" >&5
1105      cat > conftest.$ac_ext <<EOF
1106 -#line 10081 "configure"
1107 +#line 10083 "configure"
1108  #include "confdefs.h"
1109  #include <stdio.h>
1110  EOF
1111 @@ -10100,17 +10102,17 @@
1112  do
1113  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1114  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1115 -echo "configure:10104: checking for $ac_hdr" >&5
1116 +echo "configure:10106: checking for $ac_hdr" >&5
1117  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1118    echo $ac_n "(cached) $ac_c" 1>&6
1119  else
1120    cat > conftest.$ac_ext <<EOF
1121 -#line 10109 "configure"
1122 +#line 10111 "configure"
1123  #include "confdefs.h"
1124  #include <$ac_hdr>
1125  EOF
1126  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1127 -{ (eval echo configure:10114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1128 +{ (eval echo configure:10116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1129  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1130  if test -z "$ac_err"; then
1131    rm -rf conftest*
1132 @@ -10140,17 +10142,17 @@
1133  do
1134  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1135  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1136 -echo "configure:10144: checking for $ac_hdr" >&5
1137 +echo "configure:10146: checking for $ac_hdr" >&5
1138  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1139    echo $ac_n "(cached) $ac_c" 1>&6
1140  else
1141    cat > conftest.$ac_ext <<EOF
1142 -#line 10149 "configure"
1143 +#line 10151 "configure"
1144  #include "confdefs.h"
1145  #include <$ac_hdr>
1146  EOF
1147  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1148 -{ (eval echo configure:10154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1149 +{ (eval echo configure:10156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1150  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1151  if test -z "$ac_err"; then
1152    rm -rf conftest*
1153 @@ -10178,9 +10180,9 @@
1154
1155
1156      echo $ac_n "checking for a fileno() prototype in stdio.h""... $ac_c" 1>&6
1157 -echo "configure:10182: checking for a fileno() prototype in stdio.h" >&5
1158 +echo "configure:10184: checking for a fileno() prototype in stdio.h" >&5
1159      cat > conftest.$ac_ext <<EOF
1160 -#line 10184 "configure"
1161 +#line 10186 "configure"
1162  #include "confdefs.h"
1163  #include <stdio.h>
1164  EOF
1165 @@ -10201,9 +10203,9 @@
1166
1167      if test "$HAVE_SYS_SOCKET_H"; then
1168         echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
1169 -echo "configure:10205: checking for socklen_t in sys/socket.h" >&5
1170 +echo "configure:10207: checking for socklen_t in sys/socket.h" >&5
1171         cat > conftest.$ac_ext <<EOF
1172 -#line 10207 "configure"
1173 +#line 10209 "configure"
1174  #include "confdefs.h"
1175  #include <sys/socket.h>
1176  EOF
1177 @@ -10227,7 +10229,7 @@
1178      #  Do we need cross-process locking on this platform?
1179      #--------------------------------------------------------------------
1180      echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6
1181 -echo "configure:10231: checking whether cross-process locking is required by accept()" >&5
1182 +echo "configure:10233: checking whether cross-process locking is required by accept()" >&5
1183      case "`uname -sr`" in
1184         IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
1185                     echo "$ac_t""yes" 1>&6
1186 @@ -10246,16 +10248,16 @@
1187      #  hpux 9.04 compiler does and so does Stratus FTX (uses HP's compiler)
1188      #--------------------------------------------------------------------
1189      echo $ac_n "checking whether va_arg(arg, long double) crashes the compiler""... $ac_c" 1>&6
1190 -echo "configure:10250: checking whether va_arg(arg, long double) crashes the compiler" >&5
1191 +echo "configure:10252: checking whether va_arg(arg, long double) crashes the compiler" >&5
1192      cat > conftest.$ac_ext <<EOF
1193 -#line 10252 "configure"
1194 +#line 10254 "configure"
1195  #include "confdefs.h"
1196  #include <stdarg.h>
1197  int main() {
1198  long double lDblArg; va_list arg; lDblArg = va_arg(arg, long double);
1199  ; return 0; }
1200  EOF
1201 -if { (eval echo configure:10259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1202 +if { (eval echo configure:10261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1203    rm -rf conftest*
1204    echo "$ac_t""no" 1>&6
1205  else
1206 @@ -10271,12 +10273,12 @@
1207  rm -f conftest*
1208
1209      echo $ac_n "checking for working const""... $ac_c" 1>&6
1210 -echo "configure:10275: checking for working const" >&5
1211 +echo "configure:10277: checking for working const" >&5
1212  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
1213    echo $ac_n "(cached) $ac_c" 1>&6
1214  else
1215    cat > conftest.$ac_ext <<EOF
1216 -#line 10280 "configure"
1217 +#line 10282 "configure"
1218  #include "confdefs.h"
1219
1220  int main() {
1221 @@ -10325,7 +10327,7 @@
1222
1223  ; return 0; }
1224  EOF
1225 -if { (eval echo configure:10329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1226 +if { (eval echo configure:10331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1227    rm -rf conftest*
1228    ac_cv_c_const=yes
1229  else
1230 @@ -10350,12 +10352,12 @@
1231  for ac_func in strerror
1232  do
1233  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
1234 -echo "configure:10354: checking for $ac_func" >&5
1235 +echo "configure:10356: checking for $ac_func" >&5
1236  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
1237    echo $ac_n "(cached) $ac_c" 1>&6
1238  else
1239    cat > conftest.$ac_ext <<EOF
1240 -#line 10359 "configure"
1241 +#line 10361 "configure"
1242  #include "confdefs.h"
1243  /* System header to define __stub macros and hopefully few prototypes,
1244      which can conflict with char $ac_func(); below.  */
1245 @@ -10378,7 +10380,7 @@
1246
1247  ; return 0; }
1248  EOF
1249 -if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1250 +if { (eval echo configure:10384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1251    rm -rf conftest*
1252    eval "ac_cv_func_$ac_func=yes"
1253  else
1254 @@ -10441,16 +10443,16 @@
1255
1256
1257    echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6
1258 -echo "configure:10445: checking for missing declarations of reentrant functions" >&5
1259 +echo "configure:10447: checking for missing declarations of reentrant functions" >&5
1260    cat > conftest.$ac_ext <<EOF
1261 -#line 10447 "configure"
1262 +#line 10449 "configure"
1263  #include "confdefs.h"
1264  #include <time.h>
1265  int main() {
1266  struct tm *(*func)() = localtime_r
1267  ; return 0; }
1268  EOF
1269 -if { (eval echo configure:10454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1270 +if { (eval echo configure:10456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1271    rm -rf conftest*
1272
1273      :
1274 @@ -10468,14 +10470,14 @@
1275  fi
1276  rm -f conftest*
1277    cat > conftest.$ac_ext <<EOF
1278 -#line 10472 "configure"
1279 +#line 10474 "configure"
1280  #include "confdefs.h"
1281  #include <time.h>
1282  int main() {
1283  struct tm *(*func)() = gmtime_r
1284  ; return 0; }
1285  EOF
1286 -if { (eval echo configure:10479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1287 +if { (eval echo configure:10481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1288    rm -rf conftest*
1289
1290      :
1291 @@ -10493,14 +10495,14 @@
1292  fi
1293  rm -f conftest*
1294    cat > conftest.$ac_ext <<EOF
1295 -#line 10497 "configure"
1296 +#line 10499 "configure"
1297  #include "confdefs.h"
1298  #include <time.h>
1299  int main() {
1300  char *(*func)() = asctime_r
1301  ; return 0; }
1302  EOF
1303 -if { (eval echo configure:10504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1304 +if { (eval echo configure:10506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1305    rm -rf conftest*
1306
1307      :
1308 @@ -10518,14 +10520,14 @@
1309  fi
1310  rm -f conftest*
1311    cat > conftest.$ac_ext <<EOF
1312 -#line 10522 "configure"
1313 +#line 10524 "configure"
1314  #include "confdefs.h"
1315  #include <time.h>
1316  int main() {
1317  char *(*func)() = ctime_r
1318  ; return 0; }
1319  EOF
1320 -if { (eval echo configure:10529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1321 +if { (eval echo configure:10531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1322    rm -rf conftest*
1323
1324      :
1325 @@ -10543,14 +10545,14 @@
1326  fi
1327  rm -f conftest*
1328    cat > conftest.$ac_ext <<EOF
1329 -#line 10547 "configure"
1330 +#line 10549 "configure"
1331  #include "confdefs.h"
1332  #include <string.h>
1333  int main() {
1334  char *(*func)() = strtok_r
1335  ; return 0; }
1336  EOF
1337 -if { (eval echo configure:10554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1338 +if { (eval echo configure:10556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1339    rm -rf conftest*
1340
1341      :
1342 @@ -10574,7 +10576,7 @@
1343  # Extract the first word of "sendmail", so it can be a program name with args.
1344  set dummy sendmail; ac_word=$2
1345  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1346 -echo "configure:10578: checking for $ac_word" >&5
1347 +echo "configure:10580: checking for $ac_word" >&5
1348  if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then
1349    echo $ac_n "(cached) $ac_c" 1>&6
1350  else
1351 @@ -10615,7 +10617,7 @@
1352
1353
1354    echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6
1355 -echo "configure:10619: checking whether system uses EBCDIC" >&5
1356 +echo "configure:10621: checking whether system uses EBCDIC" >&5
1357  if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then
1358    echo $ac_n "(cached) $ac_c" 1>&6
1359  else
1360 @@ -10626,7 +10628,7 @@
1361
1362  else
1363    cat > conftest.$ac_ext <<EOF
1364 -#line 10630 "configure"
1365 +#line 10632 "configure"
1366  #include "confdefs.h"
1367
1368  int main(void) {
1369 @@ -10634,7 +10636,7 @@
1370  }
1371
1372  EOF
1373 -if { (eval echo configure:10638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1374 +if { (eval echo configure:10640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1375  then
1376
1377    ac_cv_ebcdic=yes
1378 @@ -10707,12 +10709,12 @@
1379    unset found
1380
1381    echo $ac_n "checking for socket""... $ac_c" 1>&6
1382 -echo "configure:10711: checking for socket" >&5
1383 +echo "configure:10713: checking for socket" >&5
1384  if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
1385    echo $ac_n "(cached) $ac_c" 1>&6
1386  else
1387    cat > conftest.$ac_ext <<EOF
1388 -#line 10716 "configure"
1389 +#line 10718 "configure"
1390  #include "confdefs.h"
1391  /* System header to define __stub macros and hopefully few prototypes,
1392      which can conflict with char socket(); below.  */
1393 @@ -10735,7 +10737,7 @@
1394
1395  ; return 0; }
1396  EOF
1397 -if { (eval echo configure:10739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1398 +if { (eval echo configure:10741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1399    rm -rf conftest*
1400    eval "ac_cv_func_socket=yes"
1401  else
1402 @@ -10753,12 +10755,12 @@
1403  else
1404    echo "$ac_t""no" 1>&6
1405   echo $ac_n "checking for __socket""... $ac_c" 1>&6
1406 -echo "configure:10757: checking for __socket" >&5
1407 +echo "configure:10759: checking for __socket" >&5
1408  if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then
1409    echo $ac_n "(cached) $ac_c" 1>&6
1410  else
1411    cat > conftest.$ac_ext <<EOF
1412 -#line 10762 "configure"
1413 +#line 10764 "configure"
1414  #include "confdefs.h"
1415  /* System header to define __stub macros and hopefully few prototypes,
1416      which can conflict with char __socket(); below.  */
1417 @@ -10781,7 +10783,7 @@
1418
1419  ; return 0; }
1420  EOF
1421 -if { (eval echo configure:10785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1422 +if { (eval echo configure:10787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1423    rm -rf conftest*
1424    eval "ac_cv_func___socket=yes"
1425  else
1426 @@ -10819,7 +10821,7 @@
1427    unset ac_cv_lib_socket___socket
1428    unset found
1429    echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
1430 -echo "configure:10823: checking for socket in -lsocket" >&5
1431 +echo "configure:10825: checking for socket in -lsocket" >&5
1432  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
1433  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1434    echo $ac_n "(cached) $ac_c" 1>&6
1435 @@ -10827,7 +10829,7 @@
1436    ac_save_LIBS="$LIBS"
1437  LIBS="-lsocket  $LIBS"
1438  cat > conftest.$ac_ext <<EOF
1439 -#line 10831 "configure"
1440 +#line 10833 "configure"
1441  #include "confdefs.h"
1442  /* Override any gcc2 internal prototype to avoid an error.  */
1443  /* We use char because int might match the return type of a gcc2
1444 @@ -10838,7 +10840,7 @@
1445  socket()
1446  ; return 0; }
1447  EOF
1448 -if { (eval echo configure:10842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1449 +if { (eval echo configure:10844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1450    rm -rf conftest*
1451    eval "ac_cv_lib_$ac_lib_var=yes"
1452  else
1453 @@ -10858,7 +10860,7 @@
1454    echo "$ac_t""no" 1>&6
1455
1456      echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6
1457 -echo "configure:10862: checking for __socket in -lsocket" >&5
1458 +echo "configure:10864: checking for __socket in -lsocket" >&5
1459  ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'`
1460  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1461    echo $ac_n "(cached) $ac_c" 1>&6
1462 @@ -10866,7 +10868,7 @@
1463    ac_save_LIBS="$LIBS"
1464  LIBS="-lsocket  $LIBS"
1465  cat > conftest.$ac_ext <<EOF
1466 -#line 10870 "configure"
1467 +#line 10872 "configure"
1468  #include "confdefs.h"
1469  /* Override any gcc2 internal prototype to avoid an error.  */
1470  /* We use char because int might match the return type of a gcc2
1471 @@ -10877,7 +10879,7 @@
1472  __socket()
1473  ; return 0; }
1474  EOF
1475 -if { (eval echo configure:10881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1476 +if { (eval echo configure:10883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1477    rm -rf conftest*
1478    eval "ac_cv_lib_$ac_lib_var=yes"
1479  else
1480 @@ -10909,11 +10911,11 @@
1481    found=no
1482  else
1483    cat > conftest.$ac_ext <<EOF
1484 -#line 10913 "configure"
1485 +#line 10915 "configure"
1486  #include "confdefs.h"
1487  main() { return (0); }
1488  EOF
1489 -if { (eval echo configure:10917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1490 +if { (eval echo configure:10919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1491  then
1492    found=yes
1493  else
1494 @@ -10964,12 +10966,12 @@
1495    unset found
1496
1497    echo $ac_n "checking for htonl""... $ac_c" 1>&6
1498 -echo "configure:10968: checking for htonl" >&5
1499 +echo "configure:10970: checking for htonl" >&5
1500  if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then
1501    echo $ac_n "(cached) $ac_c" 1>&6
1502  else
1503    cat > conftest.$ac_ext <<EOF
1504 -#line 10973 "configure"
1505 +#line 10975 "configure"
1506  #include "confdefs.h"
1507  /* System header to define __stub macros and hopefully few prototypes,
1508      which can conflict with char htonl(); below.  */
1509 @@ -10992,7 +10994,7 @@
1510
1511  ; return 0; }
1512  EOF
1513 -if { (eval echo configure:10996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1514 +if { (eval echo configure:10998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1515    rm -rf conftest*
1516    eval "ac_cv_func_htonl=yes"
1517  else
1518 @@ -11010,12 +11012,12 @@
1519  else
1520    echo "$ac_t""no" 1>&6
1521   echo $ac_n "checking for __htonl""... $ac_c" 1>&6
1522 -echo "configure:11014: checking for __htonl" >&5
1523 +echo "configure:11016: checking for __htonl" >&5
1524  if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then
1525    echo $ac_n "(cached) $ac_c" 1>&6
1526  else
1527    cat > conftest.$ac_ext <<EOF
1528 -#line 11019 "configure"
1529 +#line 11021 "configure"
1530  #include "confdefs.h"
1531  /* System header to define __stub macros and hopefully few prototypes,
1532      which can conflict with char __htonl(); below.  */
1533 @@ -11038,7 +11040,7 @@
1534
1535  ; return 0; }
1536  EOF
1537 -if { (eval echo configure:11042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1538 +if { (eval echo configure:11044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1539    rm -rf conftest*
1540    eval "ac_cv_func___htonl=yes"
1541  else
1542 @@ -11076,7 +11078,7 @@
1543    unset ac_cv_lib_socket___htonl
1544    unset found
1545    echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6
1546 -echo "configure:11080: checking for htonl in -lsocket" >&5
1547 +echo "configure:11082: checking for htonl in -lsocket" >&5
1548  ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'`
1549  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1550    echo $ac_n "(cached) $ac_c" 1>&6
1551 @@ -11084,7 +11086,7 @@
1552    ac_save_LIBS="$LIBS"
1553  LIBS="-lsocket  $LIBS"
1554  cat > conftest.$ac_ext <<EOF
1555 -#line 11088 "configure"
1556 +#line 11090 "configure"
1557  #include "confdefs.h"
1558  /* Override any gcc2 internal prototype to avoid an error.  */
1559  /* We use char because int might match the return type of a gcc2
1560 @@ -11095,7 +11097,7 @@
1561  htonl()
1562  ; return 0; }
1563  EOF
1564 -if { (eval echo configure:11099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1565 +if { (eval echo configure:11101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1566    rm -rf conftest*
1567    eval "ac_cv_lib_$ac_lib_var=yes"
1568  else
1569 @@ -11115,7 +11117,7 @@
1570    echo "$ac_t""no" 1>&6
1571
1572      echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6
1573 -echo "configure:11119: checking for __htonl in -lsocket" >&5
1574 +echo "configure:11121: checking for __htonl in -lsocket" >&5
1575  ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'`
1576  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1577    echo $ac_n "(cached) $ac_c" 1>&6
1578 @@ -11123,7 +11125,7 @@
1579    ac_save_LIBS="$LIBS"
1580  LIBS="-lsocket  $LIBS"
1581  cat > conftest.$ac_ext <<EOF
1582 -#line 11127 "configure"
1583 +#line 11129 "configure"
1584  #include "confdefs.h"
1585  /* Override any gcc2 internal prototype to avoid an error.  */
1586  /* We use char because int might match the return type of a gcc2
1587 @@ -11134,7 +11136,7 @@
1588  __htonl()
1589  ; return 0; }
1590  EOF
1591 -if { (eval echo configure:11138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1592 +if { (eval echo configure:11140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1593    rm -rf conftest*
1594    eval "ac_cv_lib_$ac_lib_var=yes"
1595  else
1596 @@ -11166,11 +11168,11 @@
1597    found=no
1598  else
1599    cat > conftest.$ac_ext <<EOF
1600 -#line 11170 "configure"
1601 +#line 11172 "configure"
1602  #include "confdefs.h"
1603  main() { return (0); }
1604  EOF
1605 -if { (eval echo configure:11174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1606 +if { (eval echo configure:11176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1607  then
1608    found=yes
1609  else
1610 @@ -11221,12 +11223,12 @@
1611    unset found
1612
1613    echo $ac_n "checking for gethostname""... $ac_c" 1>&6
1614 -echo "configure:11225: checking for gethostname" >&5
1615 +echo "configure:11227: checking for gethostname" >&5
1616  if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
1617    echo $ac_n "(cached) $ac_c" 1>&6
1618  else
1619    cat > conftest.$ac_ext <<EOF
1620 -#line 11230 "configure"
1621 +#line 11232 "configure"
1622  #include "confdefs.h"
1623  /* System header to define __stub macros and hopefully few prototypes,
1624      which can conflict with char gethostname(); below.  */
1625 @@ -11249,7 +11251,7 @@
1626
1627  ; return 0; }
1628  EOF
1629 -if { (eval echo configure:11253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1630 +if { (eval echo configure:11255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1631    rm -rf conftest*
1632    eval "ac_cv_func_gethostname=yes"
1633  else
1634 @@ -11267,12 +11269,12 @@
1635  else
1636    echo "$ac_t""no" 1>&6
1637   echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
1638 -echo "configure:11271: checking for __gethostname" >&5
1639 +echo "configure:11273: checking for __gethostname" >&5
1640  if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then
1641    echo $ac_n "(cached) $ac_c" 1>&6
1642  else
1643    cat > conftest.$ac_ext <<EOF
1644 -#line 11276 "configure"
1645 +#line 11278 "configure"
1646  #include "confdefs.h"
1647  /* System header to define __stub macros and hopefully few prototypes,
1648      which can conflict with char __gethostname(); below.  */
1649 @@ -11295,7 +11297,7 @@
1650
1651  ; return 0; }
1652  EOF
1653 -if { (eval echo configure:11299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1654 +if { (eval echo configure:11301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1655    rm -rf conftest*
1656    eval "ac_cv_func___gethostname=yes"
1657  else
1658 @@ -11333,7 +11335,7 @@
1659    unset ac_cv_lib_nsl___gethostname
1660    unset found
1661    echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
1662 -echo "configure:11337: checking for gethostname in -lnsl" >&5
1663 +echo "configure:11339: checking for gethostname in -lnsl" >&5
1664  ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
1665  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1666    echo $ac_n "(cached) $ac_c" 1>&6
1667 @@ -11341,7 +11343,7 @@
1668    ac_save_LIBS="$LIBS"
1669  LIBS="-lnsl  $LIBS"
1670  cat > conftest.$ac_ext <<EOF
1671 -#line 11345 "configure"
1672 +#line 11347 "configure"
1673  #include "confdefs.h"
1674  /* Override any gcc2 internal prototype to avoid an error.  */
1675  /* We use char because int might match the return type of a gcc2
1676 @@ -11352,7 +11354,7 @@
1677  gethostname()
1678  ; return 0; }
1679  EOF
1680 -if { (eval echo configure:11356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1681 +if { (eval echo configure:11358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1682    rm -rf conftest*
1683    eval "ac_cv_lib_$ac_lib_var=yes"
1684  else
1685 @@ -11372,7 +11374,7 @@
1686    echo "$ac_t""no" 1>&6
1687
1688      echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
1689 -echo "configure:11376: checking for __gethostname in -lnsl" >&5
1690 +echo "configure:11378: checking for __gethostname in -lnsl" >&5
1691  ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'`
1692  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1693    echo $ac_n "(cached) $ac_c" 1>&6
1694 @@ -11380,7 +11382,7 @@
1695    ac_save_LIBS="$LIBS"
1696  LIBS="-lnsl  $LIBS"
1697  cat > conftest.$ac_ext <<EOF
1698 -#line 11384 "configure"
1699 +#line 11386 "configure"
1700  #include "confdefs.h"
1701  /* Override any gcc2 internal prototype to avoid an error.  */
1702  /* We use char because int might match the return type of a gcc2
1703 @@ -11391,7 +11393,7 @@
1704  __gethostname()
1705  ; return 0; }
1706  EOF
1707 -if { (eval echo configure:11395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1708 +if { (eval echo configure:11397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1709    rm -rf conftest*
1710    eval "ac_cv_lib_$ac_lib_var=yes"
1711  else
1712 @@ -11423,11 +11425,11 @@
1713    found=no
1714  else
1715    cat > conftest.$ac_ext <<EOF
1716 -#line 11427 "configure"
1717 +#line 11429 "configure"
1718  #include "confdefs.h"
1719  main() { return (0); }
1720  EOF
1721 -if { (eval echo configure:11431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1722 +if { (eval echo configure:11433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1723  then
1724    found=yes
1725  else
1726 @@ -11478,12 +11480,12 @@
1727    unset found
1728
1729    echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
1730 -echo "configure:11482: checking for gethostbyaddr" >&5
1731 +echo "configure:11484: checking for gethostbyaddr" >&5
1732  if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then
1733    echo $ac_n "(cached) $ac_c" 1>&6
1734  else
1735    cat > conftest.$ac_ext <<EOF
1736 -#line 11487 "configure"
1737 +#line 11489 "configure"
1738  #include "confdefs.h"
1739  /* System header to define __stub macros and hopefully few prototypes,
1740      which can conflict with char gethostbyaddr(); below.  */
1741 @@ -11506,7 +11508,7 @@
1742
1743  ; return 0; }
1744  EOF
1745 -if { (eval echo configure:11510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1746 +if { (eval echo configure:11512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1747    rm -rf conftest*
1748    eval "ac_cv_func_gethostbyaddr=yes"
1749  else
1750 @@ -11524,12 +11526,12 @@
1751  else
1752    echo "$ac_t""no" 1>&6
1753   echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6
1754 -echo "configure:11528: checking for __gethostbyaddr" >&5
1755 +echo "configure:11530: checking for __gethostbyaddr" >&5
1756  if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then
1757    echo $ac_n "(cached) $ac_c" 1>&6
1758  else
1759    cat > conftest.$ac_ext <<EOF
1760 -#line 11533 "configure"
1761 +#line 11535 "configure"
1762  #include "confdefs.h"
1763  /* System header to define __stub macros and hopefully few prototypes,
1764      which can conflict with char __gethostbyaddr(); below.  */
1765 @@ -11552,7 +11554,7 @@
1766
1767  ; return 0; }
1768  EOF
1769 -if { (eval echo configure:11556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1770 +if { (eval echo configure:11558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1771    rm -rf conftest*
1772    eval "ac_cv_func___gethostbyaddr=yes"
1773  else
1774 @@ -11590,7 +11592,7 @@
1775    unset ac_cv_lib_nsl___gethostbyaddr
1776    unset found
1777    echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
1778 -echo "configure:11594: checking for gethostbyaddr in -lnsl" >&5
1779 +echo "configure:11596: checking for gethostbyaddr in -lnsl" >&5
1780  ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
1781  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1782    echo $ac_n "(cached) $ac_c" 1>&6
1783 @@ -11598,7 +11600,7 @@
1784    ac_save_LIBS="$LIBS"
1785  LIBS="-lnsl  $LIBS"
1786  cat > conftest.$ac_ext <<EOF
1787 -#line 11602 "configure"
1788 +#line 11604 "configure"
1789  #include "confdefs.h"
1790  /* Override any gcc2 internal prototype to avoid an error.  */
1791  /* We use char because int might match the return type of a gcc2
1792 @@ -11609,7 +11611,7 @@
1793  gethostbyaddr()
1794  ; return 0; }
1795  EOF
1796 -if { (eval echo configure:11613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1797 +if { (eval echo configure:11615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1798    rm -rf conftest*
1799    eval "ac_cv_lib_$ac_lib_var=yes"
1800  else
1801 @@ -11629,7 +11631,7 @@
1802    echo "$ac_t""no" 1>&6
1803
1804      echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6
1805 -echo "configure:11633: checking for __gethostbyaddr in -lnsl" >&5
1806 +echo "configure:11635: checking for __gethostbyaddr in -lnsl" >&5
1807  ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'`
1808  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1809    echo $ac_n "(cached) $ac_c" 1>&6
1810 @@ -11637,7 +11639,7 @@
1811    ac_save_LIBS="$LIBS"
1812  LIBS="-lnsl  $LIBS"
1813  cat > conftest.$ac_ext <<EOF
1814 -#line 11641 "configure"
1815 +#line 11643 "configure"
1816  #include "confdefs.h"
1817  /* Override any gcc2 internal prototype to avoid an error.  */
1818  /* We use char because int might match the return type of a gcc2
1819 @@ -11648,7 +11650,7 @@
1820  __gethostbyaddr()
1821  ; return 0; }
1822  EOF
1823 -if { (eval echo configure:11652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1824 +if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1825    rm -rf conftest*
1826    eval "ac_cv_lib_$ac_lib_var=yes"
1827  else
1828 @@ -11680,11 +11682,11 @@
1829    found=no
1830  else
1831    cat > conftest.$ac_ext <<EOF
1832 -#line 11684 "configure"
1833 +#line 11686 "configure"
1834  #include "confdefs.h"
1835  main() { return (0); }
1836  EOF
1837 -if { (eval echo configure:11688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1838 +if { (eval echo configure:11690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1839  then
1840    found=yes
1841  else
1842 @@ -11735,12 +11737,12 @@
1843    unset found
1844
1845    echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6
1846 -echo "configure:11739: checking for yp_get_default_domain" >&5
1847 +echo "configure:11741: checking for yp_get_default_domain" >&5
1848  if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then
1849    echo $ac_n "(cached) $ac_c" 1>&6
1850  else
1851    cat > conftest.$ac_ext <<EOF
1852 -#line 11744 "configure"
1853 +#line 11746 "configure"
1854  #include "confdefs.h"
1855  /* System header to define __stub macros and hopefully few prototypes,
1856      which can conflict with char yp_get_default_domain(); below.  */
1857 @@ -11763,7 +11765,7 @@
1858
1859  ; return 0; }
1860  EOF
1861 -if { (eval echo configure:11767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1862 +if { (eval echo configure:11769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1863    rm -rf conftest*
1864    eval "ac_cv_func_yp_get_default_domain=yes"
1865  else
1866 @@ -11781,12 +11783,12 @@
1867  else
1868    echo "$ac_t""no" 1>&6
1869   echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6
1870 -echo "configure:11785: checking for __yp_get_default_domain" >&5
1871 +echo "configure:11787: checking for __yp_get_default_domain" >&5
1872  if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then
1873    echo $ac_n "(cached) $ac_c" 1>&6
1874  else
1875    cat > conftest.$ac_ext <<EOF
1876 -#line 11790 "configure"
1877 +#line 11792 "configure"
1878  #include "confdefs.h"
1879  /* System header to define __stub macros and hopefully few prototypes,
1880      which can conflict with char __yp_get_default_domain(); below.  */
1881 @@ -11809,7 +11811,7 @@
1882
1883  ; return 0; }
1884  EOF
1885 -if { (eval echo configure:11813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1886 +if { (eval echo configure:11815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1887    rm -rf conftest*
1888    eval "ac_cv_func___yp_get_default_domain=yes"
1889  else
1890 @@ -11847,7 +11849,7 @@
1891    unset ac_cv_lib_nsl___yp_get_default_domain
1892    unset found
1893    echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
1894 -echo "configure:11851: checking for yp_get_default_domain in -lnsl" >&5
1895 +echo "configure:11853: checking for yp_get_default_domain in -lnsl" >&5
1896  ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'`
1897  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1898    echo $ac_n "(cached) $ac_c" 1>&6
1899 @@ -11855,7 +11857,7 @@
1900    ac_save_LIBS="$LIBS"
1901  LIBS="-lnsl  $LIBS"
1902  cat > conftest.$ac_ext <<EOF
1903 -#line 11859 "configure"
1904 +#line 11861 "configure"
1905  #include "confdefs.h"
1906  /* Override any gcc2 internal prototype to avoid an error.  */
1907  /* We use char because int might match the return type of a gcc2
1908 @@ -11866,7 +11868,7 @@
1909  yp_get_default_domain()
1910  ; return 0; }
1911  EOF
1912 -if { (eval echo configure:11870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1913 +if { (eval echo configure:11872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1914    rm -rf conftest*
1915    eval "ac_cv_lib_$ac_lib_var=yes"
1916  else
1917 @@ -11886,7 +11888,7 @@
1918    echo "$ac_t""no" 1>&6
1919
1920      echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6
1921 -echo "configure:11890: checking for __yp_get_default_domain in -lnsl" >&5
1922 +echo "configure:11892: checking for __yp_get_default_domain in -lnsl" >&5
1923  ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'`
1924  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1925    echo $ac_n "(cached) $ac_c" 1>&6
1926 @@ -11894,7 +11896,7 @@
1927    ac_save_LIBS="$LIBS"
1928  LIBS="-lnsl  $LIBS"
1929  cat > conftest.$ac_ext <<EOF
1930 -#line 11898 "configure"
1931 +#line 11900 "configure"
1932  #include "confdefs.h"
1933  /* Override any gcc2 internal prototype to avoid an error.  */
1934  /* We use char because int might match the return type of a gcc2
1935 @@ -11905,7 +11907,7 @@
1936  __yp_get_default_domain()
1937  ; return 0; }
1938  EOF
1939 -if { (eval echo configure:11909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1940 +if { (eval echo configure:11911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1941    rm -rf conftest*
1942    eval "ac_cv_lib_$ac_lib_var=yes"
1943  else
1944 @@ -11937,11 +11939,11 @@
1945    found=no
1946  else
1947    cat > conftest.$ac_ext <<EOF
1948 -#line 11941 "configure"
1949 +#line 11943 "configure"
1950  #include "confdefs.h"
1951  main() { return (0); }
1952  EOF
1953 -if { (eval echo configure:11945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1954 +if { (eval echo configure:11947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1955  then
1956    found=yes
1957  else
1958 @@ -11993,12 +11995,12 @@
1959    unset found
1960
1961    echo $ac_n "checking for dlopen""... $ac_c" 1>&6
1962 -echo "configure:11997: checking for dlopen" >&5
1963 +echo "configure:11999: checking for dlopen" >&5
1964  if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
1965    echo $ac_n "(cached) $ac_c" 1>&6
1966  else
1967    cat > conftest.$ac_ext <<EOF
1968 -#line 12002 "configure"
1969 +#line 12004 "configure"
1970  #include "confdefs.h"
1971  /* System header to define __stub macros and hopefully few prototypes,
1972      which can conflict with char dlopen(); below.  */
1973 @@ -12021,7 +12023,7 @@
1974
1975  ; return 0; }
1976  EOF
1977 -if { (eval echo configure:12025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1978 +if { (eval echo configure:12027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1979    rm -rf conftest*
1980    eval "ac_cv_func_dlopen=yes"
1981  else
1982 @@ -12039,12 +12041,12 @@
1983  else
1984    echo "$ac_t""no" 1>&6
1985   echo $ac_n "checking for __dlopen""... $ac_c" 1>&6
1986 -echo "configure:12043: checking for __dlopen" >&5
1987 +echo "configure:12045: checking for __dlopen" >&5
1988  if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then
1989    echo $ac_n "(cached) $ac_c" 1>&6
1990  else
1991    cat > conftest.$ac_ext <<EOF
1992 -#line 12048 "configure"
1993 +#line 12050 "configure"
1994  #include "confdefs.h"
1995  /* System header to define __stub macros and hopefully few prototypes,
1996      which can conflict with char __dlopen(); below.  */
1997 @@ -12067,7 +12069,7 @@
1998
1999  ; return 0; }
2000  EOF
2001 -if { (eval echo configure:12071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2002 +if { (eval echo configure:12073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2003    rm -rf conftest*
2004    eval "ac_cv_func___dlopen=yes"
2005  else
2006 @@ -12105,7 +12107,7 @@
2007    unset ac_cv_lib_dl___dlopen
2008    unset found
2009    echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
2010 -echo "configure:12109: checking for dlopen in -ldl" >&5
2011 +echo "configure:12111: checking for dlopen in -ldl" >&5
2012  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
2013  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2014    echo $ac_n "(cached) $ac_c" 1>&6
2015 @@ -12113,7 +12115,7 @@
2016    ac_save_LIBS="$LIBS"
2017  LIBS="-ldl  $LIBS"
2018  cat > conftest.$ac_ext <<EOF
2019 -#line 12117 "configure"
2020 +#line 12119 "configure"
2021  #include "confdefs.h"
2022  /* Override any gcc2 internal prototype to avoid an error.  */
2023  /* We use char because int might match the return type of a gcc2
2024 @@ -12124,7 +12126,7 @@
2025  dlopen()
2026  ; return 0; }
2027  EOF
2028 -if { (eval echo configure:12128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2029 +if { (eval echo configure:12130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2030    rm -rf conftest*
2031    eval "ac_cv_lib_$ac_lib_var=yes"
2032  else
2033 @@ -12144,7 +12146,7 @@
2034    echo "$ac_t""no" 1>&6
2035
2036      echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6
2037 -echo "configure:12148: checking for __dlopen in -ldl" >&5
2038 +echo "configure:12150: checking for __dlopen in -ldl" >&5
2039  ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'`
2040  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2041    echo $ac_n "(cached) $ac_c" 1>&6
2042 @@ -12152,7 +12154,7 @@
2043    ac_save_LIBS="$LIBS"
2044  LIBS="-ldl  $LIBS"
2045  cat > conftest.$ac_ext <<EOF
2046 -#line 12156 "configure"
2047 +#line 12158 "configure"
2048  #include "confdefs.h"
2049  /* Override any gcc2 internal prototype to avoid an error.  */
2050  /* We use char because int might match the return type of a gcc2
2051 @@ -12163,7 +12165,7 @@
2052  __dlopen()
2053  ; return 0; }
2054  EOF
2055 -if { (eval echo configure:12167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2056 +if { (eval echo configure:12169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2057    rm -rf conftest*
2058    eval "ac_cv_lib_$ac_lib_var=yes"
2059  else
2060 @@ -12195,11 +12197,11 @@
2061    found=no
2062  else
2063    cat > conftest.$ac_ext <<EOF
2064 -#line 12199 "configure"
2065 +#line 12201 "configure"
2066  #include "confdefs.h"
2067  main() { return (0); }
2068  EOF
2069 -if { (eval echo configure:12203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2070 +if { (eval echo configure:12205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2071  then
2072    found=yes
2073  else
2074 @@ -12251,7 +12253,7 @@
2075
2076  fi
2077  echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
2078 -echo "configure:12255: checking for sin in -lm" >&5
2079 +echo "configure:12257: checking for sin in -lm" >&5
2080  ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
2081  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2082    echo $ac_n "(cached) $ac_c" 1>&6
2083 @@ -12259,7 +12261,7 @@
2084    ac_save_LIBS="$LIBS"
2085  LIBS="-lm  $LIBS"
2086  cat > conftest.$ac_ext <<EOF
2087 -#line 12263 "configure"
2088 +#line 12265 "configure"
2089  #include "confdefs.h"
2090  /* Override any gcc2 internal prototype to avoid an error.  */
2091  /* We use char because int might match the return type of a gcc2
2092 @@ -12270,7 +12272,7 @@
2093  sin()
2094  ; return 0; }
2095  EOF
2096 -if { (eval echo configure:12274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2097 +if { (eval echo configure:12276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2098    rm -rf conftest*
2099    eval "ac_cv_lib_$ac_lib_var=yes"
2100  else
2101 @@ -12304,12 +12306,12 @@
2102    unset found
2103
2104    echo $ac_n "checking for res_search""... $ac_c" 1>&6
2105 -echo "configure:12308: checking for res_search" >&5
2106 +echo "configure:12310: checking for res_search" >&5
2107  if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
2108    echo $ac_n "(cached) $ac_c" 1>&6
2109  else
2110    cat > conftest.$ac_ext <<EOF
2111 -#line 12313 "configure"
2112 +#line 12315 "configure"
2113  #include "confdefs.h"
2114  /* System header to define __stub macros and hopefully few prototypes,
2115      which can conflict with char res_search(); below.  */
2116 @@ -12332,7 +12334,7 @@
2117
2118  ; return 0; }
2119  EOF
2120 -if { (eval echo configure:12336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2121 +if { (eval echo configure:12338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2122    rm -rf conftest*
2123    eval "ac_cv_func_res_search=yes"
2124  else
2125 @@ -12350,12 +12352,12 @@
2126  else
2127    echo "$ac_t""no" 1>&6
2128   echo $ac_n "checking for __res_search""... $ac_c" 1>&6
2129 -echo "configure:12354: checking for __res_search" >&5
2130 +echo "configure:12356: checking for __res_search" >&5
2131  if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
2132    echo $ac_n "(cached) $ac_c" 1>&6
2133  else
2134    cat > conftest.$ac_ext <<EOF
2135 -#line 12359 "configure"
2136 +#line 12361 "configure"
2137  #include "confdefs.h"
2138  /* System header to define __stub macros and hopefully few prototypes,
2139      which can conflict with char __res_search(); below.  */
2140 @@ -12378,7 +12380,7 @@
2141
2142  ; return 0; }
2143  EOF
2144 -if { (eval echo configure:12382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2145 +if { (eval echo configure:12384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2146    rm -rf conftest*
2147    eval "ac_cv_func___res_search=yes"
2148  else
2149 @@ -12416,7 +12418,7 @@
2150    unset ac_cv_lib_resolv___res_search
2151    unset found
2152    echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
2153 -echo "configure:12420: checking for res_search in -lresolv" >&5
2154 +echo "configure:12422: checking for res_search in -lresolv" >&5
2155  ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
2156  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2157    echo $ac_n "(cached) $ac_c" 1>&6
2158 @@ -12424,7 +12426,7 @@
2159    ac_save_LIBS="$LIBS"
2160  LIBS="-lresolv  $LIBS"
2161  cat > conftest.$ac_ext <<EOF
2162 -#line 12428 "configure"
2163 +#line 12430 "configure"
2164  #include "confdefs.h"
2165  /* Override any gcc2 internal prototype to avoid an error.  */
2166  /* We use char because int might match the return type of a gcc2
2167 @@ -12435,7 +12437,7 @@
2168  res_search()
2169  ; return 0; }
2170  EOF
2171 -if { (eval echo configure:12439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2172 +if { (eval echo configure:12441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2173    rm -rf conftest*
2174    eval "ac_cv_lib_$ac_lib_var=yes"
2175  else
2176 @@ -12455,7 +12457,7 @@
2177    echo "$ac_t""no" 1>&6
2178
2179      echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
2180 -echo "configure:12459: checking for __res_search in -lresolv" >&5
2181 +echo "configure:12461: checking for __res_search in -lresolv" >&5
2182  ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'`
2183  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2184    echo $ac_n "(cached) $ac_c" 1>&6
2185 @@ -12463,7 +12465,7 @@
2186    ac_save_LIBS="$LIBS"
2187  LIBS="-lresolv  $LIBS"
2188  cat > conftest.$ac_ext <<EOF
2189 -#line 12467 "configure"
2190 +#line 12469 "configure"
2191  #include "confdefs.h"
2192  /* Override any gcc2 internal prototype to avoid an error.  */
2193  /* We use char because int might match the return type of a gcc2
2194 @@ -12474,7 +12476,7 @@
2195  __res_search()
2196  ; return 0; }
2197  EOF
2198 -if { (eval echo configure:12478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2199 +if { (eval echo configure:12480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2200    rm -rf conftest*
2201    eval "ac_cv_lib_$ac_lib_var=yes"
2202  else
2203 @@ -12506,11 +12508,11 @@
2204    found=no
2205  else
2206    cat > conftest.$ac_ext <<EOF
2207 -#line 12510 "configure"
2208 +#line 12512 "configure"
2209  #include "confdefs.h"
2210  main() { return (0); }
2211  EOF
2212 -if { (eval echo configure:12514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2213 +if { (eval echo configure:12516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2214  then
2215    found=yes
2216  else
2217 @@ -12552,7 +12554,7 @@
2218    unset ac_cv_lib_bind___res_search
2219    unset found
2220    echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
2221 -echo "configure:12556: checking for res_search in -lbind" >&5
2222 +echo "configure:12558: checking for res_search in -lbind" >&5
2223  ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'`
2224  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2225    echo $ac_n "(cached) $ac_c" 1>&6
2226 @@ -12560,7 +12562,7 @@
2227    ac_save_LIBS="$LIBS"
2228  LIBS="-lbind  $LIBS"
2229  cat > conftest.$ac_ext <<EOF
2230 -#line 12564 "configure"
2231 +#line 12566 "configure"
2232  #include "confdefs.h"
2233  /* Override any gcc2 internal prototype to avoid an error.  */
2234  /* We use char because int might match the return type of a gcc2
2235 @@ -12571,7 +12573,7 @@
2236  res_search()
2237  ; return 0; }
2238  EOF
2239 -if { (eval echo configure:12575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2240 +if { (eval echo configure:12577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2241    rm -rf conftest*
2242    eval "ac_cv_lib_$ac_lib_var=yes"
2243  else
2244 @@ -12591,7 +12593,7 @@
2245    echo "$ac_t""no" 1>&6
2246
2247      echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
2248 -echo "configure:12595: checking for __res_search in -lbind" >&5
2249 +echo "configure:12597: checking for __res_search in -lbind" >&5
2250  ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'`
2251  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2252    echo $ac_n "(cached) $ac_c" 1>&6
2253 @@ -12599,7 +12601,7 @@
2254    ac_save_LIBS="$LIBS"
2255  LIBS="-lbind  $LIBS"
2256  cat > conftest.$ac_ext <<EOF
2257 -#line 12603 "configure"
2258 +#line 12605 "configure"
2259  #include "confdefs.h"
2260  /* Override any gcc2 internal prototype to avoid an error.  */
2261  /* We use char because int might match the return type of a gcc2
2262 @@ -12610,7 +12612,7 @@
2263  __res_search()
2264  ; return 0; }
2265  EOF
2266 -if { (eval echo configure:12614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2267 +if { (eval echo configure:12616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2268    rm -rf conftest*
2269    eval "ac_cv_lib_$ac_lib_var=yes"
2270  else
2271 @@ -12642,11 +12644,11 @@
2272    found=no
2273  else
2274    cat > conftest.$ac_ext <<EOF
2275 -#line 12646 "configure"
2276 +#line 12648 "configure"
2277  #include "confdefs.h"
2278  main() { return (0); }
2279  EOF
2280 -if { (eval echo configure:12650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2281 +if { (eval echo configure:12652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2282  then
2283    found=yes
2284  else
2285 @@ -12688,7 +12690,7 @@
2286    unset ac_cv_lib_socket___res_search
2287    unset found
2288    echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
2289 -echo "configure:12692: checking for res_search in -lsocket" >&5
2290 +echo "configure:12694: checking for res_search in -lsocket" >&5
2291  ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'`
2292  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2293    echo $ac_n "(cached) $ac_c" 1>&6
2294 @@ -12696,7 +12698,7 @@
2295    ac_save_LIBS="$LIBS"
2296  LIBS="-lsocket  $LIBS"
2297  cat > conftest.$ac_ext <<EOF
2298 -#line 12700 "configure"
2299 +#line 12702 "configure"
2300  #include "confdefs.h"
2301  /* Override any gcc2 internal prototype to avoid an error.  */
2302  /* We use char because int might match the return type of a gcc2
2303 @@ -12707,7 +12709,7 @@
2304  res_search()
2305  ; return 0; }
2306  EOF
2307 -if { (eval echo configure:12711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2308 +if { (eval echo configure:12713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2309    rm -rf conftest*
2310    eval "ac_cv_lib_$ac_lib_var=yes"
2311  else
2312 @@ -12727,7 +12729,7 @@
2313    echo "$ac_t""no" 1>&6
2314
2315      echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
2316 -echo "configure:12731: checking for __res_search in -lsocket" >&5
2317 +echo "configure:12733: checking for __res_search in -lsocket" >&5
2318  ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'`
2319  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2320    echo $ac_n "(cached) $ac_c" 1>&6
2321 @@ -12735,7 +12737,7 @@
2322    ac_save_LIBS="$LIBS"
2323  LIBS="-lsocket  $LIBS"
2324  cat > conftest.$ac_ext <<EOF
2325 -#line 12739 "configure"
2326 +#line 12741 "configure"
2327  #include "confdefs.h"
2328  /* Override any gcc2 internal prototype to avoid an error.  */
2329  /* We use char because int might match the return type of a gcc2
2330 @@ -12746,7 +12748,7 @@
2331  __res_search()
2332  ; return 0; }
2333  EOF
2334 -if { (eval echo configure:12750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2335 +if { (eval echo configure:12752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2336    rm -rf conftest*
2337    eval "ac_cv_lib_$ac_lib_var=yes"
2338  else
2339 @@ -12778,11 +12780,11 @@
2340    found=no
2341  else
2342    cat > conftest.$ac_ext <<EOF
2343 -#line 12782 "configure"
2344 +#line 12784 "configure"
2345  #include "confdefs.h"
2346  main() { return (0); }
2347  EOF
2348 -if { (eval echo configure:12786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2349 +if { (eval echo configure:12788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2350  then
2351    found=yes
2352  else
2353 @@ -12840,12 +12842,12 @@
2354    unset found
2355
2356    echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
2357 -echo "configure:12844: checking for inet_aton" >&5
2358 +echo "configure:12846: checking for inet_aton" >&5
2359  if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
2360    echo $ac_n "(cached) $ac_c" 1>&6
2361  else
2362    cat > conftest.$ac_ext <<EOF
2363 -#line 12849 "configure"
2364 +#line 12851 "configure"
2365  #include "confdefs.h"
2366  /* System header to define __stub macros and hopefully few prototypes,
2367      which can conflict with char inet_aton(); below.  */
2368 @@ -12868,7 +12870,7 @@
2369
2370  ; return 0; }
2371  EOF
2372 -if { (eval echo configure:12872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2373 +if { (eval echo configure:12874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2374    rm -rf conftest*
2375    eval "ac_cv_func_inet_aton=yes"
2376  else
2377 @@ -12886,12 +12888,12 @@
2378  else
2379    echo "$ac_t""no" 1>&6
2380   echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6
2381 -echo "configure:12890: checking for __inet_aton" >&5
2382 +echo "configure:12892: checking for __inet_aton" >&5
2383  if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then
2384    echo $ac_n "(cached) $ac_c" 1>&6
2385  else
2386    cat > conftest.$ac_ext <<EOF
2387 -#line 12895 "configure"
2388 +#line 12897 "configure"
2389  #include "confdefs.h"
2390  /* System header to define __stub macros and hopefully few prototypes,
2391      which can conflict with char __inet_aton(); below.  */
2392 @@ -12914,7 +12916,7 @@
2393
2394  ; return 0; }
2395  EOF
2396 -if { (eval echo configure:12918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2397 +if { (eval echo configure:12920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2398    rm -rf conftest*
2399    eval "ac_cv_func___inet_aton=yes"
2400  else
2401 @@ -12952,7 +12954,7 @@
2402    unset ac_cv_lib_resolv___inet_aton
2403    unset found
2404    echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
2405 -echo "configure:12956: checking for inet_aton in -lresolv" >&5
2406 +echo "configure:12958: checking for inet_aton in -lresolv" >&5
2407  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
2408  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2409    echo $ac_n "(cached) $ac_c" 1>&6
2410 @@ -12960,7 +12962,7 @@
2411    ac_save_LIBS="$LIBS"
2412  LIBS="-lresolv  $LIBS"
2413  cat > conftest.$ac_ext <<EOF
2414 -#line 12964 "configure"
2415 +#line 12966 "configure"
2416  #include "confdefs.h"
2417  /* Override any gcc2 internal prototype to avoid an error.  */
2418  /* We use char because int might match the return type of a gcc2
2419 @@ -12971,7 +12973,7 @@
2420  inet_aton()
2421  ; return 0; }
2422  EOF
2423 -if { (eval echo configure:12975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2424 +if { (eval echo configure:12977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2425    rm -rf conftest*
2426    eval "ac_cv_lib_$ac_lib_var=yes"
2427  else
2428 @@ -12991,7 +12993,7 @@
2429    echo "$ac_t""no" 1>&6
2430
2431      echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6
2432 -echo "configure:12995: checking for __inet_aton in -lresolv" >&5
2433 +echo "configure:12997: checking for __inet_aton in -lresolv" >&5
2434  ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'`
2435  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2436    echo $ac_n "(cached) $ac_c" 1>&6
2437 @@ -12999,7 +13001,7 @@
2438    ac_save_LIBS="$LIBS"
2439  LIBS="-lresolv  $LIBS"
2440  cat > conftest.$ac_ext <<EOF
2441 -#line 13003 "configure"
2442 +#line 13005 "configure"
2443  #include "confdefs.h"
2444  /* Override any gcc2 internal prototype to avoid an error.  */
2445  /* We use char because int might match the return type of a gcc2
2446 @@ -13010,7 +13012,7 @@
2447  __inet_aton()
2448  ; return 0; }
2449  EOF
2450 -if { (eval echo configure:13014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2451 +if { (eval echo configure:13016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2452    rm -rf conftest*
2453    eval "ac_cv_lib_$ac_lib_var=yes"
2454  else
2455 @@ -13042,11 +13044,11 @@
2456    found=no
2457  else
2458    cat > conftest.$ac_ext <<EOF
2459 -#line 13046 "configure"
2460 +#line 13048 "configure"
2461  #include "confdefs.h"
2462  main() { return (0); }
2463  EOF
2464 -if { (eval echo configure:13050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2465 +if { (eval echo configure:13052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2466  then
2467    found=yes
2468  else
2469 @@ -13088,7 +13090,7 @@
2470    unset ac_cv_lib_bind___inet_aton
2471    unset found
2472    echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
2473 -echo "configure:13092: checking for inet_aton in -lbind" >&5
2474 +echo "configure:13094: checking for inet_aton in -lbind" >&5
2475  ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'`
2476  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2477    echo $ac_n "(cached) $ac_c" 1>&6
2478 @@ -13096,7 +13098,7 @@
2479    ac_save_LIBS="$LIBS"
2480  LIBS="-lbind  $LIBS"
2481  cat > conftest.$ac_ext <<EOF
2482 -#line 13100 "configure"
2483 +#line 13102 "configure"
2484  #include "confdefs.h"
2485  /* Override any gcc2 internal prototype to avoid an error.  */
2486  /* We use char because int might match the return type of a gcc2
2487 @@ -13107,7 +13109,7 @@
2488  inet_aton()
2489  ; return 0; }
2490  EOF
2491 -if { (eval echo configure:13111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2492 +if { (eval echo configure:13113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2493    rm -rf conftest*
2494    eval "ac_cv_lib_$ac_lib_var=yes"
2495  else
2496 @@ -13127,7 +13129,7 @@
2497    echo "$ac_t""no" 1>&6
2498
2499      echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
2500 -echo "configure:13131: checking for __inet_aton in -lbind" >&5
2501 +echo "configure:13133: checking for __inet_aton in -lbind" >&5
2502  ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'`
2503  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2504    echo $ac_n "(cached) $ac_c" 1>&6
2505 @@ -13135,7 +13137,7 @@
2506    ac_save_LIBS="$LIBS"
2507  LIBS="-lbind  $LIBS"
2508  cat > conftest.$ac_ext <<EOF
2509 -#line 13139 "configure"
2510 +#line 13141 "configure"
2511  #include "confdefs.h"
2512  /* Override any gcc2 internal prototype to avoid an error.  */
2513  /* We use char because int might match the return type of a gcc2
2514 @@ -13146,7 +13148,7 @@
2515  __inet_aton()
2516  ; return 0; }
2517  EOF
2518 -if { (eval echo configure:13150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2519 +if { (eval echo configure:13152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2520    rm -rf conftest*
2521    eval "ac_cv_lib_$ac_lib_var=yes"
2522  else
2523 @@ -13178,11 +13180,11 @@
2524    found=no
2525  else
2526    cat > conftest.$ac_ext <<EOF
2527 -#line 13182 "configure"
2528 +#line 13184 "configure"
2529  #include "confdefs.h"
2530  main() { return (0); }
2531  EOF
2532 -if { (eval echo configure:13186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2533 +if { (eval echo configure:13188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2534  then
2535    found=yes
2536  else
2537 @@ -13236,12 +13238,12 @@
2538    unset found
2539
2540    echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
2541 -echo "configure:13240: checking for dn_skipname" >&5
2542 +echo "configure:13242: checking for dn_skipname" >&5
2543  if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
2544    echo $ac_n "(cached) $ac_c" 1>&6
2545  else
2546    cat > conftest.$ac_ext <<EOF
2547 -#line 13245 "configure"
2548 +#line 13247 "configure"
2549  #include "confdefs.h"
2550  /* System header to define __stub macros and hopefully few prototypes,
2551      which can conflict with char dn_skipname(); below.  */
2552 @@ -13264,7 +13266,7 @@
2553
2554  ; return 0; }
2555  EOF
2556 -if { (eval echo configure:13268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2557 +if { (eval echo configure:13270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2558    rm -rf conftest*
2559    eval "ac_cv_func_dn_skipname=yes"
2560  else
2561 @@ -13282,12 +13284,12 @@
2562  else
2563    echo "$ac_t""no" 1>&6
2564   echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
2565 -echo "configure:13286: checking for __dn_skipname" >&5
2566 +echo "configure:13288: checking for __dn_skipname" >&5
2567  if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
2568    echo $ac_n "(cached) $ac_c" 1>&6
2569  else
2570    cat > conftest.$ac_ext <<EOF
2571 -#line 13291 "configure"
2572 +#line 13293 "configure"
2573  #include "confdefs.h"
2574  /* System header to define __stub macros and hopefully few prototypes,
2575      which can conflict with char __dn_skipname(); below.  */
2576 @@ -13310,7 +13312,7 @@
2577
2578  ; return 0; }
2579  EOF
2580 -if { (eval echo configure:13314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2581 +if { (eval echo configure:13316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2582    rm -rf conftest*
2583    eval "ac_cv_func___dn_skipname=yes"
2584  else
2585 @@ -13348,7 +13350,7 @@
2586    unset ac_cv_lib_resolv___dn_skipname
2587    unset found
2588    echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
2589 -echo "configure:13352: checking for dn_skipname in -lresolv" >&5
2590 +echo "configure:13354: checking for dn_skipname in -lresolv" >&5
2591  ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'`
2592  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2593    echo $ac_n "(cached) $ac_c" 1>&6
2594 @@ -13356,7 +13358,7 @@
2595    ac_save_LIBS="$LIBS"
2596  LIBS="-lresolv  $LIBS"
2597  cat > conftest.$ac_ext <<EOF
2598 -#line 13360 "configure"
2599 +#line 13362 "configure"
2600  #include "confdefs.h"
2601  /* Override any gcc2 internal prototype to avoid an error.  */
2602  /* We use char because int might match the return type of a gcc2
2603 @@ -13367,7 +13369,7 @@
2604  dn_skipname()
2605  ; return 0; }
2606  EOF
2607 -if { (eval echo configure:13371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2608 +if { (eval echo configure:13373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2609    rm -rf conftest*
2610    eval "ac_cv_lib_$ac_lib_var=yes"
2611  else
2612 @@ -13387,7 +13389,7 @@
2613    echo "$ac_t""no" 1>&6
2614
2615      echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
2616 -echo "configure:13391: checking for __dn_skipname in -lresolv" >&5
2617 +echo "configure:13393: checking for __dn_skipname in -lresolv" >&5
2618  ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'`
2619  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2620    echo $ac_n "(cached) $ac_c" 1>&6
2621 @@ -13395,7 +13397,7 @@
2622    ac_save_LIBS="$LIBS"
2623  LIBS="-lresolv  $LIBS"
2624  cat > conftest.$ac_ext <<EOF
2625 -#line 13399 "configure"
2626 +#line 13401 "configure"
2627  #include "confdefs.h"
2628  /* Override any gcc2 internal prototype to avoid an error.  */
2629  /* We use char because int might match the return type of a gcc2
2630 @@ -13406,7 +13408,7 @@
2631  __dn_skipname()
2632  ; return 0; }
2633  EOF
2634 -if { (eval echo configure:13410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2635 +if { (eval echo configure:13412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2636    rm -rf conftest*
2637    eval "ac_cv_lib_$ac_lib_var=yes"
2638  else
2639 @@ -13438,11 +13440,11 @@
2640    found=no
2641  else
2642    cat > conftest.$ac_ext <<EOF
2643 -#line 13442 "configure"
2644 +#line 13444 "configure"
2645  #include "confdefs.h"
2646  main() { return (0); }
2647  EOF
2648 -if { (eval echo configure:13446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2649 +if { (eval echo configure:13448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2650  then
2651    found=yes
2652  else
2653 @@ -13484,7 +13486,7 @@
2654    unset ac_cv_lib_bind___dn_skipname
2655    unset found
2656    echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
2657 -echo "configure:13488: checking for dn_skipname in -lbind" >&5
2658 +echo "configure:13490: checking for dn_skipname in -lbind" >&5
2659  ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'`
2660  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2661    echo $ac_n "(cached) $ac_c" 1>&6
2662 @@ -13492,7 +13494,7 @@
2663    ac_save_LIBS="$LIBS"
2664  LIBS="-lbind  $LIBS"
2665  cat > conftest.$ac_ext <<EOF
2666 -#line 13496 "configure"
2667 +#line 13498 "configure"
2668  #include "confdefs.h"
2669  /* Override any gcc2 internal prototype to avoid an error.  */
2670  /* We use char because int might match the return type of a gcc2
2671 @@ -13503,7 +13505,7 @@
2672  dn_skipname()
2673  ; return 0; }
2674  EOF
2675 -if { (eval echo configure:13507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2676 +if { (eval echo configure:13509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2677    rm -rf conftest*
2678    eval "ac_cv_lib_$ac_lib_var=yes"
2679  else
2680 @@ -13523,7 +13525,7 @@
2681    echo "$ac_t""no" 1>&6
2682
2683      echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
2684 -echo "configure:13527: checking for __dn_skipname in -lbind" >&5
2685 +echo "configure:13529: checking for __dn_skipname in -lbind" >&5
2686  ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
2687  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2688    echo $ac_n "(cached) $ac_c" 1>&6
2689 @@ -13531,7 +13533,7 @@
2690    ac_save_LIBS="$LIBS"
2691  LIBS="-lbind  $LIBS"
2692  cat > conftest.$ac_ext <<EOF
2693 -#line 13535 "configure"
2694 +#line 13537 "configure"
2695  #include "confdefs.h"
2696  /* Override any gcc2 internal prototype to avoid an error.  */
2697  /* We use char because int might match the return type of a gcc2
2698 @@ -13542,7 +13544,7 @@
2699  __dn_skipname()
2700  ; return 0; }
2701  EOF
2702 -if { (eval echo configure:13546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2703 +if { (eval echo configure:13548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2704    rm -rf conftest*
2705    eval "ac_cv_lib_$ac_lib_var=yes"
2706  else
2707 @@ -13574,11 +13576,11 @@
2708    found=no
2709  else
2710    cat > conftest.$ac_ext <<EOF
2711 -#line 13578 "configure"
2712 +#line 13580 "configure"
2713  #include "confdefs.h"
2714  main() { return (0); }
2715  EOF
2716 -if { (eval echo configure:13582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2717 +if { (eval echo configure:13584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2718  then
2719    found=yes
2720  else
2721 @@ -13630,12 +13632,12 @@
2722
2723
2724  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2725 -echo "configure:13634: checking for ANSI C header files" >&5
2726 +echo "configure:13636: checking for ANSI C header files" >&5
2727  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2728    echo $ac_n "(cached) $ac_c" 1>&6
2729  else
2730    cat > conftest.$ac_ext <<EOF
2731 -#line 13639 "configure"
2732 +#line 13641 "configure"
2733  #include "confdefs.h"
2734  #include <stdlib.h>
2735  #include <stdarg.h>
2736 @@ -13643,7 +13645,7 @@
2737  #include <float.h>
2738  EOF
2739  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2740 -{ (eval echo configure:13647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2741 +{ (eval echo configure:13649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2742  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2743  if test -z "$ac_err"; then
2744    rm -rf conftest*
2745 @@ -13660,7 +13662,7 @@
2746  if test $ac_cv_header_stdc = yes; then
2747    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2748  cat > conftest.$ac_ext <<EOF
2749 -#line 13664 "configure"
2750 +#line 13666 "configure"
2751  #include "confdefs.h"
2752  #include <string.h>
2753  EOF
2754 @@ -13678,7 +13680,7 @@
2755  if test $ac_cv_header_stdc = yes; then
2756    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2757  cat > conftest.$ac_ext <<EOF
2758 -#line 13682 "configure"
2759 +#line 13684 "configure"
2760  #include "confdefs.h"
2761  #include <stdlib.h>
2762  EOF
2763 @@ -13699,7 +13701,7 @@
2764    :
2765  else
2766    cat > conftest.$ac_ext <<EOF
2767 -#line 13703 "configure"
2768 +#line 13705 "configure"
2769  #include "confdefs.h"
2770  #include <ctype.h>
2771  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
2772 @@ -13710,7 +13712,7 @@
2773  exit (0); }
2774
2775  EOF
2776 -if { (eval echo configure:13714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2777 +if { (eval echo configure:13716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2778  then
2779    :
2780  else
2781 @@ -13738,12 +13740,12 @@
2782  do
2783  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2784  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
2785 -echo "configure:13742: checking for $ac_hdr that defines DIR" >&5
2786 +echo "configure:13744: checking for $ac_hdr that defines DIR" >&5
2787  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
2788    echo $ac_n "(cached) $ac_c" 1>&6
2789  else
2790    cat > conftest.$ac_ext <<EOF
2791 -#line 13747 "configure"
2792 +#line 13749 "configure"
2793  #include "confdefs.h"
2794  #include <sys/types.h>
2795  #include <$ac_hdr>
2796 @@ -13751,7 +13753,7 @@
2797  DIR *dirp = 0;
2798  ; return 0; }
2799  EOF
2800 -if { (eval echo configure:13755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2801 +if { (eval echo configure:13757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2802    rm -rf conftest*
2803    eval "ac_cv_header_dirent_$ac_safe=yes"
2804  else
2805 @@ -13776,7 +13778,7 @@
2806  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
2807  if test $ac_header_dirent = dirent.h; then
2808  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
2809 -echo "configure:13780: checking for opendir in -ldir" >&5
2810 +echo "configure:13782: checking for opendir in -ldir" >&5
2811  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
2812  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2813    echo $ac_n "(cached) $ac_c" 1>&6
2814 @@ -13784,7 +13786,7 @@
2815    ac_save_LIBS="$LIBS"
2816  LIBS="-ldir  $LIBS"
2817  cat > conftest.$ac_ext <<EOF
2818 -#line 13788 "configure"
2819 +#line 13790 "configure"
2820  #include "confdefs.h"
2821  /* Override any gcc2 internal prototype to avoid an error.  */
2822  /* We use char because int might match the return type of a gcc2
2823 @@ -13795,7 +13797,7 @@
2824  opendir()
2825  ; return 0; }
2826  EOF
2827 -if { (eval echo configure:13799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2828 +if { (eval echo configure:13801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2829    rm -rf conftest*
2830    eval "ac_cv_lib_$ac_lib_var=yes"
2831  else
2832 @@ -13817,7 +13819,7 @@
2833
2834  else
2835  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
2836 -echo "configure:13821: checking for opendir in -lx" >&5
2837 +echo "configure:13823: checking for opendir in -lx" >&5
2838  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
2839  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2840    echo $ac_n "(cached) $ac_c" 1>&6
2841 @@ -13825,7 +13827,7 @@
2842    ac_save_LIBS="$LIBS"
2843  LIBS="-lx  $LIBS"
2844  cat > conftest.$ac_ext <<EOF
2845 -#line 13829 "configure"
2846 +#line 13831 "configure"
2847  #include "confdefs.h"
2848  /* Override any gcc2 internal prototype to avoid an error.  */
2849  /* We use char because int might match the return type of a gcc2
2850 @@ -13836,7 +13838,7 @@
2851  opendir()
2852  ; return 0; }
2853  EOF
2854 -if { (eval echo configure:13840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2855 +if { (eval echo configure:13842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2856    rm -rf conftest*
2857    eval "ac_cv_lib_$ac_lib_var=yes"
2858  else
2859 @@ -13861,16 +13863,16 @@
2860
2861
2862    echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6
2863 -echo "configure:13865: checking for fclose declaration" >&5
2864 +echo "configure:13867: checking for fclose declaration" >&5
2865    cat > conftest.$ac_ext <<EOF
2866 -#line 13867 "configure"
2867 +#line 13869 "configure"
2868  #include "confdefs.h"
2869  #include <stdio.h>
2870  int main() {
2871  int (*func)() = fclose
2872  ; return 0; }
2873  EOF
2874 -if { (eval echo configure:13874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2875 +if { (eval echo configure:13876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2876    rm -rf conftest*
2877
2878      cat >> confdefs.h <<\EOF
2879 @@ -13947,17 +13949,17 @@
2880  do
2881  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2882  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2883 -echo "configure:13951: checking for $ac_hdr" >&5
2884 +echo "configure:13953: checking for $ac_hdr" >&5
2885  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2886    echo $ac_n "(cached) $ac_c" 1>&6
2887  else
2888    cat > conftest.$ac_ext <<EOF
2889 -#line 13956 "configure"
2890 +#line 13958 "configure"
2891  #include "confdefs.h"
2892  #include <$ac_hdr>
2893  EOF
2894  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2895 -{ (eval echo configure:13961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2896 +{ (eval echo configure:13963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2897  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2898  if test -z "$ac_err"; then
2899    rm -rf conftest*
2900 @@ -13986,12 +13988,12 @@
2901
2902
2903         echo $ac_n "checking for fopencookie""... $ac_c" 1>&6
2904 -echo "configure:13990: checking for fopencookie" >&5
2905 +echo "configure:13992: checking for fopencookie" >&5
2906  if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then
2907    echo $ac_n "(cached) $ac_c" 1>&6
2908  else
2909    cat > conftest.$ac_ext <<EOF
2910 -#line 13995 "configure"
2911 +#line 13997 "configure"
2912  #include "confdefs.h"
2913  /* System header to define __stub macros and hopefully few prototypes,
2914      which can conflict with char fopencookie(); below.  */
2915 @@ -14014,7 +14016,7 @@
2916
2917  ; return 0; }
2918  EOF
2919 -if { (eval echo configure:14018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2920 +if { (eval echo configure:14020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2921    rm -rf conftest*
2922    eval "ac_cv_func_fopencookie=yes"
2923  else
2924 @@ -14036,7 +14038,7 @@
2925
2926         if test "$have_glibc_fopencookie" = "yes" ; then
2927                                           cat > conftest.$ac_ext <<EOF
2928 -#line 14040 "configure"
2929 +#line 14042 "configure"
2930  #include "confdefs.h"
2931   #define _GNU_SOURCE
2932                         #include <stdio.h>
2933 @@ -14045,7 +14047,7 @@
2934   cookie_io_functions_t cookie;
2935  ; return 0; }
2936  EOF
2937 -if { (eval echo configure:14049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2938 +if { (eval echo configure:14051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2939    rm -rf conftest*
2940     have_cookie_io_functions_t=yes
2941  else
2942 @@ -14065,7 +14067,7 @@
2943      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
2944  else
2945    cat > conftest.$ac_ext <<EOF
2946 -#line 14069 "configure"
2947 +#line 14071 "configure"
2948  #include "confdefs.h"
2949
2950  #define _GNU_SOURCE
2951 @@ -14097,7 +14099,7 @@
2952
2953
2954  EOF
2955 -if { (eval echo configure:14101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2956 +if { (eval echo configure:14103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2957  then
2958     cookie_io_functions_use_off64_t=yes
2959  else
2960 @@ -14112,7 +14114,7 @@
2961
2962        else
2963                                     cat > conftest.$ac_ext <<EOF
2964 -#line 14116 "configure"
2965 +#line 14118 "configure"
2966  #include "confdefs.h"
2967   #define _GNU_SOURCE
2968                         #include <stdio.h>
2969 @@ -14121,7 +14123,7 @@
2970   _IO_cookie_io_functions_t cookie;
2971  ; return 0; }
2972  EOF
2973 -if { (eval echo configure:14125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2974 +if { (eval echo configure:14127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2975    rm -rf conftest*
2976     have_IO_cookie_io_functions_t=yes
2977  else
2978 @@ -14158,7 +14160,7 @@
2979
2980
2981    echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6
2982 -echo "configure:14162: checking for broken getcwd" >&5
2983 +echo "configure:14164: checking for broken getcwd" >&5
2984    os=`uname -sr 2>/dev/null`
2985    case $os in
2986      SunOS*)
2987 @@ -14173,14 +14175,14 @@
2988
2989
2990    echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6
2991 -echo "configure:14177: checking for broken libc stdio" >&5
2992 +echo "configure:14179: checking for broken libc stdio" >&5
2993    if eval "test \"`echo '$''{'have_broken_glibc_fopen_append'+set}'`\" = set"; then
2994    echo $ac_n "(cached) $ac_c" 1>&6
2995  else
2996
2997    if test "$cross_compiling" = yes; then
2998    cat > conftest.$ac_ext <<EOF
2999 -#line 14184 "configure"
3000 +#line 14186 "configure"
3001  #include "confdefs.h"
3002
3003  #include <features.h>
3004 @@ -14193,7 +14195,7 @@
3005
3006  ; return 0; }
3007  EOF
3008 -if { (eval echo configure:14197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3009 +if { (eval echo configure:14199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3010    rm -rf conftest*
3011    have_broken_glibc_fopen_append=yes
3012  else
3013 @@ -14206,7 +14208,7 @@
3014
3015  else
3016    cat > conftest.$ac_ext <<EOF
3017 -#line 14210 "configure"
3018 +#line 14212 "configure"
3019  #include "confdefs.h"
3020
3021  #include <stdio.h>
3022 @@ -14234,7 +14236,7 @@
3023  }
3024
3025  EOF
3026 -if { (eval echo configure:14238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3027 +if { (eval echo configure:14240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3028  then
3029    have_broken_glibc_fopen_append=no
3030  else
3031 @@ -14262,12 +14264,12 @@
3032
3033
3034  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3035 -echo "configure:14266: checking whether struct tm is in sys/time.h or time.h" >&5
3036 +echo "configure:14268: checking whether struct tm is in sys/time.h or time.h" >&5
3037  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3038    echo $ac_n "(cached) $ac_c" 1>&6
3039  else
3040    cat > conftest.$ac_ext <<EOF
3041 -#line 14271 "configure"
3042 +#line 14273 "configure"
3043  #include "confdefs.h"
3044  #include <sys/types.h>
3045  #include <time.h>
3046 @@ -14275,7 +14277,7 @@
3047  struct tm *tp; tp->tm_sec;
3048  ; return 0; }
3049  EOF
3050 -if { (eval echo configure:14279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3051 +if { (eval echo configure:14281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3052    rm -rf conftest*
3053    ac_cv_struct_tm=time.h
3054  else
3055 @@ -14296,12 +14298,12 @@
3056  fi
3057
3058  echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
3059 -echo "configure:14300: checking for tm_zone in struct tm" >&5
3060 +echo "configure:14302: checking for tm_zone in struct tm" >&5
3061  if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
3062    echo $ac_n "(cached) $ac_c" 1>&6
3063  else
3064    cat > conftest.$ac_ext <<EOF
3065 -#line 14305 "configure"
3066 +#line 14307 "configure"
3067  #include "confdefs.h"
3068  #include <sys/types.h>
3069  #include <$ac_cv_struct_tm>
3070 @@ -14309,7 +14311,7 @@
3071  struct tm tm; tm.tm_zone;
3072  ; return 0; }
3073  EOF
3074 -if { (eval echo configure:14313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3075 +if { (eval echo configure:14315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3076    rm -rf conftest*
3077    ac_cv_struct_tm_zone=yes
3078  else
3079 @@ -14329,12 +14331,12 @@
3080
3081  else
3082    echo $ac_n "checking for tzname""... $ac_c" 1>&6
3083 -echo "configure:14333: checking for tzname" >&5
3084 +echo "configure:14335: checking for tzname" >&5
3085  if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
3086    echo $ac_n "(cached) $ac_c" 1>&6
3087  else
3088    cat > conftest.$ac_ext <<EOF
3089 -#line 14338 "configure"
3090 +#line 14340 "configure"
3091  #include "confdefs.h"
3092  #include <time.h>
3093  #ifndef tzname /* For SGI.  */
3094 @@ -14344,7 +14346,7 @@
3095  atoi(*tzname);
3096  ; return 0; }
3097  EOF
3098 -if { (eval echo configure:14348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3099 +if { (eval echo configure:14350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3100    rm -rf conftest*
3101    ac_cv_var_tzname=yes
3102  else
3103 @@ -14368,12 +14370,12 @@
3104
3105
3106  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
3107 -echo "configure:14372: checking for tm_gmtoff in struct tm" >&5
3108 +echo "configure:14374: checking for tm_gmtoff in struct tm" >&5
3109  if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then
3110    echo $ac_n "(cached) $ac_c" 1>&6
3111  else
3112    cat > conftest.$ac_ext <<EOF
3113 -#line 14377 "configure"
3114 +#line 14379 "configure"
3115  #include "confdefs.h"
3116  #include <sys/types.h>
3117  #include <$ac_cv_struct_tm>
3118 @@ -14381,7 +14383,7 @@
3119  struct tm tm; tm.tm_gmtoff;
3120  ; return 0; }
3121  EOF
3122 -if { (eval echo configure:14385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3123 +if { (eval echo configure:14387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3124    rm -rf conftest*
3125    ac_cv_struct_tm_gmtoff=yes
3126  else
3127 @@ -14404,12 +14406,12 @@
3128
3129
3130  echo $ac_n "checking for struct flock""... $ac_c" 1>&6
3131 -echo "configure:14408: checking for struct flock" >&5
3132 +echo "configure:14410: checking for struct flock" >&5
3133  if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then
3134    echo $ac_n "(cached) $ac_c" 1>&6
3135  else
3136    cat > conftest.$ac_ext <<EOF
3137 -#line 14413 "configure"
3138 +#line 14415 "configure"
3139  #include "confdefs.h"
3140
3141  #include <unistd.h>
3142 @@ -14419,7 +14421,7 @@
3143  struct flock x;
3144  ; return 0; }
3145  EOF
3146 -if { (eval echo configure:14423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3147 +if { (eval echo configure:14425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3148    rm -rf conftest*
3149
3150            ac_cv_struct_flock=yes
3151 @@ -14446,12 +14448,12 @@
3152
3153
3154  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
3155 -echo "configure:14450: checking for socklen_t" >&5
3156 +echo "configure:14452: checking for socklen_t" >&5
3157  if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
3158    echo $ac_n "(cached) $ac_c" 1>&6
3159  else
3160    cat > conftest.$ac_ext <<EOF
3161 -#line 14455 "configure"
3162 +#line 14457 "configure"
3163  #include "confdefs.h"
3164
3165  #include <sys/types.h>
3166 @@ -14463,7 +14465,7 @@
3167
3168  ; return 0; }
3169  EOF
3170 -if { (eval echo configure:14467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3171 +if { (eval echo configure:14469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3172    rm -rf conftest*
3173
3174    ac_cv_socklen_t=yes
3175 @@ -14489,7 +14491,7 @@
3176
3177
3178  echo $ac_n "checking size of long""... $ac_c" 1>&6
3179 -echo "configure:14493: checking size of long" >&5
3180 +echo "configure:14495: checking size of long" >&5
3181  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3182    echo $ac_n "(cached) $ac_c" 1>&6
3183  else
3184 @@ -14497,9 +14499,10 @@
3185    ac_cv_sizeof_long=8
3186  else
3187    cat > conftest.$ac_ext <<EOF
3188 -#line 14501 "configure"
3189 +#line 14503 "configure"
3190  #include "confdefs.h"
3191  #include <stdio.h>
3192 +#include <sys/types.h>
3193  main()
3194  {
3195    FILE *f=fopen("conftestval", "w");
3196 @@ -14508,7 +14511,7 @@
3197    exit(0);
3198  }
3199  EOF
3200 -if { (eval echo configure:14512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3201 +if { (eval echo configure:14515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3202  then
3203    ac_cv_sizeof_long=`cat conftestval`
3204  else
3205 @@ -14528,7 +14531,7 @@
3206
3207
3208  echo $ac_n "checking size of int""... $ac_c" 1>&6
3209 -echo "configure:14532: checking size of int" >&5
3210 +echo "configure:14535: checking size of int" >&5
3211  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3212    echo $ac_n "(cached) $ac_c" 1>&6
3213  else
3214 @@ -14536,9 +14539,10 @@
3215    ac_cv_sizeof_int=4
3216  else
3217    cat > conftest.$ac_ext <<EOF
3218 -#line 14540 "configure"
3219 +#line 14543 "configure"
3220  #include "confdefs.h"
3221  #include <stdio.h>
3222 +#include <sys/types.h>
3223  main()
3224  {
3225    FILE *f=fopen("conftestval", "w");
3226 @@ -14547,7 +14551,7 @@
3227    exit(0);
3228  }
3229  EOF
3230 -if { (eval echo configure:14551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3231 +if { (eval echo configure:14555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3232  then
3233    ac_cv_sizeof_int=`cat conftestval`
3234  else
3235 @@ -14568,12 +14572,12 @@
3236
3237
3238  echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
3239 -echo "configure:14572: checking for st_blksize in struct stat" >&5
3240 +echo "configure:14576: checking for st_blksize in struct stat" >&5
3241  if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
3242    echo $ac_n "(cached) $ac_c" 1>&6
3243  else
3244    cat > conftest.$ac_ext <<EOF
3245 -#line 14577 "configure"
3246 +#line 14581 "configure"
3247  #include "confdefs.h"
3248  #include <sys/types.h>
3249  #include <sys/stat.h>
3250 @@ -14581,7 +14585,7 @@
3251  struct stat s; s.st_blksize;
3252  ; return 0; }
3253  EOF
3254 -if { (eval echo configure:14585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3255 +if { (eval echo configure:14589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3256    rm -rf conftest*
3257    ac_cv_struct_st_blksize=yes
3258  else
3259 @@ -14603,12 +14607,12 @@
3260
3261  if test "`uname -s 2>/dev/null`" != "QNX"; then
3262    echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
3263 -echo "configure:14607: checking for st_blocks in struct stat" >&5
3264 +echo "configure:14611: checking for st_blocks in struct stat" >&5
3265  if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
3266    echo $ac_n "(cached) $ac_c" 1>&6
3267  else
3268    cat > conftest.$ac_ext <<EOF
3269 -#line 14612 "configure"
3270 +#line 14616 "configure"
3271  #include "confdefs.h"
3272  #include <sys/types.h>
3273  #include <sys/stat.h>
3274 @@ -14616,7 +14620,7 @@
3275  struct stat s; s.st_blocks;
3276  ; return 0; }
3277  EOF
3278 -if { (eval echo configure:14620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3279 +if { (eval echo configure:14624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3280    rm -rf conftest*
3281    ac_cv_struct_st_blocks=yes
3282  else
3283 @@ -14643,12 +14647,12 @@
3284    WARNING_LEVEL=0
3285  fi
3286  echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
3287 -echo "configure:14647: checking for st_rdev in struct stat" >&5
3288 +echo "configure:14651: checking for st_rdev in struct stat" >&5
3289  if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
3290    echo $ac_n "(cached) $ac_c" 1>&6
3291  else
3292    cat > conftest.$ac_ext <<EOF
3293 -#line 14652 "configure"
3294 +#line 14656 "configure"
3295  #include "confdefs.h"
3296  #include <sys/types.h>
3297  #include <sys/stat.h>
3298 @@ -14656,7 +14660,7 @@
3299  struct stat s; s.st_rdev;
3300  ; return 0; }
3301  EOF
3302 -if { (eval echo configure:14660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3303 +if { (eval echo configure:14664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3304    rm -rf conftest*
3305    ac_cv_struct_st_rdev=yes
3306  else
3307 @@ -14678,12 +14682,12 @@
3308
3309
3310  echo $ac_n "checking for size_t""... $ac_c" 1>&6
3311 -echo "configure:14682: checking for size_t" >&5
3312 +echo "configure:14686: checking for size_t" >&5
3313  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3314    echo $ac_n "(cached) $ac_c" 1>&6
3315  else
3316    cat > conftest.$ac_ext <<EOF
3317 -#line 14687 "configure"
3318 +#line 14691 "configure"
3319  #include "confdefs.h"
3320  #include <sys/types.h>
3321  #if STDC_HEADERS
3322 @@ -14711,12 +14715,12 @@
3323  fi
3324
3325  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
3326 -echo "configure:14715: checking for uid_t in sys/types.h" >&5
3327 +echo "configure:14719: checking for uid_t in sys/types.h" >&5
3328  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
3329    echo $ac_n "(cached) $ac_c" 1>&6
3330  else
3331    cat > conftest.$ac_ext <<EOF
3332 -#line 14720 "configure"
3333 +#line 14724 "configure"
3334  #include "confdefs.h"
3335  #include <sys/types.h>
3336  EOF
3337 @@ -14746,12 +14750,12 @@
3338
3339
3340  echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
3341 -echo "configure:14750: checking for struct sockaddr_storage" >&5
3342 +echo "configure:14754: checking for struct sockaddr_storage" >&5
3343  if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then
3344    echo $ac_n "(cached) $ac_c" 1>&6
3345  else
3346    cat > conftest.$ac_ext <<EOF
3347 -#line 14755 "configure"
3348 +#line 14759 "configure"
3349  #include "confdefs.h"
3350   #include <sys/types.h>
3351  #include <sys/socket.h>
3352 @@ -14759,7 +14763,7 @@
3353  struct sockaddr_storage s; s
3354  ; return 0; }
3355  EOF
3356 -if { (eval echo configure:14763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3357 +if { (eval echo configure:14767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3358    rm -rf conftest*
3359    ac_cv_sockaddr_storage=yes
3360  else
3361 @@ -14781,7 +14785,7 @@
3362
3363
3364  cat > conftest.$ac_ext <<EOF
3365 -#line 14785 "configure"
3366 +#line 14789 "configure"
3367  #include "confdefs.h"
3368
3369  #include <sys/types.h>
3370 @@ -14791,7 +14795,7 @@
3371  static struct sockaddr sa; int n = (int) sa.sa_len; return n
3372  ; return 0; }
3373  EOF
3374 -if { (eval echo configure:14795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3375 +if { (eval echo configure:14799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3376    rm -rf conftest*
3377    cat >> confdefs.h <<\EOF
3378  #define HAVE_SOCKADDR_LEN 1
3379 @@ -14804,12 +14808,12 @@
3380  rm -f conftest*
3381
3382  echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6
3383 -echo "configure:14808: checking for IPv6 support" >&5
3384 +echo "configure:14812: checking for IPv6 support" >&5
3385  if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then
3386    echo $ac_n "(cached) $ac_c" 1>&6
3387  else
3388    cat > conftest.$ac_ext <<EOF
3389 -#line 14813 "configure"
3390 +#line 14817 "configure"
3391  #include "confdefs.h"
3392   #include <sys/types.h>
3393  #include <sys/socket.h>
3394 @@ -14818,7 +14822,7 @@
3395  struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;
3396  ; return 0; }
3397  EOF
3398 -if { (eval echo configure:14822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3399 +if { (eval echo configure:14826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3400    rm -rf conftest*
3401    ac_cv_ipv6_support=yes
3402  else
3403 @@ -14836,12 +14840,12 @@
3404
3405
3406  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
3407 -echo "configure:14840: checking for vprintf" >&5
3408 +echo "configure:14844: checking for vprintf" >&5
3409  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
3410    echo $ac_n "(cached) $ac_c" 1>&6
3411  else
3412    cat > conftest.$ac_ext <<EOF
3413 -#line 14845 "configure"
3414 +#line 14849 "configure"
3415  #include "confdefs.h"
3416  /* System header to define __stub macros and hopefully few prototypes,
3417      which can conflict with char vprintf(); below.  */
3418 @@ -14864,7 +14868,7 @@
3419
3420  ; return 0; }
3421  EOF
3422 -if { (eval echo configure:14868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3423 +if { (eval echo configure:14872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3424    rm -rf conftest*
3425    eval "ac_cv_func_vprintf=yes"
3426  else
3427 @@ -14888,12 +14892,12 @@
3428
3429  if test "$ac_cv_func_vprintf" != yes; then
3430  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
3431 -echo "configure:14892: checking for _doprnt" >&5
3432 +echo "configure:14896: checking for _doprnt" >&5
3433  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
3434    echo $ac_n "(cached) $ac_c" 1>&6
3435  else
3436    cat > conftest.$ac_ext <<EOF
3437 -#line 14897 "configure"
3438 +#line 14901 "configure"
3439  #include "confdefs.h"
3440  /* System header to define __stub macros and hopefully few prototypes,
3441      which can conflict with char _doprnt(); below.  */
3442 @@ -14916,7 +14920,7 @@
3443
3444  ; return 0; }
3445  EOF
3446 -if { (eval echo configure:14920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3447 +if { (eval echo configure:14924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3448    rm -rf conftest*
3449    eval "ac_cv_func__doprnt=yes"
3450  else
3451 @@ -15008,12 +15012,12 @@
3452
3453  do
3454  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3455 -echo "configure:15012: checking for $ac_func" >&5
3456 +echo "configure:15016: checking for $ac_func" >&5
3457  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3458    echo $ac_n "(cached) $ac_c" 1>&6
3459  else
3460    cat > conftest.$ac_ext <<EOF
3461 -#line 15017 "configure"
3462 +#line 15021 "configure"
3463  #include "confdefs.h"
3464  /* System header to define __stub macros and hopefully few prototypes,
3465      which can conflict with char $ac_func(); below.  */
3466 @@ -15036,7 +15040,7 @@
3467
3468  ; return 0; }
3469  EOF
3470 -if { (eval echo configure:15040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3471 +if { (eval echo configure:15044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3472    rm -rf conftest*
3473    eval "ac_cv_func_$ac_func=yes"
3474  else
3475 @@ -15062,25 +15066,25 @@
3476
3477
3478  echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
3479 -echo "configure:15066: checking for getaddrinfo" >&5
3480 +echo "configure:15070: checking for getaddrinfo" >&5
3481  if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
3482    echo $ac_n "(cached) $ac_c" 1>&6
3483  else
3484    cat > conftest.$ac_ext <<EOF
3485 -#line 15071 "configure"
3486 +#line 15075 "configure"
3487  #include "confdefs.h"
3488  #include <netdb.h>
3489  int main() {
3490  struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
3491  ; return 0; }
3492  EOF
3493 -if { (eval echo configure:15078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3494 +if { (eval echo configure:15082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3495    rm -rf conftest*
3496    if test "$cross_compiling" = yes; then
3497      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3498  else
3499    cat > conftest.$ac_ext <<EOF
3500 -#line 15084 "configure"
3501 +#line 15088 "configure"
3502  #include "confdefs.h"
3503
3504  #include <netdb.h>
3505 @@ -15120,7 +15124,7 @@
3506  }
3507
3508  EOF
3509 -if { (eval echo configure:15124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3510 +if { (eval echo configure:15128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3511  then
3512    ac_cv_func_getaddrinfo=yes
3513  else
3514 @@ -15152,12 +15156,12 @@
3515  for ac_func in strlcat strlcpy getopt
3516  do
3517  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3518 -echo "configure:15156: checking for $ac_func" >&5
3519 +echo "configure:15160: checking for $ac_func" >&5
3520  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3521    echo $ac_n "(cached) $ac_c" 1>&6
3522  else
3523    cat > conftest.$ac_ext <<EOF
3524 -#line 15161 "configure"
3525 +#line 15165 "configure"
3526  #include "confdefs.h"
3527  /* System header to define __stub macros and hopefully few prototypes,
3528      which can conflict with char $ac_func(); below.  */
3529 @@ -15180,7 +15184,7 @@
3530
3531  ; return 0; }
3532  EOF
3533 -if { (eval echo configure:15184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3534 +if { (eval echo configure:15188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3535    rm -rf conftest*
3536    eval "ac_cv_func_$ac_func=yes"
3537  else
3538 @@ -15207,7 +15211,7 @@
3539
3540
3541  echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
3542 -echo "configure:15211: checking whether utime accepts a null argument" >&5
3543 +echo "configure:15215: checking whether utime accepts a null argument" >&5
3544  if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
3545    echo $ac_n "(cached) $ac_c" 1>&6
3546  else
3547 @@ -15217,7 +15221,7 @@
3548    ac_cv_func_utime_null=no
3549  else
3550    cat > conftest.$ac_ext <<EOF
3551 -#line 15221 "configure"
3552 +#line 15225 "configure"
3553  #include "confdefs.h"
3554  #include <sys/types.h>
3555  #include <sys/stat.h>
3556 @@ -15228,7 +15232,7 @@
3557  && t.st_mtime - s.st_mtime < 120));
3558  }
3559  EOF
3560 -if { (eval echo configure:15232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3561 +if { (eval echo configure:15236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3562  then
3563    ac_cv_func_utime_null=yes
3564  else
3565 @@ -15254,19 +15258,19 @@
3566  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
3567  # for constant arguments.  Useless!
3568  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
3569 -echo "configure:15258: checking for working alloca.h" >&5
3570 +echo "configure:15262: checking for working alloca.h" >&5
3571  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
3572    echo $ac_n "(cached) $ac_c" 1>&6
3573  else
3574    cat > conftest.$ac_ext <<EOF
3575 -#line 15263 "configure"
3576 +#line 15267 "configure"
3577  #include "confdefs.h"
3578  #include <alloca.h>
3579  int main() {
3580  char *p = alloca(2 * sizeof(int));
3581  ; return 0; }
3582  EOF
3583 -if { (eval echo configure:15270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3584 +if { (eval echo configure:15274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3585    rm -rf conftest*
3586    ac_cv_header_alloca_h=yes
3587  else
3588 @@ -15287,12 +15291,12 @@
3589  fi
3590
3591  echo $ac_n "checking for alloca""... $ac_c" 1>&6
3592 -echo "configure:15291: checking for alloca" >&5
3593 +echo "configure:15295: checking for alloca" >&5
3594  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
3595    echo $ac_n "(cached) $ac_c" 1>&6
3596  else
3597    cat > conftest.$ac_ext <<EOF
3598 -#line 15296 "configure"
3599 +#line 15300 "configure"
3600  #include "confdefs.h"
3601
3602  #ifdef __GNUC__
3603 @@ -15320,7 +15324,7 @@
3604  char *p = (char *) alloca(1);
3605  ; return 0; }
3606  EOF
3607 -if { (eval echo configure:15324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3608 +if { (eval echo configure:15328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3609    rm -rf conftest*
3610    ac_cv_func_alloca_works=yes
3611  else
3612 @@ -15352,12 +15356,12 @@
3613
3614
3615  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
3616 -echo "configure:15356: checking whether alloca needs Cray hooks" >&5
3617 +echo "configure:15360: checking whether alloca needs Cray hooks" >&5
3618  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
3619    echo $ac_n "(cached) $ac_c" 1>&6
3620  else
3621    cat > conftest.$ac_ext <<EOF
3622 -#line 15361 "configure"
3623 +#line 15365 "configure"
3624  #include "confdefs.h"
3625  #if defined(CRAY) && ! defined(CRAY2)
3626  webecray
3627 @@ -15382,12 +15386,12 @@
3628  if test $ac_cv_os_cray = yes; then
3629  for ac_func in _getb67 GETB67 getb67; do
3630    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3631 -echo "configure:15386: checking for $ac_func" >&5
3632 +echo "configure:15390: checking for $ac_func" >&5
3633  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3634    echo $ac_n "(cached) $ac_c" 1>&6
3635  else
3636    cat > conftest.$ac_ext <<EOF
3637 -#line 15391 "configure"
3638 +#line 15395 "configure"
3639  #include "confdefs.h"
3640  /* System header to define __stub macros and hopefully few prototypes,
3641      which can conflict with char $ac_func(); below.  */
3642 @@ -15410,7 +15414,7 @@
3643
3644  ; return 0; }
3645  EOF
3646 -if { (eval echo configure:15414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3647 +if { (eval echo configure:15418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3648    rm -rf conftest*
3649    eval "ac_cv_func_$ac_func=yes"
3650  else
3651 @@ -15437,7 +15441,7 @@
3652  fi
3653
3654  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
3655 -echo "configure:15441: checking stack direction for C alloca" >&5
3656 +echo "configure:15445: checking stack direction for C alloca" >&5
3657  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
3658    echo $ac_n "(cached) $ac_c" 1>&6
3659  else
3660 @@ -15445,7 +15449,7 @@
3661    ac_cv_c_stack_direction=0
3662  else
3663    cat > conftest.$ac_ext <<EOF
3664 -#line 15449 "configure"
3665 +#line 15453 "configure"
3666  #include "confdefs.h"
3667  find_stack_direction ()
3668  {
3669 @@ -15464,7 +15468,7 @@
3670    exit (find_stack_direction() < 0);
3671  }
3672  EOF
3673 -if { (eval echo configure:15468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3674 +if { (eval echo configure:15472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3675  then
3676    ac_cv_c_stack_direction=1
3677  else
3678 @@ -15487,13 +15491,13 @@
3679
3680
3681    echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
3682 -echo "configure:15491: checking for declared timezone" >&5
3683 +echo "configure:15495: checking for declared timezone" >&5
3684  if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then
3685    echo $ac_n "(cached) $ac_c" 1>&6
3686  else
3687
3688      cat > conftest.$ac_ext <<EOF
3689 -#line 15497 "configure"
3690 +#line 15501 "configure"
3691  #include "confdefs.h"
3692
3693  #include <sys/types.h>
3694 @@ -15508,7 +15512,7 @@
3695
3696  ; return 0; }
3697  EOF
3698 -if { (eval echo configure:15512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3699 +if { (eval echo configure:15516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3700    rm -rf conftest*
3701
3702    ac_cv_declared_timezone=yes
3703 @@ -15534,7 +15538,7 @@
3704
3705
3706  echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6
3707 -echo "configure:15538: checking for type of reentrant time-related functions" >&5
3708 +echo "configure:15542: checking for type of reentrant time-related functions" >&5
3709  if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then
3710    echo $ac_n "(cached) $ac_c" 1>&6
3711  else
3712 @@ -15545,7 +15549,7 @@
3713
3714  else
3715    cat > conftest.$ac_ext <<EOF
3716 -#line 15549 "configure"
3717 +#line 15553 "configure"
3718  #include "confdefs.h"
3719
3720  #include <time.h>
3721 @@ -15563,7 +15567,7 @@
3722  }
3723
3724  EOF
3725 -if { (eval echo configure:15567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3726 +if { (eval echo configure:15571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3727  then
3728
3729    ac_cv_time_r_type=hpux
3730 @@ -15577,7 +15581,7 @@
3731      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3732  else
3733    cat > conftest.$ac_ext <<EOF
3734 -#line 15581 "configure"
3735 +#line 15585 "configure"
3736  #include "confdefs.h"
3737
3738  #include <time.h>
3739 @@ -15593,7 +15597,7 @@
3740  }
3741
3742  EOF
3743 -if { (eval echo configure:15597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3744 +if { (eval echo configure:15601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3745  then
3746
3747      ac_cv_time_r_type=irix
3748 @@ -15631,12 +15635,12 @@
3749
3750
3751      echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
3752 -echo "configure:15635: checking for readdir_r" >&5
3753 +echo "configure:15639: checking for readdir_r" >&5
3754  if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then
3755    echo $ac_n "(cached) $ac_c" 1>&6
3756  else
3757    cat > conftest.$ac_ext <<EOF
3758 -#line 15640 "configure"
3759 +#line 15644 "configure"
3760  #include "confdefs.h"
3761  /* System header to define __stub macros and hopefully few prototypes,
3762      which can conflict with char readdir_r(); below.  */
3763 @@ -15659,7 +15663,7 @@
3764
3765  ; return 0; }
3766  EOF
3767 -if { (eval echo configure:15663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3768 +if { (eval echo configure:15667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3769    rm -rf conftest*
3770    eval "ac_cv_func_readdir_r=yes"
3771  else
3772 @@ -15681,7 +15685,7 @@
3773
3774    if test "$ac_cv_func_readdir_r" = "yes"; then
3775    echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6
3776 -echo "configure:15685: checking for type of readdir_r" >&5
3777 +echo "configure:15689: checking for type of readdir_r" >&5
3778  if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then
3779    echo $ac_n "(cached) $ac_c" 1>&6
3780  else
3781 @@ -15692,7 +15696,7 @@
3782
3783  else
3784    cat > conftest.$ac_ext <<EOF
3785 -#line 15696 "configure"
3786 +#line 15700 "configure"
3787  #include "confdefs.h"
3788
3789  #define _REENTRANT
3790 @@ -15717,7 +15721,7 @@
3791  }
3792
3793  EOF
3794 -if { (eval echo configure:15721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3795 +if { (eval echo configure:15725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3796  then
3797
3798        ac_cv_what_readdir_r=POSIX
3799 @@ -15728,7 +15732,7 @@
3800    rm -fr conftest*
3801
3802        cat > conftest.$ac_ext <<EOF
3803 -#line 15732 "configure"
3804 +#line 15736 "configure"
3805  #include "confdefs.h"
3806
3807  #define _REENTRANT
3808 @@ -15738,7 +15742,7 @@
3809
3810  EOF
3811  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3812 -{ (eval echo configure:15742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3813 +{ (eval echo configure:15746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3814  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3815  if test -z "$ac_err"; then
3816    rm -rf conftest*
3817 @@ -15783,7 +15787,7 @@
3818    echo $ac_n "(cached) $ac_c" 1>&6
3819  else
3820    cat > conftest.$ac_ext <<EOF
3821 -#line 15787 "configure"
3822 +#line 15791 "configure"
3823  #include "confdefs.h"
3824  #include <sys/types.h>
3825  #if STDC_HEADERS
3826 @@ -15835,7 +15839,7 @@
3827
3828
3829  echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6
3830 -echo "configure:15839: checking whether to include debugging symbols" >&5
3831 +echo "configure:15843: checking whether to include debugging symbols" >&5
3832  # Check whether --enable-debug or --disable-debug was given.
3833  if test "${enable_debug+set}" = set; then
3834    enableval="$enable_debug"
3835 @@ -15868,7 +15872,7 @@
3836
3837
3838  echo $ac_n "checking layout of installed files""... $ac_c" 1>&6
3839 -echo "configure:15872: checking layout of installed files" >&5
3840 +echo "configure:15876: checking layout of installed files" >&5
3841  # Check whether --with-layout or --without-layout was given.
3842  if test "${with_layout+set}" = set; then
3843    withval="$with_layout"
3844 @@ -15902,7 +15906,7 @@
3845
3846
3847  echo $ac_n "checking path to configuration file""... $ac_c" 1>&6
3848 -echo "configure:15906: checking path to configuration file" >&5
3849 +echo "configure:15910: checking path to configuration file" >&5
3850  # Check whether --with-config-file-path or --without-config-file-path was given.
3851  if test "${with_config_file_path+set}" = set; then
3852    withval="$with_config_file_path"
3853 @@ -15938,7 +15942,7 @@
3854
3855
3856  echo $ac_n "checking directory to be scanned for configuration files""... $ac_c" 1>&6
3857 -echo "configure:15942: checking directory to be scanned for configuration files" >&5
3858 +echo "configure:15946: checking directory to be scanned for configuration files" >&5
3859  # Check whether --with-config-file-scan-dir or --without-config-file-scan-dir was given.
3860  if test "${with_config_file_scan_dir+set}" = set; then
3861    withval="$with_config_file_scan_dir"
3862 @@ -15968,7 +15972,7 @@
3863
3864
3865  echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6
3866 -echo "configure:15972: checking whether to enable safe mode by default" >&5
3867 +echo "configure:15976: checking whether to enable safe mode by default" >&5
3868  # Check whether --enable-safe-mode or --disable-safe-mode was given.
3869  if test "${enable_safe_mode+set}" = set; then
3870    enableval="$enable_safe_mode"
3871 @@ -16003,7 +16007,7 @@
3872  fi
3873
3874  echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6
3875 -echo "configure:16007: checking for safe mode exec dir" >&5
3876 +echo "configure:16011: checking for safe mode exec dir" >&5
3877  # Check whether --with-exec-dir or --without-exec-dir was given.
3878  if test "${with_exec_dir+set}" = set; then
3879    withval="$with_exec_dir"
3880 @@ -16044,7 +16048,7 @@
3881
3882
3883  echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6
3884 -echo "configure:16048: checking whether to enable PHP's own SIGCHLD handler" >&5
3885 +echo "configure:16052: checking whether to enable PHP's own SIGCHLD handler" >&5
3886  # Check whether --enable-sigchild or --disable-sigchild was given.
3887  if test "${enable_sigchild+set}" = set; then
3888    enableval="$enable_sigchild"
3889 @@ -16081,7 +16085,7 @@
3890
3891
3892  echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6
3893 -echo "configure:16085: checking whether to enable magic quotes by default" >&5
3894 +echo "configure:16089: checking whether to enable magic quotes by default" >&5
3895  # Check whether --enable-magic-quotes or --disable-magic-quotes was given.
3896  if test "${enable_magic_quotes+set}" = set; then
3897    enableval="$enable_magic_quotes"
3898 @@ -16118,7 +16122,7 @@
3899
3900
3901  echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6
3902 -echo "configure:16122: checking whether to enable runpaths" >&5
3903 +echo "configure:16126: checking whether to enable runpaths" >&5
3904  # Check whether --enable-rpath or --disable-rpath was given.
3905  if test "${enable_rpath+set}" = set; then
3906    enableval="$enable_rpath"
3907 @@ -16143,7 +16147,7 @@
3908
3909
3910  echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6
3911 -echo "configure:16147: checking whether to explicitly link against libgcc" >&5
3912 +echo "configure:16151: checking whether to explicitly link against libgcc" >&5
3913  # Check whether --enable-libgcc or --disable-libgcc was given.
3914  if test "${enable_libgcc+set}" = set; then
3915    enableval="$enable_libgcc"
3916 @@ -16222,7 +16226,7 @@
3917
3918
3919  echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6
3920 -echo "configure:16226: checking whether to enable short tags by default" >&5
3921 +echo "configure:16230: checking whether to enable short tags by default" >&5
3922  # Check whether --enable-short-tags or --disable-short-tags was given.
3923  if test "${enable_short_tags+set}" = set; then
3924    enableval="$enable_short_tags"
3925 @@ -16259,7 +16263,7 @@
3926
3927
3928  echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6
3929 -echo "configure:16263: checking whether to enable dmalloc" >&5
3930 +echo "configure:16267: checking whether to enable dmalloc" >&5
3931  # Check whether --enable-dmalloc or --disable-dmalloc was given.
3932  if test "${enable_dmalloc+set}" = set; then
3933    enableval="$enable_dmalloc"
3934 @@ -16284,7 +16288,7 @@
3935  if test "$PHP_DMALLOC" = "yes"; then
3936
3937    echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6
3938 -echo "configure:16288: checking for dmalloc_error in -ldmalloc" >&5
3939 +echo "configure:16292: checking for dmalloc_error in -ldmalloc" >&5
3940  ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'`
3941  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3942    echo $ac_n "(cached) $ac_c" 1>&6
3943 @@ -16292,7 +16296,7 @@
3944    ac_save_LIBS="$LIBS"
3945  LIBS="-ldmalloc  $LIBS"
3946  cat > conftest.$ac_ext <<EOF
3947 -#line 16296 "configure"
3948 +#line 16300 "configure"
3949  #include "confdefs.h"
3950  /* Override any gcc2 internal prototype to avoid an error.  */
3951  /* We use char because int might match the return type of a gcc2
3952 @@ -16303,7 +16307,7 @@
3953  dmalloc_error()
3954  ; return 0; }
3955  EOF
3956 -if { (eval echo configure:16307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3957 +if { (eval echo configure:16311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3958    rm -rf conftest*
3959    eval "ac_cv_lib_$ac_lib_var=yes"
3960  else
3961 @@ -16347,7 +16351,7 @@
3962
3963
3964  echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
3965 -echo "configure:16351: checking whether to enable IPv6 support" >&5
3966 +echo "configure:16355: checking whether to enable IPv6 support" >&5
3967  # Check whether --enable-ipv6 or --disable-ipv6 was given.
3968  if test "${enable_ipv6+set}" = set; then
3969    enableval="$enable_ipv6"
3970 @@ -16377,7 +16381,7 @@
3971  fi
3972
3973  echo $ac_n "checking whether to enable versioning""... $ac_c" 1>&6
3974 -echo "configure:16381: checking whether to enable versioning" >&5
3975 +echo "configure:16385: checking whether to enable versioning" >&5
3976  # Check whether --enable-versioning or --disable-versioning was given.
3977  if test "${enable_versioning+set}" = set; then
3978    enableval="$enable_versioning"
3979 @@ -16429,7 +16433,7 @@
3980
3981
3982  echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6
3983 -echo "configure:16433: checking for OpenSSL support" >&5
3984 +echo "configure:16437: checking for OpenSSL support" >&5
3985  # Check whether --with-openssl or --without-openssl was given.
3986  if test "${with_openssl+set}" = set; then
3987    withval="$with_openssl"
3988 @@ -16475,7 +16479,7 @@
3989
3990
3991  echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6
3992 -echo "configure:16479: checking for Kerberos support" >&5
3993 +echo "configure:16483: checking for Kerberos support" >&5
3994  # Check whether --with-kerberos or --without-kerberos was given.
3995  if test "${with_kerberos+set}" = set; then
3996    withval="$with_kerberos"
3997 @@ -16733,7 +16737,7 @@
3998      # Extract the first word of "krb5-config", so it can be a program name with args.
3999  set dummy krb5-config; ac_word=$2
4000  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4001 -echo "configure:16737: checking for $ac_word" >&5
4002 +echo "configure:16741: checking for $ac_word" >&5
4003  if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
4004    echo $ac_n "(cached) $ac_c" 1>&6
4005  else
4006 @@ -17089,7 +17093,7 @@
4007      # Extract the first word of "pkg-config", so it can be a program name with args.
4008  set dummy pkg-config; ac_word=$2
4009  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4010 -echo "configure:17093: checking for $ac_word" >&5
4011 +echo "configure:17097: checking for $ac_word" >&5
4012  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4013    echo $ac_n "(cached) $ac_c" 1>&6
4014  else
4015 @@ -17277,9 +17281,9 @@
4016      old_CPPFLAGS=$CPPFLAGS
4017      CPPFLAGS=-I$OPENSSL_INCDIR
4018      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
4019 -echo "configure:17281: checking for OpenSSL version" >&5
4020 +echo "configure:17285: checking for OpenSSL version" >&5
4021      cat > conftest.$ac_ext <<EOF
4022 -#line 17283 "configure"
4023 +#line 17287 "configure"
4024  #include "confdefs.h"
4025
4026  #include <openssl/opensslv.h>
4027 @@ -17417,7 +17421,7 @@
4028    done
4029
4030    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
4031 -echo "configure:17421: checking for CRYPTO_free in -lcrypto" >&5
4032 +echo "configure:17425: checking for CRYPTO_free in -lcrypto" >&5
4033  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
4034  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4035    echo $ac_n "(cached) $ac_c" 1>&6
4036 @@ -17425,7 +17429,7 @@
4037    ac_save_LIBS="$LIBS"
4038  LIBS="-lcrypto  $LIBS"
4039  cat > conftest.$ac_ext <<EOF
4040 -#line 17429 "configure"
4041 +#line 17433 "configure"
4042  #include "confdefs.h"
4043  /* Override any gcc2 internal prototype to avoid an error.  */
4044  /* We use char because int might match the return type of a gcc2
4045 @@ -17436,7 +17440,7 @@
4046  CRYPTO_free()
4047  ; return 0; }
4048  EOF
4049 -if { (eval echo configure:17440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4050 +if { (eval echo configure:17444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4051    rm -rf conftest*
4052    eval "ac_cv_lib_$ac_lib_var=yes"
4053  else
4054 @@ -17576,7 +17580,7 @@
4055    done
4056
4057    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
4058 -echo "configure:17580: checking for SSL_CTX_set_ssl_version in -lssl" >&5
4059 +echo "configure:17584: checking for SSL_CTX_set_ssl_version in -lssl" >&5
4060  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
4061  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4062    echo $ac_n "(cached) $ac_c" 1>&6
4063 @@ -17584,7 +17588,7 @@
4064    ac_save_LIBS="$LIBS"
4065  LIBS="-lssl  $LIBS"
4066  cat > conftest.$ac_ext <<EOF
4067 -#line 17588 "configure"
4068 +#line 17592 "configure"
4069  #include "confdefs.h"
4070  /* Override any gcc2 internal prototype to avoid an error.  */
4071  /* We use char because int might match the return type of a gcc2
4072 @@ -17595,7 +17599,7 @@
4073  SSL_CTX_set_ssl_version()
4074  ; return 0; }
4075  EOF
4076 -if { (eval echo configure:17599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4077 +if { (eval echo configure:17603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4078    rm -rf conftest*
4079    eval "ac_cv_lib_$ac_lib_var=yes"
4080  else
4081 @@ -17721,7 +17725,7 @@
4082
4083
4084  echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6
4085 -echo "configure:17725: checking for ZLIB support" >&5
4086 +echo "configure:17729: checking for ZLIB support" >&5
4087  # Check whether --with-zlib or --without-zlib was given.
4088  if test "${with_zlib+set}" = set; then
4089    withval="$with_zlib"
4090 @@ -17767,7 +17771,7 @@
4091
4092
4093  echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6
4094 -echo "configure:17771: checking if the location of ZLIB install directory is defined" >&5
4095 +echo "configure:17775: checking if the location of ZLIB install directory is defined" >&5
4096  # Check whether --with-zlib-dir or --without-zlib-dir was given.
4097  if test "${with_zlib_dir+set}" = set; then
4098    withval="$with_zlib_dir"
4099 @@ -18120,7 +18124,7 @@
4100    done
4101
4102    echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
4103 -echo "configure:18124: checking for gzgets in -lz" >&5
4104 +echo "configure:18128: checking for gzgets in -lz" >&5
4105  ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'`
4106  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4107    echo $ac_n "(cached) $ac_c" 1>&6
4108 @@ -18128,7 +18132,7 @@
4109    ac_save_LIBS="$LIBS"
4110  LIBS="-lz  $LIBS"
4111  cat > conftest.$ac_ext <<EOF
4112 -#line 18132 "configure"
4113 +#line 18136 "configure"
4114  #include "confdefs.h"
4115  /* Override any gcc2 internal prototype to avoid an error.  */
4116  /* We use char because int might match the return type of a gcc2
4117 @@ -18139,7 +18143,7 @@
4118  gzgets()
4119  ; return 0; }
4120  EOF
4121 -if { (eval echo configure:18143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4122 +if { (eval echo configure:18147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4123    rm -rf conftest*
4124    eval "ac_cv_lib_$ac_lib_var=yes"
4125  else
4126 @@ -18277,7 +18281,7 @@
4127
4128
4129  echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
4130 -echo "configure:18281: checking whether to enable bc style precision math functions" >&5
4131 +echo "configure:18285: checking whether to enable bc style precision math functions" >&5
4132  # Check whether --enable-bcmath or --disable-bcmath was given.
4133  if test "${enable_bcmath+set}" = set; then
4134    enableval="$enable_bcmath"
4135 @@ -18571,7 +18575,7 @@
4136
4137
4138  echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
4139 -echo "configure:18575: checking for BZip2 support" >&5
4140 +echo "configure:18579: checking for BZip2 support" >&5
4141  # Check whether --with-bz2 or --without-bz2 was given.
4142  if test "${with_bz2+set}" = set; then
4143    withval="$with_bz2"
4144 @@ -18619,7 +18623,7 @@
4145      BZIP_DIR=$PHP_BZ2
4146    else
4147      echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
4148 -echo "configure:18623: checking for BZip2 in default path" >&5
4149 +echo "configure:18627: checking for BZip2 in default path" >&5
4150      for i in /usr/local /usr; do
4151        if test -r $i/include/bzlib.h; then
4152          BZIP_DIR=$i
4153 @@ -18715,7 +18719,7 @@
4154    done
4155
4156    echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
4157 -echo "configure:18719: checking for BZ2_bzerror in -lbz2" >&5
4158 +echo "configure:18723: checking for BZ2_bzerror in -lbz2" >&5
4159  ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'`
4160  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4161    echo $ac_n "(cached) $ac_c" 1>&6
4162 @@ -18723,7 +18727,7 @@
4163    ac_save_LIBS="$LIBS"
4164  LIBS="-lbz2  $LIBS"
4165  cat > conftest.$ac_ext <<EOF
4166 -#line 18727 "configure"
4167 +#line 18731 "configure"
4168  #include "confdefs.h"
4169  /* Override any gcc2 internal prototype to avoid an error.  */
4170  /* We use char because int might match the return type of a gcc2
4171 @@ -18734,7 +18738,7 @@
4172  BZ2_bzerror()
4173  ; return 0; }
4174  EOF
4175 -if { (eval echo configure:18738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4176 +if { (eval echo configure:18742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4177    rm -rf conftest*
4178    eval "ac_cv_lib_$ac_lib_var=yes"
4179  else
4180 @@ -19129,7 +19133,7 @@
4181
4182
4183  echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
4184 -echo "configure:19133: checking whether to enable calendar conversion support" >&5
4185 +echo "configure:19137: checking whether to enable calendar conversion support" >&5
4186  # Check whether --enable-calendar or --disable-calendar was given.
4187  if test "${enable_calendar+set}" = set; then
4188    enableval="$enable_calendar"
4189 @@ -19408,7 +19412,7 @@
4190
4191
4192  echo $ac_n "checking for cpdflib support""... $ac_c" 1>&6
4193 -echo "configure:19412: checking for cpdflib support" >&5
4194 +echo "configure:19416: checking for cpdflib support" >&5
4195  # Check whether --with-cpdflib or --without-cpdflib was given.
4196  if test "${with_cpdflib+set}" = set; then
4197    withval="$with_cpdflib"
4198 @@ -19771,7 +19775,7 @@
4199    done
4200
4201    echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
4202 -echo "configure:19775: checking for jpeg_read_header in -ljpeg" >&5
4203 +echo "configure:19779: checking for jpeg_read_header in -ljpeg" >&5
4204  ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
4205  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4206    echo $ac_n "(cached) $ac_c" 1>&6
4207 @@ -19779,7 +19783,7 @@
4208    ac_save_LIBS="$LIBS"
4209  LIBS="-ljpeg  $LIBS"
4210  cat > conftest.$ac_ext <<EOF
4211 -#line 19783 "configure"
4212 +#line 19787 "configure"
4213  #include "confdefs.h"
4214  /* Override any gcc2 internal prototype to avoid an error.  */
4215  /* We use char because int might match the return type of a gcc2
4216 @@ -19790,7 +19794,7 @@
4217  jpeg_read_header()
4218  ; return 0; }
4219  EOF
4220 -if { (eval echo configure:19794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4221 +if { (eval echo configure:19798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4222    rm -rf conftest*
4223    eval "ac_cv_lib_$ac_lib_var=yes"
4224  else
4225 @@ -20018,7 +20022,7 @@
4226    done
4227
4228    echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
4229 -echo "configure:20022: checking for TIFFOpen in -ltiff" >&5
4230 +echo "configure:20026: checking for TIFFOpen in -ltiff" >&5
4231  ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
4232  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4233    echo $ac_n "(cached) $ac_c" 1>&6
4234 @@ -20026,7 +20030,7 @@
4235    ac_save_LIBS="$LIBS"
4236  LIBS="-ltiff  $LIBS"
4237  cat > conftest.$ac_ext <<EOF
4238 -#line 20030 "configure"
4239 +#line 20034 "configure"
4240  #include "confdefs.h"
4241  /* Override any gcc2 internal prototype to avoid an error.  */
4242  /* We use char because int might match the return type of a gcc2
4243 @@ -20037,7 +20041,7 @@
4244  TIFFOpen()
4245  ; return 0; }
4246  EOF
4247 -if { (eval echo configure:20041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4248 +if { (eval echo configure:20045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4249    rm -rf conftest*
4250    eval "ac_cv_lib_$ac_lib_var=yes"
4251  else
4252 @@ -20256,7 +20260,7 @@
4253    done
4254
4255    echo $ac_n "checking for cpdf_open in -lcpdf""... $ac_c" 1>&6
4256 -echo "configure:20260: checking for cpdf_open in -lcpdf" >&5
4257 +echo "configure:20264: checking for cpdf_open in -lcpdf" >&5
4258  ac_lib_var=`echo cpdf'_'cpdf_open | sed 'y%./+-%__p_%'`
4259  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4260    echo $ac_n "(cached) $ac_c" 1>&6
4261 @@ -20264,7 +20268,7 @@
4262    ac_save_LIBS="$LIBS"
4263  LIBS="-lcpdf  $LIBS"
4264  cat > conftest.$ac_ext <<EOF
4265 -#line 20268 "configure"
4266 +#line 20272 "configure"
4267  #include "confdefs.h"
4268  /* Override any gcc2 internal prototype to avoid an error.  */
4269  /* We use char because int might match the return type of a gcc2
4270 @@ -20275,7 +20279,7 @@
4271  cpdf_open()
4272  ; return 0; }
4273  EOF
4274 -if { (eval echo configure:20279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4275 +if { (eval echo configure:20283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4276    rm -rf conftest*
4277    eval "ac_cv_lib_$ac_lib_var=yes"
4278  else
4279 @@ -20385,7 +20389,7 @@
4280    done
4281
4282    echo $ac_n "checking for cpdf_open in -lcpdfm""... $ac_c" 1>&6
4283 -echo "configure:20389: checking for cpdf_open in -lcpdfm" >&5
4284 +echo "configure:20393: checking for cpdf_open in -lcpdfm" >&5
4285  ac_lib_var=`echo cpdfm'_'cpdf_open | sed 'y%./+-%__p_%'`
4286  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4287    echo $ac_n "(cached) $ac_c" 1>&6
4288 @@ -20393,7 +20397,7 @@
4289    ac_save_LIBS="$LIBS"
4290  LIBS="-lcpdfm  $LIBS"
4291  cat > conftest.$ac_ext <<EOF
4292 -#line 20397 "configure"
4293 +#line 20401 "configure"
4294  #include "confdefs.h"
4295  /* Override any gcc2 internal prototype to avoid an error.  */
4296  /* We use char because int might match the return type of a gcc2
4297 @@ -20404,7 +20408,7 @@
4298  cpdf_open()
4299  ; return 0; }
4300  EOF
4301 -if { (eval echo configure:20408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4302 +if { (eval echo configure:20412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4303    rm -rf conftest*
4304    eval "ac_cv_lib_$ac_lib_var=yes"
4305  else
4306 @@ -20587,7 +20591,7 @@
4307
4308
4309  echo $ac_n "checking for CRACKlib support""... $ac_c" 1>&6
4310 -echo "configure:20591: checking for CRACKlib support" >&5
4311 +echo "configure:20595: checking for CRACKlib support" >&5
4312  # Check whether --with-crack or --without-crack was given.
4313  if test "${with_crack+set}" = set; then
4314    withval="$with_crack"
4315 @@ -21011,7 +21015,7 @@
4316
4317
4318  echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
4319 -echo "configure:21015: checking whether to enable ctype functions" >&5
4320 +echo "configure:21019: checking whether to enable ctype functions" >&5
4321  # Check whether --enable-ctype or --disable-ctype was given.
4322  if test "${enable_ctype+set}" = set; then
4323    enableval="$enable_ctype"
4324 @@ -21286,7 +21290,7 @@
4325
4326
4327  echo $ac_n "checking for CURL support""... $ac_c" 1>&6
4328 -echo "configure:21290: checking for CURL support" >&5
4329 +echo "configure:21294: checking for CURL support" >&5
4330  # Check whether --with-curl or --without-curl was given.
4331  if test "${with_curl+set}" = set; then
4332    withval="$with_curl"
4333 @@ -21335,7 +21339,7 @@
4334      CURL_DIR=$PHP_CURL
4335    else
4336      echo $ac_n "checking for CURL in default path""... $ac_c" 1>&6
4337 -echo "configure:21339: checking for CURL in default path" >&5
4338 +echo "configure:21343: checking for CURL in default path" >&5
4339      for i in /usr/local /usr; do
4340        if test -r $i/include/curl/easy.h; then
4341          CURL_DIR=$i
4342 @@ -21353,7 +21357,7 @@
4343
4344    CURL_CONFIG="curl-config"
4345    echo $ac_n "checking for cURL 7.9.8 or greater""... $ac_c" 1>&6
4346 -echo "configure:21357: checking for cURL 7.9.8 or greater" >&5
4347 +echo "configure:21361: checking for cURL 7.9.8 or greater" >&5
4348
4349    if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
4350      CURL_CONFIG=${CURL_DIR}/bin/curl-config
4351 @@ -21653,7 +21657,7 @@
4352    done
4353
4354    echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
4355 -echo "configure:21657: checking for curl_easy_perform in -lcurl" >&5
4356 +echo "configure:21661: checking for curl_easy_perform in -lcurl" >&5
4357  ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'`
4358  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4359    echo $ac_n "(cached) $ac_c" 1>&6
4360 @@ -21661,7 +21665,7 @@
4361    ac_save_LIBS="$LIBS"
4362  LIBS="-lcurl  $LIBS"
4363  cat > conftest.$ac_ext <<EOF
4364 -#line 21665 "configure"
4365 +#line 21669 "configure"
4366  #include "confdefs.h"
4367  /* Override any gcc2 internal prototype to avoid an error.  */
4368  /* We use char because int might match the return type of a gcc2
4369 @@ -21672,7 +21676,7 @@
4370  curl_easy_perform()
4371  ; return 0; }
4372  EOF
4373 -if { (eval echo configure:21676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4374 +if { (eval echo configure:21680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4375    rm -rf conftest*
4376    eval "ac_cv_lib_$ac_lib_var=yes"
4377  else
4378 @@ -21791,7 +21795,7 @@
4379    done
4380
4381    echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6
4382 -echo "configure:21795: checking for curl_version_info in -lcurl" >&5
4383 +echo "configure:21799: checking for curl_version_info in -lcurl" >&5
4384  ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'`
4385  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4386    echo $ac_n "(cached) $ac_c" 1>&6
4387 @@ -21799,7 +21803,7 @@
4388    ac_save_LIBS="$LIBS"
4389  LIBS="-lcurl  $LIBS"
4390  cat > conftest.$ac_ext <<EOF
4391 -#line 21803 "configure"
4392 +#line 21807 "configure"
4393  #include "confdefs.h"
4394  /* Override any gcc2 internal prototype to avoid an error.  */
4395  /* We use char because int might match the return type of a gcc2
4396 @@ -21810,7 +21814,7 @@
4397  curl_version_info()
4398  ; return 0; }
4399  EOF
4400 -if { (eval echo configure:21814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4401 +if { (eval echo configure:21818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4402    rm -rf conftest*
4403    eval "ac_cv_lib_$ac_lib_var=yes"
4404  else
4405 @@ -22077,7 +22081,7 @@
4406
4407
4408  echo $ac_n "checking for cyrus imap support""... $ac_c" 1>&6
4409 -echo "configure:22081: checking for cyrus imap support" >&5
4410 +echo "configure:22085: checking for cyrus imap support" >&5
4411  # Check whether --with-cyrus or --without-cyrus was given.
4412  if test "${with_cyrus+set}" = set; then
4413    withval="$with_cyrus"
4414 @@ -22263,7 +22267,7 @@
4415      old_CPPFLAGS=$CPPFLAGS
4416    CPPFLAGS=-I$CYRUS_INCPATH
4417    cat > conftest.$ac_ext <<EOF
4418 -#line 22267 "configure"
4419 +#line 22271 "configure"
4420  #include "confdefs.h"
4421  #include <stdio.h>
4422  #include <cyrus/imclient.h>
4423 @@ -22271,7 +22275,7 @@
4424  imclient_connect(0,0,0,0)
4425  ; return 0; }
4426  EOF
4427 -if { (eval echo configure:22275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4428 +if { (eval echo configure:22279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4429    :
4430  else
4431    echo "configure: failed program was:" >&5
4432 @@ -23002,7 +23006,7 @@
4433
4434
4435  echo $ac_n "checking for xDBM support""... $ac_c" 1>&6
4436 -echo "configure:23006: checking for xDBM support" >&5
4437 +echo "configure:23010: checking for xDBM support" >&5
4438  # Check whether --with-db or --without-db was given.
4439  if test "${with_db+set}" = set; then
4440    withval="$with_db"
4441 @@ -23049,7 +23053,7 @@
4442
4443
4444    echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
4445 -echo "configure:23053: checking for gdbm_open in -lgdbm" >&5
4446 +echo "configure:23057: checking for gdbm_open in -lgdbm" >&5
4447  ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
4448  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4449    echo $ac_n "(cached) $ac_c" 1>&6
4450 @@ -23057,7 +23061,7 @@
4451    ac_save_LIBS="$LIBS"
4452  LIBS="-lgdbm  $LIBS"
4453  cat > conftest.$ac_ext <<EOF
4454 -#line 23061 "configure"
4455 +#line 23065 "configure"
4456  #include "confdefs.h"
4457  /* Override any gcc2 internal prototype to avoid an error.  */
4458  /* We use char because int might match the return type of a gcc2
4459 @@ -23068,7 +23072,7 @@
4460  gdbm_open()
4461  ; return 0; }
4462  EOF
4463 -if { (eval echo configure:23072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4464 +if { (eval echo configure:23076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4465    rm -rf conftest*
4466    eval "ac_cv_lib_$ac_lib_var=yes"
4467  else
4468 @@ -23090,7 +23094,7 @@
4469  else
4470    echo "$ac_t""no" 1>&6
4471  echo $ac_n "checking for dbm_open in -lc""... $ac_c" 1>&6
4472 -echo "configure:23094: checking for dbm_open in -lc" >&5
4473 +echo "configure:23098: checking for dbm_open in -lc" >&5
4474  ac_lib_var=`echo c'_'dbm_open | sed 'y%./+-%__p_%'`
4475  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4476    echo $ac_n "(cached) $ac_c" 1>&6
4477 @@ -23098,7 +23102,7 @@
4478    ac_save_LIBS="$LIBS"
4479  LIBS="-lc  $LIBS"
4480  cat > conftest.$ac_ext <<EOF
4481 -#line 23102 "configure"
4482 +#line 23106 "configure"
4483  #include "confdefs.h"
4484  /* Override any gcc2 internal prototype to avoid an error.  */
4485  /* We use char because int might match the return type of a gcc2
4486 @@ -23109,7 +23113,7 @@
4487  dbm_open()
4488  ; return 0; }
4489  EOF
4490 -if { (eval echo configure:23113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4491 +if { (eval echo configure:23117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4492    rm -rf conftest*
4493    eval "ac_cv_lib_$ac_lib_var=yes"
4494  else
4495 @@ -23131,7 +23135,7 @@
4496  else
4497    echo "$ac_t""no" 1>&6
4498  echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
4499 -echo "configure:23135: checking for dbm_open in -ldbm" >&5
4500 +echo "configure:23139: checking for dbm_open in -ldbm" >&5
4501  ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
4502  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4503    echo $ac_n "(cached) $ac_c" 1>&6
4504 @@ -23139,7 +23143,7 @@
4505    ac_save_LIBS="$LIBS"
4506  LIBS="-ldbm  $LIBS"
4507  cat > conftest.$ac_ext <<EOF
4508 -#line 23143 "configure"
4509 +#line 23147 "configure"
4510  #include "confdefs.h"
4511  /* Override any gcc2 internal prototype to avoid an error.  */
4512  /* We use char because int might match the return type of a gcc2
4513 @@ -23150,7 +23154,7 @@
4514  dbm_open()
4515  ; return 0; }
4516  EOF
4517 -if { (eval echo configure:23154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4518 +if { (eval echo configure:23158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4519    rm -rf conftest*
4520    eval "ac_cv_lib_$ac_lib_var=yes"
4521  else
4522 @@ -23172,7 +23176,7 @@
4523  else
4524    echo "$ac_t""no" 1>&6
4525  echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6
4526 -echo "configure:23176: checking for dbm_open in -ldb" >&5
4527 +echo "configure:23180: checking for dbm_open in -ldb" >&5
4528  ac_lib_var=`echo db'_'dbm_open | sed 'y%./+-%__p_%'`
4529  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4530    echo $ac_n "(cached) $ac_c" 1>&6
4531 @@ -23180,7 +23184,7 @@
4532    ac_save_LIBS="$LIBS"
4533  LIBS="-ldb  $LIBS"
4534  cat > conftest.$ac_ext <<EOF
4535 -#line 23184 "configure"
4536 +#line 23188 "configure"
4537  #include "confdefs.h"
4538  /* Override any gcc2 internal prototype to avoid an error.  */
4539  /* We use char because int might match the return type of a gcc2
4540 @@ -23191,7 +23195,7 @@
4541  dbm_open()
4542  ; return 0; }
4543  EOF
4544 -if { (eval echo configure:23195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4545 +if { (eval echo configure:23199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4546    rm -rf conftest*
4547    eval "ac_cv_lib_$ac_lib_var=yes"
4548  else
4549 @@ -23225,7 +23229,7 @@
4550  fi
4551
4552    echo $ac_n "checking preferred dbm library""... $ac_c" 1>&6
4553 -echo "configure:23229: checking preferred dbm library" >&5
4554 +echo "configure:23233: checking preferred dbm library" >&5
4555    if test "a$DBM_TYPE" = a; then
4556      echo "$ac_t""none found" 1>&6
4557      echo "configure: warning: No dbm library found - using built-in flatfile support" 1>&2
4558 @@ -23243,17 +23247,17 @@
4559    if test "$DBM_LIB" = "-lgdbm"; then
4560      ac_safe=`echo "gdbm.h" | sed 'y%./+-%__p_%'`
4561  echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6
4562 -echo "configure:23247: checking for gdbm.h" >&5
4563 +echo "configure:23251: checking for gdbm.h" >&5
4564  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4565    echo $ac_n "(cached) $ac_c" 1>&6
4566  else
4567    cat > conftest.$ac_ext <<EOF
4568 -#line 23252 "configure"
4569 +#line 23256 "configure"
4570  #include "confdefs.h"
4571  #include <gdbm.h>
4572  EOF
4573  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4574 -{ (eval echo configure:23257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4575 +{ (eval echo configure:23261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4576  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4577  if test -z "$ac_err"; then
4578    rm -rf conftest*
4579 @@ -23276,17 +23280,17 @@
4580        echo "$ac_t"""Try /usr/local/include/gdbm.h"" 1>&6;
4581        ac_safe=`echo "/usr/local/include/gdbm.h" | sed 'y%./+-%__p_%'`
4582  echo $ac_n "checking for /usr/local/include/gdbm.h""... $ac_c" 1>&6
4583 -echo "configure:23280: checking for /usr/local/include/gdbm.h" >&5
4584 +echo "configure:23284: checking for /usr/local/include/gdbm.h" >&5
4585  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4586    echo $ac_n "(cached) $ac_c" 1>&6
4587  else
4588    cat > conftest.$ac_ext <<EOF
4589 -#line 23285 "configure"
4590 +#line 23289 "configure"
4591  #include "confdefs.h"
4592  #include </usr/local/include/gdbm.h>
4593  EOF
4594  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4595 -{ (eval echo configure:23290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4596 +{ (eval echo configure:23294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4597  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4598  if test -z "$ac_err"; then
4599    rm -rf conftest*
4600 @@ -23309,17 +23313,17 @@
4601          echo "$ac_t"""Try /opt/local/include/gdbm.h"" 1>&6;
4602          ac_safe=`echo "/opt/local/include/gdbm.h" | sed 'y%./+-%__p_%'`
4603  echo $ac_n "checking for /opt/local/include/gdbm.h""... $ac_c" 1>&6
4604 -echo "configure:23313: checking for /opt/local/include/gdbm.h" >&5
4605 +echo "configure:23317: checking for /opt/local/include/gdbm.h" >&5
4606  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4607    echo $ac_n "(cached) $ac_c" 1>&6
4608  else
4609    cat > conftest.$ac_ext <<EOF
4610 -#line 23318 "configure"
4611 +#line 23322 "configure"
4612  #include "confdefs.h"
4613  #include </opt/local/include/gdbm.h>
4614  EOF
4615  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4616 -{ (eval echo configure:23323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4617 +{ (eval echo configure:23327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4618  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4619  if test -z "$ac_err"; then
4620    rm -rf conftest*
4621 @@ -23342,17 +23346,17 @@
4622                      echo "$ac_t"""Try /usr/pkg/include/gdbm.h"" 1>&6;
4623            ac_safe=`echo "/usr/pkg/include/gdbm.h" | sed 'y%./+-%__p_%'`
4624  echo $ac_n "checking for /usr/pkg/include/gdbm.h""... $ac_c" 1>&6
4625 -echo "configure:23346: checking for /usr/pkg/include/gdbm.h" >&5
4626 +echo "configure:23350: checking for /usr/pkg/include/gdbm.h" >&5
4627  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4628    echo $ac_n "(cached) $ac_c" 1>&6
4629  else
4630    cat > conftest.$ac_ext <<EOF
4631 -#line 23351 "configure"
4632 +#line 23355 "configure"
4633  #include "confdefs.h"
4634  #include </usr/pkg/include/gdbm.h>
4635  EOF
4636  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4637 -{ (eval echo configure:23356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4638 +{ (eval echo configure:23360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4639  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4640  if test -z "$ac_err"; then
4641    rm -rf conftest*
4642 @@ -23633,7 +23637,7 @@
4643
4644
4645  echo $ac_n "checking whether to enable DBA""... $ac_c" 1>&6
4646 -echo "configure:23637: checking whether to enable DBA" >&5
4647 +echo "configure:23641: checking whether to enable DBA" >&5
4648  # Check whether --enable-dba or --disable-dba was given.
4649  if test "${enable_dba+set}" = set; then
4650    enableval="$enable_dba"
4651 @@ -23772,7 +23776,7 @@
4652    done
4653
4654    echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
4655 -echo "configure:23776: checking for gdbm_open in -lgdbm" >&5
4656 +echo "configure:23780: checking for gdbm_open in -lgdbm" >&5
4657  ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
4658  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4659    echo $ac_n "(cached) $ac_c" 1>&6
4660 @@ -23780,7 +23784,7 @@
4661    ac_save_LIBS="$LIBS"
4662  LIBS="-lgdbm  $LIBS"
4663  cat > conftest.$ac_ext <<EOF
4664 -#line 23784 "configure"
4665 +#line 23788 "configure"
4666  #include "confdefs.h"
4667  /* Override any gcc2 internal prototype to avoid an error.  */
4668  /* We use char because int might match the return type of a gcc2
4669 @@ -23791,7 +23795,7 @@
4670  gdbm_open()
4671  ; return 0; }
4672  EOF
4673 -if { (eval echo configure:23795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4674 +if { (eval echo configure:23799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4675    rm -rf conftest*
4676    eval "ac_cv_lib_$ac_lib_var=yes"
4677  else
4678 @@ -23958,7 +23962,7 @@
4679      THIS_FULL_NAME="$THIS_NAME"
4680    fi
4681    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
4682 -echo "configure:23962: checking for $THIS_FULL_NAME support" >&5
4683 +echo "configure:23966: checking for $THIS_FULL_NAME support" >&5
4684    if test -n ""; then
4685      { echo "configure: error: " 1>&2; exit 1; }
4686    fi
4687 @@ -24073,7 +24077,7 @@
4688    done
4689
4690    echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
4691 -echo "configure:24077: checking for dbm_open in -l$LIB" >&5
4692 +echo "configure:24081: checking for dbm_open in -l$LIB" >&5
4693  ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'`
4694  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4695    echo $ac_n "(cached) $ac_c" 1>&6
4696 @@ -24081,7 +24085,7 @@
4697    ac_save_LIBS="$LIBS"
4698  LIBS="-l$LIB  $LIBS"
4699  cat > conftest.$ac_ext <<EOF
4700 -#line 24085 "configure"
4701 +#line 24089 "configure"
4702  #include "confdefs.h"
4703  /* Override any gcc2 internal prototype to avoid an error.  */
4704  /* We use char because int might match the return type of a gcc2
4705 @@ -24092,7 +24096,7 @@
4706  dbm_open()
4707  ; return 0; }
4708  EOF
4709 -if { (eval echo configure:24096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4710 +if { (eval echo configure:24100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4711    rm -rf conftest*
4712    eval "ac_cv_lib_$ac_lib_var=yes"
4713  else
4714 @@ -24263,7 +24267,7 @@
4715      THIS_FULL_NAME="$THIS_NAME"
4716    fi
4717    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
4718 -echo "configure:24267: checking for $THIS_FULL_NAME support" >&5
4719 +echo "configure:24271: checking for $THIS_FULL_NAME support" >&5
4720    if test -n ""; then
4721      { echo "configure: error: " 1>&2; exit 1; }
4722    fi
4723 @@ -24320,7 +24324,7 @@
4724    LIBS="-l$LIB $LIBS"
4725
4726          cat > conftest.$ac_ext <<EOF
4727 -#line 24324 "configure"
4728 +#line 24328 "configure"
4729  #include "confdefs.h"
4730
4731  #include "$THIS_INCLUDE"
4732 @@ -24331,11 +24335,11 @@
4733
4734  ; return 0; }
4735  EOF
4736 -if { (eval echo configure:24335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4737 +if { (eval echo configure:24339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4738    rm -rf conftest*
4739
4740            cat > conftest.$ac_ext <<EOF
4741 -#line 24339 "configure"
4742 +#line 24343 "configure"
4743  #include "confdefs.h"
4744
4745  #include "$THIS_INCLUDE"
4746 @@ -24368,14 +24372,14 @@
4747    done
4748    if test -z "$THIS_LIBS"; then
4749         echo $ac_n "checking for db4 major version""... $ac_c" 1>&6
4750 -echo "configure:24372: checking for db4 major version" >&5
4751 +echo "configure:24376: checking for db4 major version" >&5
4752      { echo "configure: error: Header contains different version" 1>&2; exit 1; }
4753    fi
4754    if test "4" = "4"; then
4755      echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6
4756 -echo "configure:24377: checking for db4 minor version and patch level" >&5
4757 +echo "configure:24381: checking for db4 minor version and patch level" >&5
4758      cat > conftest.$ac_ext <<EOF
4759 -#line 24379 "configure"
4760 +#line 24383 "configure"
4761  #include "confdefs.h"
4762
4763  #include "$THIS_INCLUDE"
4764 @@ -24401,9 +24405,9 @@
4765    fi
4766    if test "$ext_shared" = "yes"; then
4767      echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
4768 -echo "configure:24405: checking if dba can be used as shared extension" >&5
4769 +echo "configure:24409: checking if dba can be used as shared extension" >&5
4770      cat > conftest.$ac_ext <<EOF
4771 -#line 24407 "configure"
4772 +#line 24411 "configure"
4773  #include "confdefs.h"
4774
4775  #include "$THIS_INCLUDE"
4776 @@ -24565,7 +24569,7 @@
4777      THIS_FULL_NAME="$THIS_NAME"
4778    fi
4779    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
4780 -echo "configure:24569: checking for $THIS_FULL_NAME support" >&5
4781 +echo "configure:24573: checking for $THIS_FULL_NAME support" >&5
4782    if test -n ""; then
4783      { echo "configure: error: " 1>&2; exit 1; }
4784    fi
4785 @@ -24596,7 +24600,7 @@
4786      THIS_FULL_NAME="$THIS_NAME"
4787    fi
4788    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
4789 -echo "configure:24600: checking for $THIS_FULL_NAME support" >&5
4790 +echo "configure:24604: checking for $THIS_FULL_NAME support" >&5
4791    if test -n "You cannot combine --with-db3 with --with-db4"; then
4792      { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; }
4793    fi
4794 @@ -24643,7 +24647,7 @@
4795    LIBS="-l$LIB $LIBS"
4796
4797          cat > conftest.$ac_ext <<EOF
4798 -#line 24647 "configure"
4799 +#line 24651 "configure"
4800  #include "confdefs.h"
4801
4802  #include "$THIS_INCLUDE"
4803 @@ -24654,11 +24658,11 @@
4804
4805  ; return 0; }
4806  EOF
4807 -if { (eval echo configure:24658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4808 +if { (eval echo configure:24662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4809    rm -rf conftest*
4810
4811            cat > conftest.$ac_ext <<EOF
4812 -#line 24662 "configure"
4813 +#line 24666 "configure"
4814  #include "confdefs.h"
4815
4816  #include "$THIS_INCLUDE"
4817 @@ -24691,14 +24695,14 @@
4818    done
4819    if test -z "$THIS_LIBS"; then
4820         echo $ac_n "checking for db3 major version""... $ac_c" 1>&6
4821 -echo "configure:24695: checking for db3 major version" >&5
4822 +echo "configure:24699: checking for db3 major version" >&5
4823      { echo "configure: error: Header contains different version" 1>&2; exit 1; }
4824    fi
4825    if test "3" = "4"; then
4826      echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6
4827 -echo "configure:24700: checking for db4 minor version and patch level" >&5
4828 +echo "configure:24704: checking for db4 minor version and patch level" >&5
4829      cat > conftest.$ac_ext <<EOF
4830 -#line 24702 "configure"
4831 +#line 24706 "configure"
4832  #include "confdefs.h"
4833
4834  #include "$THIS_INCLUDE"
4835 @@ -24724,9 +24728,9 @@
4836    fi
4837    if test "$ext_shared" = "yes"; then
4838      echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
4839 -echo "configure:24728: checking if dba can be used as shared extension" >&5
4840 +echo "configure:24732: checking if dba can be used as shared extension" >&5
4841      cat > conftest.$ac_ext <<EOF
4842 -#line 24730 "configure"
4843 +#line 24734 "configure"
4844  #include "confdefs.h"
4845
4846  #include "$THIS_INCLUDE"
4847 @@ -24888,7 +24892,7 @@
4848      THIS_FULL_NAME="$THIS_NAME"
4849    fi
4850    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
4851 -echo "configure:24892: checking for $THIS_FULL_NAME support" >&5
4852 +echo "configure:24896: checking for $THIS_FULL_NAME support" >&5
4853    if test -n ""; then
4854      { echo "configure: error: " 1>&2; exit 1; }
4855    fi
4856 @@ -24919,7 +24923,7 @@
4857      THIS_FULL_NAME="$THIS_NAME"
4858    fi
4859    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
4860 -echo "configure:24923: checking for $THIS_FULL_NAME support" >&5
4861 +echo "configure:24927: checking for $THIS_FULL_NAME support" >&5
4862    if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
4863      { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; }
4864    fi
4865 @@ -24966,7 +24970,7 @@
4866    LIBS="-l$LIB $LIBS"
4867
4868          cat > conftest.$ac_ext <<EOF
4869 -#line 24970 "configure"
4870 +#line 24974 "configure"
4871  #include "confdefs.h"
4872
4873  #include "$THIS_INCLUDE"
4874 @@ -24977,11 +24981,11 @@
4875
4876  ; return 0; }
4877  EOF
4878 -if { (eval echo configure:24981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4879 +if { (eval echo configure:24985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4880    rm -rf conftest*
4881
4882            cat > conftest.$ac_ext <<EOF
4883 -#line 24985 "configure"
4884 +#line 24989 "configure"
4885  #include "confdefs.h"
4886
4887  #include "$THIS_INCLUDE"
4888 @@ -25014,14 +25018,14 @@
4889    done
4890    if test -z "$THIS_LIBS"; then
4891         echo $ac_n "checking for db2 major version""... $ac_c" 1>&6
4892 -echo "configure:25018: checking for db2 major version" >&5
4893 +echo "configure:25022: checking for db2 major version" >&5
4894      { echo "configure: error: Header contains different version" 1>&2; exit 1; }
4895    fi
4896    if test "2" = "4"; then
4897      echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6
4898 -echo "configure:25023: checking for db4 minor version and patch level" >&5
4899 +echo "configure:25027: checking for db4 minor version and patch level" >&5
4900      cat > conftest.$ac_ext <<EOF
4901 -#line 25025 "configure"
4902 +#line 25029 "configure"
4903  #include "confdefs.h"
4904
4905  #include "$THIS_INCLUDE"
4906 @@ -25047,9 +25051,9 @@
4907    fi
4908    if test "$ext_shared" = "yes"; then
4909      echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
4910 -echo "configure:25051: checking if dba can be used as shared extension" >&5
4911 +echo "configure:25055: checking if dba can be used as shared extension" >&5
4912      cat > conftest.$ac_ext <<EOF
4913 -#line 25053 "configure"
4914 +#line 25057 "configure"
4915  #include "confdefs.h"
4916
4917  #include "$THIS_INCLUDE"
4918 @@ -25211,7 +25215,7 @@
4919      THIS_FULL_NAME="$THIS_NAME"
4920    fi
4921    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
4922 -echo "configure:25215: checking for $THIS_FULL_NAME support" >&5
4923 +echo "configure:25219: checking for $THIS_FULL_NAME support" >&5
4924    if test -n ""; then
4925      { echo "configure: error: " 1>&2; exit 1; }
4926    fi
4927 @@ -25326,7 +25330,7 @@
4928    done
4929
4930    echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
4931 -echo "configure:25330: checking for dbminit in -l$LIB" >&5
4932 +echo "configure:25334: checking for dbminit in -l$LIB" >&5
4933  ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'`
4934  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4935    echo $ac_n "(cached) $ac_c" 1>&6
4936 @@ -25334,7 +25338,7 @@
4937    ac_save_LIBS="$LIBS"
4938  LIBS="-l$LIB  $LIBS"
4939  cat > conftest.$ac_ext <<EOF
4940 -#line 25338 "configure"
4941 +#line 25342 "configure"
4942  #include "confdefs.h"
4943  /* Override any gcc2 internal prototype to avoid an error.  */
4944  /* We use char because int might match the return type of a gcc2
4945 @@ -25345,7 +25349,7 @@
4946  dbminit()
4947  ; return 0; }
4948  EOF
4949 -if { (eval echo configure:25349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4950 +if { (eval echo configure:25353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4951    rm -rf conftest*
4952    eval "ac_cv_lib_$ac_lib_var=yes"
4953  else
4954 @@ -25365,7 +25369,7 @@
4955      ext_shared=$save_ext_shared
4956
4957            echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6
4958 -echo "configure:25369: checking for DBM using GDBM" >&5
4959 +echo "configure:25373: checking for DBM using GDBM" >&5
4960            cat >> confdefs.h <<EOF
4961  #define DBM_INCLUDE_FILE "$THIS_INCLUDE"
4962  EOF
4963 @@ -25531,7 +25535,7 @@
4964      THIS_FULL_NAME="$THIS_NAME"
4965    fi
4966    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
4967 -echo "configure:25535: checking for $THIS_FULL_NAME support" >&5
4968 +echo "configure:25539: checking for $THIS_FULL_NAME support" >&5
4969    if test -n ""; then
4970      { echo "configure: error: " 1>&2; exit 1; }
4971    fi
4972 @@ -25661,7 +25665,7 @@
4973    done
4974
4975    echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6
4976 -echo "configure:25665: checking for cdb_read in -l$LIB" >&5
4977 +echo "configure:25669: checking for cdb_read in -l$LIB" >&5
4978  ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'`
4979  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4980    echo $ac_n "(cached) $ac_c" 1>&6
4981 @@ -25669,7 +25673,7 @@
4982    ac_save_LIBS="$LIBS"
4983  LIBS="-l$LIB  $LIBS"
4984  cat > conftest.$ac_ext <<EOF
4985 -#line 25673 "configure"
4986 +#line 25677 "configure"
4987  #include "confdefs.h"
4988  /* Override any gcc2 internal prototype to avoid an error.  */
4989  /* We use char because int might match the return type of a gcc2
4990 @@ -25680,7 +25684,7 @@
4991  cdb_read()
4992  ; return 0; }
4993  EOF
4994 -if { (eval echo configure:25684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4995 +if { (eval echo configure:25688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4996    rm -rf conftest*
4997    eval "ac_cv_lib_$ac_lib_var=yes"
4998  else
4999 @@ -25872,7 +25876,7 @@
5000      THIS_FULL_NAME="$THIS_NAME"
5001    fi
5002    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
5003 -echo "configure:25876: checking for $THIS_FULL_NAME support" >&5
5004 +echo "configure:25880: checking for $THIS_FULL_NAME support" >&5
5005    if test -n ""; then
5006      { echo "configure: error: " 1>&2; exit 1; }
5007    fi
5008 @@ -25926,7 +25930,7 @@
5009      THIS_FULL_NAME="$THIS_NAME"
5010    fi
5011    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
5012 -echo "configure:25930: checking for $THIS_FULL_NAME support" >&5
5013 +echo "configure:25934: checking for $THIS_FULL_NAME support" >&5
5014    if test -n ""; then
5015      { echo "configure: error: " 1>&2; exit 1; }
5016    fi
5017 @@ -25980,7 +25984,7 @@
5018      THIS_FULL_NAME="$THIS_NAME"
5019    fi
5020    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
5021 -echo "configure:25984: checking for $THIS_FULL_NAME support" >&5
5022 +echo "configure:25988: checking for $THIS_FULL_NAME support" >&5
5023    if test -n ""; then
5024      { echo "configure: error: " 1>&2; exit 1; }
5025    fi
5026 @@ -25995,7 +25999,7 @@
5027
5028
5029  echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
5030 -echo "configure:25999: checking whether to enable DBA interface" >&5
5031 +echo "configure:26003: checking whether to enable DBA interface" >&5
5032  if test "$HAVE_DBA" = "1"; then
5033    echo "$ac_t""yes" 1>&6
5034    cat >> confdefs.h <<\EOF
5035 @@ -26250,7 +26254,7 @@
5036
5037
5038  echo $ac_n "checking whether to enable dbase support""... $ac_c" 1>&6
5039 -echo "configure:26254: checking whether to enable dbase support" >&5
5040 +echo "configure:26258: checking whether to enable dbase support" >&5
5041  # Check whether --enable-dbase or --disable-dbase was given.
5042  if test "${enable_dbase+set}" = set; then
5043    enableval="$enable_dbase"
5044 @@ -26525,7 +26529,7 @@
5045
5046
5047  echo $ac_n "checking whether to enable dbx support""... $ac_c" 1>&6
5048 -echo "configure:26529: checking whether to enable dbx support" >&5
5049 +echo "configure:26533: checking whether to enable dbx support" >&5
5050  # Check whether --enable-dbx or --disable-dbx was given.
5051  if test "${enable_dbx+set}" = set; then
5052    enableval="$enable_dbx"
5053 @@ -26796,7 +26800,7 @@
5054
5055
5056  echo $ac_n "checking whether to enable direct I/O support""... $ac_c" 1>&6
5057 -echo "configure:26800: checking whether to enable direct I/O support" >&5
5058 +echo "configure:26804: checking whether to enable direct I/O support" >&5
5059  # Check whether --enable-dio or --disable-dio was given.
5060  if test "${enable_dio+set}" = set; then
5061    enableval="$enable_dio"
5062 @@ -27069,7 +27073,7 @@
5063
5064
5065  echo $ac_n "checking for DOM support""... $ac_c" 1>&6
5066 -echo "configure:27073: checking for DOM support" >&5
5067 +echo "configure:27077: checking for DOM support" >&5
5068  # Check whether --with-dom or --without-dom was given.
5069  if test "${with_dom+set}" = set; then
5070    withval="$with_dom"
5071 @@ -27116,7 +27120,7 @@
5072
5073
5074  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
5075 -echo "configure:27120: checking for the location of libz" >&5
5076 +echo "configure:27124: checking for the location of libz" >&5
5077  # Check whether --with-zlib-dir or --without-zlib-dir was given.
5078  if test "${with_zlib_dir+set}" = set; then
5079    withval="$with_zlib_dir"
5080 @@ -27163,9 +27167,9 @@
5081    old_CPPFLAGS=$CPPFLAGS
5082    CPPFLAGS=-I$DOMXML_DIR/include$DOMXML_DIR_ADD
5083    echo $ac_n "checking for libxml version""... $ac_c" 1>&6
5084 -echo "configure:27167: checking for libxml version" >&5
5085 +echo "configure:27171: checking for libxml version" >&5
5086    cat > conftest.$ac_ext <<EOF
5087 -#line 27169 "configure"
5088 +#line 27173 "configure"
5089  #include "confdefs.h"
5090
5091  #include <libxml/xmlversion.h>
5092 @@ -27742,7 +27746,7 @@
5093
5094
5095  echo $ac_n "checking for DOM XSLT support""... $ac_c" 1>&6
5096 -echo "configure:27746: checking for DOM XSLT support" >&5
5097 +echo "configure:27750: checking for DOM XSLT support" >&5
5098  # Check whether --with-dom-xslt or --without-dom-xslt was given.
5099  if test "${with_dom_xslt+set}" = set; then
5100    withval="$with_dom_xslt"
5101 @@ -27767,7 +27771,7 @@
5102
5103
5104  echo $ac_n "checking for DOM EXSLT support""... $ac_c" 1>&6
5105 -echo "configure:27771: checking for DOM EXSLT support" >&5
5106 +echo "configure:27775: checking for DOM EXSLT support" >&5
5107  # Check whether --with-dom-exslt or --without-dom-exslt was given.
5108  if test "${with_dom_exslt+set}" = set; then
5109    withval="$with_dom_exslt"
5110 @@ -27808,9 +27812,9 @@
5111    old_CPPFLAGS=$CPPFLAGS
5112    CPPFLAGS=-I$DOMXSLT_DIR/include
5113    echo $ac_n "checking for libxslt version""... $ac_c" 1>&6
5114 -echo "configure:27812: checking for libxslt version" >&5
5115 +echo "configure:27816: checking for libxslt version" >&5
5116    cat > conftest.$ac_ext <<EOF
5117 -#line 27814 "configure"
5118 +#line 27818 "configure"
5119  #include "confdefs.h"
5120
5121  #include <libxslt/xsltconfig.h>
5122 @@ -28238,9 +28242,9 @@
5123    old_CPPFLAGS=$CPPFLAGS
5124    CPPFLAGS=-I$DOMEXSLT_DIR/include
5125    echo $ac_n "checking for libexslt version""... $ac_c" 1>&6
5126 -echo "configure:28242: checking for libexslt version" >&5
5127 +echo "configure:28246: checking for libexslt version" >&5
5128    cat > conftest.$ac_ext <<EOF
5129 -#line 28244 "configure"
5130 +#line 28248 "configure"
5131  #include "confdefs.h"
5132
5133  #include <libexslt/exsltconfig.h>
5134 @@ -28410,7 +28414,7 @@
5135
5136
5137  echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6
5138 -echo "configure:28414: checking whether to enable EXIF (metadata from images) support" >&5
5139 +echo "configure:28418: checking whether to enable EXIF (metadata from images) support" >&5
5140  # Check whether --enable-exif or --disable-exif was given.
5141  if test "${enable_exif+set}" = set; then
5142    enableval="$enable_exif"
5143 @@ -28685,7 +28689,7 @@
5144
5145
5146  echo $ac_n "checking for FrontBase SQL92 (fbsql) support""... $ac_c" 1>&6
5147 -echo "configure:28689: checking for FrontBase SQL92 (fbsql) support" >&5
5148 +echo "configure:28693: checking for FrontBase SQL92 (fbsql) support" >&5
5149  # Check whether --with-fbsql or --without-fbsql was given.
5150  if test "${with_fbsql+set}" = set; then
5151    withval="$with_fbsql"
5152 @@ -29119,7 +29123,7 @@
5153
5154
5155  echo $ac_n "checking for FDF support""... $ac_c" 1>&6
5156 -echo "configure:29123: checking for FDF support" >&5
5157 +echo "configure:29127: checking for FDF support" >&5
5158  # Check whether --with-fdftk or --without-fdftk was given.
5159  if test "${with_fdftk+set}" = set; then
5160    withval="$with_fdftk"
5161 @@ -29320,7 +29324,7 @@
5162    done
5163
5164    echo $ac_n "checking for FDFOpen in -l$file""... $ac_c" 1>&6
5165 -echo "configure:29324: checking for FDFOpen in -l$file" >&5
5166 +echo "configure:29328: checking for FDFOpen in -l$file" >&5
5167  ac_lib_var=`echo $file'_'FDFOpen | sed 'y%./+-%__p_%'`
5168  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5169    echo $ac_n "(cached) $ac_c" 1>&6
5170 @@ -29328,7 +29332,7 @@
5171    ac_save_LIBS="$LIBS"
5172  LIBS="-l$file  $LIBS"
5173  cat > conftest.$ac_ext <<EOF
5174 -#line 29332 "configure"
5175 +#line 29336 "configure"
5176  #include "confdefs.h"
5177  /* Override any gcc2 internal prototype to avoid an error.  */
5178  /* We use char because int might match the return type of a gcc2
5179 @@ -29339,7 +29343,7 @@
5180  FDFOpen()
5181  ; return 0; }
5182  EOF
5183 -if { (eval echo configure:29343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5184 +if { (eval echo configure:29347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5185    rm -rf conftest*
5186    eval "ac_cv_lib_$ac_lib_var=yes"
5187  else
5188 @@ -29449,7 +29453,7 @@
5189    done
5190
5191    echo $ac_n "checking for FDFGetFDFVersion in -l$file""... $ac_c" 1>&6
5192 -echo "configure:29453: checking for FDFGetFDFVersion in -l$file" >&5
5193 +echo "configure:29457: checking for FDFGetFDFVersion in -l$file" >&5
5194  ac_lib_var=`echo $file'_'FDFGetFDFVersion | sed 'y%./+-%__p_%'`
5195  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5196    echo $ac_n "(cached) $ac_c" 1>&6
5197 @@ -29457,7 +29461,7 @@
5198    ac_save_LIBS="$LIBS"
5199  LIBS="-l$file  $LIBS"
5200  cat > conftest.$ac_ext <<EOF
5201 -#line 29461 "configure"
5202 +#line 29465 "configure"
5203  #include "confdefs.h"
5204  /* Override any gcc2 internal prototype to avoid an error.  */
5205  /* We use char because int might match the return type of a gcc2
5206 @@ -29468,7 +29472,7 @@
5207  FDFGetFDFVersion()
5208  ; return 0; }
5209  EOF
5210 -if { (eval echo configure:29472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5211 +if { (eval echo configure:29476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5212    rm -rf conftest*
5213    eval "ac_cv_lib_$ac_lib_var=yes"
5214  else
5215 @@ -29843,7 +29847,7 @@
5216
5217
5218  echo $ac_n "checking whether to enable the bundled filePro support""... $ac_c" 1>&6
5219 -echo "configure:29847: checking whether to enable the bundled filePro support" >&5
5220 +echo "configure:29851: checking whether to enable the bundled filePro support" >&5
5221  # Check whether --enable-filepro or --disable-filepro was given.
5222  if test "${enable_filepro+set}" = set; then
5223    enableval="$enable_filepro"
5224 @@ -30118,7 +30122,7 @@
5225
5226
5227  echo $ac_n "checking for FriBidi support""... $ac_c" 1>&6
5228 -echo "configure:30122: checking for FriBidi support" >&5
5229 +echo "configure:30126: checking for FriBidi support" >&5
5230  # Check whether --with-fribidi or --without-fribidi was given.
5231  if test "${with_fribidi+set}" = set; then
5232    withval="$with_fribidi"
5233 @@ -30167,7 +30171,7 @@
5234      # Extract the first word of "fribidi-config", so it can be a program name with args.
5235  set dummy fribidi-config; ac_word=$2
5236  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5237 -echo "configure:30171: checking for $ac_word" >&5
5238 +echo "configure:30175: checking for $ac_word" >&5
5239  if eval "test \"`echo '$''{'ac_cv_path_FRIBIDI_CONFIG'+set}'`\" = set"; then
5240    echo $ac_n "(cached) $ac_c" 1>&6
5241  else
5242 @@ -30204,7 +30208,7 @@
5243    fi
5244
5245      echo $ac_n "checking for FriBidi version""... $ac_c" 1>&6
5246 -echo "configure:30208: checking for FriBidi version" >&5
5247 +echo "configure:30212: checking for FriBidi version" >&5
5248
5249    if test ! -x "$FRIBIDI_CONFIG"; then
5250      { echo "configure: error: fribidi-config not found." 1>&2; exit 1; }
5251 @@ -30573,7 +30577,7 @@
5252
5253
5254  echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6
5255 -echo "configure:30577: checking whether to enable FTP support" >&5
5256 +echo "configure:30581: checking whether to enable FTP support" >&5
5257  # Check whether --enable-ftp or --disable-ftp was given.
5258  if test "${enable_ftp+set}" = set; then
5259    enableval="$enable_ftp"
5260 @@ -30849,7 +30853,7 @@
5261
5262
5263  echo $ac_n "checking for GD support""... $ac_c" 1>&6
5264 -echo "configure:30853: checking for GD support" >&5
5265 +echo "configure:30857: checking for GD support" >&5
5266  # Check whether --with-gd or --without-gd was given.
5267  if test "${with_gd+set}" = set; then
5268    withval="$with_gd"
5269 @@ -30896,7 +30900,7 @@
5270
5271
5272  echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
5273 -echo "configure:30900: checking for the location of libjpeg" >&5
5274 +echo "configure:30904: checking for the location of libjpeg" >&5
5275  # Check whether --with-jpeg-dir or --without-jpeg-dir was given.
5276  if test "${with_jpeg_dir+set}" = set; then
5277    withval="$with_jpeg_dir"
5278 @@ -30923,7 +30927,7 @@
5279
5280
5281  echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
5282 -echo "configure:30927: checking for the location of libpng" >&5
5283 +echo "configure:30931: checking for the location of libpng" >&5
5284  # Check whether --with-png-dir or --without-png-dir was given.
5285  if test "${with_png_dir+set}" = set; then
5286    withval="$with_png_dir"
5287 @@ -30950,7 +30954,7 @@
5288
5289
5290  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
5291 -echo "configure:30954: checking for the location of libz" >&5
5292 +echo "configure:30958: checking for the location of libz" >&5
5293  # Check whether --with-zlib-dir or --without-zlib-dir was given.
5294  if test "${with_zlib_dir+set}" = set; then
5295    withval="$with_zlib_dir"
5296 @@ -30976,7 +30980,7 @@
5297
5298
5299  echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6
5300 -echo "configure:30980: checking for the location of libXpm" >&5
5301 +echo "configure:30984: checking for the location of libXpm" >&5
5302  # Check whether --with-xpm-dir or --without-xpm-dir was given.
5303  if test "${with_xpm_dir+set}" = set; then
5304    withval="$with_xpm_dir"
5305 @@ -31001,7 +31005,7 @@
5306
5307
5308  echo $ac_n "checking for FreeType 1.x support""... $ac_c" 1>&6
5309 -echo "configure:31005: checking for FreeType 1.x support" >&5
5310 +echo "configure:31009: checking for FreeType 1.x support" >&5
5311  # Check whether --with-ttf or --without-ttf was given.
5312  if test "${with_ttf+set}" = set; then
5313    withval="$with_ttf"
5314 @@ -31026,7 +31030,7 @@
5315
5316
5317  echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6
5318 -echo "configure:31030: checking for FreeType 2" >&5
5319 +echo "configure:31034: checking for FreeType 2" >&5
5320  # Check whether --with-freetype-dir or --without-freetype-dir was given.
5321  if test "${with_freetype_dir+set}" = set; then
5322    withval="$with_freetype_dir"
5323 @@ -31051,7 +31055,7 @@
5324
5325
5326  echo $ac_n "checking for T1lib support""... $ac_c" 1>&6
5327 -echo "configure:31055: checking for T1lib support" >&5
5328 +echo "configure:31059: checking for T1lib support" >&5
5329  # Check whether --with-t1lib or --without-t1lib was given.
5330  if test "${with_t1lib+set}" = set; then
5331    withval="$with_t1lib"
5332 @@ -31076,7 +31080,7 @@
5333
5334
5335  echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6
5336 -echo "configure:31080: checking whether to enable truetype string function in GD" >&5
5337 +echo "configure:31084: checking whether to enable truetype string function in GD" >&5
5338  # Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given.
5339  if test "${enable_gd_native_ttf+set}" = set; then
5340    enableval="$enable_gd_native_ttf"
5341 @@ -31101,7 +31105,7 @@
5342
5343
5344  echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6
5345 -echo "configure:31105: checking whether to enable JIS-mapped Japanese font support in GD" >&5
5346 +echo "configure:31109: checking whether to enable JIS-mapped Japanese font support in GD" >&5
5347  # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given.
5348  if test "${enable_gd_jis_conv+set}" = set; then
5349    enableval="$enable_gd_jis_conv"
5350 @@ -31155,12 +31159,12 @@
5351    for ac_func in fabsf floorf
5352  do
5353  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5354 -echo "configure:31159: checking for $ac_func" >&5
5355 +echo "configure:31163: checking for $ac_func" >&5
5356  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5357    echo $ac_n "(cached) $ac_c" 1>&6
5358  else
5359    cat > conftest.$ac_ext <<EOF
5360 -#line 31164 "configure"
5361 +#line 31168 "configure"
5362  #include "confdefs.h"
5363  /* System header to define __stub macros and hopefully few prototypes,
5364      which can conflict with char $ac_func(); below.  */
5365 @@ -31183,7 +31187,7 @@
5366
5367  ; return 0; }
5368  EOF
5369 -if { (eval echo configure:31187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5370 +if { (eval echo configure:31191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5371    rm -rf conftest*
5372    eval "ac_cv_func_$ac_func=yes"
5373  else
5374 @@ -31315,7 +31319,7 @@
5375    done
5376
5377    echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
5378 -echo "configure:31319: checking for jpeg_read_header in -ljpeg" >&5
5379 +echo "configure:31323: checking for jpeg_read_header in -ljpeg" >&5
5380  ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
5381  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5382    echo $ac_n "(cached) $ac_c" 1>&6
5383 @@ -31323,7 +31327,7 @@
5384    ac_save_LIBS="$LIBS"
5385  LIBS="-ljpeg  $LIBS"
5386  cat > conftest.$ac_ext <<EOF
5387 -#line 31327 "configure"
5388 +#line 31331 "configure"
5389  #include "confdefs.h"
5390  /* Override any gcc2 internal prototype to avoid an error.  */
5391  /* We use char because int might match the return type of a gcc2
5392 @@ -31334,7 +31338,7 @@
5393  jpeg_read_header()
5394  ; return 0; }
5395  EOF
5396 -if { (eval echo configure:31338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5397 +if { (eval echo configure:31342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5398    rm -rf conftest*
5399    eval "ac_cv_lib_$ac_lib_var=yes"
5400  else
5401 @@ -31598,7 +31602,7 @@
5402    done
5403
5404    echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
5405 -echo "configure:31602: checking for png_write_image in -lpng" >&5
5406 +echo "configure:31606: checking for png_write_image in -lpng" >&5
5407  ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
5408  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5409    echo $ac_n "(cached) $ac_c" 1>&6
5410 @@ -31606,7 +31610,7 @@
5411    ac_save_LIBS="$LIBS"
5412  LIBS="-lpng  $LIBS"
5413  cat > conftest.$ac_ext <<EOF
5414 -#line 31610 "configure"
5415 +#line 31614 "configure"
5416  #include "confdefs.h"
5417  /* Override any gcc2 internal prototype to avoid an error.  */
5418  /* We use char because int might match the return type of a gcc2
5419 @@ -31617,7 +31621,7 @@
5420  png_write_image()
5421  ; return 0; }
5422  EOF
5423 -if { (eval echo configure:31621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5424 +if { (eval echo configure:31625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5425    rm -rf conftest*
5426    eval "ac_cv_lib_$ac_lib_var=yes"
5427  else
5428 @@ -31978,7 +31982,7 @@
5429    done
5430
5431    echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
5432 -echo "configure:31982: checking for XpmFreeXpmImage in -lXpm" >&5
5433 +echo "configure:31986: checking for XpmFreeXpmImage in -lXpm" >&5
5434  ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
5435  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5436    echo $ac_n "(cached) $ac_c" 1>&6
5437 @@ -31986,7 +31990,7 @@
5438    ac_save_LIBS="$LIBS"
5439  LIBS="-lXpm  $LIBS"
5440  cat > conftest.$ac_ext <<EOF
5441 -#line 31990 "configure"
5442 +#line 31994 "configure"
5443  #include "confdefs.h"
5444  /* Override any gcc2 internal prototype to avoid an error.  */
5445  /* We use char because int might match the return type of a gcc2
5446 @@ -31997,7 +32001,7 @@
5447  XpmFreeXpmImage()
5448  ; return 0; }
5449  EOF
5450 -if { (eval echo configure:32001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5451 +if { (eval echo configure:32005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5452    rm -rf conftest*
5453    eval "ac_cv_lib_$ac_lib_var=yes"
5454  else
5455 @@ -32695,7 +32699,7 @@
5456    done
5457
5458    echo $ac_n "checking for T1_LoadFont in -lt1""... $ac_c" 1>&6
5459 -echo "configure:32699: checking for T1_LoadFont in -lt1" >&5
5460 +echo "configure:32703: checking for T1_LoadFont in -lt1" >&5
5461  ac_lib_var=`echo t1'_'T1_LoadFont | sed 'y%./+-%__p_%'`
5462  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5463    echo $ac_n "(cached) $ac_c" 1>&6
5464 @@ -32703,7 +32707,7 @@
5465    ac_save_LIBS="$LIBS"
5466  LIBS="-lt1  $LIBS"
5467  cat > conftest.$ac_ext <<EOF
5468 -#line 32707 "configure"
5469 +#line 32711 "configure"
5470  #include "confdefs.h"
5471  /* Override any gcc2 internal prototype to avoid an error.  */
5472  /* We use char because int might match the return type of a gcc2
5473 @@ -32714,7 +32718,7 @@
5474  T1_LoadFont()
5475  ; return 0; }
5476  EOF
5477 -if { (eval echo configure:32718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5478 +if { (eval echo configure:32722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5479    rm -rf conftest*
5480    eval "ac_cv_lib_$ac_lib_var=yes"
5481  else
5482 @@ -33107,7 +33111,7 @@
5483    done
5484
5485    echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
5486 -echo "configure:33111: checking for jpeg_read_header in -ljpeg" >&5
5487 +echo "configure:33115: checking for jpeg_read_header in -ljpeg" >&5
5488  ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
5489  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5490    echo $ac_n "(cached) $ac_c" 1>&6
5491 @@ -33115,7 +33119,7 @@
5492    ac_save_LIBS="$LIBS"
5493  LIBS="-ljpeg  $LIBS"
5494  cat > conftest.$ac_ext <<EOF
5495 -#line 33119 "configure"
5496 +#line 33123 "configure"
5497  #include "confdefs.h"
5498  /* Override any gcc2 internal prototype to avoid an error.  */
5499  /* We use char because int might match the return type of a gcc2
5500 @@ -33126,7 +33130,7 @@
5501  jpeg_read_header()
5502  ; return 0; }
5503  EOF
5504 -if { (eval echo configure:33130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5505 +if { (eval echo configure:33134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5506    rm -rf conftest*
5507    eval "ac_cv_lib_$ac_lib_var=yes"
5508  else
5509 @@ -33390,7 +33394,7 @@
5510    done
5511
5512    echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
5513 -echo "configure:33394: checking for png_write_image in -lpng" >&5
5514 +echo "configure:33398: checking for png_write_image in -lpng" >&5
5515  ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
5516  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5517    echo $ac_n "(cached) $ac_c" 1>&6
5518 @@ -33398,7 +33402,7 @@
5519    ac_save_LIBS="$LIBS"
5520  LIBS="-lpng  $LIBS"
5521  cat > conftest.$ac_ext <<EOF
5522 -#line 33402 "configure"
5523 +#line 33406 "configure"
5524  #include "confdefs.h"
5525  /* Override any gcc2 internal prototype to avoid an error.  */
5526  /* We use char because int might match the return type of a gcc2
5527 @@ -33409,7 +33413,7 @@
5528  png_write_image()
5529  ; return 0; }
5530  EOF
5531 -if { (eval echo configure:33413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5532 +if { (eval echo configure:33417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5533    rm -rf conftest*
5534    eval "ac_cv_lib_$ac_lib_var=yes"
5535  else
5536 @@ -33770,7 +33774,7 @@
5537    done
5538
5539    echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
5540 -echo "configure:33774: checking for XpmFreeXpmImage in -lXpm" >&5
5541 +echo "configure:33778: checking for XpmFreeXpmImage in -lXpm" >&5
5542  ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
5543  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5544    echo $ac_n "(cached) $ac_c" 1>&6
5545 @@ -33778,7 +33782,7 @@
5546    ac_save_LIBS="$LIBS"
5547  LIBS="-lXpm  $LIBS"
5548  cat > conftest.$ac_ext <<EOF
5549 -#line 33782 "configure"
5550 +#line 33786 "configure"
5551  #include "confdefs.h"
5552  /* Override any gcc2 internal prototype to avoid an error.  */
5553  /* We use char because int might match the return type of a gcc2
5554 @@ -33789,7 +33793,7 @@
5555  XpmFreeXpmImage()
5556  ; return 0; }
5557  EOF
5558 -if { (eval echo configure:33793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5559 +if { (eval echo configure:33797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5560    rm -rf conftest*
5561    eval "ac_cv_lib_$ac_lib_var=yes"
5562  else
5563 @@ -34487,7 +34491,7 @@
5564    done
5565
5566    echo $ac_n "checking for T1_LoadFont in -lt1""... $ac_c" 1>&6
5567 -echo "configure:34491: checking for T1_LoadFont in -lt1" >&5
5568 +echo "configure:34495: checking for T1_LoadFont in -lt1" >&5
5569  ac_lib_var=`echo t1'_'T1_LoadFont | sed 'y%./+-%__p_%'`
5570  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5571    echo $ac_n "(cached) $ac_c" 1>&6
5572 @@ -34495,7 +34499,7 @@
5573    ac_save_LIBS="$LIBS"
5574  LIBS="-lt1  $LIBS"
5575  cat > conftest.$ac_ext <<EOF
5576 -#line 34499 "configure"
5577 +#line 34503 "configure"
5578  #include "confdefs.h"
5579  /* Override any gcc2 internal prototype to avoid an error.  */
5580  /* We use char because int might match the return type of a gcc2
5581 @@ -34506,7 +34510,7 @@
5582  T1_LoadFont()
5583  ; return 0; }
5584  EOF
5585 -if { (eval echo configure:34510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5586 +if { (eval echo configure:34514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5587    rm -rf conftest*
5588    eval "ac_cv_lib_$ac_lib_var=yes"
5589  else
5590 @@ -34862,7 +34866,7 @@
5591    done
5592
5593    echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
5594 -echo "configure:34866: checking for gdImageString16 in -lgd" >&5
5595 +echo "configure:34870: checking for gdImageString16 in -lgd" >&5
5596  ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
5597  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5598    echo $ac_n "(cached) $ac_c" 1>&6
5599 @@ -34870,7 +34874,7 @@
5600    ac_save_LIBS="$LIBS"
5601  LIBS="-lgd  $LIBS"
5602  cat > conftest.$ac_ext <<EOF
5603 -#line 34874 "configure"
5604 +#line 34878 "configure"
5605  #include "confdefs.h"
5606  /* Override any gcc2 internal prototype to avoid an error.  */
5607  /* We use char because int might match the return type of a gcc2
5608 @@ -34881,7 +34885,7 @@
5609  gdImageString16()
5610  ; return 0; }
5611  EOF
5612 -if { (eval echo configure:34885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5613 +if { (eval echo configure:34889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5614    rm -rf conftest*
5615    eval "ac_cv_lib_$ac_lib_var=yes"
5616  else
5617 @@ -34993,7 +34997,7 @@
5618    done
5619
5620    echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6
5621 -echo "configure:34997: checking for gdImagePaletteCopy in -lgd" >&5
5622 +echo "configure:35001: checking for gdImagePaletteCopy in -lgd" >&5
5623  ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'`
5624  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5625    echo $ac_n "(cached) $ac_c" 1>&6
5626 @@ -35001,7 +35005,7 @@
5627    ac_save_LIBS="$LIBS"
5628  LIBS="-lgd  $LIBS"
5629  cat > conftest.$ac_ext <<EOF
5630 -#line 35005 "configure"
5631 +#line 35009 "configure"
5632  #include "confdefs.h"
5633  /* Override any gcc2 internal prototype to avoid an error.  */
5634  /* We use char because int might match the return type of a gcc2
5635 @@ -35012,7 +35016,7 @@
5636  gdImagePaletteCopy()
5637  ; return 0; }
5638  EOF
5639 -if { (eval echo configure:35016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5640 +if { (eval echo configure:35020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5641    rm -rf conftest*
5642    eval "ac_cv_lib_$ac_lib_var=yes"
5643  else
5644 @@ -35124,7 +35128,7 @@
5645    done
5646
5647    echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
5648 -echo "configure:35128: checking for gdImageCreateFromPng in -lgd" >&5
5649 +echo "configure:35132: checking for gdImageCreateFromPng in -lgd" >&5
5650  ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
5651  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5652    echo $ac_n "(cached) $ac_c" 1>&6
5653 @@ -35132,7 +35136,7 @@
5654    ac_save_LIBS="$LIBS"
5655  LIBS="-lgd  $LIBS"
5656  cat > conftest.$ac_ext <<EOF
5657 -#line 35136 "configure"
5658 +#line 35140 "configure"
5659  #include "confdefs.h"
5660  /* Override any gcc2 internal prototype to avoid an error.  */
5661  /* We use char because int might match the return type of a gcc2
5662 @@ -35143,7 +35147,7 @@
5663  gdImageCreateFromPng()
5664  ; return 0; }
5665  EOF
5666 -if { (eval echo configure:35147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5667 +if { (eval echo configure:35151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5668    rm -rf conftest*
5669    eval "ac_cv_lib_$ac_lib_var=yes"
5670  else
5671 @@ -35255,7 +35259,7 @@
5672    done
5673
5674    echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
5675 -echo "configure:35259: checking for gdImageCreateFromGif in -lgd" >&5
5676 +echo "configure:35263: checking for gdImageCreateFromGif in -lgd" >&5
5677  ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
5678  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5679    echo $ac_n "(cached) $ac_c" 1>&6
5680 @@ -35263,7 +35267,7 @@
5681    ac_save_LIBS="$LIBS"
5682  LIBS="-lgd  $LIBS"
5683  cat > conftest.$ac_ext <<EOF
5684 -#line 35267 "configure"
5685 +#line 35271 "configure"
5686  #include "confdefs.h"
5687  /* Override any gcc2 internal prototype to avoid an error.  */
5688  /* We use char because int might match the return type of a gcc2
5689 @@ -35274,7 +35278,7 @@
5690  gdImageCreateFromGif()
5691  ; return 0; }
5692  EOF
5693 -if { (eval echo configure:35278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5694 +if { (eval echo configure:35282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5695    rm -rf conftest*
5696    eval "ac_cv_lib_$ac_lib_var=yes"
5697  else
5698 @@ -35386,7 +35390,7 @@
5699    done
5700
5701    echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
5702 -echo "configure:35390: checking for gdImageGif in -lgd" >&5
5703 +echo "configure:35394: checking for gdImageGif in -lgd" >&5
5704  ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'`
5705  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5706    echo $ac_n "(cached) $ac_c" 1>&6
5707 @@ -35394,7 +35398,7 @@
5708    ac_save_LIBS="$LIBS"
5709  LIBS="-lgd  $LIBS"
5710  cat > conftest.$ac_ext <<EOF
5711 -#line 35398 "configure"
5712 +#line 35402 "configure"
5713  #include "confdefs.h"
5714  /* Override any gcc2 internal prototype to avoid an error.  */
5715  /* We use char because int might match the return type of a gcc2
5716 @@ -35405,7 +35409,7 @@
5717  gdImageGif()
5718  ; return 0; }
5719  EOF
5720 -if { (eval echo configure:35409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5721 +if { (eval echo configure:35413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5722    rm -rf conftest*
5723    eval "ac_cv_lib_$ac_lib_var=yes"
5724  else
5725 @@ -35517,7 +35521,7 @@
5726    done
5727
5728    echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6
5729 -echo "configure:35521: checking for gdImageWBMP in -lgd" >&5
5730 +echo "configure:35525: checking for gdImageWBMP in -lgd" >&5
5731  ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'`
5732  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5733    echo $ac_n "(cached) $ac_c" 1>&6
5734 @@ -35525,7 +35529,7 @@
5735    ac_save_LIBS="$LIBS"
5736  LIBS="-lgd  $LIBS"
5737  cat > conftest.$ac_ext <<EOF
5738 -#line 35529 "configure"
5739 +#line 35533 "configure"
5740  #include "confdefs.h"
5741  /* Override any gcc2 internal prototype to avoid an error.  */
5742  /* We use char because int might match the return type of a gcc2
5743 @@ -35536,7 +35540,7 @@
5744  gdImageWBMP()
5745  ; return 0; }
5746  EOF
5747 -if { (eval echo configure:35540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5748 +if { (eval echo configure:35544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5749    rm -rf conftest*
5750    eval "ac_cv_lib_$ac_lib_var=yes"
5751  else
5752 @@ -35648,7 +35652,7 @@
5753    done
5754
5755    echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
5756 -echo "configure:35652: checking for gdImageCreateFromJpeg in -lgd" >&5
5757 +echo "configure:35656: checking for gdImageCreateFromJpeg in -lgd" >&5
5758  ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
5759  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5760    echo $ac_n "(cached) $ac_c" 1>&6
5761 @@ -35656,7 +35660,7 @@
5762    ac_save_LIBS="$LIBS"
5763  LIBS="-lgd  $LIBS"
5764  cat > conftest.$ac_ext <<EOF
5765 -#line 35660 "configure"
5766 +#line 35664 "configure"
5767  #include "confdefs.h"
5768  /* Override any gcc2 internal prototype to avoid an error.  */
5769  /* We use char because int might match the return type of a gcc2
5770 @@ -35667,7 +35671,7 @@
5771  gdImageCreateFromJpeg()
5772  ; return 0; }
5773  EOF
5774 -if { (eval echo configure:35671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5775 +if { (eval echo configure:35675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5776    rm -rf conftest*
5777    eval "ac_cv_lib_$ac_lib_var=yes"
5778  else
5779 @@ -35779,7 +35783,7 @@
5780    done
5781
5782    echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6
5783 -echo "configure:35783: checking for gdImageCreateFromXpm in -lgd" >&5
5784 +echo "configure:35787: checking for gdImageCreateFromXpm in -lgd" >&5
5785  ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'`
5786  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5787    echo $ac_n "(cached) $ac_c" 1>&6
5788 @@ -35787,7 +35791,7 @@
5789    ac_save_LIBS="$LIBS"
5790  LIBS="-lgd  $LIBS"
5791  cat > conftest.$ac_ext <<EOF
5792 -#line 35791 "configure"
5793 +#line 35795 "configure"
5794  #include "confdefs.h"
5795  /* Override any gcc2 internal prototype to avoid an error.  */
5796  /* We use char because int might match the return type of a gcc2
5797 @@ -35798,7 +35802,7 @@
5798  gdImageCreateFromXpm()
5799  ; return 0; }
5800  EOF
5801 -if { (eval echo configure:35802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5802 +if { (eval echo configure:35806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5803    rm -rf conftest*
5804    eval "ac_cv_lib_$ac_lib_var=yes"
5805  else
5806 @@ -35910,7 +35914,7 @@
5807    done
5808
5809    echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6
5810 -echo "configure:35914: checking for gdImageCreateFromGd2 in -lgd" >&5
5811 +echo "configure:35918: checking for gdImageCreateFromGd2 in -lgd" >&5
5812  ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'`
5813  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5814    echo $ac_n "(cached) $ac_c" 1>&6
5815 @@ -35918,7 +35922,7 @@
5816    ac_save_LIBS="$LIBS"
5817  LIBS="-lgd  $LIBS"
5818  cat > conftest.$ac_ext <<EOF
5819 -#line 35922 "configure"
5820 +#line 35926 "configure"
5821  #include "confdefs.h"
5822  /* Override any gcc2 internal prototype to avoid an error.  */
5823  /* We use char because int might match the return type of a gcc2
5824 @@ -35929,7 +35933,7 @@
5825  gdImageCreateFromGd2()
5826  ; return 0; }
5827  EOF
5828 -if { (eval echo configure:35933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5829 +if { (eval echo configure:35937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5830    rm -rf conftest*
5831    eval "ac_cv_lib_$ac_lib_var=yes"
5832  else
5833 @@ -36041,7 +36045,7 @@
5834    done
5835
5836    echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6
5837 -echo "configure:36045: checking for gdImageCreateTrueColor in -lgd" >&5
5838 +echo "configure:36049: checking for gdImageCreateTrueColor in -lgd" >&5
5839  ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'`
5840  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5841    echo $ac_n "(cached) $ac_c" 1>&6
5842 @@ -36049,7 +36053,7 @@
5843    ac_save_LIBS="$LIBS"
5844  LIBS="-lgd  $LIBS"
5845  cat > conftest.$ac_ext <<EOF
5846 -#line 36053 "configure"
5847 +#line 36057 "configure"
5848  #include "confdefs.h"
5849  /* Override any gcc2 internal prototype to avoid an error.  */
5850  /* We use char because int might match the return type of a gcc2
5851 @@ -36060,7 +36064,7 @@
5852  gdImageCreateTrueColor()
5853  ; return 0; }
5854  EOF
5855 -if { (eval echo configure:36064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5856 +if { (eval echo configure:36068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5857    rm -rf conftest*
5858    eval "ac_cv_lib_$ac_lib_var=yes"
5859  else
5860 @@ -36172,7 +36176,7 @@
5861    done
5862
5863    echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6
5864 -echo "configure:36176: checking for gdImageSetTile in -lgd" >&5
5865 +echo "configure:36180: checking for gdImageSetTile in -lgd" >&5
5866  ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'`
5867  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5868    echo $ac_n "(cached) $ac_c" 1>&6
5869 @@ -36180,7 +36184,7 @@
5870    ac_save_LIBS="$LIBS"
5871  LIBS="-lgd  $LIBS"
5872  cat > conftest.$ac_ext <<EOF
5873 -#line 36184 "configure"
5874 +#line 36188 "configure"
5875  #include "confdefs.h"
5876  /* Override any gcc2 internal prototype to avoid an error.  */
5877  /* We use char because int might match the return type of a gcc2
5878 @@ -36191,7 +36195,7 @@
5879  gdImageSetTile()
5880  ; return 0; }
5881  EOF
5882 -if { (eval echo configure:36195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5883 +if { (eval echo configure:36199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5884    rm -rf conftest*
5885    eval "ac_cv_lib_$ac_lib_var=yes"
5886  else
5887 @@ -36303,7 +36307,7 @@
5888    done
5889
5890    echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6
5891 -echo "configure:36307: checking for gdImageEllipse in -lgd" >&5
5892 +echo "configure:36311: checking for gdImageEllipse in -lgd" >&5
5893  ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'`
5894  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5895    echo $ac_n "(cached) $ac_c" 1>&6
5896 @@ -36311,7 +36315,7 @@
5897    ac_save_LIBS="$LIBS"
5898  LIBS="-lgd  $LIBS"
5899  cat > conftest.$ac_ext <<EOF
5900 -#line 36315 "configure"
5901 +#line 36319 "configure"
5902  #include "confdefs.h"
5903  /* Override any gcc2 internal prototype to avoid an error.  */
5904  /* We use char because int might match the return type of a gcc2
5905 @@ -36322,7 +36326,7 @@
5906  gdImageEllipse()
5907  ; return 0; }
5908  EOF
5909 -if { (eval echo configure:36326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5910 +if { (eval echo configure:36330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5911    rm -rf conftest*
5912    eval "ac_cv_lib_$ac_lib_var=yes"
5913  else
5914 @@ -36434,7 +36438,7 @@
5915    done
5916
5917    echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6
5918 -echo "configure:36438: checking for gdImageSetBrush in -lgd" >&5
5919 +echo "configure:36442: checking for gdImageSetBrush in -lgd" >&5
5920  ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'`
5921  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5922    echo $ac_n "(cached) $ac_c" 1>&6
5923 @@ -36442,7 +36446,7 @@
5924    ac_save_LIBS="$LIBS"
5925  LIBS="-lgd  $LIBS"
5926  cat > conftest.$ac_ext <<EOF
5927 -#line 36446 "configure"
5928 +#line 36450 "configure"
5929  #include "confdefs.h"
5930  /* Override any gcc2 internal prototype to avoid an error.  */
5931  /* We use char because int might match the return type of a gcc2
5932 @@ -36453,7 +36457,7 @@
5933  gdImageSetBrush()
5934  ; return 0; }
5935  EOF
5936 -if { (eval echo configure:36457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5937 +if { (eval echo configure:36461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5938    rm -rf conftest*
5939    eval "ac_cv_lib_$ac_lib_var=yes"
5940  else
5941 @@ -36565,7 +36569,7 @@
5942    done
5943
5944    echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6
5945 -echo "configure:36569: checking for gdImageStringTTF in -lgd" >&5
5946 +echo "configure:36573: checking for gdImageStringTTF in -lgd" >&5
5947  ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'`
5948  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5949    echo $ac_n "(cached) $ac_c" 1>&6
5950 @@ -36573,7 +36577,7 @@
5951    ac_save_LIBS="$LIBS"
5952  LIBS="-lgd  $LIBS"
5953  cat > conftest.$ac_ext <<EOF
5954 -#line 36577 "configure"
5955 +#line 36581 "configure"
5956  #include "confdefs.h"
5957  /* Override any gcc2 internal prototype to avoid an error.  */
5958  /* We use char because int might match the return type of a gcc2
5959 @@ -36584,7 +36588,7 @@
5960  gdImageStringTTF()
5961  ; return 0; }
5962  EOF
5963 -if { (eval echo configure:36588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5964 +if { (eval echo configure:36592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5965    rm -rf conftest*
5966    eval "ac_cv_lib_$ac_lib_var=yes"
5967  else
5968 @@ -36696,7 +36700,7 @@
5969    done
5970
5971    echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6
5972 -echo "configure:36700: checking for gdImageStringFT in -lgd" >&5
5973 +echo "configure:36704: checking for gdImageStringFT in -lgd" >&5
5974  ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'`
5975  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5976    echo $ac_n "(cached) $ac_c" 1>&6
5977 @@ -36704,7 +36708,7 @@
5978    ac_save_LIBS="$LIBS"
5979  LIBS="-lgd  $LIBS"
5980  cat > conftest.$ac_ext <<EOF
5981 -#line 36708 "configure"
5982 +#line 36712 "configure"
5983  #include "confdefs.h"
5984  /* Override any gcc2 internal prototype to avoid an error.  */
5985  /* We use char because int might match the return type of a gcc2
5986 @@ -36715,7 +36719,7 @@
5987  gdImageStringFT()
5988  ; return 0; }
5989  EOF
5990 -if { (eval echo configure:36719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5991 +if { (eval echo configure:36723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5992    rm -rf conftest*
5993    eval "ac_cv_lib_$ac_lib_var=yes"
5994  else
5995 @@ -36827,7 +36831,7 @@
5996    done
5997
5998    echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6
5999 -echo "configure:36831: checking for gdImageStringFTEx in -lgd" >&5
6000 +echo "configure:36835: checking for gdImageStringFTEx in -lgd" >&5
6001  ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'`
6002  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6003    echo $ac_n "(cached) $ac_c" 1>&6
6004 @@ -36835,7 +36839,7 @@
6005    ac_save_LIBS="$LIBS"
6006  LIBS="-lgd  $LIBS"
6007  cat > conftest.$ac_ext <<EOF
6008 -#line 36839 "configure"
6009 +#line 36843 "configure"
6010  #include "confdefs.h"
6011  /* Override any gcc2 internal prototype to avoid an error.  */
6012  /* We use char because int might match the return type of a gcc2
6013 @@ -36846,7 +36850,7 @@
6014  gdImageStringFTEx()
6015  ; return 0; }
6016  EOF
6017 -if { (eval echo configure:36850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6018 +if { (eval echo configure:36854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6019    rm -rf conftest*
6020    eval "ac_cv_lib_$ac_lib_var=yes"
6021  else
6022 @@ -36958,7 +36962,7 @@
6023    done
6024
6025    echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6
6026 -echo "configure:36962: checking for gdImageColorClosestHWB in -lgd" >&5
6027 +echo "configure:36966: checking for gdImageColorClosestHWB in -lgd" >&5
6028  ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'`
6029  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6030    echo $ac_n "(cached) $ac_c" 1>&6
6031 @@ -36966,7 +36970,7 @@
6032    ac_save_LIBS="$LIBS"
6033  LIBS="-lgd  $LIBS"
6034  cat > conftest.$ac_ext <<EOF
6035 -#line 36970 "configure"
6036 +#line 36974 "configure"
6037  #include "confdefs.h"
6038  /* Override any gcc2 internal prototype to avoid an error.  */
6039  /* We use char because int might match the return type of a gcc2
6040 @@ -36977,7 +36981,7 @@
6041  gdImageColorClosestHWB()
6042  ; return 0; }
6043  EOF
6044 -if { (eval echo configure:36981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6045 +if { (eval echo configure:36985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6046    rm -rf conftest*
6047    eval "ac_cv_lib_$ac_lib_var=yes"
6048  else
6049 @@ -37089,7 +37093,7 @@
6050    done
6051
6052    echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
6053 -echo "configure:37093: checking for gdImageColorResolve in -lgd" >&5
6054 +echo "configure:37097: checking for gdImageColorResolve in -lgd" >&5
6055  ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
6056  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6057    echo $ac_n "(cached) $ac_c" 1>&6
6058 @@ -37097,7 +37101,7 @@
6059    ac_save_LIBS="$LIBS"
6060  LIBS="-lgd  $LIBS"
6061  cat > conftest.$ac_ext <<EOF
6062 -#line 37101 "configure"
6063 +#line 37105 "configure"
6064  #include "confdefs.h"
6065  /* Override any gcc2 internal prototype to avoid an error.  */
6066  /* We use char because int might match the return type of a gcc2
6067 @@ -37108,7 +37112,7 @@
6068  gdImageColorResolve()
6069  ; return 0; }
6070  EOF
6071 -if { (eval echo configure:37112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6072 +if { (eval echo configure:37116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6073    rm -rf conftest*
6074    eval "ac_cv_lib_$ac_lib_var=yes"
6075  else
6076 @@ -37220,7 +37224,7 @@
6077    done
6078
6079    echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6
6080 -echo "configure:37224: checking for gdImageGifCtx in -lgd" >&5
6081 +echo "configure:37228: checking for gdImageGifCtx in -lgd" >&5
6082  ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'`
6083  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6084    echo $ac_n "(cached) $ac_c" 1>&6
6085 @@ -37228,7 +37232,7 @@
6086    ac_save_LIBS="$LIBS"
6087  LIBS="-lgd  $LIBS"
6088  cat > conftest.$ac_ext <<EOF
6089 -#line 37232 "configure"
6090 +#line 37236 "configure"
6091  #include "confdefs.h"
6092  /* Override any gcc2 internal prototype to avoid an error.  */
6093  /* We use char because int might match the return type of a gcc2
6094 @@ -37239,7 +37243,7 @@
6095  gdImageGifCtx()
6096  ; return 0; }
6097  EOF
6098 -if { (eval echo configure:37243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6099 +if { (eval echo configure:37247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6100    rm -rf conftest*
6101    eval "ac_cv_lib_$ac_lib_var=yes"
6102  else
6103 @@ -37351,7 +37355,7 @@
6104    done
6105
6106    echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
6107 -echo "configure:37355: checking for gdCacheCreate in -lgd" >&5
6108 +echo "configure:37359: checking for gdCacheCreate in -lgd" >&5
6109  ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
6110  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6111    echo $ac_n "(cached) $ac_c" 1>&6
6112 @@ -37359,7 +37363,7 @@
6113    ac_save_LIBS="$LIBS"
6114  LIBS="-lgd  $LIBS"
6115  cat > conftest.$ac_ext <<EOF
6116 -#line 37363 "configure"
6117 +#line 37367 "configure"
6118  #include "confdefs.h"
6119  /* Override any gcc2 internal prototype to avoid an error.  */
6120  /* We use char because int might match the return type of a gcc2
6121 @@ -37370,7 +37374,7 @@
6122  gdCacheCreate()
6123  ; return 0; }
6124  EOF
6125 -if { (eval echo configure:37374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6126 +if { (eval echo configure:37378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6127    rm -rf conftest*
6128    eval "ac_cv_lib_$ac_lib_var=yes"
6129  else
6130 @@ -37482,7 +37486,7 @@
6131    done
6132
6133    echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6
6134 -echo "configure:37486: checking for gdFontCacheShutdown in -lgd" >&5
6135 +echo "configure:37490: checking for gdFontCacheShutdown in -lgd" >&5
6136  ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'`
6137  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6138    echo $ac_n "(cached) $ac_c" 1>&6
6139 @@ -37490,7 +37494,7 @@
6140    ac_save_LIBS="$LIBS"
6141  LIBS="-lgd  $LIBS"
6142  cat > conftest.$ac_ext <<EOF
6143 -#line 37494 "configure"
6144 +#line 37498 "configure"
6145  #include "confdefs.h"
6146  /* Override any gcc2 internal prototype to avoid an error.  */
6147  /* We use char because int might match the return type of a gcc2
6148 @@ -37501,7 +37505,7 @@
6149  gdFontCacheShutdown()
6150  ; return 0; }
6151  EOF
6152 -if { (eval echo configure:37505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6153 +if { (eval echo configure:37509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6154    rm -rf conftest*
6155    eval "ac_cv_lib_$ac_lib_var=yes"
6156  else
6157 @@ -37613,7 +37617,7 @@
6158    done
6159
6160    echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6
6161 -echo "configure:37617: checking for gdFreeFontCache in -lgd" >&5
6162 +echo "configure:37621: checking for gdFreeFontCache in -lgd" >&5
6163  ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'`
6164  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6165    echo $ac_n "(cached) $ac_c" 1>&6
6166 @@ -37621,7 +37625,7 @@
6167    ac_save_LIBS="$LIBS"
6168  LIBS="-lgd  $LIBS"
6169  cat > conftest.$ac_ext <<EOF
6170 -#line 37625 "configure"
6171 +#line 37629 "configure"
6172  #include "confdefs.h"
6173  /* Override any gcc2 internal prototype to avoid an error.  */
6174  /* We use char because int might match the return type of a gcc2
6175 @@ -37632,7 +37636,7 @@
6176  gdFreeFontCache()
6177  ; return 0; }
6178  EOF
6179 -if { (eval echo configure:37636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6180 +if { (eval echo configure:37640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6181    rm -rf conftest*
6182    eval "ac_cv_lib_$ac_lib_var=yes"
6183  else
6184 @@ -37744,7 +37748,7 @@
6185    done
6186
6187    echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6
6188 -echo "configure:37748: checking for gdNewDynamicCtxEx in -lgd" >&5
6189 +echo "configure:37752: checking for gdNewDynamicCtxEx in -lgd" >&5
6190  ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'`
6191  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6192    echo $ac_n "(cached) $ac_c" 1>&6
6193 @@ -37752,7 +37756,7 @@
6194    ac_save_LIBS="$LIBS"
6195  LIBS="-lgd  $LIBS"
6196  cat > conftest.$ac_ext <<EOF
6197 -#line 37756 "configure"
6198 +#line 37760 "configure"
6199  #include "confdefs.h"
6200  /* Override any gcc2 internal prototype to avoid an error.  */
6201  /* We use char because int might match the return type of a gcc2
6202 @@ -37763,7 +37767,7 @@
6203  gdNewDynamicCtxEx()
6204  ; return 0; }
6205  EOF
6206 -if { (eval echo configure:37767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6207 +if { (eval echo configure:37771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6208    rm -rf conftest*
6209    eval "ac_cv_lib_$ac_lib_var=yes"
6210  else
6211 @@ -37818,7 +37822,7 @@
6212          old_CPPFLAGS=$CPPFLAGS
6213    CPPFLAGS=-I$GD_INCLUDE
6214    cat > conftest.$ac_ext <<EOF
6215 -#line 37822 "configure"
6216 +#line 37826 "configure"
6217  #include "confdefs.h"
6218
6219  #include <gd.h>
6220 @@ -37832,7 +37836,7 @@
6221
6222  ; return 0; }
6223  EOF
6224 -if { (eval echo configure:37836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6225 +if { (eval echo configure:37840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6226    rm -rf conftest*
6227
6228      cat >> confdefs.h <<\EOF
6229 @@ -38191,7 +38195,7 @@
6230    done
6231
6232    echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
6233 -echo "configure:38195: checking for gdImageCreate in -lgd" >&5
6234 +echo "configure:38199: checking for gdImageCreate in -lgd" >&5
6235  ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
6236  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6237    echo $ac_n "(cached) $ac_c" 1>&6
6238 @@ -38199,7 +38203,7 @@
6239    ac_save_LIBS="$LIBS"
6240  LIBS="-lgd  $LIBS"
6241  cat > conftest.$ac_ext <<EOF
6242 -#line 38203 "configure"
6243 +#line 38207 "configure"
6244  #include "confdefs.h"
6245  /* Override any gcc2 internal prototype to avoid an error.  */
6246  /* We use char because int might match the return type of a gcc2
6247 @@ -38210,7 +38214,7 @@
6248  gdImageCreate()
6249  ; return 0; }
6250  EOF
6251 -if { (eval echo configure:38214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6252 +if { (eval echo configure:38218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6253    rm -rf conftest*
6254    eval "ac_cv_lib_$ac_lib_var=yes"
6255  else
6256 @@ -38256,7 +38260,7 @@
6257
6258
6259  echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6
6260 -echo "configure:38260: checking for GNU gettext support" >&5
6261 +echo "configure:38264: checking for GNU gettext support" >&5
6262  # Check whether --with-gettext or --without-gettext was given.
6263  if test "${with_gettext+set}" = set; then
6264    withval="$with_gettext"
6265 @@ -38314,7 +38318,7 @@
6266    O_LDFLAGS=$LDFLAGS
6267    LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
6268    echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
6269 -echo "configure:38318: checking for bindtextdomain in -lintl" >&5
6270 +echo "configure:38322: checking for bindtextdomain in -lintl" >&5
6271  ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
6272  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6273    echo $ac_n "(cached) $ac_c" 1>&6
6274 @@ -38322,7 +38326,7 @@
6275    ac_save_LIBS="$LIBS"
6276  LIBS="-lintl  $LIBS"
6277  cat > conftest.$ac_ext <<EOF
6278 -#line 38326 "configure"
6279 +#line 38330 "configure"
6280  #include "confdefs.h"
6281  /* Override any gcc2 internal prototype to avoid an error.  */
6282  /* We use char because int might match the return type of a gcc2
6283 @@ -38333,7 +38337,7 @@
6284  bindtextdomain()
6285  ; return 0; }
6286  EOF
6287 -if { (eval echo configure:38337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6288 +if { (eval echo configure:38341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6289    rm -rf conftest*
6290    eval "ac_cv_lib_$ac_lib_var=yes"
6291  else
6292 @@ -38355,7 +38359,7 @@
6293  else
6294    echo "$ac_t""no" 1>&6
6295  echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
6296 -echo "configure:38359: checking for bindtextdomain in -lc" >&5
6297 +echo "configure:38363: checking for bindtextdomain in -lc" >&5
6298  ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'`
6299  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6300    echo $ac_n "(cached) $ac_c" 1>&6
6301 @@ -38363,7 +38367,7 @@
6302    ac_save_LIBS="$LIBS"
6303  LIBS="-lc  $LIBS"
6304  cat > conftest.$ac_ext <<EOF
6305 -#line 38367 "configure"
6306 +#line 38371 "configure"
6307  #include "confdefs.h"
6308  /* Override any gcc2 internal prototype to avoid an error.  */
6309  /* We use char because int might match the return type of a gcc2
6310 @@ -38374,7 +38378,7 @@
6311  bindtextdomain()
6312  ; return 0; }
6313  EOF
6314 -if { (eval echo configure:38378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6315 +if { (eval echo configure:38382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6316    rm -rf conftest*
6317    eval "ac_cv_lib_$ac_lib_var=yes"
6318  else
6319 @@ -38766,7 +38770,7 @@
6320
6321
6322    echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
6323 -echo "configure:38770: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
6324 +echo "configure:38774: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
6325  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'`
6326  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6327    echo $ac_n "(cached) $ac_c" 1>&6
6328 @@ -38774,7 +38778,7 @@
6329    ac_save_LIBS="$LIBS"
6330  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
6331  cat > conftest.$ac_ext <<EOF
6332 -#line 38778 "configure"
6333 +#line 38782 "configure"
6334  #include "confdefs.h"
6335  /* Override any gcc2 internal prototype to avoid an error.  */
6336  /* We use char because int might match the return type of a gcc2
6337 @@ -38785,7 +38789,7 @@
6338  ngettext()
6339  ; return 0; }
6340  EOF
6341 -if { (eval echo configure:38789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6342 +if { (eval echo configure:38793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6343    rm -rf conftest*
6344    eval "ac_cv_lib_$ac_lib_var=yes"
6345  else
6346 @@ -38809,7 +38813,7 @@
6347  fi
6348
6349    echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
6350 -echo "configure:38813: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
6351 +echo "configure:38817: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
6352  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'`
6353  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6354    echo $ac_n "(cached) $ac_c" 1>&6
6355 @@ -38817,7 +38821,7 @@
6356    ac_save_LIBS="$LIBS"
6357  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
6358  cat > conftest.$ac_ext <<EOF
6359 -#line 38821 "configure"
6360 +#line 38825 "configure"
6361  #include "confdefs.h"
6362  /* Override any gcc2 internal prototype to avoid an error.  */
6363  /* We use char because int might match the return type of a gcc2
6364 @@ -38828,7 +38832,7 @@
6365  dngettext()
6366  ; return 0; }
6367  EOF
6368 -if { (eval echo configure:38832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6369 +if { (eval echo configure:38836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6370    rm -rf conftest*
6371    eval "ac_cv_lib_$ac_lib_var=yes"
6372  else
6373 @@ -38852,7 +38856,7 @@
6374  fi
6375
6376    echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
6377 -echo "configure:38856: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
6378 +echo "configure:38860: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
6379  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'`
6380  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6381    echo $ac_n "(cached) $ac_c" 1>&6
6382 @@ -38860,7 +38864,7 @@
6383    ac_save_LIBS="$LIBS"
6384  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
6385  cat > conftest.$ac_ext <<EOF
6386 -#line 38864 "configure"
6387 +#line 38868 "configure"
6388  #include "confdefs.h"
6389  /* Override any gcc2 internal prototype to avoid an error.  */
6390  /* We use char because int might match the return type of a gcc2
6391 @@ -38871,7 +38875,7 @@
6392  dcngettext()
6393  ; return 0; }
6394  EOF
6395 -if { (eval echo configure:38875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6396 +if { (eval echo configure:38879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6397    rm -rf conftest*
6398    eval "ac_cv_lib_$ac_lib_var=yes"
6399  else
6400 @@ -38895,7 +38899,7 @@
6401  fi
6402
6403    echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
6404 -echo "configure:38899: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
6405 +echo "configure:38903: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
6406  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'`
6407  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6408    echo $ac_n "(cached) $ac_c" 1>&6
6409 @@ -38903,7 +38907,7 @@
6410    ac_save_LIBS="$LIBS"
6411  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
6412  cat > conftest.$ac_ext <<EOF
6413 -#line 38907 "configure"
6414 +#line 38911 "configure"
6415  #include "confdefs.h"
6416  /* Override any gcc2 internal prototype to avoid an error.  */
6417  /* We use char because int might match the return type of a gcc2
6418 @@ -38914,7 +38918,7 @@
6419  bind_textdomain_codeset()
6420  ; return 0; }
6421  EOF
6422 -if { (eval echo configure:38918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6423 +if { (eval echo configure:38922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6424    rm -rf conftest*
6425    eval "ac_cv_lib_$ac_lib_var=yes"
6426  else
6427 @@ -38944,7 +38948,7 @@
6428
6429
6430  echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6
6431 -echo "configure:38948: checking for GNU MP support" >&5
6432 +echo "configure:38952: checking for GNU MP support" >&5
6433  # Check whether --with-gmp or --without-gmp was given.
6434  if test "${with_gmp+set}" = set; then
6435    withval="$with_gmp"
6436 @@ -39078,7 +39082,7 @@
6437    done
6438
6439    echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
6440 -echo "configure:39082: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
6441 +echo "configure:39086: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
6442  ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
6443  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6444    echo $ac_n "(cached) $ac_c" 1>&6
6445 @@ -39086,7 +39090,7 @@
6446    ac_save_LIBS="$LIBS"
6447  LIBS="-lgmp  $LIBS"
6448  cat > conftest.$ac_ext <<EOF
6449 -#line 39090 "configure"
6450 +#line 39094 "configure"
6451  #include "confdefs.h"
6452  /* Override any gcc2 internal prototype to avoid an error.  */
6453  /* We use char because int might match the return type of a gcc2
6454 @@ -39097,7 +39101,7 @@
6455  __gmp_randinit_lc_2exp_size()
6456  ; return 0; }
6457  EOF
6458 -if { (eval echo configure:39101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6459 +if { (eval echo configure:39105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6460    rm -rf conftest*
6461    eval "ac_cv_lib_$ac_lib_var=yes"
6462  else
6463 @@ -39205,7 +39209,7 @@
6464    done
6465
6466    echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
6467 -echo "configure:39209: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
6468 +echo "configure:39213: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
6469  ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
6470  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6471    echo $ac_n "(cached) $ac_c" 1>&6
6472 @@ -39213,7 +39217,7 @@
6473    ac_save_LIBS="$LIBS"
6474  LIBS="-lgmp  $LIBS"
6475  cat > conftest.$ac_ext <<EOF
6476 -#line 39217 "configure"
6477 +#line 39221 "configure"
6478  #include "confdefs.h"
6479  /* Override any gcc2 internal prototype to avoid an error.  */
6480  /* We use char because int might match the return type of a gcc2
6481 @@ -39224,7 +39228,7 @@
6482  gmp_randinit_lc_2exp_size()
6483  ; return 0; }
6484  EOF
6485 -if { (eval echo configure:39228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6486 +if { (eval echo configure:39232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6487    rm -rf conftest*
6488    eval "ac_cv_lib_$ac_lib_var=yes"
6489  else
6490 @@ -39623,7 +39627,7 @@
6491
6492
6493  echo $ac_n "checking for hwapi support""... $ac_c" 1>&6
6494 -echo "configure:39627: checking for hwapi support" >&5
6495 +echo "configure:39631: checking for hwapi support" >&5
6496  # Check whether --with-hwapi or --without-hwapi was given.
6497  if test "${with_hwapi+set}" = set; then
6498    withval="$with_hwapi"
6499 @@ -39671,7 +39675,7 @@
6500      HWAPI_DIR=$PHP_HWAPI
6501    else
6502      echo $ac_n "checking for HWAPI in default path""... $ac_c" 1>&6
6503 -echo "configure:39675: checking for HWAPI in default path" >&5
6504 +echo "configure:39679: checking for HWAPI in default path" >&5
6505      for i in /usr/local /usr; do
6506        if test -r $i/include/hwapi/sdk/api/object.h; then
6507          HWAPI_DIR=$i
6508 @@ -39827,7 +39831,7 @@
6509  # Extract the first word of "$ac_prog", so it can be a program name with args.
6510  set dummy $ac_prog; ac_word=$2
6511  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
6512 -echo "configure:39831: checking for $ac_word" >&5
6513 +echo "configure:39835: checking for $ac_word" >&5
6514  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
6515    echo $ac_n "(cached) $ac_c" 1>&6
6516  else
6517 @@ -39859,7 +39863,7 @@
6518
6519
6520  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
6521 -echo "configure:39863: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
6522 +echo "configure:39867: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
6523
6524  ac_ext=C
6525  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
6526 @@ -39870,12 +39874,12 @@
6527
6528  cat > conftest.$ac_ext << EOF
6529
6530 -#line 39874 "configure"
6531 +#line 39878 "configure"
6532  #include "confdefs.h"
6533
6534  int main(){return(0);}
6535  EOF
6536 -if { (eval echo configure:39879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6537 +if { (eval echo configure:39883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6538    ac_cv_prog_cxx_works=yes
6539    # If we can't run a trivial program, we are probably using a cross compiler.
6540    if (./conftest; exit) 2>/dev/null; then
6541 @@ -39901,12 +39905,12 @@
6542    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
6543  fi
6544  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
6545 -echo "configure:39905: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
6546 +echo "configure:39909: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
6547  echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
6548  cross_compiling=$ac_cv_prog_cxx_cross
6549
6550  echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
6551 -echo "configure:39910: checking whether we are using GNU C++" >&5
6552 +echo "configure:39914: checking whether we are using GNU C++" >&5
6553  if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
6554    echo $ac_n "(cached) $ac_c" 1>&6
6555  else
6556 @@ -39915,7 +39919,7 @@
6557    yes;
6558  #endif
6559  EOF
6560 -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
6561 +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
6562    ac_cv_prog_gxx=yes
6563  else
6564    ac_cv_prog_gxx=no
6565 @@ -39934,7 +39938,7 @@
6566  ac_save_CXXFLAGS="$CXXFLAGS"
6567  CXXFLAGS=
6568  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
6569 -echo "configure:39938: checking whether ${CXX-g++} accepts -g" >&5
6570 +echo "configure:39942: checking whether ${CXX-g++} accepts -g" >&5
6571  if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
6572    echo $ac_n "(cached) $ac_c" 1>&6
6573  else
6574 @@ -39966,7 +39970,7 @@
6575  fi
6576
6577      echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
6578 -echo "configure:39970: checking how to run the C++ preprocessor" >&5
6579 +echo "configure:39974: checking how to run the C++ preprocessor" >&5
6580  if test -z "$CXXCPP"; then
6581  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
6582    echo $ac_n "(cached) $ac_c" 1>&6
6583 @@ -39979,12 +39983,12 @@
6584  cross_compiling=$ac_cv_prog_cxx_cross
6585    CXXCPP="${CXX-g++} -E"
6586    cat > conftest.$ac_ext <<EOF
6587 -#line 39983 "configure"
6588 +#line 39987 "configure"
6589  #include "confdefs.h"
6590  #include <stdlib.h>
6591  EOF
6592  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6593 -{ (eval echo configure:39988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6594 +{ (eval echo configure:39992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6595  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
6596  if test -z "$ac_err"; then
6597    :
6598 @@ -40297,7 +40301,7 @@
6599
6600
6601  echo $ac_n "checking for Hyperwave support""... $ac_c" 1>&6
6602 -echo "configure:40301: checking for Hyperwave support" >&5
6603 +echo "configure:40305: checking for Hyperwave support" >&5
6604  # Check whether --with-hyperwave or --without-hyperwave was given.
6605  if test "${with_hyperwave+set}" = set; then
6606    withval="$with_hyperwave"
6607 @@ -40552,7 +40556,7 @@
6608
6609
6610  echo $ac_n "checking for iconv support""... $ac_c" 1>&6
6611 -echo "configure:40556: checking for iconv support" >&5
6612 +echo "configure:40560: checking for iconv support" >&5
6613  # Check whether --with-iconv or --without-iconv was given.
6614  if test "${with_iconv+set}" = set; then
6615    withval="$with_iconv"
6616 @@ -40615,12 +40619,12 @@
6617
6618          if test "$PHP_ICONV" = "yes"; then
6619      echo $ac_n "checking for iconv""... $ac_c" 1>&6
6620 -echo "configure:40619: checking for iconv" >&5
6621 +echo "configure:40623: checking for iconv" >&5
6622  if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
6623    echo $ac_n "(cached) $ac_c" 1>&6
6624  else
6625    cat > conftest.$ac_ext <<EOF
6626 -#line 40624 "configure"
6627 +#line 40628 "configure"
6628  #include "confdefs.h"
6629  /* System header to define __stub macros and hopefully few prototypes,
6630      which can conflict with char iconv(); below.  */
6631 @@ -40643,7 +40647,7 @@
6632
6633  ; return 0; }
6634  EOF
6635 -if { (eval echo configure:40647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6636 +if { (eval echo configure:40651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6637    rm -rf conftest*
6638    eval "ac_cv_func_iconv=yes"
6639  else
6640 @@ -40667,12 +40671,12 @@
6641    echo "$ac_t""no" 1>&6
6642
6643        echo $ac_n "checking for libiconv""... $ac_c" 1>&6
6644 -echo "configure:40671: checking for libiconv" >&5
6645 +echo "configure:40675: checking for libiconv" >&5
6646  if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
6647    echo $ac_n "(cached) $ac_c" 1>&6
6648  else
6649    cat > conftest.$ac_ext <<EOF
6650 -#line 40676 "configure"
6651 +#line 40680 "configure"
6652  #include "confdefs.h"
6653  /* System header to define __stub macros and hopefully few prototypes,
6654      which can conflict with char libiconv(); below.  */
6655 @@ -40695,7 +40699,7 @@
6656
6657  ; return 0; }
6658  EOF
6659 -if { (eval echo configure:40699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6660 +if { (eval echo configure:40703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6661    rm -rf conftest*
6662    eval "ac_cv_func_libiconv=yes"
6663  else
6664 @@ -40830,7 +40834,7 @@
6665    done
6666
6667    echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
6668 -echo "configure:40834: checking for libiconv in -l$iconv_lib_name" >&5
6669 +echo "configure:40838: checking for libiconv in -l$iconv_lib_name" >&5
6670  ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
6671  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6672    echo $ac_n "(cached) $ac_c" 1>&6
6673 @@ -40838,7 +40842,7 @@
6674    ac_save_LIBS="$LIBS"
6675  LIBS="-l$iconv_lib_name  $LIBS"
6676  cat > conftest.$ac_ext <<EOF
6677 -#line 40842 "configure"
6678 +#line 40846 "configure"
6679  #include "confdefs.h"
6680  /* Override any gcc2 internal prototype to avoid an error.  */
6681  /* We use char because int might match the return type of a gcc2
6682 @@ -40849,7 +40853,7 @@
6683  libiconv()
6684  ; return 0; }
6685  EOF
6686 -if { (eval echo configure:40853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6687 +if { (eval echo configure:40857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6688    rm -rf conftest*
6689    eval "ac_cv_lib_$ac_lib_var=yes"
6690  else
6691 @@ -40962,7 +40966,7 @@
6692    done
6693
6694    echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
6695 -echo "configure:40966: checking for iconv in -l$iconv_lib_name" >&5
6696 +echo "configure:40970: checking for iconv in -l$iconv_lib_name" >&5
6697  ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
6698  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6699    echo $ac_n "(cached) $ac_c" 1>&6
6700 @@ -40970,7 +40974,7 @@
6701    ac_save_LIBS="$LIBS"
6702  LIBS="-l$iconv_lib_name  $LIBS"
6703  cat > conftest.$ac_ext <<EOF
6704 -#line 40974 "configure"
6705 +#line 40978 "configure"
6706  #include "confdefs.h"
6707  /* Override any gcc2 internal prototype to avoid an error.  */
6708  /* We use char because int might match the return type of a gcc2
6709 @@ -40981,7 +40985,7 @@
6710  iconv()
6711  ; return 0; }
6712  EOF
6713 -if { (eval echo configure:40985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6714 +if { (eval echo configure:40989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6715    rm -rf conftest*
6716    eval "ac_cv_lib_$ac_lib_var=yes"
6717  else
6718 @@ -41187,16 +41191,16 @@
6719
6720      if test -z "$iconv_lib_name"; then
6721        echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6
6722 -echo "configure:41191: checking if iconv is glibc's" >&5
6723 +echo "configure:41195: checking if iconv is glibc's" >&5
6724        cat > conftest.$ac_ext <<EOF
6725 -#line 41193 "configure"
6726 +#line 41197 "configure"
6727  #include "confdefs.h"
6728  #include <gnu/libc-version.h>
6729  int main() {
6730  gnu_get_libc_version();
6731  ; return 0; }
6732  EOF
6733 -if { (eval echo configure:41200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6734 +if { (eval echo configure:41204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6735    rm -rf conftest*
6736
6737          echo "$ac_t""yes" 1>&6
6738 @@ -41215,16 +41219,16 @@
6739        case "$iconv_lib_name" in
6740          iconv )
6741            echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6
6742 -echo "configure:41219: checking if iconv is Konstantin Chuguev's" >&5
6743 +echo "configure:41223: checking if iconv is Konstantin Chuguev's" >&5
6744            cat > conftest.$ac_ext <<EOF
6745 -#line 41221 "configure"
6746 +#line 41225 "configure"
6747  #include "confdefs.h"
6748  #include <iconv.h>
6749  int main() {
6750  iconv_ccs_init(NULL, NULL);
6751  ; return 0; }
6752  EOF
6753 -if { (eval echo configure:41228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6754 +if { (eval echo configure:41232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6755    rm -rf conftest*
6756
6757              echo "$ac_t""yes" 1>&6
6758 @@ -41302,12 +41306,12 @@
6759      esac
6760
6761      echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
6762 -echo "configure:41306: checking if iconv supports errno" >&5
6763 +echo "configure:41310: checking if iconv supports errno" >&5
6764      if test "$cross_compiling" = yes; then
6765      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
6766  else
6767    cat > conftest.$ac_ext <<EOF
6768 -#line 41311 "configure"
6769 +#line 41315 "configure"
6770  #include "confdefs.h"
6771
6772  #include <$PHP_ICONV_H_PATH>
6773 @@ -41328,7 +41332,7 @@
6774  }
6775
6776  EOF
6777 -if { (eval echo configure:41332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
6778 +if { (eval echo configure:41336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
6779  then
6780
6781        echo "$ac_t""yes" 1>&6
6782 @@ -41360,9 +41364,9 @@
6783
6784
6785      echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6
6786 -echo "configure:41364: checking if your cpp allows macro usage in include lines" >&5
6787 +echo "configure:41368: checking if your cpp allows macro usage in include lines" >&5
6788      cat > conftest.$ac_ext <<EOF
6789 -#line 41366 "configure"
6790 +#line 41370 "configure"
6791  #include "confdefs.h"
6792
6793  #define FOO <$PHP_ICONV_H_PATH>
6794 @@ -41372,7 +41376,7 @@
6795
6796  ; return 0; }
6797  EOF
6798 -if { (eval echo configure:41376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6799 +if { (eval echo configure:41380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6800    rm -rf conftest*
6801
6802        echo "$ac_t""yes" 1>&6
6803 @@ -41641,7 +41645,7 @@
6804
6805
6806  echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
6807 -echo "configure:41645: checking for IMAP support" >&5
6808 +echo "configure:41649: checking for IMAP support" >&5
6809  # Check whether --with-imap or --without-imap was given.
6810  if test "${with_imap+set}" = set; then
6811    withval="$with_imap"
6812 @@ -41687,7 +41691,7 @@
6813
6814
6815  echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
6816 -echo "configure:41691: checking for IMAP Kerberos support" >&5
6817 +echo "configure:41695: checking for IMAP Kerberos support" >&5
6818  # Check whether --with-kerberos or --without-kerberos was given.
6819  if test "${with_kerberos+set}" = set; then
6820    withval="$with_kerberos"
6821 @@ -41712,7 +41716,7 @@
6822
6823
6824  echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
6825 -echo "configure:41716: checking for IMAP SSL support" >&5
6826 +echo "configure:41720: checking for IMAP SSL support" >&5
6827  # Check whether --with-imap-ssl or --without-imap-ssl was given.
6828  if test "${with_imap_ssl+set}" = set; then
6829    withval="$with_imap_ssl"
6830 @@ -42048,7 +42052,7 @@
6831      done
6832
6833          cat > conftest.$ac_ext <<EOF
6834 -#line 42052 "configure"
6835 +#line 42056 "configure"
6836  #include "confdefs.h"
6837  #include <$IMAP_INC_DIR/mail.h>
6838  EOF
6839 @@ -42068,7 +42072,7 @@
6840          old_CPPFLAGS=$CPPFLAGS
6841      CPPFLAGS=-I$IMAP_INC_DIR
6842      cat > conftest.$ac_ext <<EOF
6843 -#line 42072 "configure"
6844 +#line 42076 "configure"
6845  #include "confdefs.h"
6846
6847  #include "imap4r1.h"
6848 @@ -42170,7 +42174,7 @@
6849    done
6850
6851    echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
6852 -echo "configure:42174: checking for pam_start in -lpam" >&5
6853 +echo "configure:42178: checking for pam_start in -lpam" >&5
6854  ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
6855  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6856    echo $ac_n "(cached) $ac_c" 1>&6
6857 @@ -42178,7 +42182,7 @@
6858    ac_save_LIBS="$LIBS"
6859  LIBS="-lpam  $LIBS"
6860  cat > conftest.$ac_ext <<EOF
6861 -#line 42182 "configure"
6862 +#line 42186 "configure"
6863  #include "confdefs.h"
6864  /* Override any gcc2 internal prototype to avoid an error.  */
6865  /* We use char because int might match the return type of a gcc2
6866 @@ -42189,7 +42193,7 @@
6867  pam_start()
6868  ; return 0; }
6869  EOF
6870 -if { (eval echo configure:42193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6871 +if { (eval echo configure:42197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6872    rm -rf conftest*
6873    eval "ac_cv_lib_$ac_lib_var=yes"
6874  else
6875 @@ -42327,7 +42331,7 @@
6876    done
6877
6878    echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
6879 -echo "configure:42331: checking for crypt in -lcrypt" >&5
6880 +echo "configure:42335: checking for crypt in -lcrypt" >&5
6881  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
6882  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6883    echo $ac_n "(cached) $ac_c" 1>&6
6884 @@ -42335,7 +42339,7 @@
6885    ac_save_LIBS="$LIBS"
6886  LIBS="-lcrypt  $LIBS"
6887  cat > conftest.$ac_ext <<EOF
6888 -#line 42339 "configure"
6889 +#line 42343 "configure"
6890  #include "confdefs.h"
6891  /* Override any gcc2 internal prototype to avoid an error.  */
6892  /* We use char because int might match the return type of a gcc2
6893 @@ -42346,7 +42350,7 @@
6894  crypt()
6895  ; return 0; }
6896  EOF
6897 -if { (eval echo configure:42350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6898 +if { (eval echo configure:42354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6899    rm -rf conftest*
6900    eval "ac_cv_lib_$ac_lib_var=yes"
6901  else
6902 @@ -42549,7 +42553,7 @@
6903      # Extract the first word of "krb5-config", so it can be a program name with args.
6904  set dummy krb5-config; ac_word=$2
6905  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
6906 -echo "configure:42553: checking for $ac_word" >&5
6907 +echo "configure:42557: checking for $ac_word" >&5
6908  if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
6909    echo $ac_n "(cached) $ac_c" 1>&6
6910  else
6911 @@ -42900,7 +42904,7 @@
6912
6913    else
6914      cat > conftest.$ac_ext <<EOF
6915 -#line 42904 "configure"
6916 +#line 42908 "configure"
6917  #include "confdefs.h"
6918  #include <$IMAP_INC_DIR/linkage.h>
6919  EOF
6920 @@ -42935,7 +42939,7 @@
6921      # Extract the first word of "pkg-config", so it can be a program name with args.
6922  set dummy pkg-config; ac_word=$2
6923  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
6924 -echo "configure:42939: checking for $ac_word" >&5
6925 +echo "configure:42943: checking for $ac_word" >&5
6926  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
6927    echo $ac_n "(cached) $ac_c" 1>&6
6928  else
6929 @@ -43123,9 +43127,9 @@
6930      old_CPPFLAGS=$CPPFLAGS
6931      CPPFLAGS=-I$OPENSSL_INCDIR
6932      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
6933 -echo "configure:43127: checking for OpenSSL version" >&5
6934 +echo "configure:43131: checking for OpenSSL version" >&5
6935      cat > conftest.$ac_ext <<EOF
6936 -#line 43129 "configure"
6937 +#line 43133 "configure"
6938  #include "confdefs.h"
6939
6940  #include <openssl/opensslv.h>
6941 @@ -43263,7 +43267,7 @@
6942    done
6943
6944    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
6945 -echo "configure:43267: checking for CRYPTO_free in -lcrypto" >&5
6946 +echo "configure:43271: checking for CRYPTO_free in -lcrypto" >&5
6947  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
6948  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6949    echo $ac_n "(cached) $ac_c" 1>&6
6950 @@ -43271,7 +43275,7 @@
6951    ac_save_LIBS="$LIBS"
6952  LIBS="-lcrypto  $LIBS"
6953  cat > conftest.$ac_ext <<EOF
6954 -#line 43275 "configure"
6955 +#line 43279 "configure"
6956  #include "confdefs.h"
6957  /* Override any gcc2 internal prototype to avoid an error.  */
6958  /* We use char because int might match the return type of a gcc2
6959 @@ -43282,7 +43286,7 @@
6960  CRYPTO_free()
6961  ; return 0; }
6962  EOF
6963 -if { (eval echo configure:43286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6964 +if { (eval echo configure:43290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6965    rm -rf conftest*
6966    eval "ac_cv_lib_$ac_lib_var=yes"
6967  else
6968 @@ -43422,7 +43426,7 @@
6969    done
6970
6971    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
6972 -echo "configure:43426: checking for SSL_CTX_set_ssl_version in -lssl" >&5
6973 +echo "configure:43430: checking for SSL_CTX_set_ssl_version in -lssl" >&5
6974  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
6975  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6976    echo $ac_n "(cached) $ac_c" 1>&6
6977 @@ -43430,7 +43434,7 @@
6978    ac_save_LIBS="$LIBS"
6979  LIBS="-lssl  $LIBS"
6980  cat > conftest.$ac_ext <<EOF
6981 -#line 43434 "configure"
6982 +#line 43438 "configure"
6983  #include "confdefs.h"
6984  /* Override any gcc2 internal prototype to avoid an error.  */
6985  /* We use char because int might match the return type of a gcc2
6986 @@ -43441,7 +43445,7 @@
6987  SSL_CTX_set_ssl_version()
6988  ; return 0; }
6989  EOF
6990 -if { (eval echo configure:43445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6991 +if { (eval echo configure:43449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6992    rm -rf conftest*
6993    eval "ac_cv_lib_$ac_lib_var=yes"
6994  else
6995 @@ -43559,7 +43563,7 @@
6996
6997    elif test -f "$IMAP_INC_DIR/linkage.c"; then
6998      cat > conftest.$ac_ext <<EOF
6999 -#line 43563 "configure"
7000 +#line 43567 "configure"
7001  #include "confdefs.h"
7002  #include <$IMAP_INC_DIR/linkage.c>
7003  EOF
7004 @@ -43587,7 +43591,7 @@
7005      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
7006  else
7007    cat > conftest.$ac_ext <<EOF
7008 -#line 43591 "configure"
7009 +#line 43595 "configure"
7010  #include "confdefs.h"
7011
7012      void mm_log(void){}
7013 @@ -43612,7 +43616,7 @@
7014      }
7015
7016  EOF
7017 -if { (eval echo configure:43616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7018 +if { (eval echo configure:43620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7019  then
7020
7021      LIBS=$old_LIBS
7022 @@ -43638,7 +43642,7 @@
7023
7024
7025      echo $ac_n "checking whether IMAP works""... $ac_c" 1>&6
7026 -echo "configure:43642: checking whether IMAP works" >&5
7027 +echo "configure:43646: checking whether IMAP works" >&5
7028
7029    old_LIBS=$LIBS
7030    LIBS="$TST_LIBS $LIBS"
7031 @@ -43646,7 +43650,7 @@
7032      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
7033  else
7034    cat > conftest.$ac_ext <<EOF
7035 -#line 43650 "configure"
7036 +#line 43654 "configure"
7037  #include "confdefs.h"
7038
7039      void mm_log(void){}
7040 @@ -43671,7 +43675,7 @@
7041      }
7042
7043  EOF
7044 -if { (eval echo configure:43675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7045 +if { (eval echo configure:43679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7046  then
7047
7048      LIBS=$old_LIBS
7049 @@ -43701,7 +43705,7 @@
7050
7051
7052  echo $ac_n "checking for Informix support""... $ac_c" 1>&6
7053 -echo "configure:43705: checking for Informix support" >&5
7054 +echo "configure:43709: checking for Informix support" >&5
7055  # Check whether --with-informix or --without-informix was given.
7056  if test "${with_informix+set}" = set; then
7057    withval="$with_informix"
7058 @@ -43923,7 +43927,7 @@
7059    esac
7060
7061    echo $ac_n "checking Informix version""... $ac_c" 1>&6
7062 -echo "configure:43927: checking Informix version" >&5
7063 +echo "configure:43931: checking Informix version" >&5
7064    IFX_VERSION=`$INFORMIXDIR/bin/esql -V | grep "ESQL Version" | sed -ne '1 s/\(.*\)ESQL Version \([0-9]*\)\.\([0-9]*\).*/\2\3/p'`
7065    echo "$ac_t""$IFX_VERSION" 1>&6
7066    cat >> confdefs.h <<EOF
7067 @@ -44301,7 +44305,7 @@
7068
7069
7070  echo $ac_n "checking for Ingres II support""... $ac_c" 1>&6
7071 -echo "configure:44305: checking for Ingres II support" >&5
7072 +echo "configure:44309: checking for Ingres II support" >&5
7073  # Check whether --with-ingres or --without-ingres was given.
7074  if test "${with_ingres+set}" = set; then
7075    withval="$with_ingres"
7076 @@ -44821,7 +44825,7 @@
7077
7078
7079  echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
7080 -echo "configure:44825: checking for InterBase support" >&5
7081 +echo "configure:44829: checking for InterBase support" >&5
7082  # Check whether --with-interbase or --without-interbase was given.
7083  if test "${with_interbase+set}" = set; then
7084    withval="$with_interbase"
7085 @@ -44954,7 +44958,7 @@
7086    done
7087
7088    echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
7089 -echo "configure:44958: checking for isc_detach_database in -lgds" >&5
7090 +echo "configure:44962: checking for isc_detach_database in -lgds" >&5
7091  ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
7092  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7093    echo $ac_n "(cached) $ac_c" 1>&6
7094 @@ -44962,7 +44966,7 @@
7095    ac_save_LIBS="$LIBS"
7096  LIBS="-lgds  $LIBS"
7097  cat > conftest.$ac_ext <<EOF
7098 -#line 44966 "configure"
7099 +#line 44970 "configure"
7100  #include "confdefs.h"
7101  /* Override any gcc2 internal prototype to avoid an error.  */
7102  /* We use char because int might match the return type of a gcc2
7103 @@ -44973,7 +44977,7 @@
7104  isc_detach_database()
7105  ; return 0; }
7106  EOF
7107 -if { (eval echo configure:44977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7108 +if { (eval echo configure:44981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7109    rm -rf conftest*
7110    eval "ac_cv_lib_$ac_lib_var=yes"
7111  else
7112 @@ -45083,7 +45087,7 @@
7113    done
7114
7115    echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
7116 -echo "configure:45087: checking for isc_detach_database in -lib_util" >&5
7117 +echo "configure:45091: checking for isc_detach_database in -lib_util" >&5
7118  ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
7119  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7120    echo $ac_n "(cached) $ac_c" 1>&6
7121 @@ -45091,7 +45095,7 @@
7122    ac_save_LIBS="$LIBS"
7123  LIBS="-lib_util  $LIBS"
7124  cat > conftest.$ac_ext <<EOF
7125 -#line 45095 "configure"
7126 +#line 45099 "configure"
7127  #include "confdefs.h"
7128  /* Override any gcc2 internal prototype to avoid an error.  */
7129  /* We use char because int might match the return type of a gcc2
7130 @@ -45102,7 +45106,7 @@
7131  isc_detach_database()
7132  ; return 0; }
7133  EOF
7134 -if { (eval echo configure:45106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7135 +if { (eval echo configure:45110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7136    rm -rf conftest*
7137    eval "ac_cv_lib_$ac_lib_var=yes"
7138  else
7139 @@ -45502,7 +45506,7 @@
7140
7141
7142  echo $ac_n "checking for IRCG support""... $ac_c" 1>&6
7143 -echo "configure:45506: checking for IRCG support" >&5
7144 +echo "configure:45510: checking for IRCG support" >&5
7145  # Check whether --with-ircg or --without-ircg was given.
7146  if test "${with_ircg+set}" = set; then
7147    withval="$with_ircg"
7148 @@ -45995,7 +45999,7 @@
7149
7150
7151  echo $ac_n "checking for Java support""... $ac_c" 1>&6
7152 -echo "configure:45999: checking for Java support" >&5
7153 +echo "configure:46003: checking for Java support" >&5
7154  # Check whether --with-java or --without-java was given.
7155  if test "${with_java+set}" = set; then
7156    withval="$with_java"
7157 @@ -46048,7 +46052,7 @@
7158    esac
7159
7160   echo $ac_n "checking Java Jar location""... $ac_c" 1>&6
7161 -echo "configure:46052: checking Java Jar location" >&5
7162 +echo "configure:46056: checking Java Jar location" >&5
7163    if test "$PHP_JAVA" = "yes"; then
7164      if JAVA_JAR=`which jar 2>/dev/null`; then
7165        JAVA_JAR="$JAVA_JAR cf"
7166 @@ -46074,7 +46078,7 @@
7167
7168
7169   echo $ac_n "checking Java C location""... $ac_c" 1>&6
7170 -echo "configure:46078: checking Java C location" >&5
7171 +echo "configure:46082: checking Java C location" >&5
7172   if test "$PHP_JAVA" = "yes"; then
7173     JAVA_C=`which javac`
7174   else
7175 @@ -46101,17 +46105,17 @@
7176  do
7177  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
7178  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
7179 -echo "configure:46105: checking for $ac_hdr" >&5
7180 +echo "configure:46109: checking for $ac_hdr" >&5
7181  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
7182    echo $ac_n "(cached) $ac_c" 1>&6
7183  else
7184    cat > conftest.$ac_ext <<EOF
7185 -#line 46110 "configure"
7186 +#line 46114 "configure"
7187  #include "confdefs.h"
7188  #include <$ac_hdr>
7189  EOF
7190  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7191 -{ (eval echo configure:46115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7192 +{ (eval echo configure:46119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7193  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7194  if test -z "$ac_err"; then
7195    rm -rf conftest*
7196 @@ -46141,17 +46145,17 @@
7197  do
7198  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
7199  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
7200 -echo "configure:46145: checking for $ac_hdr" >&5
7201 +echo "configure:46149: checking for $ac_hdr" >&5
7202  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
7203    echo $ac_n "(cached) $ac_c" 1>&6
7204  else
7205    cat > conftest.$ac_ext <<EOF
7206 -#line 46150 "configure"
7207 +#line 46154 "configure"
7208  #include "confdefs.h"
7209  #include <$ac_hdr>
7210  EOF
7211  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7212 -{ (eval echo configure:46155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7213 +{ (eval echo configure:46159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7214  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7215  if test -z "$ac_err"; then
7216    rm -rf conftest*
7217 @@ -46181,7 +46185,7 @@
7218    save_old_LDFLAGS=$LDFLAGS
7219    LDFLAGS="-framework "JavaVM" $LDFLAGS"
7220          echo $ac_n "checking for JNI_CreateJavaVM in -lc""... $ac_c" 1>&6
7221 -echo "configure:46185: checking for JNI_CreateJavaVM in -lc" >&5
7222 +echo "configure:46189: checking for JNI_CreateJavaVM in -lc" >&5
7223  ac_lib_var=`echo c'_'JNI_CreateJavaVM | sed 'y%./+-%__p_%'`
7224  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7225    echo $ac_n "(cached) $ac_c" 1>&6
7226 @@ -46189,7 +46193,7 @@
7227    ac_save_LIBS="$LIBS"
7228  LIBS="-lc  $LIBS"
7229  cat > conftest.$ac_ext <<EOF
7230 -#line 46193 "configure"
7231 +#line 46197 "configure"
7232  #include "confdefs.h"
7233  /* Override any gcc2 internal prototype to avoid an error.  */
7234  /* We use char because int might match the return type of a gcc2
7235 @@ -46200,7 +46204,7 @@
7236  JNI_CreateJavaVM()
7237  ; return 0; }
7238  EOF
7239 -if { (eval echo configure:46204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7240 +if { (eval echo configure:46208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7241    rm -rf conftest*
7242    eval "ac_cv_lib_$ac_lib_var=yes"
7243  else
7244 @@ -46253,7 +46257,7 @@
7245    else
7246
7247   echo $ac_n "checking Checking for libjava""... $ac_c" 1>&6
7248 -echo "configure:46257: checking Checking for libjava" >&5
7249 +echo "configure:46261: checking Checking for libjava" >&5
7250   if test -d $PHP_JAVA/lib/kaffe; then
7251
7252    if test "$PHP_JAVA/lib" != "/usr/lib"; then
7253 @@ -46791,7 +46795,7 @@
7254
7255
7256  echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
7257 -echo "configure:46795: checking for LDAP support" >&5
7258 +echo "configure:46799: checking for LDAP support" >&5
7259  # Check whether --with-ldap or --without-ldap was given.
7260  if test "${with_ldap+set}" = set; then
7261    withval="$with_ldap"
7262 @@ -49062,19 +49066,19 @@
7263    LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
7264
7265    echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6
7266 -echo "configure:49066: checking for 3 arg ldap_set_rebind_proc" >&5
7267 +echo "configure:49070: checking for 3 arg ldap_set_rebind_proc" >&5
7268  if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then
7269    echo $ac_n "(cached) $ac_c" 1>&6
7270  else
7271    cat > conftest.$ac_ext <<EOF
7272 -#line 49071 "configure"
7273 +#line 49075 "configure"
7274  #include "confdefs.h"
7275  #include <ldap.h>
7276  int main() {
7277  ldap_set_rebind_proc(0,0,0)
7278  ; return 0; }
7279  EOF
7280 -if { (eval echo configure:49078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7281 +if { (eval echo configure:49082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7282    rm -rf conftest*
7283    ac_cv_3arg_setrebindproc=yes
7284  else
7285 @@ -49098,12 +49102,12 @@
7286        for ac_func in ldap_parse_reference ldap_start_tls_s
7287  do
7288  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
7289 -echo "configure:49102: checking for $ac_func" >&5
7290 +echo "configure:49106: checking for $ac_func" >&5
7291  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
7292    echo $ac_n "(cached) $ac_c" 1>&6
7293  else
7294    cat > conftest.$ac_ext <<EOF
7295 -#line 49107 "configure"
7296 +#line 49111 "configure"
7297  #include "confdefs.h"
7298  /* System header to define __stub macros and hopefully few prototypes,
7299      which can conflict with char $ac_func(); below.  */
7300 @@ -49126,7 +49130,7 @@
7301
7302  ; return 0; }
7303  EOF
7304 -if { (eval echo configure:49130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7305 +if { (eval echo configure:49134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7306    rm -rf conftest*
7307    eval "ac_cv_func_$ac_func=yes"
7308  else
7309 @@ -49174,7 +49178,7 @@
7310
7311
7312  echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
7313 -echo "configure:49178: checking whether to enable multibyte string support" >&5
7314 +echo "configure:49182: checking whether to enable multibyte string support" >&5
7315  # Check whether --enable-mbstring or --disable-mbstring was given.
7316  if test "${enable_mbstring+set}" = set; then
7317    enableval="$enable_mbstring"
7318 @@ -49220,7 +49224,7 @@
7319
7320
7321  echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
7322 -echo "configure:49224: checking whether to enable multibyte regex support" >&5
7323 +echo "configure:49228: checking whether to enable multibyte regex support" >&5
7324  # Check whether --enable-mbregex or --disable-mbregex was given.
7325  if test "${enable_mbregex+set}" = set; then
7326    enableval="$enable_mbregex"
7327 @@ -49245,7 +49249,7 @@
7328
7329
7330  echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
7331 -echo "configure:49249: checking for external libmbfl" >&5
7332 +echo "configure:49253: checking for external libmbfl" >&5
7333  # Check whether --with-libmbfl or --without-libmbfl was given.
7334  if test "${with_libmbfl+set}" = set; then
7335    withval="$with_libmbfl"
7336 @@ -49525,7 +49529,7 @@
7337    done
7338
7339    echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
7340 -echo "configure:49529: checking for mbfl_buffer_converter_new in -lmbfl" >&5
7341 +echo "configure:49533: checking for mbfl_buffer_converter_new in -lmbfl" >&5
7342  ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'`
7343  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7344    echo $ac_n "(cached) $ac_c" 1>&6
7345 @@ -49533,7 +49537,7 @@
7346    ac_save_LIBS="$LIBS"
7347  LIBS="-lmbfl  $LIBS"
7348  cat > conftest.$ac_ext <<EOF
7349 -#line 49537 "configure"
7350 +#line 49541 "configure"
7351  #include "confdefs.h"
7352  /* Override any gcc2 internal prototype to avoid an error.  */
7353  /* We use char because int might match the return type of a gcc2
7354 @@ -49544,7 +49548,7 @@
7355  mbfl_buffer_converter_new()
7356  ; return 0; }
7357  EOF
7358 -if { (eval echo configure:49548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7359 +if { (eval echo configure:49552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7360    rm -rf conftest*
7361    eval "ac_cv_lib_$ac_lib_var=yes"
7362  else
7363 @@ -49966,7 +49970,7 @@
7364
7365
7366  echo $ac_n "checking for MCAL support""... $ac_c" 1>&6
7367 -echo "configure:49970: checking for MCAL support" >&5
7368 +echo "configure:49974: checking for MCAL support" >&5
7369  # Check whether --with-mcal or --without-mcal was given.
7370  if test "${with_mcal+set}" = set; then
7371    withval="$with_mcal"
7372 @@ -50375,7 +50379,7 @@
7373
7374
7375  echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
7376 -echo "configure:50379: checking for mcrypt support" >&5
7377 +echo "configure:50383: checking for mcrypt support" >&5
7378  # Check whether --with-mcrypt or --without-mcrypt was given.
7379  if test "${with_mcrypt+set}" = set; then
7380    withval="$with_mcrypt"
7381 @@ -50508,7 +50512,7 @@
7382    done
7383
7384    echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
7385 -echo "configure:50512: checking for mcrypt_module_open in -lmcrypt" >&5
7386 +echo "configure:50516: checking for mcrypt_module_open in -lmcrypt" >&5
7387  ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
7388  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7389    echo $ac_n "(cached) $ac_c" 1>&6
7390 @@ -50516,7 +50520,7 @@
7391    ac_save_LIBS="$LIBS"
7392  LIBS="-lmcrypt  $LIBS"
7393  cat > conftest.$ac_ext <<EOF
7394 -#line 50520 "configure"
7395 +#line 50524 "configure"
7396  #include "confdefs.h"
7397  /* Override any gcc2 internal prototype to avoid an error.  */
7398  /* We use char because int might match the return type of a gcc2
7399 @@ -50527,7 +50531,7 @@
7400  mcrypt_module_open()
7401  ; return 0; }
7402  EOF
7403 -if { (eval echo configure:50531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7404 +if { (eval echo configure:50535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7405    rm -rf conftest*
7406    eval "ac_cv_lib_$ac_lib_var=yes"
7407  else
7408 @@ -50655,7 +50659,7 @@
7409    done
7410
7411    echo $ac_n "checking for mcrypt_generic_deinit in -lmcrypt""... $ac_c" 1>&6
7412 -echo "configure:50659: checking for mcrypt_generic_deinit in -lmcrypt" >&5
7413 +echo "configure:50663: checking for mcrypt_generic_deinit in -lmcrypt" >&5
7414  ac_lib_var=`echo mcrypt'_'mcrypt_generic_deinit | sed 'y%./+-%__p_%'`
7415  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7416    echo $ac_n "(cached) $ac_c" 1>&6
7417 @@ -50663,7 +50667,7 @@
7418    ac_save_LIBS="$LIBS"
7419  LIBS="-lmcrypt  $LIBS"
7420  cat > conftest.$ac_ext <<EOF
7421 -#line 50667 "configure"
7422 +#line 50671 "configure"
7423  #include "confdefs.h"
7424  /* Override any gcc2 internal prototype to avoid an error.  */
7425  /* We use char because int might match the return type of a gcc2
7426 @@ -50674,7 +50678,7 @@
7427  mcrypt_generic_deinit()
7428  ; return 0; }
7429  EOF
7430 -if { (eval echo configure:50678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7431 +if { (eval echo configure:50682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7432    rm -rf conftest*
7433    eval "ac_cv_lib_$ac_lib_var=yes"
7434  else
7435 @@ -50800,7 +50804,7 @@
7436    done
7437
7438    echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
7439 -echo "configure:50804: checking for mcrypt_module_open in -lmcrypt" >&5
7440 +echo "configure:50808: checking for mcrypt_module_open in -lmcrypt" >&5
7441  ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
7442  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7443    echo $ac_n "(cached) $ac_c" 1>&6
7444 @@ -50808,7 +50812,7 @@
7445    ac_save_LIBS="$LIBS"
7446  LIBS="-lmcrypt  $LIBS"
7447  cat > conftest.$ac_ext <<EOF
7448 -#line 50812 "configure"
7449 +#line 50816 "configure"
7450  #include "confdefs.h"
7451  /* Override any gcc2 internal prototype to avoid an error.  */
7452  /* We use char because int might match the return type of a gcc2
7453 @@ -50819,7 +50823,7 @@
7454  mcrypt_module_open()
7455  ; return 0; }
7456  EOF
7457 -if { (eval echo configure:50823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7458 +if { (eval echo configure:50827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7459    rm -rf conftest*
7460    eval "ac_cv_lib_$ac_lib_var=yes"
7461  else
7462 @@ -50924,7 +50928,7 @@
7463    done
7464
7465    echo $ac_n "checking for mcrypt_generic_deinit in -lmcrypt""... $ac_c" 1>&6
7466 -echo "configure:50928: checking for mcrypt_generic_deinit in -lmcrypt" >&5
7467 +echo "configure:50932: checking for mcrypt_generic_deinit in -lmcrypt" >&5
7468  ac_lib_var=`echo mcrypt'_'mcrypt_generic_deinit | sed 'y%./+-%__p_%'`
7469  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7470    echo $ac_n "(cached) $ac_c" 1>&6
7471 @@ -50932,7 +50936,7 @@
7472    ac_save_LIBS="$LIBS"
7473  LIBS="-lmcrypt  $LIBS"
7474  cat > conftest.$ac_ext <<EOF
7475 -#line 50936 "configure"
7476 +#line 50940 "configure"
7477  #include "confdefs.h"
7478  /* Override any gcc2 internal prototype to avoid an error.  */
7479  /* We use char because int might match the return type of a gcc2
7480 @@ -50943,7 +50947,7 @@
7481  mcrypt_generic_deinit()
7482  ; return 0; }
7483  EOF
7484 -if { (eval echo configure:50947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7485 +if { (eval echo configure:50951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7486    rm -rf conftest*
7487    eval "ac_cv_lib_$ac_lib_var=yes"
7488  else
7489 @@ -51068,7 +51072,7 @@
7490    done
7491
7492    echo $ac_n "checking for init_mcrypt in -lmcrypt""... $ac_c" 1>&6
7493 -echo "configure:51072: checking for init_mcrypt in -lmcrypt" >&5
7494 +echo "configure:51076: checking for init_mcrypt in -lmcrypt" >&5
7495  ac_lib_var=`echo mcrypt'_'init_mcrypt | sed 'y%./+-%__p_%'`
7496  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7497    echo $ac_n "(cached) $ac_c" 1>&6
7498 @@ -51076,7 +51080,7 @@
7499    ac_save_LIBS="$LIBS"
7500  LIBS="-lmcrypt  $LIBS"
7501  cat > conftest.$ac_ext <<EOF
7502 -#line 51080 "configure"
7503 +#line 51084 "configure"
7504  #include "confdefs.h"
7505  /* Override any gcc2 internal prototype to avoid an error.  */
7506  /* We use char because int might match the return type of a gcc2
7507 @@ -51087,7 +51091,7 @@
7508  init_mcrypt()
7509  ; return 0; }
7510  EOF
7511 -if { (eval echo configure:51091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7512 +if { (eval echo configure:51095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7513    rm -rf conftest*
7514    eval "ac_cv_lib_$ac_lib_var=yes"
7515  else
7516 @@ -51495,7 +51499,7 @@
7517
7518
7519  echo $ac_n "checking for MCVE support""... $ac_c" 1>&6
7520 -echo "configure:51499: checking for MCVE support" >&5
7521 +echo "configure:51503: checking for MCVE support" >&5
7522  # Check whether --with-mcve or --without-mcve was given.
7523  if test "${with_mcve+set}" = set; then
7524    withval="$with_mcve"
7525 @@ -51541,7 +51545,7 @@
7526
7527
7528  echo $ac_n "checking OpenSSL dir for MCVE""... $ac_c" 1>&6
7529 -echo "configure:51545: checking OpenSSL dir for MCVE" >&5
7530 +echo "configure:51549: checking OpenSSL dir for MCVE" >&5
7531  # Check whether --with-openssl-dir or --without-openssl-dir was given.
7532  if test "${with_openssl_dir+set}" = set; then
7533    withval="$with_openssl_dir"
7534 @@ -51567,7 +51571,7 @@
7535      # Extract the first word of "egrep", so it can be a program name with args.
7536  set dummy egrep; ac_word=$2
7537  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
7538 -echo "configure:51571: checking for $ac_word" >&5
7539 +echo "configure:51575: checking for $ac_word" >&5
7540  if eval "test \"`echo '$''{'ac_cv_prog_EGREP'+set}'`\" = set"; then
7541    echo $ac_n "(cached) $ac_c" 1>&6
7542  else
7543 @@ -51612,7 +51616,7 @@
7544      # Extract the first word of "pkg-config", so it can be a program name with args.
7545  set dummy pkg-config; ac_word=$2
7546  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
7547 -echo "configure:51616: checking for $ac_word" >&5
7548 +echo "configure:51620: checking for $ac_word" >&5
7549  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
7550    echo $ac_n "(cached) $ac_c" 1>&6
7551  else
7552 @@ -51800,9 +51804,9 @@
7553      old_CPPFLAGS=$CPPFLAGS
7554      CPPFLAGS=-I$OPENSSL_INCDIR
7555      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
7556 -echo "configure:51804: checking for OpenSSL version" >&5
7557 +echo "configure:51808: checking for OpenSSL version" >&5
7558      cat > conftest.$ac_ext <<EOF
7559 -#line 51806 "configure"
7560 +#line 51810 "configure"
7561  #include "confdefs.h"
7562
7563  #include <openssl/opensslv.h>
7564 @@ -51940,7 +51944,7 @@
7565    done
7566
7567    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
7568 -echo "configure:51944: checking for CRYPTO_free in -lcrypto" >&5
7569 +echo "configure:51948: checking for CRYPTO_free in -lcrypto" >&5
7570  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
7571  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7572    echo $ac_n "(cached) $ac_c" 1>&6
7573 @@ -51948,7 +51952,7 @@
7574    ac_save_LIBS="$LIBS"
7575  LIBS="-lcrypto  $LIBS"
7576  cat > conftest.$ac_ext <<EOF
7577 -#line 51952 "configure"
7578 +#line 51956 "configure"
7579  #include "confdefs.h"
7580  /* Override any gcc2 internal prototype to avoid an error.  */
7581  /* We use char because int might match the return type of a gcc2
7582 @@ -51959,7 +51963,7 @@
7583  CRYPTO_free()
7584  ; return 0; }
7585  EOF
7586 -if { (eval echo configure:51963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7587 +if { (eval echo configure:51967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7588    rm -rf conftest*
7589    eval "ac_cv_lib_$ac_lib_var=yes"
7590  else
7591 @@ -52099,7 +52103,7 @@
7592    done
7593
7594    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
7595 -echo "configure:52103: checking for SSL_CTX_set_ssl_version in -lssl" >&5
7596 +echo "configure:52107: checking for SSL_CTX_set_ssl_version in -lssl" >&5
7597  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
7598  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7599    echo $ac_n "(cached) $ac_c" 1>&6
7600 @@ -52107,7 +52111,7 @@
7601    ac_save_LIBS="$LIBS"
7602  LIBS="-lssl  $LIBS"
7603  cat > conftest.$ac_ext <<EOF
7604 -#line 52111 "configure"
7605 +#line 52115 "configure"
7606  #include "confdefs.h"
7607  /* Override any gcc2 internal prototype to avoid an error.  */
7608  /* We use char because int might match the return type of a gcc2
7609 @@ -52118,7 +52122,7 @@
7610  SSL_CTX_set_ssl_version()
7611  ; return 0; }
7612  EOF
7613 -if { (eval echo configure:52122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7614 +if { (eval echo configure:52126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7615    rm -rf conftest*
7616    eval "ac_cv_lib_$ac_lib_var=yes"
7617  else
7618 @@ -52250,9 +52254,9 @@
7619
7620      saved_CPPFLAGS=$CPPFLAGS
7621    echo $ac_n "checking for correct libmcve version""... $ac_c" 1>&6
7622 -echo "configure:52254: checking for correct libmcve version" >&5
7623 +echo "configure:52258: checking for correct libmcve version" >&5
7624    cat > conftest.$ac_ext <<EOF
7625 -#line 52256 "configure"
7626 +#line 52260 "configure"
7627  #include "confdefs.h"
7628
7629  #include "$MCVE_DIR/include/mcve.h"
7630 @@ -52277,9 +52281,9 @@
7631
7632
7633    echo $ac_n "checking for correct libmonetra 4.2 or higher""... $ac_c" 1>&6
7634 -echo "configure:52281: checking for correct libmonetra 4.2 or higher" >&5
7635 +echo "configure:52285: checking for correct libmonetra 4.2 or higher" >&5
7636    cat > conftest.$ac_ext <<EOF
7637 -#line 52283 "configure"
7638 +#line 52287 "configure"
7639  #include "confdefs.h"
7640
7641  #include "$MCVE_DIR/include/mcve.h"
7642 @@ -52520,7 +52524,7 @@
7643    done
7644
7645    echo $ac_n "checking for MCVE_DestroyEngine in -lmcve""... $ac_c" 1>&6
7646 -echo "configure:52524: checking for MCVE_DestroyEngine in -lmcve" >&5
7647 +echo "configure:52528: checking for MCVE_DestroyEngine in -lmcve" >&5
7648  ac_lib_var=`echo mcve'_'MCVE_DestroyEngine | sed 'y%./+-%__p_%'`
7649  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7650    echo $ac_n "(cached) $ac_c" 1>&6
7651 @@ -52528,7 +52532,7 @@
7652    ac_save_LIBS="$LIBS"
7653  LIBS="-lmcve  $LIBS"
7654  cat > conftest.$ac_ext <<EOF
7655 -#line 52532 "configure"
7656 +#line 52536 "configure"
7657  #include "confdefs.h"
7658  /* Override any gcc2 internal prototype to avoid an error.  */
7659  /* We use char because int might match the return type of a gcc2
7660 @@ -52539,7 +52543,7 @@
7661  MCVE_DestroyEngine()
7662  ; return 0; }
7663  EOF
7664 -if { (eval echo configure:52543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7665 +if { (eval echo configure:52547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7666    rm -rf conftest*
7667    eval "ac_cv_lib_$ac_lib_var=yes"
7668  else
7669 @@ -52656,7 +52660,7 @@
7670    done
7671
7672    echo $ac_n "checking for M_DestroyEngine in -lmcve""... $ac_c" 1>&6
7673 -echo "configure:52660: checking for M_DestroyEngine in -lmcve" >&5
7674 +echo "configure:52664: checking for M_DestroyEngine in -lmcve" >&5
7675  ac_lib_var=`echo mcve'_'M_DestroyEngine | sed 'y%./+-%__p_%'`
7676  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7677    echo $ac_n "(cached) $ac_c" 1>&6
7678 @@ -52664,7 +52668,7 @@
7679    ac_save_LIBS="$LIBS"
7680  LIBS="-lmcve  $LIBS"
7681  cat > conftest.$ac_ext <<EOF
7682 -#line 52668 "configure"
7683 +#line 52672 "configure"
7684  #include "confdefs.h"
7685  /* Override any gcc2 internal prototype to avoid an error.  */
7686  /* We use char because int might match the return type of a gcc2
7687 @@ -52675,7 +52679,7 @@
7688  M_DestroyEngine()
7689  ; return 0; }
7690  EOF
7691 -if { (eval echo configure:52679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7692 +if { (eval echo configure:52683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7693    rm -rf conftest*
7694    eval "ac_cv_lib_$ac_lib_var=yes"
7695  else
7696 @@ -52950,7 +52954,7 @@
7697
7698
7699  echo $ac_n "checking for mhash support""... $ac_c" 1>&6
7700 -echo "configure:52954: checking for mhash support" >&5
7701 +echo "configure:52958: checking for mhash support" >&5
7702  # Check whether --with-mhash or --without-mhash was given.
7703  if test "${with_mhash+set}" = set; then
7704    withval="$with_mhash"
7705 @@ -53364,7 +53368,7 @@
7706
7707
7708  echo $ac_n "checking whether to include mime_magic support""... $ac_c" 1>&6
7709 -echo "configure:53368: checking whether to include mime_magic support" >&5
7710 +echo "configure:53372: checking whether to include mime_magic support" >&5
7711  # Check whether --with-mime-magic or --without-mime-magic was given.
7712  if test "${with_mime_magic+set}" = set; then
7713    withval="$with_mime_magic"
7714 @@ -53661,7 +53665,7 @@
7715
7716
7717  echo $ac_n "checking for MING support""... $ac_c" 1>&6
7718 -echo "configure:53665: checking for MING support" >&5
7719 +echo "configure:53669: checking for MING support" >&5
7720  # Check whether --with-ming or --without-ming was given.
7721  if test "${with_ming+set}" = set; then
7722    withval="$with_ming"
7723 @@ -53706,7 +53710,7 @@
7724
7725  if test "$PHP_MING" != "no"; then
7726    echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
7727 -echo "configure:53710: checking for sin in -lm" >&5
7728 +echo "configure:53714: checking for sin in -lm" >&5
7729  ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
7730  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7731    echo $ac_n "(cached) $ac_c" 1>&6
7732 @@ -53714,7 +53718,7 @@
7733    ac_save_LIBS="$LIBS"
7734  LIBS="-lm  $LIBS"
7735  cat > conftest.$ac_ext <<EOF
7736 -#line 53718 "configure"
7737 +#line 53722 "configure"
7738  #include "confdefs.h"
7739  /* Override any gcc2 internal prototype to avoid an error.  */
7740  /* We use char because int might match the return type of a gcc2
7741 @@ -53725,7 +53729,7 @@
7742  sin()
7743  ; return 0; }
7744  EOF
7745 -if { (eval echo configure:53729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7746 +if { (eval echo configure:53733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7747    rm -rf conftest*
7748    eval "ac_cv_lib_$ac_lib_var=yes"
7749  else
7750 @@ -53854,7 +53858,7 @@
7751    done
7752
7753    echo $ac_n "checking for Ming_useSWFVersion in -lming""... $ac_c" 1>&6
7754 -echo "configure:53858: checking for Ming_useSWFVersion in -lming" >&5
7755 +echo "configure:53862: checking for Ming_useSWFVersion in -lming" >&5
7756  ac_lib_var=`echo ming'_'Ming_useSWFVersion | sed 'y%./+-%__p_%'`
7757  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7758    echo $ac_n "(cached) $ac_c" 1>&6
7759 @@ -53862,7 +53866,7 @@
7760    ac_save_LIBS="$LIBS"
7761  LIBS="-lming  $LIBS"
7762  cat > conftest.$ac_ext <<EOF
7763 -#line 53866 "configure"
7764 +#line 53870 "configure"
7765  #include "confdefs.h"
7766  /* Override any gcc2 internal prototype to avoid an error.  */
7767  /* We use char because int might match the return type of a gcc2
7768 @@ -53873,7 +53877,7 @@
7769  Ming_useSWFVersion()
7770  ; return 0; }
7771  EOF
7772 -if { (eval echo configure:53877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7773 +if { (eval echo configure:53881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7774    rm -rf conftest*
7775    eval "ac_cv_lib_$ac_lib_var=yes"
7776  else
7777 @@ -54040,14 +54044,14 @@
7778
7779
7780    echo $ac_n "checking for destroySWFBlock""... $ac_c" 1>&6
7781 -echo "configure:54044: checking for destroySWFBlock" >&5
7782 +echo "configure:54048: checking for destroySWFBlock" >&5
7783    if test "$cross_compiling" = yes; then
7784
7785      echo "$ac_t""unknown" 1>&6
7786
7787  else
7788    cat > conftest.$ac_ext <<EOF
7789 -#line 54051 "configure"
7790 +#line 54055 "configure"
7791  #include "confdefs.h"
7792
7793  #include "ming.h"
7794 @@ -54059,7 +54063,7 @@
7795  }
7796
7797  EOF
7798 -if { (eval echo configure:54063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7799 +if { (eval echo configure:54067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7800  then
7801
7802      echo "$ac_t""missing" 1>&6
7803 @@ -54083,7 +54087,7 @@
7804      old_CPPFLAGS=$CPPFLAGS
7805    CPPFLAGS=-I$MING_INC_DIR
7806    cat > conftest.$ac_ext <<EOF
7807 -#line 54087 "configure"
7808 +#line 54091 "configure"
7809  #include "confdefs.h"
7810
7811  #include <ming.h>
7812 @@ -54340,7 +54344,7 @@
7813
7814
7815  echo $ac_n "checking for mnoGoSearch support""... $ac_c" 1>&6
7816 -echo "configure:54344: checking for mnoGoSearch support" >&5
7817 +echo "configure:54348: checking for mnoGoSearch support" >&5
7818  # Check whether --with-mnogosearch or --without-mnogosearch was given.
7819  if test "${with_mnogosearch+set}" = set; then
7820    withval="$with_mnogosearch"
7821 @@ -54396,7 +54400,7 @@
7822      fi
7823
7824      echo $ac_n "checking for mnoGoSearch version""... $ac_c" 1>&6
7825 -echo "configure:54400: checking for mnoGoSearch version" >&5
7826 +echo "configure:54404: checking for mnoGoSearch version" >&5
7827
7828      if test -x "$MNOGOSEARCH_BINDIR/udm-config"; then
7829         MNOGOSEARCH_VERSION=`$MNOGOSEARCH_BINDIR/udm-config --version`
7830 @@ -54758,7 +54762,7 @@
7831
7832
7833  echo $ac_n "checking for msession support""... $ac_c" 1>&6
7834 -echo "configure:54762: checking for msession support" >&5
7835 +echo "configure:54766: checking for msession support" >&5
7836  # Check whether --with-msession or --without-msession was given.
7837  if test "${with_msession+set}" = set; then
7838    withval="$with_msession"
7839 @@ -54806,7 +54810,7 @@
7840                 PHOENIX_DIR=$PHP_MSESSION
7841         else
7842                 echo $ac_n "checking for msession in default path""... $ac_c" 1>&6
7843 -echo "configure:54810: checking for msession in default path" >&5
7844 +echo "configure:54814: checking for msession in default path" >&5
7845                 for i in /usr/local/phoenix /usr/local /usr; do
7846                         if test -r $i/lib/libphoenix.a; then
7847                                 PHOENIX_DIR=$i
7848 @@ -55156,7 +55160,7 @@
7849
7850
7851  echo $ac_n "checking for mSQL support""... $ac_c" 1>&6
7852 -echo "configure:55160: checking for mSQL support" >&5
7853 +echo "configure:55164: checking for mSQL support" >&5
7854  # Check whether --with-msql or --without-msql was given.
7855  if test "${with_msql+set}" = set; then
7856    withval="$with_msql"
7857 @@ -55564,11 +55568,11 @@
7858
7859
7860    echo $ac_n "checking mSQL version""... $ac_c" 1>&6
7861 -echo "configure:55568: checking mSQL version" >&5
7862 +echo "configure:55572: checking mSQL version" >&5
7863    ac_php_oldcppflags=$CPPFLAGS
7864    CPPFLAGS="$INCLUDES $CPPFLAGS"
7865    cat > conftest.$ac_ext <<EOF
7866 -#line 55572 "configure"
7867 +#line 55576 "configure"
7868  #include "confdefs.h"
7869  #include <sys/types.h>
7870  #include "msql.h"
7871 @@ -55576,7 +55580,7 @@
7872  int i = IDX_TYPE
7873  ; return 0; }
7874  EOF
7875 -if { (eval echo configure:55580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7876 +if { (eval echo configure:55584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7877    rm -rf conftest*
7878
7879      cat >> confdefs.h <<\EOF
7880 @@ -55607,7 +55611,7 @@
7881
7882
7883  echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
7884 -echo "configure:55611: checking for MSSQL support via FreeTDS" >&5
7885 +echo "configure:55615: checking for MSSQL support via FreeTDS" >&5
7886  # Check whether --with-mssql or --without-mssql was given.
7887  if test "${with_mssql+set}" = set; then
7888    withval="$with_mssql"
7889 @@ -56032,7 +56036,7 @@
7890
7891
7892    echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
7893 -echo "configure:56036: checking for dnet_addr in -ldnet_stub" >&5
7894 +echo "configure:56040: checking for dnet_addr in -ldnet_stub" >&5
7895  ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
7896  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7897    echo $ac_n "(cached) $ac_c" 1>&6
7898 @@ -56040,7 +56044,7 @@
7899    ac_save_LIBS="$LIBS"
7900  LIBS="-ldnet_stub  $LIBS"
7901  cat > conftest.$ac_ext <<EOF
7902 -#line 56044 "configure"
7903 +#line 56048 "configure"
7904  #include "confdefs.h"
7905  /* Override any gcc2 internal prototype to avoid an error.  */
7906  /* We use char because int might match the return type of a gcc2
7907 @@ -56051,7 +56055,7 @@
7908  dnet_addr()
7909  ; return 0; }
7910  EOF
7911 -if { (eval echo configure:56055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7912 +if { (eval echo configure:56059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7913    rm -rf conftest*
7914    eval "ac_cv_lib_$ac_lib_var=yes"
7915  else
7916 @@ -56233,7 +56237,7 @@
7917
7918
7919  echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
7920 -echo "configure:56237: checking for MySQL support" >&5
7921 +echo "configure:56241: checking for MySQL support" >&5
7922  # Check whether --with-mysql or --without-mysql was given.
7923  if test "${with_mysql+set}" = set; then
7924    withval="$with_mysql"
7925 @@ -56279,7 +56283,7 @@
7926
7927
7928  echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
7929 -echo "configure:56283: checking for specified location of the MySQL UNIX socket" >&5
7930 +echo "configure:56287: checking for specified location of the MySQL UNIX socket" >&5
7931  # Check whether --with-mysql-sock or --without-mysql-sock was given.
7932  if test "${with_mysql_sock+set}" = set; then
7933    withval="$with_mysql_sock"
7934 @@ -56305,7 +56309,7 @@
7935
7936
7937  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
7938 -echo "configure:56309: checking for the location of libz" >&5
7939 +echo "configure:56313: checking for the location of libz" >&5
7940  # Check whether --with-zlib-dir or --without-zlib-dir was given.
7941  if test "${with_zlib_dir+set}" = set; then
7942    withval="$with_zlib_dir"
7943 @@ -56336,7 +56340,7 @@
7944
7945
7946    echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
7947 -echo "configure:56340: checking for MySQL UNIX socket location" >&5
7948 +echo "configure:56344: checking for MySQL UNIX socket location" >&5
7949    if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
7950      MYSQL_SOCK=$PHP_MYSQL_SOCK
7951      cat >> confdefs.h <<EOF
7952 @@ -56383,7 +56387,7 @@
7953    # Extract the first word of "ranlib", so it can be a program name with args.
7954  set dummy ranlib; ac_word=$2
7955  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
7956 -echo "configure:56387: checking for $ac_word" >&5
7957 +echo "configure:56391: checking for $ac_word" >&5
7958  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
7959    echo $ac_n "(cached) $ac_c" 1>&6
7960  else
7961 @@ -56411,21 +56415,21 @@
7962  fi
7963
7964  echo $ac_n "checking for inline""... $ac_c" 1>&6
7965 -echo "configure:56415: checking for inline" >&5
7966 +echo "configure:56419: checking for inline" >&5
7967  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
7968    echo $ac_n "(cached) $ac_c" 1>&6
7969  else
7970    ac_cv_c_inline=no
7971  for ac_kw in inline __inline__ __inline; do
7972    cat > conftest.$ac_ext <<EOF
7973 -#line 56422 "configure"
7974 +#line 56426 "configure"
7975  #include "confdefs.h"
7976
7977  int main() {
7978  } $ac_kw foo() {
7979  ; return 0; }
7980  EOF
7981 -if { (eval echo configure:56429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7982 +if { (eval echo configure:56433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7983    rm -rf conftest*
7984    ac_cv_c_inline=$ac_kw; break
7985  else
7986 @@ -56451,12 +56455,12 @@
7987  esac
7988
7989  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
7990 -echo "configure:56455: checking return type of signal handlers" >&5
7991 +echo "configure:56459: checking return type of signal handlers" >&5
7992  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
7993    echo $ac_n "(cached) $ac_c" 1>&6
7994  else
7995    cat > conftest.$ac_ext <<EOF
7996 -#line 56460 "configure"
7997 +#line 56464 "configure"
7998  #include "confdefs.h"
7999  #include <sys/types.h>
8000  #include <signal.h>
8001 @@ -56473,7 +56477,7 @@
8002  int i;
8003  ; return 0; }
8004  EOF
8005 -if { (eval echo configure:56477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8006 +if { (eval echo configure:56481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8007    rm -rf conftest*
8008    ac_cv_type_signal=void
8009  else
8010 @@ -56504,12 +56508,12 @@
8011
8012
8013  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
8014 -echo "configure:56508: checking for ANSI C header files" >&5
8015 +echo "configure:56512: checking for ANSI C header files" >&5
8016  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
8017    echo $ac_n "(cached) $ac_c" 1>&6
8018  else
8019    cat > conftest.$ac_ext <<EOF
8020 -#line 56513 "configure"
8021 +#line 56517 "configure"
8022  #include "confdefs.h"
8023  #include <stdlib.h>
8024  #include <stdarg.h>
8025 @@ -56517,7 +56521,7 @@
8026  #include <float.h>
8027  EOF
8028  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8029 -{ (eval echo configure:56521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8030 +{ (eval echo configure:56525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8031  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8032  if test -z "$ac_err"; then
8033    rm -rf conftest*
8034 @@ -56534,7 +56538,7 @@
8035  if test $ac_cv_header_stdc = yes; then
8036    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
8037  cat > conftest.$ac_ext <<EOF
8038 -#line 56538 "configure"
8039 +#line 56542 "configure"
8040  #include "confdefs.h"
8041  #include <string.h>
8042  EOF
8043 @@ -56552,7 +56556,7 @@
8044  if test $ac_cv_header_stdc = yes; then
8045    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
8046  cat > conftest.$ac_ext <<EOF
8047 -#line 56556 "configure"
8048 +#line 56560 "configure"
8049  #include "confdefs.h"
8050  #include <stdlib.h>
8051  EOF
8052 @@ -56573,7 +56577,7 @@
8053    :
8054  else
8055    cat > conftest.$ac_ext <<EOF
8056 -#line 56577 "configure"
8057 +#line 56581 "configure"
8058  #include "confdefs.h"
8059  #include <ctype.h>
8060  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
8061 @@ -56584,7 +56588,7 @@
8062  exit (0); }
8063
8064  EOF
8065 -if { (eval echo configure:56588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8066 +if { (eval echo configure:56592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8067  then
8068    :
8069  else
8070 @@ -56617,17 +56621,17 @@
8071  do
8072  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
8073  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
8074 -echo "configure:56621: checking for $ac_hdr" >&5
8075 +echo "configure:56625: checking for $ac_hdr" >&5
8076  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8077    echo $ac_n "(cached) $ac_c" 1>&6
8078  else
8079    cat > conftest.$ac_ext <<EOF
8080 -#line 56626 "configure"
8081 +#line 56630 "configure"
8082  #include "confdefs.h"
8083  #include <$ac_hdr>
8084  EOF
8085  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8086 -{ (eval echo configure:56631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8087 +{ (eval echo configure:56635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8088  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8089  if test -z "$ac_err"; then
8090    rm -rf conftest*
8091 @@ -56659,7 +56663,7 @@
8092
8093
8094  echo $ac_n "checking size of char""... $ac_c" 1>&6
8095 -echo "configure:56663: checking size of char" >&5
8096 +echo "configure:56667: checking size of char" >&5
8097  if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
8098    echo $ac_n "(cached) $ac_c" 1>&6
8099  else
8100 @@ -56667,9 +56671,10 @@
8101    ac_cv_sizeof_char=1
8102  else
8103    cat > conftest.$ac_ext <<EOF
8104 -#line 56671 "configure"
8105 +#line 56675 "configure"
8106  #include "confdefs.h"
8107  #include <stdio.h>
8108 +#include <sys/types.h>
8109  main()
8110  {
8111    FILE *f=fopen("conftestval", "w");
8112 @@ -56678,7 +56683,7 @@
8113    exit(0);
8114  }
8115  EOF
8116 -if { (eval echo configure:56682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8117 +if { (eval echo configure:56687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8118  then
8119    ac_cv_sizeof_char=`cat conftestval`
8120  else
8121 @@ -56699,7 +56704,7 @@
8122
8123
8124  echo $ac_n "checking size of int""... $ac_c" 1>&6
8125 -echo "configure:56703: checking size of int" >&5
8126 +echo "configure:56708: checking size of int" >&5
8127  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
8128    echo $ac_n "(cached) $ac_c" 1>&6
8129  else
8130 @@ -56707,9 +56712,10 @@
8131    ac_cv_sizeof_int=4
8132  else
8133    cat > conftest.$ac_ext <<EOF
8134 -#line 56711 "configure"
8135 +#line 56716 "configure"
8136  #include "confdefs.h"
8137  #include <stdio.h>
8138 +#include <sys/types.h>
8139  main()
8140  {
8141    FILE *f=fopen("conftestval", "w");
8142 @@ -56718,7 +56724,7 @@
8143    exit(0);
8144  }
8145  EOF
8146 -if { (eval echo configure:56722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8147 +if { (eval echo configure:56728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8148  then
8149    ac_cv_sizeof_int=`cat conftestval`
8150  else
8151 @@ -56738,7 +56744,7 @@
8152
8153
8154  echo $ac_n "checking size of long""... $ac_c" 1>&6
8155 -echo "configure:56742: checking size of long" >&5
8156 +echo "configure:56748: checking size of long" >&5
8157  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
8158    echo $ac_n "(cached) $ac_c" 1>&6
8159  else
8160 @@ -56746,9 +56752,10 @@
8161    ac_cv_sizeof_long=4
8162  else
8163    cat > conftest.$ac_ext <<EOF
8164 -#line 56750 "configure"
8165 +#line 56756 "configure"
8166  #include "confdefs.h"
8167  #include <stdio.h>
8168 +#include <sys/types.h>
8169  main()
8170  {
8171    FILE *f=fopen("conftestval", "w");
8172 @@ -56757,7 +56764,7 @@
8173    exit(0);
8174  }
8175  EOF
8176 -if { (eval echo configure:56761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8177 +if { (eval echo configure:56768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8178  then
8179    ac_cv_sizeof_long=`cat conftestval`
8180  else
8181 @@ -56777,7 +56784,7 @@
8182
8183
8184  echo $ac_n "checking size of long long""... $ac_c" 1>&6
8185 -echo "configure:56781: checking size of long long" >&5
8186 +echo "configure:56788: checking size of long long" >&5
8187  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
8188    echo $ac_n "(cached) $ac_c" 1>&6
8189  else
8190 @@ -56785,9 +56792,10 @@
8191    ac_cv_sizeof_long_long=8
8192  else
8193    cat > conftest.$ac_ext <<EOF
8194 -#line 56789 "configure"
8195 +#line 56796 "configure"
8196  #include "confdefs.h"
8197  #include <stdio.h>
8198 +#include <sys/types.h>
8199  main()
8200  {
8201    FILE *f=fopen("conftestval", "w");
8202 @@ -56796,7 +56804,7 @@
8203    exit(0);
8204  }
8205  EOF
8206 -if { (eval echo configure:56800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8207 +if { (eval echo configure:56808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8208  then
8209    ac_cv_sizeof_long_long=`cat conftestval`
8210  else
8211 @@ -56816,12 +56824,12 @@
8212
8213
8214  echo $ac_n "checking for size_t""... $ac_c" 1>&6
8215 -echo "configure:56820: checking for size_t" >&5
8216 +echo "configure:56828: checking for size_t" >&5
8217  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
8218    echo $ac_n "(cached) $ac_c" 1>&6
8219  else
8220    cat > conftest.$ac_ext <<EOF
8221 -#line 56825 "configure"
8222 +#line 56833 "configure"
8223  #include "confdefs.h"
8224  #include <sys/types.h>
8225  #if STDC_HEADERS
8226 @@ -56849,12 +56857,12 @@
8227  fi
8228
8229  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
8230 -echo "configure:56853: checking whether time.h and sys/time.h may both be included" >&5
8231 +echo "configure:56861: checking whether time.h and sys/time.h may both be included" >&5
8232  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
8233    echo $ac_n "(cached) $ac_c" 1>&6
8234  else
8235    cat > conftest.$ac_ext <<EOF
8236 -#line 56858 "configure"
8237 +#line 56866 "configure"
8238  #include "confdefs.h"
8239  #include <sys/types.h>
8240  #include <sys/time.h>
8241 @@ -56863,7 +56871,7 @@
8242  struct tm *tp;
8243  ; return 0; }
8244  EOF
8245 -if { (eval echo configure:56867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8246 +if { (eval echo configure:56875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8247    rm -rf conftest*
8248    ac_cv_header_time=yes
8249  else
8250 @@ -56884,12 +56892,12 @@
8251  fi
8252
8253  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
8254 -echo "configure:56888: checking for uid_t in sys/types.h" >&5
8255 +echo "configure:56896: checking for uid_t in sys/types.h" >&5
8256  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
8257    echo $ac_n "(cached) $ac_c" 1>&6
8258  else
8259    cat > conftest.$ac_ext <<EOF
8260 -#line 56893 "configure"
8261 +#line 56901 "configure"
8262  #include "confdefs.h"
8263  #include <sys/types.h>
8264  EOF
8265 @@ -56919,7 +56927,7 @@
8266
8267
8268  echo $ac_n "checking for type ulong""... $ac_c" 1>&6
8269 -echo "configure:56923: checking for type ulong" >&5
8270 +echo "configure:56931: checking for type ulong" >&5
8271  if eval "test \"`echo '$''{'ac_cv_ulong'+set}'`\" = set"; then
8272    echo $ac_n "(cached) $ac_c" 1>&6
8273  else
8274 @@ -56927,7 +56935,7 @@
8275    ac_cv_ulong=no
8276  else
8277    cat > conftest.$ac_ext <<EOF
8278 -#line 56931 "configure"
8279 +#line 56939 "configure"
8280  #include "confdefs.h"
8281  #include <stdio.h>
8282  #include <sys/types.h>
8283 @@ -56938,7 +56946,7 @@
8284    exit(0);
8285  }
8286  EOF
8287 -if { (eval echo configure:56942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8288 +if { (eval echo configure:56950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8289  then
8290    ac_cv_ulong=yes
8291  else
8292 @@ -56962,7 +56970,7 @@
8293  fi
8294
8295  echo $ac_n "checking for type uchar""... $ac_c" 1>&6
8296 -echo "configure:56966: checking for type uchar" >&5
8297 +echo "configure:56974: checking for type uchar" >&5
8298  if eval "test \"`echo '$''{'ac_cv_uchar'+set}'`\" = set"; then
8299    echo $ac_n "(cached) $ac_c" 1>&6
8300  else
8301 @@ -56970,7 +56978,7 @@
8302    ac_cv_uchar=no
8303  else
8304    cat > conftest.$ac_ext <<EOF
8305 -#line 56974 "configure"
8306 +#line 56982 "configure"
8307  #include "confdefs.h"
8308  #include <stdio.h>
8309  #include <sys/types.h>
8310 @@ -56981,7 +56989,7 @@
8311    exit(0);
8312  }
8313  EOF
8314 -if { (eval echo configure:56985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8315 +if { (eval echo configure:56993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8316  then
8317    ac_cv_uchar=yes
8318  else
8319 @@ -57005,7 +57013,7 @@
8320  fi
8321
8322  echo $ac_n "checking for type uint""... $ac_c" 1>&6
8323 -echo "configure:57009: checking for type uint" >&5
8324 +echo "configure:57017: checking for type uint" >&5
8325  if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
8326    echo $ac_n "(cached) $ac_c" 1>&6
8327  else
8328 @@ -57013,7 +57021,7 @@
8329    ac_cv_uint=no
8330  else
8331    cat > conftest.$ac_ext <<EOF
8332 -#line 57017 "configure"
8333 +#line 57025 "configure"
8334  #include "confdefs.h"
8335  #include <stdio.h>
8336  #include <sys/types.h>
8337 @@ -57024,7 +57032,7 @@
8338    exit(0);
8339  }
8340  EOF
8341 -if { (eval echo configure:57028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8342 +if { (eval echo configure:57036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8343  then
8344    ac_cv_uint=yes
8345  else
8346 @@ -57048,7 +57056,7 @@
8347  fi
8348
8349  echo $ac_n "checking for type ushort""... $ac_c" 1>&6
8350 -echo "configure:57052: checking for type ushort" >&5
8351 +echo "configure:57060: checking for type ushort" >&5
8352  if eval "test \"`echo '$''{'ac_cv_ushort'+set}'`\" = set"; then
8353    echo $ac_n "(cached) $ac_c" 1>&6
8354  else
8355 @@ -57056,7 +57064,7 @@
8356    ac_cv_ushort=no
8357  else
8358    cat > conftest.$ac_ext <<EOF
8359 -#line 57060 "configure"
8360 +#line 57068 "configure"
8361  #include "confdefs.h"
8362  #include <stdio.h>
8363  #include <sys/types.h>
8364 @@ -57067,7 +57075,7 @@
8365    exit(0);
8366  }
8367  EOF
8368 -if { (eval echo configure:57071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8369 +if { (eval echo configure:57079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8370  then
8371    ac_cv_ushort=yes
8372  else
8373 @@ -57091,7 +57099,7 @@
8374  fi
8375
8376  echo $ac_n "checking for int8""... $ac_c" 1>&6
8377 -echo "configure:57095: checking for int8" >&5
8378 +echo "configure:57103: checking for int8" >&5
8379  if eval "test \"`echo '$''{'ac_cv_int8'+set}'`\" = set"; then
8380    echo $ac_n "(cached) $ac_c" 1>&6
8381  else
8382 @@ -57099,7 +57107,7 @@
8383    ac_cv_int8=no
8384  else
8385    cat > conftest.$ac_ext <<EOF
8386 -#line 57103 "configure"
8387 +#line 57111 "configure"
8388  #include "confdefs.h"
8389
8390  #ifdef HAVE_STDLIB_H
8391 @@ -57121,7 +57129,7 @@
8392  }
8393
8394  EOF
8395 -if { (eval echo configure:57125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8396 +if { (eval echo configure:57133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8397  then
8398    ac_cv_int8=yes
8399  else
8400 @@ -57147,7 +57155,7 @@
8401
8402  ac_save_CXXFLAGS="$CXXFLAGS"
8403  echo $ac_n "checking base type of last arg to accept""... $ac_c" 1>&6
8404 -echo "configure:57151: checking base type of last arg to accept" >&5
8405 +echo "configure:57159: checking base type of last arg to accept" >&5
8406  if eval "test \"`echo '$''{'mysql_cv_btype_last_arg_accept'+set}'`\" = set"; then
8407    echo $ac_n "(cached) $ac_c" 1>&6
8408  else
8409 @@ -57165,7 +57173,7 @@
8410  fi
8411  mysql_cv_btype_last_arg_accept=none
8412  cat > conftest.$ac_ext <<EOF
8413 -#line 57169 "configure"
8414 +#line 57177 "configure"
8415  #include "confdefs.h"
8416  #include <stdlib.h>
8417  #include <sys/types.h>
8418 @@ -57175,7 +57183,7 @@
8419  int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0);
8420  ; return 0; }
8421  EOF
8422 -if { (eval echo configure:57179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8423 +if { (eval echo configure:57187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8424    rm -rf conftest*
8425    mysql_cv_btype_last_arg_accept=socklen_t
8426  else
8427 @@ -57185,7 +57193,7 @@
8428  rm -f conftest*
8429  if test $mysql_cv_btype_last_arg_accept = none; then
8430  cat > conftest.$ac_ext <<EOF
8431 -#line 57189 "configure"
8432 +#line 57197 "configure"
8433  #include "confdefs.h"
8434  #include <stdlib.h>
8435  #include <sys/types.h>
8436 @@ -57195,7 +57203,7 @@
8437  int a = accept(1, (struct sockaddr *) 0, (size_t *) 0);
8438  ; return 0; }
8439  EOF
8440 -if { (eval echo configure:57199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8441 +if { (eval echo configure:57207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8442    rm -rf conftest*
8443    mysql_cv_btype_last_arg_accept=size_t
8444  else
8445 @@ -57224,12 +57232,12 @@
8446  CXXFLAGS="$ac_save_CXXFLAGS"
8447
8448  echo $ac_n "checking return type of qsort""... $ac_c" 1>&6
8449 -echo "configure:57228: checking return type of qsort" >&5
8450 +echo "configure:57236: checking return type of qsort" >&5
8451  if eval "test \"`echo '$''{'mysql_cv_type_qsort'+set}'`\" = set"; then
8452    echo $ac_n "(cached) $ac_c" 1>&6
8453  else
8454    cat > conftest.$ac_ext <<EOF
8455 -#line 57233 "configure"
8456 +#line 57241 "configure"
8457  #include "confdefs.h"
8458  #include <stdlib.h>
8459  #ifdef __cplusplus
8460 @@ -57242,7 +57250,7 @@
8461  int i;
8462  ; return 0; }
8463  EOF
8464 -if { (eval echo configure:57246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8465 +if { (eval echo configure:57254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8466    rm -rf conftest*
8467    mysql_cv_type_qsort=void
8468  else
8469 @@ -57292,12 +57300,12 @@
8470   crypt dlopen dlerror fchmod getpass getpassphrase
8471  do
8472  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
8473 -echo "configure:57296: checking for $ac_func" >&5
8474 +echo "configure:57304: checking for $ac_func" >&5
8475  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
8476    echo $ac_n "(cached) $ac_c" 1>&6
8477  else
8478    cat > conftest.$ac_ext <<EOF
8479 -#line 57301 "configure"
8480 +#line 57309 "configure"
8481  #include "confdefs.h"
8482  /* System header to define __stub macros and hopefully few prototypes,
8483      which can conflict with char $ac_func(); below.  */
8484 @@ -57320,7 +57328,7 @@
8485
8486  ; return 0; }
8487  EOF
8488 -if { (eval echo configure:57324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8489 +if { (eval echo configure:57332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8490    rm -rf conftest*
8491    eval "ac_cv_func_$ac_func=yes"
8492  else
8493 @@ -57349,12 +57357,12 @@
8494  for ac_func in strtok_r
8495  do
8496  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
8497 -echo "configure:57353: checking for $ac_func" >&5
8498 +echo "configure:57361: checking for $ac_func" >&5
8499  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
8500    echo $ac_n "(cached) $ac_c" 1>&6
8501  else
8502    cat > conftest.$ac_ext <<EOF
8503 -#line 57358 "configure"
8504 +#line 57366 "configure"
8505  #include "confdefs.h"
8506  /* System header to define __stub macros and hopefully few prototypes,
8507      which can conflict with char $ac_func(); below.  */
8508 @@ -57377,7 +57385,7 @@
8509
8510  ; return 0; }
8511  EOF
8512 -if { (eval echo configure:57381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8513 +if { (eval echo configure:57389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8514    rm -rf conftest*
8515    eval "ac_cv_func_$ac_func=yes"
8516  else
8517 @@ -57406,7 +57414,7 @@
8518  # Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
8519  ac_save_CXXFLAGS="$CXXFLAGS"
8520  echo $ac_n "checking style of gethostname_r routines""... $ac_c" 1>&6
8521 -echo "configure:57410: checking style of gethostname_r routines" >&5
8522 +echo "configure:57418: checking style of gethostname_r routines" >&5
8523  if eval "test \"`echo '$''{'mysql_cv_gethostname_style'+set}'`\" = set"; then
8524    echo $ac_n "(cached) $ac_c" 1>&6
8525  else
8526 @@ -57423,7 +57431,7 @@
8527    CXXFLAGS="$CXXFLAGS -Werror"
8528  fi
8529  cat > conftest.$ac_ext <<EOF
8530 -#line 57427 "configure"
8531 +#line 57435 "configure"
8532  #include "confdefs.h"
8533  #if !defined(SCO) && !defined(__osf__)
8534  #define _REENTRANT
8535 @@ -57441,7 +57449,7 @@
8536    (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);
8537  ; return 0; }
8538  EOF
8539 -if { (eval echo configure:57445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8540 +if { (eval echo configure:57453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8541    rm -rf conftest*
8542    mysql_cv_gethostname_style=glibc2
8543  else
8544 @@ -57473,7 +57481,7 @@
8545  # Check 3rd argument of getthostbyname_r
8546  ac_save_CXXFLAGS="$CXXFLAGS"
8547  echo $ac_n "checking 3 argument to gethostname_r routines""... $ac_c" 1>&6
8548 -echo "configure:57477: checking 3 argument to gethostname_r routines" >&5
8549 +echo "configure:57485: checking 3 argument to gethostname_r routines" >&5
8550  if eval "test \"`echo '$''{'mysql_cv_gethostname_arg'+set}'`\" = set"; then
8551    echo $ac_n "(cached) $ac_c" 1>&6
8552  else
8553 @@ -57490,7 +57498,7 @@
8554    CXXFLAGS="$CXXFLAGS -Werror"
8555  fi
8556  cat > conftest.$ac_ext <<EOF
8557 -#line 57494 "configure"
8558 +#line 57502 "configure"
8559  #include "confdefs.h"
8560  #if !defined(SCO) && !defined(__osf__)
8561  #define _REENTRANT
8562 @@ -57507,7 +57515,7 @@
8563   skr = gethostbyname_r((const char *) 0, (struct hostent*) 0, (hostent_data*) 0);
8564  ; return 0; }
8565  EOF
8566 -if { (eval echo configure:57511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8567 +if { (eval echo configure:57519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8568    rm -rf conftest*
8569    mysql_cv_gethostname_arg=hostent_data
8570  else
8571 @@ -57540,12 +57548,12 @@
8572
8573    # Check definition of pthread_getspecific
8574    echo $ac_n "checking "args to pthread_getspecific"""... $ac_c" 1>&6
8575 -echo "configure:57544: checking "args to pthread_getspecific"" >&5
8576 +echo "configure:57552: checking "args to pthread_getspecific"" >&5
8577  if eval "test \"`echo '$''{'mysql_cv_getspecific_args'+set}'`\" = set"; then
8578    echo $ac_n "(cached) $ac_c" 1>&6
8579  else
8580    cat > conftest.$ac_ext <<EOF
8581 -#line 57549 "configure"
8582 +#line 57557 "configure"
8583  #include "confdefs.h"
8584  #ifndef SCO
8585  #define _REENTRANT
8586 @@ -57557,7 +57565,7 @@
8587  pthread_getspecific((pthread_key_t) NULL);
8588  ; return 0; }
8589  EOF
8590 -if { (eval echo configure:57561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8591 +if { (eval echo configure:57569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8592    rm -rf conftest*
8593    mysql_cv_getspecific_args=POSIX
8594  else
8595 @@ -57581,12 +57589,12 @@
8596
8597    # Check definition of pthread_mutex_init
8598    echo $ac_n "checking "args to pthread_mutex_init"""... $ac_c" 1>&6
8599 -echo "configure:57585: checking "args to pthread_mutex_init"" >&5
8600 +echo "configure:57593: checking "args to pthread_mutex_init"" >&5
8601  if eval "test \"`echo '$''{'mysql_cv_mutex_init_args'+set}'`\" = set"; then
8602    echo $ac_n "(cached) $ac_c" 1>&6
8603  else
8604    cat > conftest.$ac_ext <<EOF
8605 -#line 57590 "configure"
8606 +#line 57598 "configure"
8607  #include "confdefs.h"
8608  #ifndef SCO
8609  #define _REENTRANT
8610 @@ -57600,7 +57608,7 @@
8611    pthread_mutex_init(&mp,&attr);
8612  ; return 0; }
8613  EOF
8614 -if { (eval echo configure:57604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8615 +if { (eval echo configure:57612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8616    rm -rf conftest*
8617    mysql_cv_mutex_init_args=POSIX
8618  else
8619 @@ -57624,12 +57632,12 @@
8620
8621  # Check definition of readdir_r
8622  echo $ac_n "checking "args to readdir_r"""... $ac_c" 1>&6
8623 -echo "configure:57628: checking "args to readdir_r"" >&5
8624 +echo "configure:57636: checking "args to readdir_r"" >&5
8625  if eval "test \"`echo '$''{'mysql_cv_readdir_r'+set}'`\" = set"; then
8626    echo $ac_n "(cached) $ac_c" 1>&6
8627  else
8628    cat > conftest.$ac_ext <<EOF
8629 -#line 57633 "configure"
8630 +#line 57641 "configure"
8631  #include "confdefs.h"
8632  #ifndef SCO
8633  #define _REENTRANT
8634 @@ -57642,7 +57650,7 @@
8635  readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL);
8636  ; return 0; }
8637  EOF
8638 -if { (eval echo configure:57646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8639 +if { (eval echo configure:57654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8640    rm -rf conftest*
8641    mysql_cv_readdir_r=POSIX
8642  else
8643 @@ -57666,12 +57674,12 @@
8644
8645  # Check definition av posix sigwait()
8646  echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6
8647 -echo "configure:57670: checking "style of sigwait"" >&5
8648 +echo "configure:57678: checking "style of sigwait"" >&5
8649  if eval "test \"`echo '$''{'mysql_cv_sigwait'+set}'`\" = set"; then
8650    echo $ac_n "(cached) $ac_c" 1>&6
8651  else
8652    cat > conftest.$ac_ext <<EOF
8653 -#line 57675 "configure"
8654 +#line 57683 "configure"
8655  #include "confdefs.h"
8656  #ifndef SCO
8657  #define _REENTRANT
8658 @@ -57687,7 +57695,7 @@
8659  #endif
8660  ; return 0; }
8661  EOF
8662 -if { (eval echo configure:57691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8663 +if { (eval echo configure:57699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8664    rm -rf conftest*
8665    mysql_cv_sigwait=POSIX
8666  else
8667 @@ -57713,12 +57721,12 @@
8668  unset mysql_cv_sigwait
8669  # Check definition av posix sigwait()
8670  echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6
8671 -echo "configure:57717: checking "style of sigwait"" >&5
8672 +echo "configure:57725: checking "style of sigwait"" >&5
8673  if eval "test \"`echo '$''{'mysql_cv_sigwait'+set}'`\" = set"; then
8674    echo $ac_n "(cached) $ac_c" 1>&6
8675  else
8676    cat > conftest.$ac_ext <<EOF
8677 -#line 57722 "configure"
8678 +#line 57730 "configure"
8679  #include "confdefs.h"
8680  #ifndef SCO
8681  #define _REENTRANT
8682 @@ -57732,7 +57740,7 @@
8683  sigwait(&set);
8684  ; return 0; }
8685  EOF
8686 -if { (eval echo configure:57736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8687 +if { (eval echo configure:57744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8688    rm -rf conftest*
8689    mysql_cv_sigwait=NONPOSIX
8690  else
8691 @@ -58000,7 +58008,7 @@
8692
8693
8694  echo $ac_n "checking size of char""... $ac_c" 1>&6
8695 -echo "configure:58004: checking size of char" >&5
8696 +echo "configure:58012: checking size of char" >&5
8697  if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
8698    echo $ac_n "(cached) $ac_c" 1>&6
8699  else
8700 @@ -58008,9 +58016,10 @@
8701    ac_cv_sizeof_char=1
8702  else
8703    cat > conftest.$ac_ext <<EOF
8704 -#line 58012 "configure"
8705 +#line 58020 "configure"
8706  #include "confdefs.h"
8707  #include <stdio.h>
8708 +#include <sys/types.h>
8709  main()
8710  {
8711    FILE *f=fopen("conftestval", "w");
8712 @@ -58019,7 +58028,7 @@
8713    exit(0);
8714  }
8715  EOF
8716 -if { (eval echo configure:58023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8717 +if { (eval echo configure:58032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8718  then
8719    ac_cv_sizeof_char=`cat conftestval`
8720  else
8721 @@ -58040,7 +58049,7 @@
8722
8723
8724  echo $ac_n "checking size of int""... $ac_c" 1>&6
8725 -echo "configure:58044: checking size of int" >&5
8726 +echo "configure:58053: checking size of int" >&5
8727  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
8728    echo $ac_n "(cached) $ac_c" 1>&6
8729  else
8730 @@ -58048,9 +58057,10 @@
8731    ac_cv_sizeof_int=4
8732  else
8733    cat > conftest.$ac_ext <<EOF
8734 -#line 58052 "configure"
8735 +#line 58061 "configure"
8736  #include "confdefs.h"
8737  #include <stdio.h>
8738 +#include <sys/types.h>
8739  main()
8740  {
8741    FILE *f=fopen("conftestval", "w");
8742 @@ -58059,7 +58069,7 @@
8743    exit(0);
8744  }
8745  EOF
8746 -if { (eval echo configure:58063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8747 +if { (eval echo configure:58073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8748  then
8749    ac_cv_sizeof_int=`cat conftestval`
8750  else
8751 @@ -58079,7 +58089,7 @@
8752
8753
8754  echo $ac_n "checking size of long""... $ac_c" 1>&6
8755 -echo "configure:58083: checking size of long" >&5
8756 +echo "configure:58093: checking size of long" >&5
8757  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
8758    echo $ac_n "(cached) $ac_c" 1>&6
8759  else
8760 @@ -58087,9 +58097,10 @@
8761    ac_cv_sizeof_long=4
8762  else
8763    cat > conftest.$ac_ext <<EOF
8764 -#line 58091 "configure"
8765 +#line 58101 "configure"
8766  #include "confdefs.h"
8767  #include <stdio.h>
8768 +#include <sys/types.h>
8769  main()
8770  {
8771    FILE *f=fopen("conftestval", "w");
8772 @@ -58098,7 +58109,7 @@
8773    exit(0);
8774  }
8775  EOF
8776 -if { (eval echo configure:58102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8777 +if { (eval echo configure:58113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8778  then
8779    ac_cv_sizeof_long=`cat conftestval`
8780  else
8781 @@ -58118,7 +58129,7 @@
8782
8783
8784  echo $ac_n "checking size of long long""... $ac_c" 1>&6
8785 -echo "configure:58122: checking size of long long" >&5
8786 +echo "configure:58133: checking size of long long" >&5
8787  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
8788    echo $ac_n "(cached) $ac_c" 1>&6
8789  else
8790 @@ -58126,9 +58137,10 @@
8791    ac_cv_sizeof_long_long=8
8792  else
8793    cat > conftest.$ac_ext <<EOF
8794 -#line 58130 "configure"
8795 +#line 58141 "configure"
8796  #include "confdefs.h"
8797  #include <stdio.h>
8798 +#include <sys/types.h>
8799  main()
8800  {
8801    FILE *f=fopen("conftestval", "w");
8802 @@ -58137,7 +58149,7 @@
8803    exit(0);
8804  }
8805  EOF
8806 -if { (eval echo configure:58141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8807 +if { (eval echo configure:58153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8808  then
8809    ac_cv_sizeof_long_long=`cat conftestval`
8810  else
8811 @@ -58157,12 +58169,12 @@
8812
8813
8814  echo $ac_n "checking for size_t""... $ac_c" 1>&6
8815 -echo "configure:58161: checking for size_t" >&5
8816 +echo "configure:58173: checking for size_t" >&5
8817  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
8818    echo $ac_n "(cached) $ac_c" 1>&6
8819  else
8820    cat > conftest.$ac_ext <<EOF
8821 -#line 58166 "configure"
8822 +#line 58178 "configure"
8823  #include "confdefs.h"
8824  #include <sys/types.h>
8825  #if STDC_HEADERS
8826 @@ -58190,12 +58202,12 @@
8827  fi
8828
8829  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
8830 -echo "configure:58194: checking whether time.h and sys/time.h may both be included" >&5
8831 +echo "configure:58206: checking whether time.h and sys/time.h may both be included" >&5
8832  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
8833    echo $ac_n "(cached) $ac_c" 1>&6
8834  else
8835    cat > conftest.$ac_ext <<EOF
8836 -#line 58199 "configure"
8837 +#line 58211 "configure"
8838  #include "confdefs.h"
8839  #include <sys/types.h>
8840  #include <sys/time.h>
8841 @@ -58204,7 +58216,7 @@
8842  struct tm *tp;
8843  ; return 0; }
8844  EOF
8845 -if { (eval echo configure:58208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8846 +if { (eval echo configure:58220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8847    rm -rf conftest*
8848    ac_cv_header_time=yes
8849  else
8850 @@ -58225,12 +58237,12 @@
8851  fi
8852
8853  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
8854 -echo "configure:58229: checking for uid_t in sys/types.h" >&5
8855 +echo "configure:58241: checking for uid_t in sys/types.h" >&5
8856  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
8857    echo $ac_n "(cached) $ac_c" 1>&6
8858  else
8859    cat > conftest.$ac_ext <<EOF
8860 -#line 58234 "configure"
8861 +#line 58246 "configure"
8862  #include "confdefs.h"
8863  #include <sys/types.h>
8864  EOF
8865 @@ -58260,7 +58272,7 @@
8866
8867
8868  echo $ac_n "checking for type ulong""... $ac_c" 1>&6
8869 -echo "configure:58264: checking for type ulong" >&5
8870 +echo "configure:58276: checking for type ulong" >&5
8871  if eval "test \"`echo '$''{'ac_cv_ulong'+set}'`\" = set"; then
8872    echo $ac_n "(cached) $ac_c" 1>&6
8873  else
8874 @@ -58268,7 +58280,7 @@
8875    ac_cv_ulong=no
8876  else
8877    cat > conftest.$ac_ext <<EOF
8878 -#line 58272 "configure"
8879 +#line 58284 "configure"
8880  #include "confdefs.h"
8881  #include <stdio.h>
8882  #include <sys/types.h>
8883 @@ -58279,7 +58291,7 @@
8884    exit(0);
8885  }
8886  EOF
8887 -if { (eval echo configure:58283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8888 +if { (eval echo configure:58295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8889  then
8890    ac_cv_ulong=yes
8891  else
8892 @@ -58303,7 +58315,7 @@
8893  fi
8894
8895  echo $ac_n "checking for type uchar""... $ac_c" 1>&6
8896 -echo "configure:58307: checking for type uchar" >&5
8897 +echo "configure:58319: checking for type uchar" >&5
8898  if eval "test \"`echo '$''{'ac_cv_uchar'+set}'`\" = set"; then
8899    echo $ac_n "(cached) $ac_c" 1>&6
8900  else
8901 @@ -58311,7 +58323,7 @@
8902    ac_cv_uchar=no
8903  else
8904    cat > conftest.$ac_ext <<EOF
8905 -#line 58315 "configure"
8906 +#line 58327 "configure"
8907  #include "confdefs.h"
8908  #include <stdio.h>
8909  #include <sys/types.h>
8910 @@ -58322,7 +58334,7 @@
8911    exit(0);
8912  }
8913  EOF
8914 -if { (eval echo configure:58326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8915 +if { (eval echo configure:58338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8916  then
8917    ac_cv_uchar=yes
8918  else
8919 @@ -58346,7 +58358,7 @@
8920  fi
8921
8922  echo $ac_n "checking for type uint""... $ac_c" 1>&6
8923 -echo "configure:58350: checking for type uint" >&5
8924 +echo "configure:58362: checking for type uint" >&5
8925  if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
8926    echo $ac_n "(cached) $ac_c" 1>&6
8927  else
8928 @@ -58354,7 +58366,7 @@
8929    ac_cv_uint=no
8930  else
8931    cat > conftest.$ac_ext <<EOF
8932 -#line 58358 "configure"
8933 +#line 58370 "configure"
8934  #include "confdefs.h"
8935  #include <stdio.h>
8936  #include <sys/types.h>
8937 @@ -58365,7 +58377,7 @@
8938    exit(0);
8939  }
8940  EOF
8941 -if { (eval echo configure:58369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8942 +if { (eval echo configure:58381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8943  then
8944    ac_cv_uint=yes
8945  else
8946 @@ -58389,7 +58401,7 @@
8947  fi
8948
8949  echo $ac_n "checking for type ushort""... $ac_c" 1>&6
8950 -echo "configure:58393: checking for type ushort" >&5
8951 +echo "configure:58405: checking for type ushort" >&5
8952  if eval "test \"`echo '$''{'ac_cv_ushort'+set}'`\" = set"; then
8953    echo $ac_n "(cached) $ac_c" 1>&6
8954  else
8955 @@ -58397,7 +58409,7 @@
8956    ac_cv_ushort=no
8957  else
8958    cat > conftest.$ac_ext <<EOF
8959 -#line 58401 "configure"
8960 +#line 58413 "configure"
8961  #include "confdefs.h"
8962  #include <stdio.h>
8963  #include <sys/types.h>
8964 @@ -58408,7 +58420,7 @@
8965    exit(0);
8966  }
8967  EOF
8968 -if { (eval echo configure:58412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8969 +if { (eval echo configure:58424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8970  then
8971    ac_cv_ushort=yes
8972  else
8973 @@ -58432,7 +58444,7 @@
8974  fi
8975
8976  echo $ac_n "checking for int8""... $ac_c" 1>&6
8977 -echo "configure:58436: checking for int8" >&5
8978 +echo "configure:58448: checking for int8" >&5
8979  if eval "test \"`echo '$''{'ac_cv_int8'+set}'`\" = set"; then
8980    echo $ac_n "(cached) $ac_c" 1>&6
8981  else
8982 @@ -58440,7 +58452,7 @@
8983    ac_cv_int8=no
8984  else
8985    cat > conftest.$ac_ext <<EOF
8986 -#line 58444 "configure"
8987 +#line 58456 "configure"
8988  #include "confdefs.h"
8989
8990  #ifdef HAVE_STDLIB_H
8991 @@ -58462,7 +58474,7 @@
8992  }
8993
8994  EOF
8995 -if { (eval echo configure:58466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8996 +if { (eval echo configure:58478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8997  then
8998    ac_cv_int8=yes
8999  else
9000 @@ -58488,7 +58500,7 @@
9001
9002  ac_save_CXXFLAGS="$CXXFLAGS"
9003  echo $ac_n "checking base type of last arg to accept""... $ac_c" 1>&6
9004 -echo "configure:58492: checking base type of last arg to accept" >&5
9005 +echo "configure:58504: checking base type of last arg to accept" >&5
9006  if eval "test \"`echo '$''{'mysql_cv_btype_last_arg_accept'+set}'`\" = set"; then
9007    echo $ac_n "(cached) $ac_c" 1>&6
9008  else
9009 @@ -58506,7 +58518,7 @@
9010  fi
9011  mysql_cv_btype_last_arg_accept=none
9012  cat > conftest.$ac_ext <<EOF
9013 -#line 58510 "configure"
9014 +#line 58522 "configure"
9015  #include "confdefs.h"
9016  #include <stdlib.h>
9017  #include <sys/types.h>
9018 @@ -58516,7 +58528,7 @@
9019  int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0);
9020  ; return 0; }
9021  EOF
9022 -if { (eval echo configure:58520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9023 +if { (eval echo configure:58532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9024    rm -rf conftest*
9025    mysql_cv_btype_last_arg_accept=socklen_t
9026  else
9027 @@ -58526,7 +58538,7 @@
9028  rm -f conftest*
9029  if test $mysql_cv_btype_last_arg_accept = none; then
9030  cat > conftest.$ac_ext <<EOF
9031 -#line 58530 "configure"
9032 +#line 58542 "configure"
9033  #include "confdefs.h"
9034  #include <stdlib.h>
9035  #include <sys/types.h>
9036 @@ -58536,7 +58548,7 @@
9037  int a = accept(1, (struct sockaddr *) 0, (size_t *) 0);
9038  ; return 0; }
9039  EOF
9040 -if { (eval echo configure:58540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9041 +if { (eval echo configure:58552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9042    rm -rf conftest*
9043    mysql_cv_btype_last_arg_accept=size_t
9044  else
9045 @@ -58565,12 +58577,12 @@
9046  CXXFLAGS="$ac_save_CXXFLAGS"
9047
9048  echo $ac_n "checking return type of qsort""... $ac_c" 1>&6
9049 -echo "configure:58569: checking return type of qsort" >&5
9050 +echo "configure:58581: checking return type of qsort" >&5
9051  if eval "test \"`echo '$''{'mysql_cv_type_qsort'+set}'`\" = set"; then
9052    echo $ac_n "(cached) $ac_c" 1>&6
9053  else
9054    cat > conftest.$ac_ext <<EOF
9055 -#line 58574 "configure"
9056 +#line 58586 "configure"
9057  #include "confdefs.h"
9058  #include <stdlib.h>
9059  #ifdef __cplusplus
9060 @@ -58583,7 +58595,7 @@
9061  int i;
9062  ; return 0; }
9063  EOF
9064 -if { (eval echo configure:58587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9065 +if { (eval echo configure:58599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9066    rm -rf conftest*
9067    mysql_cv_type_qsort=void
9068  else
9069 @@ -58947,7 +58959,7 @@
9070    done
9071
9072    echo $ac_n "checking for mysql_close in -lmysqlclient""... $ac_c" 1>&6
9073 -echo "configure:58951: checking for mysql_close in -lmysqlclient" >&5
9074 +echo "configure:58963: checking for mysql_close in -lmysqlclient" >&5
9075  ac_lib_var=`echo mysqlclient'_'mysql_close | sed 'y%./+-%__p_%'`
9076  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9077    echo $ac_n "(cached) $ac_c" 1>&6
9078 @@ -58955,7 +58967,7 @@
9079    ac_save_LIBS="$LIBS"
9080  LIBS="-lmysqlclient  $LIBS"
9081  cat > conftest.$ac_ext <<EOF
9082 -#line 58959 "configure"
9083 +#line 58971 "configure"
9084  #include "confdefs.h"
9085  /* Override any gcc2 internal prototype to avoid an error.  */
9086  /* We use char because int might match the return type of a gcc2
9087 @@ -58966,7 +58978,7 @@
9088  mysql_close()
9089  ; return 0; }
9090  EOF
9091 -if { (eval echo configure:58970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9092 +if { (eval echo configure:58982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9093    rm -rf conftest*
9094    eval "ac_cv_lib_$ac_lib_var=yes"
9095  else
9096 @@ -59171,7 +59183,7 @@
9097    done
9098
9099    echo $ac_n "checking for mysql_error in -lmysqlclient""... $ac_c" 1>&6
9100 -echo "configure:59175: checking for mysql_error in -lmysqlclient" >&5
9101 +echo "configure:59187: checking for mysql_error in -lmysqlclient" >&5
9102  ac_lib_var=`echo mysqlclient'_'mysql_error | sed 'y%./+-%__p_%'`
9103  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9104    echo $ac_n "(cached) $ac_c" 1>&6
9105 @@ -59179,7 +59191,7 @@
9106    ac_save_LIBS="$LIBS"
9107  LIBS="-lmysqlclient  $LIBS"
9108  cat > conftest.$ac_ext <<EOF
9109 -#line 59183 "configure"
9110 +#line 59195 "configure"
9111  #include "confdefs.h"
9112  /* Override any gcc2 internal prototype to avoid an error.  */
9113  /* We use char because int might match the return type of a gcc2
9114 @@ -59190,7 +59202,7 @@
9115  mysql_error()
9116  ; return 0; }
9117  EOF
9118 -if { (eval echo configure:59194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9119 +if { (eval echo configure:59206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9120    rm -rf conftest*
9121    eval "ac_cv_lib_$ac_lib_var=yes"
9122  else
9123 @@ -59328,7 +59340,7 @@
9124    done
9125
9126    echo $ac_n "checking for mysql_errno in -lmysqlclient""... $ac_c" 1>&6
9127 -echo "configure:59332: checking for mysql_errno in -lmysqlclient" >&5
9128 +echo "configure:59344: checking for mysql_errno in -lmysqlclient" >&5
9129  ac_lib_var=`echo mysqlclient'_'mysql_errno | sed 'y%./+-%__p_%'`
9130  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9131    echo $ac_n "(cached) $ac_c" 1>&6
9132 @@ -59336,7 +59348,7 @@
9133    ac_save_LIBS="$LIBS"
9134  LIBS="-lmysqlclient  $LIBS"
9135  cat > conftest.$ac_ext <<EOF
9136 -#line 59340 "configure"
9137 +#line 59352 "configure"
9138  #include "confdefs.h"
9139  /* Override any gcc2 internal prototype to avoid an error.  */
9140  /* We use char because int might match the return type of a gcc2
9141 @@ -59347,7 +59359,7 @@
9142  mysql_errno()
9143  ; return 0; }
9144  EOF
9145 -if { (eval echo configure:59351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9146 +if { (eval echo configure:59363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9147    rm -rf conftest*
9148    eval "ac_cv_lib_$ac_lib_var=yes"
9149  else
9150 @@ -59547,7 +59559,7 @@
9151
9152
9153  echo $ac_n "checking for ncurses support""... $ac_c" 1>&6
9154 -echo "configure:59551: checking for ncurses support" >&5
9155 +echo "configure:59563: checking for ncurses support" >&5
9156  # Check whether --with-ncurses or --without-ncurses was given.
9157  if test "${with_ncurses+set}" = set; then
9158    withval="$with_ncurses"
9159 @@ -59737,7 +59749,7 @@
9160    done
9161
9162    echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
9163 -echo "configure:59741: checking for $LIBSYMBOL in -l$LIBNAME" >&5
9164 +echo "configure:59753: checking for $LIBSYMBOL in -l$LIBNAME" >&5
9165  ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
9166  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9167    echo $ac_n "(cached) $ac_c" 1>&6
9168 @@ -59745,7 +59757,7 @@
9169    ac_save_LIBS="$LIBS"
9170  LIBS="-l$LIBNAME  $LIBS"
9171  cat > conftest.$ac_ext <<EOF
9172 -#line 59749 "configure"
9173 +#line 59761 "configure"
9174  #include "confdefs.h"
9175  /* Override any gcc2 internal prototype to avoid an error.  */
9176  /* We use char because int might match the return type of a gcc2
9177 @@ -59756,7 +59768,7 @@
9178  $LIBSYMBOL()
9179  ; return 0; }
9180  EOF
9181 -if { (eval echo configure:59760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9182 +if { (eval echo configure:59772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9183    rm -rf conftest*
9184    eval "ac_cv_lib_$ac_lib_var=yes"
9185  else
9186 @@ -59957,7 +59969,7 @@
9187    done
9188
9189    echo $ac_n "checking for new_panel in -lpanel""... $ac_c" 1>&6
9190 -echo "configure:59961: checking for new_panel in -lpanel" >&5
9191 +echo "configure:59973: checking for new_panel in -lpanel" >&5
9192  ac_lib_var=`echo panel'_'new_panel | sed 'y%./+-%__p_%'`
9193  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9194    echo $ac_n "(cached) $ac_c" 1>&6
9195 @@ -59965,7 +59977,7 @@
9196    ac_save_LIBS="$LIBS"
9197  LIBS="-lpanel  $LIBS"
9198  cat > conftest.$ac_ext <<EOF
9199 -#line 59969 "configure"
9200 +#line 59981 "configure"
9201  #include "confdefs.h"
9202  /* Override any gcc2 internal prototype to avoid an error.  */
9203  /* We use char because int might match the return type of a gcc2
9204 @@ -59976,7 +59988,7 @@
9205  new_panel()
9206  ; return 0; }
9207  EOF
9208 -if { (eval echo configure:59980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9209 +if { (eval echo configure:59992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9210    rm -rf conftest*
9211    eval "ac_cv_lib_$ac_lib_var=yes"
9212  else
9213 @@ -60123,7 +60135,7 @@
9214
9215
9216     echo $ac_n "checking for color_set in -l$LIBNAME""... $ac_c" 1>&6
9217 -echo "configure:60127: checking for color_set in -l$LIBNAME" >&5
9218 +echo "configure:60139: checking for color_set in -l$LIBNAME" >&5
9219  ac_lib_var=`echo $LIBNAME'_'color_set | sed 'y%./+-%__p_%'`
9220  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9221    echo $ac_n "(cached) $ac_c" 1>&6
9222 @@ -60131,7 +60143,7 @@
9223    ac_save_LIBS="$LIBS"
9224  LIBS="-l$LIBNAME  $LIBS"
9225  cat > conftest.$ac_ext <<EOF
9226 -#line 60135 "configure"
9227 +#line 60147 "configure"
9228  #include "confdefs.h"
9229  /* Override any gcc2 internal prototype to avoid an error.  */
9230  /* We use char because int might match the return type of a gcc2
9231 @@ -60142,7 +60154,7 @@
9232  color_set()
9233  ; return 0; }
9234  EOF
9235 -if { (eval echo configure:60146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9236 +if { (eval echo configure:60158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9237    rm -rf conftest*
9238    eval "ac_cv_lib_$ac_lib_var=yes"
9239  else
9240 @@ -60166,7 +60178,7 @@
9241  fi
9242
9243     echo $ac_n "checking for slk_color in -l$LIBNAME""... $ac_c" 1>&6
9244 -echo "configure:60170: checking for slk_color in -l$LIBNAME" >&5
9245 +echo "configure:60182: checking for slk_color in -l$LIBNAME" >&5
9246  ac_lib_var=`echo $LIBNAME'_'slk_color | sed 'y%./+-%__p_%'`
9247  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9248    echo $ac_n "(cached) $ac_c" 1>&6
9249 @@ -60174,7 +60186,7 @@
9250    ac_save_LIBS="$LIBS"
9251  LIBS="-l$LIBNAME  $LIBS"
9252  cat > conftest.$ac_ext <<EOF
9253 -#line 60178 "configure"
9254 +#line 60190 "configure"
9255  #include "confdefs.h"
9256  /* Override any gcc2 internal prototype to avoid an error.  */
9257  /* We use char because int might match the return type of a gcc2
9258 @@ -60185,7 +60197,7 @@
9259  slk_color()
9260  ; return 0; }
9261  EOF
9262 -if { (eval echo configure:60189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9263 +if { (eval echo configure:60201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9264    rm -rf conftest*
9265    eval "ac_cv_lib_$ac_lib_var=yes"
9266  else
9267 @@ -60209,7 +60221,7 @@
9268  fi
9269
9270     echo $ac_n "checking for assume_default_colors in -l$LIBNAME""... $ac_c" 1>&6
9271 -echo "configure:60213: checking for assume_default_colors in -l$LIBNAME" >&5
9272 +echo "configure:60225: checking for assume_default_colors in -l$LIBNAME" >&5
9273  ac_lib_var=`echo $LIBNAME'_'assume_default_colors | sed 'y%./+-%__p_%'`
9274  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9275    echo $ac_n "(cached) $ac_c" 1>&6
9276 @@ -60217,7 +60229,7 @@
9277    ac_save_LIBS="$LIBS"
9278  LIBS="-l$LIBNAME  $LIBS"
9279  cat > conftest.$ac_ext <<EOF
9280 -#line 60221 "configure"
9281 +#line 60233 "configure"
9282  #include "confdefs.h"
9283  /* Override any gcc2 internal prototype to avoid an error.  */
9284  /* We use char because int might match the return type of a gcc2
9285 @@ -60228,7 +60240,7 @@
9286  assume_default_colors()
9287  ; return 0; }
9288  EOF
9289 -if { (eval echo configure:60232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9290 +if { (eval echo configure:60244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9291    rm -rf conftest*
9292    eval "ac_cv_lib_$ac_lib_var=yes"
9293  else
9294 @@ -60252,7 +60264,7 @@
9295  fi
9296
9297     echo $ac_n "checking for use_extended_names in -l$LIBNAME""... $ac_c" 1>&6
9298 -echo "configure:60256: checking for use_extended_names in -l$LIBNAME" >&5
9299 +echo "configure:60268: checking for use_extended_names in -l$LIBNAME" >&5
9300  ac_lib_var=`echo $LIBNAME'_'use_extended_names | sed 'y%./+-%__p_%'`
9301  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9302    echo $ac_n "(cached) $ac_c" 1>&6
9303 @@ -60260,7 +60272,7 @@
9304    ac_save_LIBS="$LIBS"
9305  LIBS="-l$LIBNAME  $LIBS"
9306  cat > conftest.$ac_ext <<EOF
9307 -#line 60264 "configure"
9308 +#line 60276 "configure"
9309  #include "confdefs.h"
9310  /* Override any gcc2 internal prototype to avoid an error.  */
9311  /* We use char because int might match the return type of a gcc2
9312 @@ -60271,7 +60283,7 @@
9313  use_extended_names()
9314  ; return 0; }
9315  EOF
9316 -if { (eval echo configure:60275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9317 +if { (eval echo configure:60287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9318    rm -rf conftest*
9319    eval "ac_cv_lib_$ac_lib_var=yes"
9320  else
9321 @@ -60532,7 +60544,7 @@
9322
9323
9324  echo $ac_n "checking for Oracle (OCI8) support using ORACLE_HOME installation""... $ac_c" 1>&6
9325 -echo "configure:60536: checking for Oracle (OCI8) support using ORACLE_HOME installation" >&5
9326 +echo "configure:60548: checking for Oracle (OCI8) support using ORACLE_HOME installation" >&5
9327  # Check whether --with-oci8 or --without-oci8 was given.
9328  if test "${with_oci8+set}" = set; then
9329    withval="$with_oci8"
9330 @@ -60579,7 +60591,7 @@
9331
9332
9333  echo $ac_n "checking for Oracle (OCI8) support using Oracle Instant Client""... $ac_c" 1>&6
9334 -echo "configure:60583: checking for Oracle (OCI8) support using Oracle Instant Client" >&5
9335 +echo "configure:60595: checking for Oracle (OCI8) support using Oracle Instant Client" >&5
9336  # Check whether --with-oci8-instant-client or --without-oci8-instant-client was given.
9337  if test "${with_oci8_instant_client+set}" = set; then
9338    withval="$with_oci8_instant_client"
9339 @@ -60632,7 +60644,7 @@
9340    fi
9341
9342    echo $ac_n "checking Oracle Install Directory""... $ac_c" 1>&6
9343 -echo "configure:60636: checking Oracle Install Directory" >&5
9344 +echo "configure:60648: checking Oracle Install Directory" >&5
9345    if test "$PHP_OCI8" = "yes"; then
9346      OCI8_DIR=$ORACLE_HOME
9347    else
9348 @@ -60927,7 +60939,7 @@
9349
9350
9351    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
9352 -echo "configure:60931: checking Oracle version" >&5
9353 +echo "configure:60943: checking Oracle version" >&5
9354    if test -s "$OCI8_DIR/orainst/unix.rgs"; then
9355      OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
9356      test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
9357 @@ -61404,7 +61416,7 @@
9358    old_CPPFLAGS=$CPPFLAGS
9359    CPPFLAGS=$OCI8_INCLUDES
9360    cat > conftest.$ac_ext <<EOF
9361 -#line 61408 "configure"
9362 +#line 61420 "configure"
9363  #include "confdefs.h"
9364
9365  #include <oci.h>
9366 @@ -61581,7 +61593,7 @@
9367    done
9368
9369    echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
9370 -echo "configure:61585: checking for OCIEnvNlsCreate in -lclntsh" >&5
9371 +echo "configure:61597: checking for OCIEnvNlsCreate in -lclntsh" >&5
9372  ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
9373  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9374    echo $ac_n "(cached) $ac_c" 1>&6
9375 @@ -61589,7 +61601,7 @@
9376    ac_save_LIBS="$LIBS"
9377  LIBS="-lclntsh  $LIBS"
9378  cat > conftest.$ac_ext <<EOF
9379 -#line 61593 "configure"
9380 +#line 61605 "configure"
9381  #include "confdefs.h"
9382  /* Override any gcc2 internal prototype to avoid an error.  */
9383  /* We use char because int might match the return type of a gcc2
9384 @@ -61600,7 +61612,7 @@
9385  OCIEnvNlsCreate()
9386  ; return 0; }
9387  EOF
9388 -if { (eval echo configure:61604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9389 +if { (eval echo configure:61616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9390    rm -rf conftest*
9391    eval "ac_cv_lib_$ac_lib_var=yes"
9392  else
9393 @@ -61700,7 +61712,7 @@
9394    done
9395
9396    echo $ac_n "checking for OCINlsCharSetNameToId in -lclntsh""... $ac_c" 1>&6
9397 -echo "configure:61704: checking for OCINlsCharSetNameToId in -lclntsh" >&5
9398 +echo "configure:61716: checking for OCINlsCharSetNameToId in -lclntsh" >&5
9399  ac_lib_var=`echo clntsh'_'OCINlsCharSetNameToId | sed 'y%./+-%__p_%'`
9400  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9401    echo $ac_n "(cached) $ac_c" 1>&6
9402 @@ -61708,7 +61720,7 @@
9403    ac_save_LIBS="$LIBS"
9404  LIBS="-lclntsh  $LIBS"
9405  cat > conftest.$ac_ext <<EOF
9406 -#line 61712 "configure"
9407 +#line 61724 "configure"
9408  #include "confdefs.h"
9409  /* Override any gcc2 internal prototype to avoid an error.  */
9410  /* We use char because int might match the return type of a gcc2
9411 @@ -61719,7 +61731,7 @@
9412  OCINlsCharSetNameToId()
9413  ; return 0; }
9414  EOF
9415 -if { (eval echo configure:61723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9416 +if { (eval echo configure:61735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9417    rm -rf conftest*
9418    eval "ac_cv_lib_$ac_lib_var=yes"
9419  else
9420 @@ -61934,7 +61946,7 @@
9421    done
9422
9423    echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
9424 -echo "configure:61938: checking for OCILobIsTemporary in -lclntsh" >&5
9425 +echo "configure:61950: checking for OCILobIsTemporary in -lclntsh" >&5
9426  ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
9427  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9428    echo $ac_n "(cached) $ac_c" 1>&6
9429 @@ -61942,7 +61954,7 @@
9430    ac_save_LIBS="$LIBS"
9431  LIBS="-lclntsh  $LIBS"
9432  cat > conftest.$ac_ext <<EOF
9433 -#line 61946 "configure"
9434 +#line 61958 "configure"
9435  #include "confdefs.h"
9436  /* Override any gcc2 internal prototype to avoid an error.  */
9437  /* We use char because int might match the return type of a gcc2
9438 @@ -61953,7 +61965,7 @@
9439  OCILobIsTemporary()
9440  ; return 0; }
9441  EOF
9442 -if { (eval echo configure:61957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9443 +if { (eval echo configure:61969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9444    rm -rf conftest*
9445    eval "ac_cv_lib_$ac_lib_var=yes"
9446  else
9447 @@ -62066,7 +62078,7 @@
9448    done
9449
9450    echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
9451 -echo "configure:62070: checking for OCILobIsTemporary in -locijdbc8" >&5
9452 +echo "configure:62082: checking for OCILobIsTemporary in -locijdbc8" >&5
9453  ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
9454  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9455    echo $ac_n "(cached) $ac_c" 1>&6
9456 @@ -62074,7 +62086,7 @@
9457    ac_save_LIBS="$LIBS"
9458  LIBS="-locijdbc8  $LIBS"
9459  cat > conftest.$ac_ext <<EOF
9460 -#line 62078 "configure"
9461 +#line 62090 "configure"
9462  #include "confdefs.h"
9463  /* Override any gcc2 internal prototype to avoid an error.  */
9464  /* We use char because int might match the return type of a gcc2
9465 @@ -62085,7 +62097,7 @@
9466  OCILobIsTemporary()
9467  ; return 0; }
9468  EOF
9469 -if { (eval echo configure:62089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9470 +if { (eval echo configure:62101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9471    rm -rf conftest*
9472    eval "ac_cv_lib_$ac_lib_var=yes"
9473  else
9474 @@ -62229,7 +62241,7 @@
9475    done
9476
9477    echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
9478 -echo "configure:62233: checking for OCICollAssign in -lclntsh" >&5
9479 +echo "configure:62245: checking for OCICollAssign in -lclntsh" >&5
9480  ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'`
9481  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9482    echo $ac_n "(cached) $ac_c" 1>&6
9483 @@ -62237,7 +62249,7 @@
9484    ac_save_LIBS="$LIBS"
9485  LIBS="-lclntsh  $LIBS"
9486  cat > conftest.$ac_ext <<EOF
9487 -#line 62241 "configure"
9488 +#line 62253 "configure"
9489  #include "confdefs.h"
9490  /* Override any gcc2 internal prototype to avoid an error.  */
9491  /* We use char because int might match the return type of a gcc2
9492 @@ -62248,7 +62260,7 @@
9493  OCICollAssign()
9494  ; return 0; }
9495  EOF
9496 -if { (eval echo configure:62252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9497 +if { (eval echo configure:62264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9498    rm -rf conftest*
9499    eval "ac_cv_lib_$ac_lib_var=yes"
9500  else
9501 @@ -62533,7 +62545,7 @@
9502  elif test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
9503
9504    echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
9505 -echo "configure:62537: checking Oracle Instant Client directory" >&5
9506 +echo "configure:62549: checking Oracle Instant Client directory" >&5
9507    if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
9508      PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib  2> /dev/null | tail -1`
9509      if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
9510 @@ -62545,7 +62557,7 @@
9511    OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
9512
9513    echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
9514 -echo "configure:62549: checking Oracle Instant Client SDK header directory" >&5
9515 +echo "configure:62561: checking Oracle Instant Client SDK header directory" >&5
9516
9517    OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e 's!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'`
9518
9519 @@ -62701,7 +62713,7 @@
9520
9521
9522    echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
9523 -echo "configure:62705: checking Oracle Instant Client version" >&5
9524 +echo "configure:62717: checking Oracle Instant Client version" >&5
9525    if test -f $PHP_OCI8_INSTANT_CLIENT/libociei.$SHLIB_SUFFIX_NAME; then
9526      if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
9527        if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
9528 @@ -63063,7 +63075,7 @@
9529
9530  if test -z "$ODBC_TYPE"; then
9531  echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
9532 -echo "configure:63067: checking for Adabas support" >&5
9533 +echo "configure:63079: checking for Adabas support" >&5
9534  # Check whether --with-adabas or --without-adabas was given.
9535  if test "${with_adabas+set}" = set; then
9536    withval="$with_adabas"
9537 @@ -63256,7 +63268,7 @@
9538
9539  if test -z "$ODBC_TYPE"; then
9540  echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
9541 -echo "configure:63260: checking for SAP DB support" >&5
9542 +echo "configure:63272: checking for SAP DB support" >&5
9543  # Check whether --with-sapdb or --without-sapdb was given.
9544  if test "${with_sapdb+set}" = set; then
9545    withval="$with_sapdb"
9546 @@ -63386,7 +63398,7 @@
9547
9548  if test -z "$ODBC_TYPE"; then
9549  echo $ac_n "checking for Solid support""... $ac_c" 1>&6
9550 -echo "configure:63390: checking for Solid support" >&5
9551 +echo "configure:63402: checking for Solid support" >&5
9552  # Check whether --with-solid or --without-solid was given.
9553  if test "${with_solid+set}" = set; then
9554    withval="$with_solid"
9555 @@ -63444,7 +63456,7 @@
9556      echo "$ac_t""yes" 1>&6
9557
9558    echo $ac_n "checking Solid library file""... $ac_c" 1>&6
9559 -echo "configure:63448: checking Solid library file" >&5
9560 +echo "configure:63460: checking Solid library file" >&5
9561    ac_solid_uname_r=`uname -r 2>/dev/null`
9562    ac_solid_uname_s=`uname -s 2>/dev/null`
9563    case $ac_solid_uname_s in
9564 @@ -63530,7 +63542,7 @@
9565
9566  if test -z "$ODBC_TYPE"; then
9567  echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
9568 -echo "configure:63534: checking for IBM DB2 support" >&5
9569 +echo "configure:63546: checking for IBM DB2 support" >&5
9570  # Check whether --with-ibm-db2 or --without-ibm-db2 was given.
9571  if test "${with_ibm_db2+set}" = set; then
9572    withval="$with_ibm_db2"
9573 @@ -63602,7 +63614,7 @@
9574
9575  if test -z "$ODBC_TYPE"; then
9576  echo $ac_n "checking for Empress support""... $ac_c" 1>&6
9577 -echo "configure:63606: checking for Empress support" >&5
9578 +echo "configure:63618: checking for Empress support" >&5
9579  # Check whether --with-empress or --without-empress was given.
9580  if test "${with_empress+set}" = set; then
9581    withval="$with_empress"
9582 @@ -63651,7 +63663,7 @@
9583      echo "$ac_t""yes" 1>&6
9584
9585    echo $ac_n "checking Empress library file""... $ac_c" 1>&6
9586 -echo "configure:63655: checking Empress library file" >&5
9587 +echo "configure:63667: checking Empress library file" >&5
9588    ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
9589    if test ! -f $ODBC_LIBS; then
9590      ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
9591 @@ -63672,7 +63684,7 @@
9592
9593  if test -z "$ODBC_TYPE"; then
9594  echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
9595 -echo "configure:63676: checking for Empress local access support" >&5
9596 +echo "configure:63688: checking for Empress local access support" >&5
9597  # Check whether --with-empress-bcs or --without-empress-bcs was given.
9598  if test "${with_empress_bcs+set}" = set; then
9599    withval="$with_empress_bcs"
9600 @@ -63737,7 +63749,7 @@
9601      echo "$ac_t""yes" 1>&6
9602
9603    echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
9604 -echo "configure:63741: checking Empress local access library file" >&5
9605 +echo "configure:63753: checking Empress local access library file" >&5
9606    ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
9607    if test ! -f $ODBCBCS_LIBS; then
9608      ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
9609 @@ -63758,7 +63770,7 @@
9610
9611  if test -z "$ODBC_TYPE"; then
9612  echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
9613 -echo "configure:63762: checking for Birdstep support" >&5
9614 +echo "configure:63774: checking for Birdstep support" >&5
9615  # Check whether --with-birdstep or --without-birdstep was given.
9616  if test "${with_birdstep+set}" = set; then
9617    withval="$with_birdstep"
9618 @@ -63822,7 +63834,7 @@
9619
9620  if test -z "$ODBC_TYPE"; then
9621  echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
9622 -echo "configure:63826: checking for a custom ODBC support" >&5
9623 +echo "configure:63838: checking for a custom ODBC support" >&5
9624  # Check whether --with-custom-odbc or --without-custom-odbc was given.
9625  if test "${with_custom_odbc+set}" = set; then
9626    withval="$with_custom_odbc"
9627 @@ -63856,7 +63868,7 @@
9628
9629  if test -z "$ODBC_TYPE"; then
9630  echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
9631 -echo "configure:63860: checking for iODBC support" >&5
9632 +echo "configure:63872: checking for iODBC support" >&5
9633  # Check whether --with-iodbc or --without-iodbc was given.
9634  if test "${with_iodbc+set}" = set; then
9635    withval="$with_iodbc"
9636 @@ -63998,7 +64010,7 @@
9637
9638  if test -z "$ODBC_TYPE"; then
9639  echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
9640 -echo "configure:64002: checking for Easysoft ODBC-ODBC Bridge support" >&5
9641 +echo "configure:64014: checking for Easysoft ODBC-ODBC Bridge support" >&5
9642  # Check whether --with-esoob or --without-esoob was given.
9643  if test "${with_esoob+set}" = set; then
9644    withval="$with_esoob"
9645 @@ -64058,7 +64070,7 @@
9646
9647  if test -z "$ODBC_TYPE"; then
9648  echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
9649 -echo "configure:64062: checking for unixODBC support" >&5
9650 +echo "configure:64074: checking for unixODBC support" >&5
9651  # Check whether --with-unixODBC or --without-unixODBC was given.
9652  if test "${with_unixODBC+set}" = set; then
9653    withval="$with_unixODBC"
9654 @@ -64118,7 +64130,7 @@
9655
9656  if test -z "$ODBC_TYPE"; then
9657  echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
9658 -echo "configure:64122: checking for DBMaker support" >&5
9659 +echo "configure:64134: checking for DBMaker support" >&5
9660  # Check whether --with-dbmaker or --without-dbmaker was given.
9661  if test "${with_dbmaker+set}" = set; then
9662    withval="$with_dbmaker"
9663 @@ -64636,7 +64648,7 @@
9664
9665
9666  echo $ac_n "checking for Oracle-ORACLE support""... $ac_c" 1>&6
9667 -echo "configure:64640: checking for Oracle-ORACLE support" >&5
9668 +echo "configure:64652: checking for Oracle-ORACLE support" >&5
9669  # Check whether --with-oracle or --without-oracle was given.
9670  if test "${with_oracle+set}" = set; then
9671    withval="$with_oracle"
9672 @@ -64681,7 +64693,7 @@
9673
9674  if test "$PHP_ORACLE" != "no"; then
9675    echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
9676 -echo "configure:64685: checking Oracle Install-Dir" >&5
9677 +echo "configure:64697: checking Oracle Install-Dir" >&5
9678    if test "$PHP_ORACLE" = "yes"; then
9679         ORACLE_DIR=$ORACLE_HOME
9680    else
9681 @@ -64972,7 +64984,7 @@
9682
9683
9684    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
9685 -echo "configure:64976: checking Oracle version" >&5
9686 +echo "configure:64988: checking Oracle version" >&5
9687    if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
9688         ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
9689         test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
9690 @@ -69669,7 +69681,7 @@
9691
9692
9693  echo $ac_n "checking whether to enable user-space object overloading support""... $ac_c" 1>&6
9694 -echo "configure:69673: checking whether to enable user-space object overloading support" >&5
9695 +echo "configure:69685: checking whether to enable user-space object overloading support" >&5
9696  # Check whether --enable-overload or --disable-overload was given.
9697  if test "${enable_overload+set}" = set; then
9698    enableval="$enable_overload"
9699 @@ -69944,7 +69956,7 @@
9700
9701
9702  echo $ac_n "checking for Ovrimos SQL Server support""... $ac_c" 1>&6
9703 -echo "configure:69948: checking for Ovrimos SQL Server support" >&5
9704 +echo "configure:69960: checking for Ovrimos SQL Server support" >&5
9705  # Check whether --with-ovrimos or --without-ovrimos was given.
9706  if test "${with_ovrimos+set}" = set; then
9707    withval="$with_ovrimos"
9708 @@ -70029,7 +70041,7 @@
9709
9710    LDFLAGS="$LDFLAGS $ld_runpath_switch$OVRIMOS_DIR/lib -L$OVRIMOS_DIR/lib"
9711    echo $ac_n "checking for main in -lsqlcli""... $ac_c" 1>&6
9712 -echo "configure:70033: checking for main in -lsqlcli" >&5
9713 +echo "configure:70045: checking for main in -lsqlcli" >&5
9714  ac_lib_var=`echo sqlcli'_'main | sed 'y%./+-%__p_%'`
9715  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9716    echo $ac_n "(cached) $ac_c" 1>&6
9717 @@ -70037,14 +70049,14 @@
9718    ac_save_LIBS="$LIBS"
9719  LIBS="-lsqlcli  $LIBS"
9720  cat > conftest.$ac_ext <<EOF
9721 -#line 70041 "configure"
9722 +#line 70053 "configure"
9723  #include "confdefs.h"
9724
9725  int main() {
9726  main()
9727  ; return 0; }
9728  EOF
9729 -if { (eval echo configure:70048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9730 +if { (eval echo configure:70060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9731    rm -rf conftest*
9732    eval "ac_cv_lib_$ac_lib_var=yes"
9733  else
9734 @@ -70403,7 +70415,7 @@
9735
9736
9737  echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
9738 -echo "configure:70407: checking whether to enable pcntl support" >&5
9739 +echo "configure:70419: checking whether to enable pcntl support" >&5
9740  # Check whether --enable-pcntl or --disable-pcntl was given.
9741  if test "${enable_pcntl+set}" = set; then
9742    enableval="$enable_pcntl"
9743 @@ -70451,12 +70463,12 @@
9744    for ac_func in fork
9745  do
9746  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
9747 -echo "configure:70455: checking for $ac_func" >&5
9748 +echo "configure:70467: checking for $ac_func" >&5
9749  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
9750    echo $ac_n "(cached) $ac_c" 1>&6
9751  else
9752    cat > conftest.$ac_ext <<EOF
9753 -#line 70460 "configure"
9754 +#line 70472 "configure"
9755  #include "confdefs.h"
9756  /* System header to define __stub macros and hopefully few prototypes,
9757      which can conflict with char $ac_func(); below.  */
9758 @@ -70479,7 +70491,7 @@
9759
9760  ; return 0; }
9761  EOF
9762 -if { (eval echo configure:70483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9763 +if { (eval echo configure:70495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9764    rm -rf conftest*
9765    eval "ac_cv_func_$ac_func=yes"
9766  else
9767 @@ -70510,12 +70522,12 @@
9768    for ac_func in waitpid
9769  do
9770  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
9771 -echo "configure:70514: checking for $ac_func" >&5
9772 +echo "configure:70526: checking for $ac_func" >&5
9773  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
9774    echo $ac_n "(cached) $ac_c" 1>&6
9775  else
9776    cat > conftest.$ac_ext <<EOF
9777 -#line 70519 "configure"
9778 +#line 70531 "configure"
9779  #include "confdefs.h"
9780  /* System header to define __stub macros and hopefully few prototypes,
9781      which can conflict with char $ac_func(); below.  */
9782 @@ -70538,7 +70550,7 @@
9783
9784  ; return 0; }
9785  EOF
9786 -if { (eval echo configure:70542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9787 +if { (eval echo configure:70554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9788    rm -rf conftest*
9789    eval "ac_cv_func_$ac_func=yes"
9790  else
9791 @@ -70569,12 +70581,12 @@
9792    for ac_func in sigaction
9793  do
9794  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
9795 -echo "configure:70573: checking for $ac_func" >&5
9796 +echo "configure:70585: checking for $ac_func" >&5
9797  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
9798    echo $ac_n "(cached) $ac_c" 1>&6
9799  else
9800    cat > conftest.$ac_ext <<EOF
9801 -#line 70578 "configure"
9802 +#line 70590 "configure"
9803  #include "confdefs.h"
9804  /* System header to define __stub macros and hopefully few prototypes,
9805      which can conflict with char $ac_func(); below.  */
9806 @@ -70597,7 +70609,7 @@
9807
9808  ; return 0; }
9809  EOF
9810 -if { (eval echo configure:70601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9811 +if { (eval echo configure:70613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9812    rm -rf conftest*
9813    eval "ac_cv_func_$ac_func=yes"
9814  else
9815 @@ -70854,7 +70866,7 @@
9816
9817
9818  echo $ac_n "checking for PCRE support""... $ac_c" 1>&6
9819 -echo "configure:70858: checking for PCRE support" >&5
9820 +echo "configure:70870: checking for PCRE support" >&5
9821  # Check whether --with-pcre-regex or --without-pcre-regex was given.
9822  if test "${with_pcre_regex+set}" = set; then
9823    withval="$with_pcre_regex"
9824 @@ -71520,7 +71532,7 @@
9825
9826
9827  echo $ac_n "checking for PDFlib support""... $ac_c" 1>&6
9828 -echo "configure:71524: checking for PDFlib support" >&5
9829 +echo "configure:71536: checking for PDFlib support" >&5
9830  # Check whether --with-pdflib or --without-pdflib was given.
9831  if test "${with_pdflib+set}" = set; then
9832    withval="$with_pdflib"
9833 @@ -71567,7 +71579,7 @@
9834
9835
9836  echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
9837 -echo "configure:71571: checking for the location of libjpeg" >&5
9838 +echo "configure:71583: checking for the location of libjpeg" >&5
9839  # Check whether --with-jpeg-dir or --without-jpeg-dir was given.
9840  if test "${with_jpeg_dir+set}" = set; then
9841    withval="$with_jpeg_dir"
9842 @@ -71594,7 +71606,7 @@
9843
9844
9845  echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
9846 -echo "configure:71598: checking for the location of libpng" >&5
9847 +echo "configure:71610: checking for the location of libpng" >&5
9848  # Check whether --with-png-dir or --without-png-dir was given.
9849  if test "${with_png_dir+set}" = set; then
9850    withval="$with_png_dir"
9851 @@ -71621,7 +71633,7 @@
9852
9853
9854  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
9855 -echo "configure:71625: checking for the location of libz" >&5
9856 +echo "configure:71637: checking for the location of libz" >&5
9857  # Check whether --with-zlib-dir or --without-zlib-dir was given.
9858  if test "${with_zlib_dir+set}" = set; then
9859    withval="$with_zlib_dir"
9860 @@ -71647,7 +71659,7 @@
9861
9862
9863  echo $ac_n "checking for the location of libtiff""... $ac_c" 1>&6
9864 -echo "configure:71651: checking for the location of libtiff" >&5
9865 +echo "configure:71663: checking for the location of libtiff" >&5
9866  # Check whether --with-tiff-dir or --without-tiff-dir was given.
9867  if test "${with_tiff_dir+set}" = set; then
9868    withval="$with_tiff_dir"
9869 @@ -71979,7 +71991,7 @@
9870    done
9871
9872    echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
9873 -echo "configure:71983: checking for jpeg_read_header in -ljpeg" >&5
9874 +echo "configure:71995: checking for jpeg_read_header in -ljpeg" >&5
9875  ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
9876  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9877    echo $ac_n "(cached) $ac_c" 1>&6
9878 @@ -71987,7 +71999,7 @@
9879    ac_save_LIBS="$LIBS"
9880  LIBS="-ljpeg  $LIBS"
9881  cat > conftest.$ac_ext <<EOF
9882 -#line 71991 "configure"
9883 +#line 72003 "configure"
9884  #include "confdefs.h"
9885  /* Override any gcc2 internal prototype to avoid an error.  */
9886  /* We use char because int might match the return type of a gcc2
9887 @@ -71998,7 +72010,7 @@
9888  jpeg_read_header()
9889  ; return 0; }
9890  EOF
9891 -if { (eval echo configure:72002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9892 +if { (eval echo configure:72014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9893    rm -rf conftest*
9894    eval "ac_cv_lib_$ac_lib_var=yes"
9895  else
9896 @@ -72213,7 +72225,7 @@
9897    done
9898
9899    echo $ac_n "checking for png_create_info_struct in -lpng""... $ac_c" 1>&6
9900 -echo "configure:72217: checking for png_create_info_struct in -lpng" >&5
9901 +echo "configure:72229: checking for png_create_info_struct in -lpng" >&5
9902  ac_lib_var=`echo png'_'png_create_info_struct | sed 'y%./+-%__p_%'`
9903  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9904    echo $ac_n "(cached) $ac_c" 1>&6
9905 @@ -72221,7 +72233,7 @@
9906    ac_save_LIBS="$LIBS"
9907  LIBS="-lpng  $LIBS"
9908  cat > conftest.$ac_ext <<EOF
9909 -#line 72225 "configure"
9910 +#line 72237 "configure"
9911  #include "confdefs.h"
9912  /* Override any gcc2 internal prototype to avoid an error.  */
9913  /* We use char because int might match the return type of a gcc2
9914 @@ -72232,7 +72244,7 @@
9915  png_create_info_struct()
9916  ; return 0; }
9917  EOF
9918 -if { (eval echo configure:72236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9919 +if { (eval echo configure:72248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9920    rm -rf conftest*
9921    eval "ac_cv_lib_$ac_lib_var=yes"
9922  else
9923 @@ -72447,7 +72459,7 @@
9924    done
9925
9926    echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
9927 -echo "configure:72451: checking for TIFFOpen in -ltiff" >&5
9928 +echo "configure:72463: checking for TIFFOpen in -ltiff" >&5
9929  ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
9930  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9931    echo $ac_n "(cached) $ac_c" 1>&6
9932 @@ -72455,7 +72467,7 @@
9933    ac_save_LIBS="$LIBS"
9934  LIBS="-ltiff  $LIBS"
9935  cat > conftest.$ac_ext <<EOF
9936 -#line 72459 "configure"
9937 +#line 72471 "configure"
9938  #include "confdefs.h"
9939  /* Override any gcc2 internal prototype to avoid an error.  */
9940  /* We use char because int might match the return type of a gcc2
9941 @@ -72466,7 +72478,7 @@
9942  TIFFOpen()
9943  ; return 0; }
9944  EOF
9945 -if { (eval echo configure:72470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9946 +if { (eval echo configure:72482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9947    rm -rf conftest*
9948    eval "ac_cv_lib_$ac_lib_var=yes"
9949  else
9950 @@ -72600,7 +72612,7 @@
9951    fi
9952
9953      echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
9954 -echo "configure:72604: checking for the location of zlib" >&5
9955 +echo "configure:72616: checking for the location of zlib" >&5
9956    if test "$PHP_ZLIB_DIR" = "no"; then
9957      echo "$ac_t""no. If configure fails, try --with-zlib-dir=<DIR>" 1>&6
9958    else
9959 @@ -72748,7 +72760,7 @@
9960    case $PHP_PDFLIB in
9961      yes)
9962        echo $ac_n "checking for PDF_show_boxed in -lpdf""... $ac_c" 1>&6
9963 -echo "configure:72752: checking for PDF_show_boxed in -lpdf" >&5
9964 +echo "configure:72764: checking for PDF_show_boxed in -lpdf" >&5
9965  ac_lib_var=`echo pdf'_'PDF_show_boxed | sed 'y%./+-%__p_%'`
9966  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9967    echo $ac_n "(cached) $ac_c" 1>&6
9968 @@ -72756,7 +72768,7 @@
9969    ac_save_LIBS="$LIBS"
9970  LIBS="-lpdf  $LIBS"
9971  cat > conftest.$ac_ext <<EOF
9972 -#line 72760 "configure"
9973 +#line 72772 "configure"
9974  #include "confdefs.h"
9975  /* Override any gcc2 internal prototype to avoid an error.  */
9976  /* We use char because int might match the return type of a gcc2
9977 @@ -72767,7 +72779,7 @@
9978  PDF_show_boxed()
9979  ; return 0; }
9980  EOF
9981 -if { (eval echo configure:72771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9982 +if { (eval echo configure:72783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9983    rm -rf conftest*
9984    eval "ac_cv_lib_$ac_lib_var=yes"
9985  else
9986 @@ -72907,7 +72919,7 @@
9987    done
9988
9989    echo $ac_n "checking for PDF_show_boxed in -lpdf""... $ac_c" 1>&6
9990 -echo "configure:72911: checking for PDF_show_boxed in -lpdf" >&5
9991 +echo "configure:72923: checking for PDF_show_boxed in -lpdf" >&5
9992  ac_lib_var=`echo pdf'_'PDF_show_boxed | sed 'y%./+-%__p_%'`
9993  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9994    echo $ac_n "(cached) $ac_c" 1>&6
9995 @@ -72915,7 +72927,7 @@
9996    ac_save_LIBS="$LIBS"
9997  LIBS="-lpdf  $LIBS"
9998  cat > conftest.$ac_ext <<EOF
9999 -#line 72919 "configure"
10000 +#line 72931 "configure"
10001  #include "confdefs.h"
10002  /* Override any gcc2 internal prototype to avoid an error.  */
10003  /* We use char because int might match the return type of a gcc2
10004 @@ -72926,7 +72938,7 @@
10005  PDF_show_boxed()
10006  ; return 0; }
10007  EOF
10008 -if { (eval echo configure:72930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10009 +if { (eval echo configure:72942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10010    rm -rf conftest*
10011    eval "ac_cv_lib_$ac_lib_var=yes"
10012  else
10013 @@ -73105,7 +73117,7 @@
10014
10015
10016  echo $ac_n "checking for Verisign Payflow Pro support""... $ac_c" 1>&6
10017 -echo "configure:73109: checking for Verisign Payflow Pro support" >&5
10018 +echo "configure:73121: checking for Verisign Payflow Pro support" >&5
10019  # Check whether --with-pfpro or --without-pfpro was given.
10020  if test "${with_pfpro+set}" = set; then
10021    withval="$with_pfpro"
10022 @@ -73265,7 +73277,7 @@
10023    done
10024
10025    echo $ac_n "checking for pfproInit in -lpfpro""... $ac_c" 1>&6
10026 -echo "configure:73269: checking for pfproInit in -lpfpro" >&5
10027 +echo "configure:73281: checking for pfproInit in -lpfpro" >&5
10028  ac_lib_var=`echo pfpro'_'pfproInit | sed 'y%./+-%__p_%'`
10029  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10030    echo $ac_n "(cached) $ac_c" 1>&6
10031 @@ -73273,7 +73285,7 @@
10032    ac_save_LIBS="$LIBS"
10033  LIBS="-lpfpro  $LIBS"
10034  cat > conftest.$ac_ext <<EOF
10035 -#line 73277 "configure"
10036 +#line 73289 "configure"
10037  #include "confdefs.h"
10038  /* Override any gcc2 internal prototype to avoid an error.  */
10039  /* We use char because int might match the return type of a gcc2
10040 @@ -73284,7 +73296,7 @@
10041  pfproInit()
10042  ; return 0; }
10043  EOF
10044 -if { (eval echo configure:73288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10045 +if { (eval echo configure:73300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10046    rm -rf conftest*
10047    eval "ac_cv_lib_$ac_lib_var=yes"
10048  else
10049 @@ -73394,7 +73406,7 @@
10050    done
10051
10052    echo $ac_n "checking for PNInit in -lpfpro""... $ac_c" 1>&6
10053 -echo "configure:73398: checking for PNInit in -lpfpro" >&5
10054 +echo "configure:73410: checking for PNInit in -lpfpro" >&5
10055  ac_lib_var=`echo pfpro'_'PNInit | sed 'y%./+-%__p_%'`
10056  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10057    echo $ac_n "(cached) $ac_c" 1>&6
10058 @@ -73402,7 +73414,7 @@
10059    ac_save_LIBS="$LIBS"
10060  LIBS="-lpfpro  $LIBS"
10061  cat > conftest.$ac_ext <<EOF
10062 -#line 73406 "configure"
10063 +#line 73418 "configure"
10064  #include "confdefs.h"
10065  /* Override any gcc2 internal prototype to avoid an error.  */
10066  /* We use char because int might match the return type of a gcc2
10067 @@ -73413,7 +73425,7 @@
10068  PNInit()
10069  ; return 0; }
10070  EOF
10071 -if { (eval echo configure:73417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10072 +if { (eval echo configure:73429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10073    rm -rf conftest*
10074    eval "ac_cv_lib_$ac_lib_var=yes"
10075  else
10076 @@ -73818,7 +73830,7 @@
10077
10078
10079  echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
10080 -echo "configure:73822: checking for PostgreSQL support" >&5
10081 +echo "configure:73834: checking for PostgreSQL support" >&5
10082  # Check whether --with-pgsql or --without-pgsql was given.
10083  if test "${with_pgsql+set}" = set; then
10084    withval="$with_pgsql"
10085 @@ -73921,7 +73933,7 @@
10086    old_LDFLAGS=$LDFLAGS
10087    LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
10088    echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
10089 -echo "configure:73925: checking for PQescapeString in -lpq" >&5
10090 +echo "configure:73937: checking for PQescapeString in -lpq" >&5
10091  ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'`
10092  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10093    echo $ac_n "(cached) $ac_c" 1>&6
10094 @@ -73929,7 +73941,7 @@
10095    ac_save_LIBS="$LIBS"
10096  LIBS="-lpq  $LIBS"
10097  cat > conftest.$ac_ext <<EOF
10098 -#line 73933 "configure"
10099 +#line 73945 "configure"
10100  #include "confdefs.h"
10101  /* Override any gcc2 internal prototype to avoid an error.  */
10102  /* We use char because int might match the return type of a gcc2
10103 @@ -73940,7 +73952,7 @@
10104  PQescapeString()
10105  ; return 0; }
10106  EOF
10107 -if { (eval echo configure:73944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10108 +if { (eval echo configure:73956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10109    rm -rf conftest*
10110    eval "ac_cv_lib_$ac_lib_var=yes"
10111  else
10112 @@ -73964,7 +73976,7 @@
10113  fi
10114
10115    echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
10116 -echo "configure:73968: checking for PQsetnonblocking in -lpq" >&5
10117 +echo "configure:73980: checking for PQsetnonblocking in -lpq" >&5
10118  ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'`
10119  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10120    echo $ac_n "(cached) $ac_c" 1>&6
10121 @@ -73972,7 +73984,7 @@
10122    ac_save_LIBS="$LIBS"
10123  LIBS="-lpq  $LIBS"
10124  cat > conftest.$ac_ext <<EOF
10125 -#line 73976 "configure"
10126 +#line 73988 "configure"
10127  #include "confdefs.h"
10128  /* Override any gcc2 internal prototype to avoid an error.  */
10129  /* We use char because int might match the return type of a gcc2
10130 @@ -73983,7 +73995,7 @@
10131  PQsetnonblocking()
10132  ; return 0; }
10133  EOF
10134 -if { (eval echo configure:73987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10135 +if { (eval echo configure:73999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10136    rm -rf conftest*
10137    eval "ac_cv_lib_$ac_lib_var=yes"
10138  else
10139 @@ -74007,7 +74019,7 @@
10140  fi
10141
10142    echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
10143 -echo "configure:74011: checking for PQcmdTuples in -lpq" >&5
10144 +echo "configure:74023: checking for PQcmdTuples in -lpq" >&5
10145  ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
10146  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10147    echo $ac_n "(cached) $ac_c" 1>&6
10148 @@ -74015,7 +74027,7 @@
10149    ac_save_LIBS="$LIBS"
10150  LIBS="-lpq  $LIBS"
10151  cat > conftest.$ac_ext <<EOF
10152 -#line 74019 "configure"
10153 +#line 74031 "configure"
10154  #include "confdefs.h"
10155  /* Override any gcc2 internal prototype to avoid an error.  */
10156  /* We use char because int might match the return type of a gcc2
10157 @@ -74026,7 +74038,7 @@
10158  PQcmdTuples()
10159  ; return 0; }
10160  EOF
10161 -if { (eval echo configure:74030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10162 +if { (eval echo configure:74042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10163    rm -rf conftest*
10164    eval "ac_cv_lib_$ac_lib_var=yes"
10165  else
10166 @@ -74050,7 +74062,7 @@
10167  fi
10168
10169    echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
10170 -echo "configure:74054: checking for PQoidValue in -lpq" >&5
10171 +echo "configure:74066: checking for PQoidValue in -lpq" >&5
10172  ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
10173  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10174    echo $ac_n "(cached) $ac_c" 1>&6
10175 @@ -74058,7 +74070,7 @@
10176    ac_save_LIBS="$LIBS"
10177  LIBS="-lpq  $LIBS"
10178  cat > conftest.$ac_ext <<EOF
10179 -#line 74062 "configure"
10180 +#line 74074 "configure"
10181  #include "confdefs.h"
10182  /* Override any gcc2 internal prototype to avoid an error.  */
10183  /* We use char because int might match the return type of a gcc2
10184 @@ -74069,7 +74081,7 @@
10185  PQoidValue()
10186  ; return 0; }
10187  EOF
10188 -if { (eval echo configure:74073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10189 +if { (eval echo configure:74085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10190    rm -rf conftest*
10191    eval "ac_cv_lib_$ac_lib_var=yes"
10192  else
10193 @@ -74093,7 +74105,7 @@
10194  fi
10195
10196    echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
10197 -echo "configure:74097: checking for PQclientEncoding in -lpq" >&5
10198 +echo "configure:74109: checking for PQclientEncoding in -lpq" >&5
10199  ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
10200  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10201    echo $ac_n "(cached) $ac_c" 1>&6
10202 @@ -74101,7 +74113,7 @@
10203    ac_save_LIBS="$LIBS"
10204  LIBS="-lpq  $LIBS"
10205  cat > conftest.$ac_ext <<EOF
10206 -#line 74105 "configure"
10207 +#line 74117 "configure"
10208  #include "confdefs.h"
10209  /* Override any gcc2 internal prototype to avoid an error.  */
10210  /* We use char because int might match the return type of a gcc2
10211 @@ -74112,7 +74124,7 @@
10212  PQclientEncoding()
10213  ; return 0; }
10214  EOF
10215 -if { (eval echo configure:74116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10216 +if { (eval echo configure:74128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10217    rm -rf conftest*
10218    eval "ac_cv_lib_$ac_lib_var=yes"
10219  else
10220 @@ -74136,7 +74148,7 @@
10221  fi
10222
10223    echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
10224 -echo "configure:74140: checking for pg_encoding_to_char in -lpq" >&5
10225 +echo "configure:74152: checking for pg_encoding_to_char in -lpq" >&5
10226  ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
10227  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10228    echo $ac_n "(cached) $ac_c" 1>&6
10229 @@ -74144,7 +74156,7 @@
10230    ac_save_LIBS="$LIBS"
10231  LIBS="-lpq  $LIBS"
10232  cat > conftest.$ac_ext <<EOF
10233 -#line 74148 "configure"
10234 +#line 74160 "configure"
10235  #include "confdefs.h"
10236  /* Override any gcc2 internal prototype to avoid an error.  */
10237  /* We use char because int might match the return type of a gcc2
10238 @@ -74155,7 +74167,7 @@
10239  pg_encoding_to_char()
10240  ; return 0; }
10241  EOF
10242 -if { (eval echo configure:74159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10243 +if { (eval echo configure:74171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10244    rm -rf conftest*
10245    eval "ac_cv_lib_$ac_lib_var=yes"
10246  else
10247 @@ -74542,7 +74554,7 @@
10248
10249
10250  echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
10251 -echo "configure:74546: checking whether to enable POSIX-like functions" >&5
10252 +echo "configure:74558: checking whether to enable POSIX-like functions" >&5
10253  # Check whether --enable-posix or --disable-posix was given.
10254  if test "${enable_posix+set}" = set; then
10255    enableval="$enable_posix"
10256 @@ -74815,12 +74827,12 @@
10257    for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo getrlimit
10258  do
10259  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
10260 -echo "configure:74819: checking for $ac_func" >&5
10261 +echo "configure:74831: checking for $ac_func" >&5
10262  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
10263    echo $ac_n "(cached) $ac_c" 1>&6
10264  else
10265    cat > conftest.$ac_ext <<EOF
10266 -#line 74824 "configure"
10267 +#line 74836 "configure"
10268  #include "confdefs.h"
10269  /* System header to define __stub macros and hopefully few prototypes,
10270      which can conflict with char $ac_func(); below.  */
10271 @@ -74843,7 +74855,7 @@
10272
10273  ; return 0; }
10274  EOF
10275 -if { (eval echo configure:74847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10276 +if { (eval echo configure:74859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10277    rm -rf conftest*
10278    eval "ac_cv_func_$ac_func=yes"
10279  else
10280 @@ -74873,7 +74885,7 @@
10281
10282
10283  echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
10284 -echo "configure:74877: checking for PSPELL support" >&5
10285 +echo "configure:74889: checking for PSPELL support" >&5
10286  # Check whether --with-pspell or --without-pspell was given.
10287  if test "${with_pspell+set}" = set; then
10288    withval="$with_pspell"
10289 @@ -75337,7 +75349,7 @@
10290    done
10291
10292    echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
10293 -echo "configure:75341: checking for new_aspell_config in -laspell" >&5
10294 +echo "configure:75353: checking for new_aspell_config in -laspell" >&5
10295  ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'`
10296  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10297    echo $ac_n "(cached) $ac_c" 1>&6
10298 @@ -75345,7 +75357,7 @@
10299    ac_save_LIBS="$LIBS"
10300  LIBS="-laspell  $LIBS"
10301  cat > conftest.$ac_ext <<EOF
10302 -#line 75349 "configure"
10303 +#line 75361 "configure"
10304  #include "confdefs.h"
10305  /* Override any gcc2 internal prototype to avoid an error.  */
10306  /* We use char because int might match the return type of a gcc2
10307 @@ -75356,7 +75368,7 @@
10308  new_aspell_config()
10309  ; return 0; }
10310  EOF
10311 -if { (eval echo configure:75360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10312 +if { (eval echo configure:75372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10313    rm -rf conftest*
10314    eval "ac_cv_lib_$ac_lib_var=yes"
10315  else
10316 @@ -75528,7 +75540,7 @@
10317
10318
10319  echo $ac_n "checking for QtDOM support""... $ac_c" 1>&6
10320 -echo "configure:75532: checking for QtDOM support" >&5
10321 +echo "configure:75544: checking for QtDOM support" >&5
10322  # Check whether --with-qtdom or --without-qtdom was given.
10323  if test "${with_qtdom+set}" = set; then
10324    withval="$with_qtdom"
10325 @@ -75956,7 +75968,7 @@
10326  # Extract the first word of "$ac_prog", so it can be a program name with args.
10327  set dummy $ac_prog; ac_word=$2
10328  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
10329 -echo "configure:75960: checking for $ac_word" >&5
10330 +echo "configure:75972: checking for $ac_word" >&5
10331  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
10332    echo $ac_n "(cached) $ac_c" 1>&6
10333  else
10334 @@ -75988,7 +76000,7 @@
10335
10336
10337  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
10338 -echo "configure:75992: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
10339 +echo "configure:76004: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
10340
10341  ac_ext=C
10342  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
10343 @@ -75999,12 +76011,12 @@
10344
10345  cat > conftest.$ac_ext << EOF
10346
10347 -#line 76003 "configure"
10348 +#line 76015 "configure"
10349  #include "confdefs.h"
10350
10351  int main(){return(0);}
10352  EOF
10353 -if { (eval echo configure:76008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10354 +if { (eval echo configure:76020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10355    ac_cv_prog_cxx_works=yes
10356    # If we can't run a trivial program, we are probably using a cross compiler.
10357    if (./conftest; exit) 2>/dev/null; then
10358 @@ -76030,12 +76042,12 @@
10359    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
10360  fi
10361  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
10362 -echo "configure:76034: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
10363 +echo "configure:76046: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
10364  echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
10365  cross_compiling=$ac_cv_prog_cxx_cross
10366
10367  echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
10368 -echo "configure:76039: checking whether we are using GNU C++" >&5
10369 +echo "configure:76051: checking whether we are using GNU C++" >&5
10370  if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
10371    echo $ac_n "(cached) $ac_c" 1>&6
10372  else
10373 @@ -76044,7 +76056,7 @@
10374    yes;
10375  #endif
10376  EOF
10377 -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
10378 +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
10379    ac_cv_prog_gxx=yes
10380  else
10381    ac_cv_prog_gxx=no
10382 @@ -76063,7 +76075,7 @@
10383  ac_save_CXXFLAGS="$CXXFLAGS"
10384  CXXFLAGS=
10385  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
10386 -echo "configure:76067: checking whether ${CXX-g++} accepts -g" >&5
10387 +echo "configure:76079: checking whether ${CXX-g++} accepts -g" >&5
10388  if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
10389    echo $ac_n "(cached) $ac_c" 1>&6
10390  else
10391 @@ -76095,7 +76107,7 @@
10392  fi
10393
10394      echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
10395 -echo "configure:76099: checking how to run the C++ preprocessor" >&5
10396 +echo "configure:76111: checking how to run the C++ preprocessor" >&5
10397  if test -z "$CXXCPP"; then
10398  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
10399    echo $ac_n "(cached) $ac_c" 1>&6
10400 @@ -76108,12 +76120,12 @@
10401  cross_compiling=$ac_cv_prog_cxx_cross
10402    CXXCPP="${CXX-g++} -E"
10403    cat > conftest.$ac_ext <<EOF
10404 -#line 76112 "configure"
10405 +#line 76124 "configure"
10406  #include "confdefs.h"
10407  #include <stdlib.h>
10408  EOF
10409  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
10410 -{ (eval echo configure:76117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10411 +{ (eval echo configure:76129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10412  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
10413  if test -z "$ac_err"; then
10414    :
10415 @@ -76146,7 +76158,7 @@
10416
10417
10418  echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
10419 -echo "configure:76150: checking for libedit readline replacement" >&5
10420 +echo "configure:76162: checking for libedit readline replacement" >&5
10421  # Check whether --with-libedit or --without-libedit was given.
10422  if test "${with_libedit+set}" = set; then
10423    withval="$with_libedit"
10424 @@ -76192,7 +76204,7 @@
10425
10426
10427  echo $ac_n "checking for readline support""... $ac_c" 1>&6
10428 -echo "configure:76196: checking for readline support" >&5
10429 +echo "configure:76208: checking for readline support" >&5
10430  # Check whether --with-readline or --without-readline was given.
10431  if test "${with_readline+set}" = set; then
10432    withval="$with_readline"
10433 @@ -76277,7 +76289,7 @@
10434
10435
10436    echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
10437 -echo "configure:76281: checking for tgetent in -lncurses" >&5
10438 +echo "configure:76293: checking for tgetent in -lncurses" >&5
10439  ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
10440  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10441    echo $ac_n "(cached) $ac_c" 1>&6
10442 @@ -76285,7 +76297,7 @@
10443    ac_save_LIBS="$LIBS"
10444  LIBS="-lncurses  $LIBS"
10445  cat > conftest.$ac_ext <<EOF
10446 -#line 76289 "configure"
10447 +#line 76301 "configure"
10448  #include "confdefs.h"
10449  /* Override any gcc2 internal prototype to avoid an error.  */
10450  /* We use char because int might match the return type of a gcc2
10451 @@ -76296,7 +76308,7 @@
10452  tgetent()
10453  ; return 0; }
10454  EOF
10455 -if { (eval echo configure:76300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10456 +if { (eval echo configure:76312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10457    rm -rf conftest*
10458    eval "ac_cv_lib_$ac_lib_var=yes"
10459  else
10460 @@ -76340,7 +76352,7 @@
10461    echo "$ac_t""no" 1>&6
10462
10463      echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
10464 -echo "configure:76344: checking for tgetent in -ltermcap" >&5
10465 +echo "configure:76356: checking for tgetent in -ltermcap" >&5
10466  ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
10467  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10468    echo $ac_n "(cached) $ac_c" 1>&6
10469 @@ -76348,7 +76360,7 @@
10470    ac_save_LIBS="$LIBS"
10471  LIBS="-ltermcap  $LIBS"
10472  cat > conftest.$ac_ext <<EOF
10473 -#line 76352 "configure"
10474 +#line 76364 "configure"
10475  #include "confdefs.h"
10476  /* Override any gcc2 internal prototype to avoid an error.  */
10477  /* We use char because int might match the return type of a gcc2
10478 @@ -76359,7 +76371,7 @@
10479  tgetent()
10480  ; return 0; }
10481  EOF
10482 -if { (eval echo configure:76363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10483 +if { (eval echo configure:76375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10484    rm -rf conftest*
10485    eval "ac_cv_lib_$ac_lib_var=yes"
10486  else
10487 @@ -76488,7 +76500,7 @@
10488    done
10489
10490    echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
10491 -echo "configure:76492: checking for readline in -lreadline" >&5
10492 +echo "configure:76504: checking for readline in -lreadline" >&5
10493  ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
10494  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10495    echo $ac_n "(cached) $ac_c" 1>&6
10496 @@ -76496,7 +76508,7 @@
10497    ac_save_LIBS="$LIBS"
10498  LIBS="-lreadline  $LIBS"
10499  cat > conftest.$ac_ext <<EOF
10500 -#line 76500 "configure"
10501 +#line 76512 "configure"
10502  #include "confdefs.h"
10503  /* Override any gcc2 internal prototype to avoid an error.  */
10504  /* We use char because int might match the return type of a gcc2
10505 @@ -76507,7 +76519,7 @@
10506  readline()
10507  ; return 0; }
10508  EOF
10509 -if { (eval echo configure:76511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10510 +if { (eval echo configure:76523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10511    rm -rf conftest*
10512    eval "ac_cv_lib_$ac_lib_var=yes"
10513  else
10514 @@ -76718,7 +76730,7 @@
10515    done
10516
10517    echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
10518 -echo "configure:76722: checking for add_history in -lhistory" >&5
10519 +echo "configure:76734: checking for add_history in -lhistory" >&5
10520  ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'`
10521  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10522    echo $ac_n "(cached) $ac_c" 1>&6
10523 @@ -76726,7 +76738,7 @@
10524    ac_save_LIBS="$LIBS"
10525  LIBS="-lhistory  $LIBS"
10526  cat > conftest.$ac_ext <<EOF
10527 -#line 76730 "configure"
10528 +#line 76742 "configure"
10529  #include "confdefs.h"
10530  /* Override any gcc2 internal prototype to avoid an error.  */
10531  /* We use char because int might match the return type of a gcc2
10532 @@ -76737,7 +76749,7 @@
10533  add_history()
10534  ; return 0; }
10535  EOF
10536 -if { (eval echo configure:76741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10537 +if { (eval echo configure:76753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10538    rm -rf conftest*
10539    eval "ac_cv_lib_$ac_lib_var=yes"
10540  else
10541 @@ -77139,7 +77151,7 @@
10542
10543
10544    echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
10545 -echo "configure:77143: checking for tgetent in -lncurses" >&5
10546 +echo "configure:77155: checking for tgetent in -lncurses" >&5
10547  ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
10548  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10549    echo $ac_n "(cached) $ac_c" 1>&6
10550 @@ -77147,7 +77159,7 @@
10551    ac_save_LIBS="$LIBS"
10552  LIBS="-lncurses  $LIBS"
10553  cat > conftest.$ac_ext <<EOF
10554 -#line 77151 "configure"
10555 +#line 77163 "configure"
10556  #include "confdefs.h"
10557  /* Override any gcc2 internal prototype to avoid an error.  */
10558  /* We use char because int might match the return type of a gcc2
10559 @@ -77158,7 +77170,7 @@
10560  tgetent()
10561  ; return 0; }
10562  EOF
10563 -if { (eval echo configure:77162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10564 +if { (eval echo configure:77174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10565    rm -rf conftest*
10566    eval "ac_cv_lib_$ac_lib_var=yes"
10567  else
10568 @@ -77202,7 +77214,7 @@
10569    echo "$ac_t""no" 1>&6
10570
10571      echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
10572 -echo "configure:77206: checking for tgetent in -ltermcap" >&5
10573 +echo "configure:77218: checking for tgetent in -ltermcap" >&5
10574  ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
10575  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10576    echo $ac_n "(cached) $ac_c" 1>&6
10577 @@ -77210,7 +77222,7 @@
10578    ac_save_LIBS="$LIBS"
10579  LIBS="-ltermcap  $LIBS"
10580  cat > conftest.$ac_ext <<EOF
10581 -#line 77214 "configure"
10582 +#line 77226 "configure"
10583  #include "confdefs.h"
10584  /* Override any gcc2 internal prototype to avoid an error.  */
10585  /* We use char because int might match the return type of a gcc2
10586 @@ -77221,7 +77233,7 @@
10587  tgetent()
10588  ; return 0; }
10589  EOF
10590 -if { (eval echo configure:77225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10591 +if { (eval echo configure:77237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10592    rm -rf conftest*
10593    eval "ac_cv_lib_$ac_lib_var=yes"
10594  else
10595 @@ -77350,7 +77362,7 @@
10596    done
10597
10598    echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
10599 -echo "configure:77354: checking for readline in -ledit" >&5
10600 +echo "configure:77366: checking for readline in -ledit" >&5
10601  ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
10602  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10603    echo $ac_n "(cached) $ac_c" 1>&6
10604 @@ -77358,7 +77370,7 @@
10605    ac_save_LIBS="$LIBS"
10606  LIBS="-ledit  $LIBS"
10607  cat > conftest.$ac_ext <<EOF
10608 -#line 77362 "configure"
10609 +#line 77374 "configure"
10610  #include "confdefs.h"
10611  /* Override any gcc2 internal prototype to avoid an error.  */
10612  /* We use char because int might match the return type of a gcc2
10613 @@ -77369,7 +77381,7 @@
10614  readline()
10615  ; return 0; }
10616  EOF
10617 -if { (eval echo configure:77373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10618 +if { (eval echo configure:77385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10619    rm -rf conftest*
10620    eval "ac_cv_lib_$ac_lib_var=yes"
10621  else
10622 @@ -77733,7 +77745,7 @@
10623
10624
10625  echo $ac_n "checking for recode support""... $ac_c" 1>&6
10626 -echo "configure:77737: checking for recode support" >&5
10627 +echo "configure:77749: checking for recode support" >&5
10628  # Check whether --with-recode or --without-recode was given.
10629  if test "${with_recode+set}" = set; then
10630    withval="$with_recode"
10631 @@ -77883,7 +77895,7 @@
10632    done
10633
10634    echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
10635 -echo "configure:77887: checking for recode_format_table in -lrecode" >&5
10636 +echo "configure:77899: checking for recode_format_table in -lrecode" >&5
10637  ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'`
10638  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10639    echo $ac_n "(cached) $ac_c" 1>&6
10640 @@ -77891,7 +77903,7 @@
10641    ac_save_LIBS="$LIBS"
10642  LIBS="-lrecode  $LIBS"
10643  cat > conftest.$ac_ext <<EOF
10644 -#line 77895 "configure"
10645 +#line 77907 "configure"
10646  #include "confdefs.h"
10647  /* Override any gcc2 internal prototype to avoid an error.  */
10648  /* We use char because int might match the return type of a gcc2
10649 @@ -77902,7 +77914,7 @@
10650  recode_format_table()
10651  ; return 0; }
10652  EOF
10653 -if { (eval echo configure:77906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10654 +if { (eval echo configure:77918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10655    rm -rf conftest*
10656    eval "ac_cv_lib_$ac_lib_var=yes"
10657  else
10658 @@ -78031,7 +78043,7 @@
10659      LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
10660      LIBS="$LIBS -lrecode"
10661      cat > conftest.$ac_ext <<EOF
10662 -#line 78035 "configure"
10663 +#line 78047 "configure"
10664  #include "confdefs.h"
10665
10666  char *program_name;
10667 @@ -78042,7 +78054,7 @@
10668
10669  ; return 0; }
10670  EOF
10671 -if { (eval echo configure:78046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10672 +if { (eval echo configure:78058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10673    rm -rf conftest*
10674
10675
10676 @@ -78204,17 +78216,17 @@
10677  do
10678  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
10679  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
10680 -echo "configure:78208: checking for $ac_hdr" >&5
10681 +echo "configure:78220: checking for $ac_hdr" >&5
10682  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
10683    echo $ac_n "(cached) $ac_c" 1>&6
10684  else
10685    cat > conftest.$ac_ext <<EOF
10686 -#line 78213 "configure"
10687 +#line 78225 "configure"
10688  #include "confdefs.h"
10689  #include <$ac_hdr>
10690  EOF
10691  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
10692 -{ (eval echo configure:78218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10693 +{ (eval echo configure:78230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10694  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
10695  if test -z "$ac_err"; then
10696    rm -rf conftest*
10697 @@ -78467,7 +78479,7 @@
10698
10699
10700  echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
10701 -echo "configure:78471: checking whether to enable PHP sessions" >&5
10702 +echo "configure:78483: checking whether to enable PHP sessions" >&5
10703  # Check whether --enable-session or --disable-session was given.
10704  if test "${enable_session+set}" = set; then
10705    enableval="$enable_session"
10706 @@ -78513,7 +78525,7 @@
10707
10708
10709  echo $ac_n "checking for mm support""... $ac_c" 1>&6
10710 -echo "configure:78517: checking for mm support" >&5
10711 +echo "configure:78529: checking for mm support" >&5
10712  # Check whether --with-mm or --without-mm was given.
10713  if test "${with_mm+set}" = set; then
10714    withval="$with_mm"
10715 @@ -78538,7 +78550,7 @@
10716  if test "$PHP_SESSION" != "no"; then
10717
10718    echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
10719 -echo "configure:78542: checking whether pwrite works" >&5
10720 +echo "configure:78554: checking whether pwrite works" >&5
10721  if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
10722    echo $ac_n "(cached) $ac_c" 1>&6
10723  else
10724 @@ -78550,7 +78562,7 @@
10725
10726  else
10727    cat > conftest.$ac_ext <<EOF
10728 -#line 78554 "configure"
10729 +#line 78566 "configure"
10730  #include "confdefs.h"
10731
10732  #include <sys/types.h>
10733 @@ -78571,7 +78583,7 @@
10734
10735
10736  EOF
10737 -if { (eval echo configure:78575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10738 +if { (eval echo configure:78587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10739  then
10740
10741      ac_cv_pwrite=yes
10742 @@ -78596,7 +78608,7 @@
10743
10744  else
10745    cat > conftest.$ac_ext <<EOF
10746 -#line 78600 "configure"
10747 +#line 78612 "configure"
10748  #include "confdefs.h"
10749
10750  #include <sys/types.h>
10751 @@ -78617,7 +78629,7 @@
10752
10753
10754  EOF
10755 -if { (eval echo configure:78621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10756 +if { (eval echo configure:78633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10757  then
10758
10759      ac_cv_pwrite=yes
10760 @@ -78658,7 +78670,7 @@
10761
10762
10763    echo $ac_n "checking whether pread works""... $ac_c" 1>&6
10764 -echo "configure:78662: checking whether pread works" >&5
10765 +echo "configure:78674: checking whether pread works" >&5
10766  if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
10767    echo $ac_n "(cached) $ac_c" 1>&6
10768  else
10769 @@ -78671,7 +78683,7 @@
10770
10771  else
10772    cat > conftest.$ac_ext <<EOF
10773 -#line 78675 "configure"
10774 +#line 78687 "configure"
10775  #include "confdefs.h"
10776
10777  #include <sys/types.h>
10778 @@ -78691,7 +78703,7 @@
10779      }
10780
10781  EOF
10782 -if { (eval echo configure:78695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10783 +if { (eval echo configure:78707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10784  then
10785
10786      ac_cv_pread=yes
10787 @@ -78718,7 +78730,7 @@
10788
10789  else
10790    cat > conftest.$ac_ext <<EOF
10791 -#line 78722 "configure"
10792 +#line 78734 "configure"
10793  #include "confdefs.h"
10794
10795  #include <sys/types.h>
10796 @@ -78738,7 +78750,7 @@
10797      }
10798
10799  EOF
10800 -if { (eval echo configure:78742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10801 +if { (eval echo configure:78754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10802  then
10803
10804      ac_cv_pread=yes
10805 @@ -79153,7 +79165,7 @@
10806
10807
10808  echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
10809 -echo "configure:79157: checking whether to enable shmop support" >&5
10810 +echo "configure:79169: checking whether to enable shmop support" >&5
10811  # Check whether --enable-shmop or --disable-shmop was given.
10812  if test "${enable_shmop+set}" = set; then
10813    enableval="$enable_shmop"
10814 @@ -79428,7 +79440,7 @@
10815
10816
10817  echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
10818 -echo "configure:79432: checking for SNMP support" >&5
10819 +echo "configure:79444: checking for SNMP support" >&5
10820  # Check whether --with-snmp or --without-snmp was given.
10821  if test "${with_snmp+set}" = set; then
10822    withval="$with_snmp"
10823 @@ -79474,7 +79486,7 @@
10824
10825
10826  echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
10827 -echo "configure:79478: checking OpenSSL dir for SNMP" >&5
10828 +echo "configure:79490: checking OpenSSL dir for SNMP" >&5
10829  # Check whether --with-openssl-dir or --without-openssl-dir was given.
10830  if test "${with_openssl_dir+set}" = set; then
10831    withval="$with_openssl_dir"
10832 @@ -79502,7 +79514,7 @@
10833      # Extract the first word of "net-snmp-config", so it can be a program name with args.
10834  set dummy net-snmp-config; ac_word=$2
10835  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
10836 -echo "configure:79506: checking for $ac_word" >&5
10837 +echo "configure:79518: checking for $ac_word" >&5
10838  if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then
10839    echo $ac_n "(cached) $ac_c" 1>&6
10840  else
10841 @@ -79686,17 +79698,17 @@
10842  do
10843  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
10844  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
10845 -echo "configure:79690: checking for $ac_hdr" >&5
10846 +echo "configure:79702: checking for $ac_hdr" >&5
10847  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
10848    echo $ac_n "(cached) $ac_c" 1>&6
10849  else
10850    cat > conftest.$ac_ext <<EOF
10851 -#line 79695 "configure"
10852 +#line 79707 "configure"
10853  #include "confdefs.h"
10854  #include <$ac_hdr>
10855  EOF
10856  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
10857 -{ (eval echo configure:79700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10858 +{ (eval echo configure:79712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10859  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
10860  if test -z "$ac_err"; then
10861    rm -rf conftest*
10862 @@ -79724,9 +79736,9 @@
10863
10864      if test "$ac_cv_header_default_store_h" = "yes"; then
10865        echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
10866 -echo "configure:79728: checking for OpenSSL support in SNMP libraries" >&5
10867 +echo "configure:79740: checking for OpenSSL support in SNMP libraries" >&5
10868        cat > conftest.$ac_ext <<EOF
10869 -#line 79730 "configure"
10870 +#line 79742 "configure"
10871  #include "confdefs.h"
10872
10873  #include <ucd-snmp-config.h>
10874 @@ -79778,7 +79790,7 @@
10875      # Extract the first word of "pkg-config", so it can be a program name with args.
10876  set dummy pkg-config; ac_word=$2
10877  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
10878 -echo "configure:79782: checking for $ac_word" >&5
10879 +echo "configure:79794: checking for $ac_word" >&5
10880  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
10881    echo $ac_n "(cached) $ac_c" 1>&6
10882  else
10883 @@ -79966,9 +79978,9 @@
10884      old_CPPFLAGS=$CPPFLAGS
10885      CPPFLAGS=-I$OPENSSL_INCDIR
10886      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
10887 -echo "configure:79970: checking for OpenSSL version" >&5
10888 +echo "configure:79982: checking for OpenSSL version" >&5
10889      cat > conftest.$ac_ext <<EOF
10890 -#line 79972 "configure"
10891 +#line 79984 "configure"
10892  #include "confdefs.h"
10893
10894  #include <openssl/opensslv.h>
10895 @@ -80106,7 +80118,7 @@
10896    done
10897
10898    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
10899 -echo "configure:80110: checking for CRYPTO_free in -lcrypto" >&5
10900 +echo "configure:80122: checking for CRYPTO_free in -lcrypto" >&5
10901  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
10902  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10903    echo $ac_n "(cached) $ac_c" 1>&6
10904 @@ -80114,7 +80126,7 @@
10905    ac_save_LIBS="$LIBS"
10906  LIBS="-lcrypto  $LIBS"
10907  cat > conftest.$ac_ext <<EOF
10908 -#line 80118 "configure"
10909 +#line 80130 "configure"
10910  #include "confdefs.h"
10911  /* Override any gcc2 internal prototype to avoid an error.  */
10912  /* We use char because int might match the return type of a gcc2
10913 @@ -80125,7 +80137,7 @@
10914  CRYPTO_free()
10915  ; return 0; }
10916  EOF
10917 -if { (eval echo configure:80129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10918 +if { (eval echo configure:80141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10919    rm -rf conftest*
10920    eval "ac_cv_lib_$ac_lib_var=yes"
10921  else
10922 @@ -80265,7 +80277,7 @@
10923    done
10924
10925    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
10926 -echo "configure:80269: checking for SSL_CTX_set_ssl_version in -lssl" >&5
10927 +echo "configure:80281: checking for SSL_CTX_set_ssl_version in -lssl" >&5
10928  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
10929  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10930    echo $ac_n "(cached) $ac_c" 1>&6
10931 @@ -80273,7 +80285,7 @@
10932    ac_save_LIBS="$LIBS"
10933  LIBS="-lssl  $LIBS"
10934  cat > conftest.$ac_ext <<EOF
10935 -#line 80277 "configure"
10936 +#line 80289 "configure"
10937  #include "confdefs.h"
10938  /* Override any gcc2 internal prototype to avoid an error.  */
10939  /* We use char because int might match the return type of a gcc2
10940 @@ -80284,7 +80296,7 @@
10941  SSL_CTX_set_ssl_version()
10942  ; return 0; }
10943  EOF
10944 -if { (eval echo configure:80288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10945 +if { (eval echo configure:80300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10946    rm -rf conftest*
10947    eval "ac_cv_lib_$ac_lib_var=yes"
10948  else
10949 @@ -80396,7 +80408,7 @@
10950      fi
10951
10952      echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
10953 -echo "configure:80400: checking for kstat_read in -lkstat" >&5
10954 +echo "configure:80412: checking for kstat_read in -lkstat" >&5
10955  ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
10956  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10957    echo $ac_n "(cached) $ac_c" 1>&6
10958 @@ -80404,7 +80416,7 @@
10959    ac_save_LIBS="$LIBS"
10960  LIBS="-lkstat  $LIBS"
10961  cat > conftest.$ac_ext <<EOF
10962 -#line 80408 "configure"
10963 +#line 80420 "configure"
10964  #include "confdefs.h"
10965  /* Override any gcc2 internal prototype to avoid an error.  */
10966  /* We use char because int might match the return type of a gcc2
10967 @@ -80415,7 +80427,7 @@
10968  kstat_read()
10969  ; return 0; }
10970  EOF
10971 -if { (eval echo configure:80419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10972 +if { (eval echo configure:80431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10973    rm -rf conftest*
10974    eval "ac_cv_lib_$ac_lib_var=yes"
10975  else
10976 @@ -80668,7 +80680,7 @@
10977    done
10978
10979    echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
10980 -echo "configure:80672: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
10981 +echo "configure:80684: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
10982  ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'`
10983  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10984    echo $ac_n "(cached) $ac_c" 1>&6
10985 @@ -80676,7 +80688,7 @@
10986    ac_save_LIBS="$LIBS"
10987  LIBS="-l$SNMP_LIBNAME  $LIBS"
10988  cat > conftest.$ac_ext <<EOF
10989 -#line 80680 "configure"
10990 +#line 80692 "configure"
10991  #include "confdefs.h"
10992  /* Override any gcc2 internal prototype to avoid an error.  */
10993  /* We use char because int might match the return type of a gcc2
10994 @@ -80687,7 +80699,7 @@
10995  snmp_parse_oid()
10996  ; return 0; }
10997  EOF
10998 -if { (eval echo configure:80691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10999 +if { (eval echo configure:80703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11000    rm -rf conftest*
11001    eval "ac_cv_lib_$ac_lib_var=yes"
11002  else
11003 @@ -80804,7 +80816,7 @@
11004    done
11005
11006    echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
11007 -echo "configure:80808: checking for init_snmp in -l$SNMP_LIBNAME" >&5
11008 +echo "configure:80820: checking for init_snmp in -l$SNMP_LIBNAME" >&5
11009  ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'`
11010  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11011    echo $ac_n "(cached) $ac_c" 1>&6
11012 @@ -80812,7 +80824,7 @@
11013    ac_save_LIBS="$LIBS"
11014  LIBS="-l$SNMP_LIBNAME  $LIBS"
11015  cat > conftest.$ac_ext <<EOF
11016 -#line 80816 "configure"
11017 +#line 80828 "configure"
11018  #include "confdefs.h"
11019  /* Override any gcc2 internal prototype to avoid an error.  */
11020  /* We use char because int might match the return type of a gcc2
11021 @@ -80823,7 +80835,7 @@
11022  init_snmp()
11023  ; return 0; }
11024  EOF
11025 -if { (eval echo configure:80827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11026 +if { (eval echo configure:80839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11027    rm -rf conftest*
11028    eval "ac_cv_lib_$ac_lib_var=yes"
11029  else
11030 @@ -81089,7 +81101,7 @@
11031
11032
11033  echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
11034 -echo "configure:81093: checking whether to enable UCD SNMP hack" >&5
11035 +echo "configure:81105: checking whether to enable UCD SNMP hack" >&5
11036  # Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
11037  if test "${enable_ucd_snmp_hack+set}" = set; then
11038    enableval="$enable_ucd_snmp_hack"
11039 @@ -81115,7 +81127,7 @@
11040
11041
11042  echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
11043 -echo "configure:81119: checking whether to enable sockets support" >&5
11044 +echo "configure:81131: checking whether to enable sockets support" >&5
11045  # Check whether --enable-sockets or --disable-sockets was given.
11046  if test "${enable_sockets+set}" = set; then
11047    enableval="$enable_sockets"
11048 @@ -81160,13 +81172,13 @@
11049
11050  if test "$PHP_SOCKETS" != "no"; then
11051      echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
11052 -echo "configure:81164: checking for struct cmsghdr" >&5
11053 +echo "configure:81176: checking for struct cmsghdr" >&5
11054  if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
11055    echo $ac_n "(cached) $ac_c" 1>&6
11056  else
11057
11058      cat > conftest.$ac_ext <<EOF
11059 -#line 81170 "configure"
11060 +#line 81182 "configure"
11061  #include "confdefs.h"
11062
11063  #include <sys/types.h>
11064 @@ -81175,7 +81187,7 @@
11065  struct cmsghdr s; s
11066  ; return 0; }
11067  EOF
11068 -if { (eval echo configure:81179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
11069 +if { (eval echo configure:81191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
11070    rm -rf conftest*
11071    ac_cv_cmsghdr=yes
11072  else
11073 @@ -81200,12 +81212,12 @@
11074    for ac_func in hstrerror set_h_errno
11075  do
11076  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
11077 -echo "configure:81204: checking for $ac_func" >&5
11078 +echo "configure:81216: checking for $ac_func" >&5
11079  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
11080    echo $ac_n "(cached) $ac_c" 1>&6
11081  else
11082    cat > conftest.$ac_ext <<EOF
11083 -#line 81209 "configure"
11084 +#line 81221 "configure"
11085  #include "confdefs.h"
11086  /* System header to define __stub macros and hopefully few prototypes,
11087      which can conflict with char $ac_func(); below.  */
11088 @@ -81228,7 +81240,7 @@
11089
11090  ; return 0; }
11091  EOF
11092 -if { (eval echo configure:81232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11093 +if { (eval echo configure:81244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11094    rm -rf conftest*
11095    eval "ac_cv_func_$ac_func=yes"
11096  else
11097 @@ -81256,17 +81268,17 @@
11098  do
11099  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
11100  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
11101 -echo "configure:81260: checking for $ac_hdr" >&5
11102 +echo "configure:81272: checking for $ac_hdr" >&5
11103  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
11104    echo $ac_n "(cached) $ac_c" 1>&6
11105  else
11106    cat > conftest.$ac_ext <<EOF
11107 -#line 81265 "configure"
11108 +#line 81277 "configure"
11109  #include "confdefs.h"
11110  #include <$ac_hdr>
11111  EOF
11112  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
11113 -{ (eval echo configure:81270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
11114 +{ (eval echo configure:81282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
11115  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
11116  if test -z "$ac_err"; then
11117    rm -rf conftest*
11118 @@ -81293,7 +81305,7 @@
11119  done
11120
11121    cat > conftest.$ac_ext <<EOF
11122 -#line 81297 "configure"
11123 +#line 81309 "configure"
11124  #include "confdefs.h"
11125
11126  #include <sys/types.h>
11127 @@ -81303,7 +81315,7 @@
11128  static struct msghdr tp; int n = (int) tp.msg_flags; return n
11129  ; return 0; }
11130  EOF
11131 -if { (eval echo configure:81307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
11132 +if { (eval echo configure:81319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
11133    :
11134  else
11135    echo "configure: failed program was:" >&5
11136 @@ -81547,18 +81559,1049 @@
11137
11138
11139
11140 +echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
11141 +echo "configure:81564: checking for sqlite support" >&5
11142 +# Check whether --with-sqlite or --without-sqlite was given.
11143 +if test "${with_sqlite+set}" = set; then
11144 +  withval="$with_sqlite"
11145 +  PHP_SQLITE=$withval
11146 +else
11147 +
11148 +  PHP_SQLITE=no
11149 +
11150 +  if test "$PHP_ENABLE_ALL" && test "yes" = "yes"; then
11151 +    PHP_SQLITE=$PHP_ENABLE_ALL
11152 +  fi
11153 +
11154 +fi
11155 +
11156 +
11157 +
11158 +ext_output="yes, shared"
11159 +ext_shared=yes
11160 +case $PHP_SQLITE in
11161 +shared,*)
11162 +  PHP_SQLITE=`echo "$PHP_SQLITE"|sed 's/^shared,//'`
11163 +  ;;
11164 +shared)
11165 +  PHP_SQLITE=yes
11166 +  ;;
11167 +no)
11168 +  ext_output=no
11169 +  ext_shared=no
11170 +  ;;
11171 +*)
11172 +  ext_output=yes
11173 +  ext_shared=no
11174 +  ;;
11175 +esac
11176 +
11177 +
11178 +
11179 +echo "$ac_t""$ext_output" 1>&6
11180 +
11181 +
11182 +
11183 +
11184 +if test "$PHP_SQLITE" != "no"; then
11185 +
11186 +  if test "$PHP_SQLITE" != "yes"; then
11187 +    SEARCH_PATH="/usr/local /usr"
11188 +    SEARCH_FOR="/include/sqlite.h"
11189 +    if test -r $PHP_SQLITE/; then # path given as parameter
11190 +        SQLITE_DIR=$PHP_SQLITE
11191 +    else # search default path list
11192 +        echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
11193 +echo "configure:81616: checking for sqlite files in default path" >&5
11194 +        for i in $SEARCH_PATH ; do
11195 +        if test -r $i/$SEARCH_FOR; then
11196 +            SQLITE_DIR=$i
11197 +            echo "$ac_t""found in $i" 1>&6
11198 +        fi
11199 +        done
11200 +    fi
11201 +
11202 +    if test -z "$SQLITE_DIR"; then
11203 +        echo "$ac_t""not found" 1>&6
11204 +        { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; }
11205 +    fi
11206 +
11207 +
11208 +  if test "$SQLITE_DIR/include" != "/usr/include"; then
11209 +
11210 +  if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then
11211 +    ai_p=$SQLITE_DIR/include
11212 +  else
11213 +
11214 +    ep_dir="`echo $SQLITE_DIR/include|sed 's%/*[^/][^/]*/*$%%'`"
11215 +
11216 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
11217 +    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`"
11218 +  fi
11219 +
11220 +
11221 +
11222 +  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
11223 +
11224 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
11225 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
11226 +    eval "INCLUDEPATH$unique=set"
11227 +
11228 +      if test ""; then
11229 +        INCLUDES="-I$ai_p $INCLUDES"
11230 +      else
11231 +        INCLUDES="$INCLUDES -I$ai_p"
11232 +      fi
11233 +
11234 +  fi
11235 +
11236 +  fi
11237 +
11238 +
11239 +    LIBNAME=sqlite
11240 +    LIBSYMBOL=sqlite_open
11241 +
11242 +
11243 +  save_old_LDFLAGS=$LDFLAGS
11244 +  ac_stuff="
11245 +        -L$SQLITE_DIR/lib -lm -ldl
11246 +    "
11247 +
11248 +  save_ext_shared=$ext_shared
11249 +  ext_shared=yes
11250 +
11251 +  for ac_i in $ac_stuff; do
11252 +    case $ac_i in
11253 +    -l*)
11254 +      ac_ii=`echo $ac_i|cut -c 3-`
11255 +
11256 +
11257 +  case $ac_ii in
11258 +  c|c_r|pthread*) ;;
11259 +  *)
11260 +    if test "$ext_shared" = "yes"; then
11261 +        LDFLAGS="$LDFLAGS -l$ac_ii"
11262 +    else
11263 +
11264 +
11265 +  case $ac_ii in
11266 +  c|c_r|pthread*) ;;
11267 +  *)
11268 +      LIBS="$LIBS -l$ac_ii"
11269 +   ;;
11270 +  esac
11271 +
11272 +
11273 +    fi
11274 +   ;;
11275 +  esac
11276 +
11277 +
11278 +    ;;
11279 +    -L*)
11280 +      ac_ii=`echo $ac_i|cut -c 3-`
11281 +
11282 +  if test "$ac_ii" != "/usr/lib"; then
11283 +
11284 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
11285 +    ai_p=$ac_ii
11286 +  else
11287 +
11288 +    ep_dir="`echo $ac_ii|sed 's%/*[^/][^/]*/*$%%'`"
11289 +
11290 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
11291 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
11292 +  fi
11293 +
11294 +
11295 +      if test "$ext_shared" = "yes"; then
11296 +        LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS"
11297 +      else
11298 +
11299 +
11300 +
11301 +  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
11302 +
11303 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
11304 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
11305 +    eval "LIBPATH$unique=set"
11306 +
11307 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
11308 +    LDFLAGS="$LDFLAGS -L$ai_p"
11309 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
11310 +
11311 +  fi
11312 +
11313 +
11314 +      fi
11315 +
11316 +  fi
11317 +
11318 +    ;;
11319 +    esac
11320 +  done
11321 +
11322 +  echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
11323 +echo "configure:81746: checking for $LIBSYMBOL in -l$LIBNAME" >&5
11324 +ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
11325 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11326 +  echo $ac_n "(cached) $ac_c" 1>&6
11327 +else
11328 +  ac_save_LIBS="$LIBS"
11329 +LIBS="-l$LIBNAME  $LIBS"
11330 +cat > conftest.$ac_ext <<EOF
11331 +#line 81754 "configure"
11332 +#include "confdefs.h"
11333 +/* Override any gcc2 internal prototype to avoid an error.  */
11334 +/* We use char because int might match the return type of a gcc2
11335 +    builtin and then its argument prototype would still apply.  */
11336 +char $LIBSYMBOL();
11337 +
11338 +int main() {
11339 +$LIBSYMBOL()
11340 +; return 0; }
11341 +EOF
11342 +if { (eval echo configure:81765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11343 +  rm -rf conftest*
11344 +  eval "ac_cv_lib_$ac_lib_var=yes"
11345 +else
11346 +  echo "configure: failed program was:" >&5
11347 +  cat conftest.$ac_ext >&5
11348 +  rm -rf conftest*
11349 +  eval "ac_cv_lib_$ac_lib_var=no"
11350 +fi
11351 +rm -f conftest*
11352 +LIBS="$ac_save_LIBS"
11353 +
11354 +fi
11355 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
11356 +  echo "$ac_t""yes" 1>&6
11357 +
11358 +    LDFLAGS=$save_old_LDFLAGS
11359 +    ext_shared=$save_ext_shared
11360 +
11361 +
11362 +
11363 +  if test "$ext_shared" = "yes"; then
11364 +    SQLITE_SHARED_LIBADD="-l$LIBNAME $SQLITE_SHARED_LIBADD"
11365 +    if test -n "$SQLITE_DIR/lib"; then
11366 +
11367 +  if test "$SQLITE_DIR/lib" != "/usr/lib"; then
11368 +
11369 +  if test -z "$SQLITE_DIR/lib" || echo "$SQLITE_DIR/lib" | grep '^/' >/dev/null ; then
11370 +    ai_p=$SQLITE_DIR/lib
11371 +  else
11372 +
11373 +    ep_dir="`echo $SQLITE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
11374 +
11375 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
11376 +    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/lib\"`"
11377 +  fi
11378 +
11379 +
11380 +      if test "$ext_shared" = "yes"; then
11381 +        SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $SQLITE_SHARED_LIBADD"
11382 +      else
11383 +
11384 +
11385 +
11386 +  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
11387 +
11388 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
11389 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
11390 +    eval "LIBPATH$unique=set"
11391 +
11392 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
11393 +    LDFLAGS="$LDFLAGS -L$ai_p"
11394 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
11395 +
11396 +  fi
11397 +
11398 +
11399 +      fi
11400 +
11401 +  fi
11402 +
11403 +    fi
11404 +  else
11405 +
11406 +
11407 +  if test -n "$SQLITE_DIR/lib"; then
11408 +
11409 +  if test "$SQLITE_DIR/lib" != "/usr/lib"; then
11410 +
11411 +  if test -z "$SQLITE_DIR/lib" || echo "$SQLITE_DIR/lib" | grep '^/' >/dev/null ; then
11412 +    ai_p=$SQLITE_DIR/lib
11413 +  else
11414 +
11415 +    ep_dir="`echo $SQLITE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
11416 +
11417 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
11418 +    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/lib\"`"
11419 +  fi
11420 +
11421 +
11422 +
11423 +
11424 +
11425 +  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
11426 +
11427 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
11428 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
11429 +    eval "LIBPATH$unique=set"
11430 +
11431 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
11432 +    LDFLAGS="$LDFLAGS -L$ai_p"
11433 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
11434 +
11435 +  fi
11436 +
11437 +
11438 +
11439 +  fi
11440 +
11441 +  fi
11442 +
11443 +
11444 +  case $LIBNAME in
11445 +  c|c_r|pthread*) ;;
11446 +  *)
11447 +      LIBS="-l$LIBNAME $LIBS"
11448 +   ;;
11449 +  esac
11450 +
11451 +
11452 +
11453 +
11454 +  fi
11455 +
11456 +
11457 +        cat >> confdefs.h <<\EOF
11458 +#define HAVE_SQLITELIB 1
11459 +EOF
11460 +
11461 +
11462 +
11463 +else
11464 +  echo "$ac_t""no" 1>&6
11465 +
11466 +    LDFLAGS=$save_old_LDFLAGS
11467 +    ext_shared=$save_ext_shared
11468 +    unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
11469 +
11470 +        { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
11471 +
11472 +
11473 +fi
11474 +
11475 +
11476 +
11477 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD"
11478 +
11479 +
11480 +  ext_builddir=ext/sqlite
11481 +  ext_srcdir=$abs_srcdir/ext/sqlite
11482 +
11483 +  ac_extra=
11484 +
11485 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
11486 +
11487 +
11488 +
11489 +  case ext/sqlite in
11490 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
11491 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
11492 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
11493 +  esac
11494 +
11495 +
11496 +
11497 +  b_c_pre=$php_c_pre
11498 +  b_cxx_pre=$php_cxx_pre
11499 +  b_c_meta=$php_c_meta
11500 +  b_cxx_meta=$php_cxx_meta
11501 +  b_c_post=$php_c_post
11502 +  b_cxx_post=$php_cxx_post
11503 +  b_lo=$php_lo
11504 +
11505 +
11506 +  old_IFS=$IFS
11507 +  for ac_src in sqlite.c; do
11508 +
11509 +      IFS=.
11510 +      set $ac_src
11511 +      ac_obj=$1
11512 +      IFS=$old_IFS
11513 +
11514 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
11515 +
11516 +      case $ac_src in
11517 +         *.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" ;;
11518 +         *.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" ;;
11519 +      esac
11520 +
11521 +         cat >>Makefile.objects<<EOF
11522 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
11523 +       $ac_comp
11524 +EOF
11525 +  done
11526 +
11527 +
11528 +    EXT_STATIC="$EXT_STATIC sqlite"
11529 +    if test "$ext_shared" != "nocli"; then
11530 +      EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
11531 +    fi
11532 +  else
11533 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
11534 +
11535 +  case ext/sqlite in
11536 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
11537 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
11538 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
11539 +  esac
11540 +
11541 +
11542 +
11543 +  b_c_pre=$shared_c_pre
11544 +  b_cxx_pre=$shared_cxx_pre
11545 +  b_c_meta=$shared_c_meta
11546 +  b_cxx_meta=$shared_cxx_meta
11547 +  b_c_post=$shared_c_post
11548 +  b_cxx_post=$shared_cxx_post
11549 +  b_lo=$shared_lo
11550 +
11551 +
11552 +  old_IFS=$IFS
11553 +  for ac_src in sqlite.c; do
11554 +
11555 +      IFS=.
11556 +      set $ac_src
11557 +      ac_obj=$1
11558 +      IFS=$old_IFS
11559 +
11560 +      shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo"
11561 +
11562 +      case $ac_src in
11563 +         *.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" ;;
11564 +         *.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" ;;
11565 +      esac
11566 +
11567 +         cat >>Makefile.objects<<EOF
11568 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
11569 +       $ac_comp
11570 +EOF
11571 +  done
11572 +
11573 +
11574 +  install_modules="install-modules"
11575 +
11576 +  case $host_alias in
11577 +    *darwin*)
11578 +      suffix=so
11579 +      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)'
11580 +      ;;
11581 +    *)
11582 +      suffix=la
11583 +      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)'
11584 +      ;;
11585 +  esac
11586 +
11587 +  PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix"
11588 +
11589 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
11590 +
11591 +  cat >>Makefile.objects<<EOF
11592 +\$(phplibdir)/sqlite.$suffix: $ext_builddir/sqlite.$suffix
11593 +       \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite.$suffix \$(phplibdir)
11594 +
11595 +$ext_builddir/sqlite.$suffix: \$(shared_objects_sqlite) \$(SQLITE_SHARED_DEPENDENCIES)
11596 +       $link_cmd
11597 +
11598 +EOF
11599 +
11600 +      cat >> confdefs.h <<EOF
11601 +#define COMPILE_DL_SQLITE 1
11602 +EOF
11603 +
11604 +    fi
11605 +  fi
11606 +
11607 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
11608 +    if test "$PHP_SAPI" = "cgi"; then
11609 +
11610 +
11611 +  case ext/sqlite in
11612 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
11613 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
11614 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
11615 +  esac
11616 +
11617 +
11618 +
11619 +  b_c_pre=$php_c_pre
11620 +  b_cxx_pre=$php_cxx_pre
11621 +  b_c_meta=$php_c_meta
11622 +  b_cxx_meta=$php_cxx_meta
11623 +  b_c_post=$php_c_post
11624 +  b_cxx_post=$php_cxx_post
11625 +  b_lo=$php_lo
11626 +
11627 +
11628 +  old_IFS=$IFS
11629 +  for ac_src in sqlite.c; do
11630 +
11631 +      IFS=.
11632 +      set $ac_src
11633 +      ac_obj=$1
11634 +      IFS=$old_IFS
11635 +
11636 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
11637 +
11638 +      case $ac_src in
11639 +         *.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" ;;
11640 +         *.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" ;;
11641 +      esac
11642 +
11643 +         cat >>Makefile.objects<<EOF
11644 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
11645 +       $ac_comp
11646 +EOF
11647 +  done
11648 +
11649 +
11650 +      EXT_STATIC="$EXT_STATIC sqlite"
11651 +    else
11652 +
11653 +
11654 +  case ext/sqlite in
11655 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
11656 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
11657 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
11658 +  esac
11659 +
11660 +
11661 +
11662 +  b_c_pre=$php_c_pre
11663 +  b_cxx_pre=$php_cxx_pre
11664 +  b_c_meta=$php_c_meta
11665 +  b_cxx_meta=$php_cxx_meta
11666 +  b_c_post=$php_c_post
11667 +  b_cxx_post=$php_cxx_post
11668 +  b_lo=$php_lo
11669 +
11670 +
11671 +  old_IFS=$IFS
11672 +  for ac_src in sqlite.c; do
11673 +
11674 +      IFS=.
11675 +      set $ac_src
11676 +      ac_obj=$1
11677 +      IFS=$old_IFS
11678 +
11679 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
11680 +
11681 +      case $ac_src in
11682 +         *.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" ;;
11683 +         *.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" ;;
11684 +      esac
11685 +
11686 +         cat >>Makefile.objects<<EOF
11687 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
11688 +       $ac_comp
11689 +EOF
11690 +  done
11691 +
11692 +
11693 +    fi
11694 +    EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
11695 +  fi
11696 +
11697 +  BUILD_DIR="$BUILD_DIR $ext_builddir"
11698 +
11699 +
11700 +  else
11701 +    # use bundled library
11702 +
11703 +    PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src"
11704 +
11705 +    sources="libsqlite/src/opcodes.c
11706 +        libsqlite/src/parse.c libsqlite/src/encode.c \
11707 +        libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
11708 +        libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
11709 +        libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
11710 +        libsqlite/src/os.c libsqlite/src/pager.c \
11711 +        libsqlite/src/printf.c libsqlite/src/random.c \
11712 +        libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
11713 +        libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
11714 +        libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \
11715 +        libsqlite/src/vacuum.c libsqlite/src/copy.c \
11716 +        libsqlite/src/where.c libsqlite/src/trigger.c"
11717 +
11718 +
11719 +  ext_builddir=ext/sqlite
11720 +  ext_srcdir=$abs_srcdir/ext/sqlite
11721 +
11722 +  ac_extra=`echo "$PHP_SQLITE_CFLAGS"|sed s#@ext_srcdir@#$ext_srcdir#g`
11723 +
11724 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
11725 +
11726 +
11727 +
11728 +  case ext/sqlite in
11729 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
11730 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
11731 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
11732 +  esac
11733 +
11734 +
11735 +
11736 +  b_c_pre=$php_c_pre
11737 +  b_cxx_pre=$php_cxx_pre
11738 +  b_c_meta=$php_c_meta
11739 +  b_cxx_meta=$php_cxx_meta
11740 +  b_c_post=$php_c_post
11741 +  b_cxx_post=$php_cxx_post
11742 +  b_lo=$php_lo
11743 +
11744 +
11745 +  old_IFS=$IFS
11746 +  for ac_src in sqlite.c $sources; do
11747 +
11748 +      IFS=.
11749 +      set $ac_src
11750 +      ac_obj=$1
11751 +      IFS=$old_IFS
11752 +
11753 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
11754 +
11755 +      case $ac_src in
11756 +         *.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" ;;
11757 +         *.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" ;;
11758 +      esac
11759 +
11760 +         cat >>Makefile.objects<<EOF
11761 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
11762 +       $ac_comp
11763 +EOF
11764 +  done
11765 +
11766 +
11767 +    EXT_STATIC="$EXT_STATIC sqlite"
11768 +    if test "$ext_shared" != "nocli"; then
11769 +      EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
11770 +    fi
11771 +  else
11772 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
11773 +
11774 +  case ext/sqlite in
11775 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
11776 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
11777 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
11778 +  esac
11779 +
11780 +
11781 +
11782 +  b_c_pre=$shared_c_pre
11783 +  b_cxx_pre=$shared_cxx_pre
11784 +  b_c_meta=$shared_c_meta
11785 +  b_cxx_meta=$shared_cxx_meta
11786 +  b_c_post=$shared_c_post
11787 +  b_cxx_post=$shared_cxx_post
11788 +  b_lo=$shared_lo
11789 +
11790 +
11791 +  old_IFS=$IFS
11792 +  for ac_src in sqlite.c $sources; do
11793 +
11794 +      IFS=.
11795 +      set $ac_src
11796 +      ac_obj=$1
11797 +      IFS=$old_IFS
11798 +
11799 +      shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo"
11800 +
11801 +      case $ac_src in
11802 +         *.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" ;;
11803 +         *.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" ;;
11804 +      esac
11805 +
11806 +         cat >>Makefile.objects<<EOF
11807 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
11808 +       $ac_comp
11809 +EOF
11810 +  done
11811 +
11812 +
11813 +  install_modules="install-modules"
11814 +
11815 +  case $host_alias in
11816 +    *darwin*)
11817 +      suffix=so
11818 +      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)'
11819 +      ;;
11820 +    *)
11821 +      suffix=la
11822 +      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)'
11823 +      ;;
11824 +  esac
11825 +
11826 +  PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix"
11827 +
11828 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
11829 +
11830 +  cat >>Makefile.objects<<EOF
11831 +\$(phplibdir)/sqlite.$suffix: $ext_builddir/sqlite.$suffix
11832 +       \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite.$suffix \$(phplibdir)
11833 +
11834 +$ext_builddir/sqlite.$suffix: \$(shared_objects_sqlite) \$(SQLITE_SHARED_DEPENDENCIES)
11835 +       $link_cmd
11836 +
11837 +EOF
11838 +
11839 +      cat >> confdefs.h <<EOF
11840 +#define COMPILE_DL_SQLITE 1
11841 +EOF
11842 +
11843 +    fi
11844 +  fi
11845 +
11846 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
11847 +    if test "$PHP_SAPI" = "cgi"; then
11848 +
11849 +
11850 +  case ext/sqlite in
11851 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
11852 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
11853 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
11854 +  esac
11855 +
11856 +
11857 +
11858 +  b_c_pre=$php_c_pre
11859 +  b_cxx_pre=$php_cxx_pre
11860 +  b_c_meta=$php_c_meta
11861 +  b_cxx_meta=$php_cxx_meta
11862 +  b_c_post=$php_c_post
11863 +  b_cxx_post=$php_cxx_post
11864 +  b_lo=$php_lo
11865 +
11866 +
11867 +  old_IFS=$IFS
11868 +  for ac_src in sqlite.c $sources; do
11869 +
11870 +      IFS=.
11871 +      set $ac_src
11872 +      ac_obj=$1
11873 +      IFS=$old_IFS
11874 +
11875 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
11876 +
11877 +      case $ac_src in
11878 +         *.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" ;;
11879 +         *.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" ;;
11880 +      esac
11881 +
11882 +         cat >>Makefile.objects<<EOF
11883 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
11884 +       $ac_comp
11885 +EOF
11886 +  done
11887 +
11888 +
11889 +      EXT_STATIC="$EXT_STATIC sqlite"
11890 +    else
11891 +
11892 +
11893 +  case ext/sqlite in
11894 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
11895 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
11896 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
11897 +  esac
11898 +
11899 +
11900 +
11901 +  b_c_pre=$php_c_pre
11902 +  b_cxx_pre=$php_cxx_pre
11903 +  b_c_meta=$php_c_meta
11904 +  b_cxx_meta=$php_cxx_meta
11905 +  b_c_post=$php_c_post
11906 +  b_cxx_post=$php_cxx_post
11907 +  b_lo=$php_lo
11908 +
11909 +
11910 +  old_IFS=$IFS
11911 +  for ac_src in sqlite.c $sources; do
11912 +
11913 +      IFS=.
11914 +      set $ac_src
11915 +      ac_obj=$1
11916 +      IFS=$old_IFS
11917 +
11918 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
11919 +
11920 +      case $ac_src in
11921 +         *.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" ;;
11922 +         *.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" ;;
11923 +      esac
11924 +
11925 +         cat >>Makefile.objects<<EOF
11926 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
11927 +       $ac_comp
11928 +EOF
11929 +  done
11930 +
11931 +
11932 +    fi
11933 +    EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
11934 +  fi
11935 +
11936 +  BUILD_DIR="$BUILD_DIR $ext_builddir"
11937 +
11938 +
11939 +
11940 +  BUILD_DIR="$BUILD_DIR $ext_builddir/libsqlite"
11941 +
11942 +
11943 +  BUILD_DIR="$BUILD_DIR $ext_builddir/libsqlite/src"
11944 +
11945 +    echo $ac_n "checking size of char *""... $ac_c" 1>&6
11946 +echo "configure:82369: checking size of char *" >&5
11947 +if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
11948 +  echo $ac_n "(cached) $ac_c" 1>&6
11949 +else
11950 +  if test "$cross_compiling" = yes; then
11951 +  ac_cv_sizeof_char_p=4
11952 +else
11953 +  cat > conftest.$ac_ext <<EOF
11954 +#line 82377 "configure"
11955 +#include "confdefs.h"
11956 +#include <stdio.h>
11957 +#include <sys/types.h>
11958 +main()
11959 +{
11960 +  FILE *f=fopen("conftestval", "w");
11961 +  if (!f) exit(1);
11962 +  fprintf(f, "%d\n", sizeof(char *));
11963 +  exit(0);
11964 +}
11965 +EOF
11966 +if { (eval echo configure:82389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11967 +then
11968 +  ac_cv_sizeof_char_p=`cat conftestval`
11969 +else
11970 +  echo "configure: failed program was:" >&5
11971 +  cat conftest.$ac_ext >&5
11972 +  rm -fr conftest*
11973 +  ac_cv_sizeof_char_p=0
11974 +fi
11975 +rm -fr conftest*
11976 +fi
11977 +
11978 +fi
11979 +echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
11980 +cat >> confdefs.h <<EOF
11981 +#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
11982 +EOF
11983 +
11984 +
11985 +    cat >> confdefs.h <<\EOF
11986 +#define SQLITE_PTR_SZ SIZEOF_CHAR_P
11987 +EOF
11988 +
11989 +    cat >> confdefs.h <<\EOF
11990 +#define OS_UNIX 1
11991 +EOF
11992 +
11993 +    cat >> confdefs.h <<\EOF
11994 +#define OS_WIN 0
11995 +EOF
11996 +
11997 +            SQLITE_ENCODING="ISO8859"
11998 +
11999 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING"
12000 +
12001 +
12002 +    # Extract the first word of "lemon", so it can be a program name with args.
12003 +set dummy lemon; ac_word=$2
12004 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12005 +echo "configure:82428: checking for $ac_word" >&5
12006 +if eval "test \"`echo '$''{'ac_cv_path_LEMON'+set}'`\" = set"; then
12007 +  echo $ac_n "(cached) $ac_c" 1>&6
12008 +else
12009 +  case "$LEMON" in
12010 +  /*)
12011 +  ac_cv_path_LEMON="$LEMON" # Let the user override the test with a path.
12012 +  ;;
12013 +  ?:/*)
12014 +  ac_cv_path_LEMON="$LEMON" # Let the user override the test with a dos path.
12015 +  ;;
12016 +  *)
12017 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
12018 +  ac_dummy="$PATH"
12019 +  for ac_dir in $ac_dummy; do
12020 +    test -z "$ac_dir" && ac_dir=.
12021 +    if test -f $ac_dir/$ac_word; then
12022 +      ac_cv_path_LEMON="$ac_dir/$ac_word"
12023 +      break
12024 +    fi
12025 +  done
12026 +  IFS="$ac_save_ifs"
12027 +  test -z "$ac_cv_path_LEMON" && ac_cv_path_LEMON="no"
12028 +  ;;
12029 +esac
12030 +fi
12031 +LEMON="$ac_cv_path_LEMON"
12032 +if test -n "$LEMON"; then
12033 +  echo "$ac_t""$LEMON" 1>&6
12034 +else
12035 +  echo "$ac_t""no" 1>&6
12036 +fi
12037 +
12038 +
12039 +  PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON"
12040 +
12041 +
12042 +    SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
12043 +
12044 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION"
12045 +
12046 +
12047 +    if test "$ext_shared" = "no"; then
12048 +      echo '#include "php_config.h"' > $ext_srcdir/libsqlite/src/config.h
12049 +    else
12050 +      echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/libsqlite/src/config.h
12051 +    fi
12052 +
12053 +    cat >> $ext_srcdir/libsqlite/src/config.h <<EOF
12054 +#if ZTS
12055 +# define THREADSAFE 1
12056 +#endif
12057 +#if !ZEND_DEBUG
12058 +# define NDEBUG
12059 +#endif
12060 +EOF
12061 +
12062 +
12063 +  src=$ext_srcdir/Makefile.frag
12064 +  ac_srcdir=$ext_srcdir
12065 +  ac_builddir=$ext_builddir
12066 +  sed -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
12067 +
12068 +
12069 +  fi
12070 +
12071 +  for ac_func in usleep nanosleep
12072 +do
12073 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
12074 +echo "configure:82497: checking for $ac_func" >&5
12075 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
12076 +  echo $ac_n "(cached) $ac_c" 1>&6
12077 +else
12078 +  cat > conftest.$ac_ext <<EOF
12079 +#line 82502 "configure"
12080 +#include "confdefs.h"
12081 +/* System header to define __stub macros and hopefully few prototypes,
12082 +    which can conflict with char $ac_func(); below.  */
12083 +#include <assert.h>
12084 +/* Override any gcc2 internal prototype to avoid an error.  */
12085 +/* We use char because int might match the return type of a gcc2
12086 +    builtin and then its argument prototype would still apply.  */
12087 +char $ac_func();
12088 +
12089 +int main() {
12090 +
12091 +/* The GNU C library defines this for functions which it implements
12092 +    to always fail with ENOSYS.  Some functions are actually named
12093 +    something starting with __ and the normal name is an alias.  */
12094 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
12095 +choke me
12096 +#else
12097 +$ac_func();
12098 +#endif
12099 +
12100 +; return 0; }
12101 +EOF
12102 +if { (eval echo configure:82525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12103 +  rm -rf conftest*
12104 +  eval "ac_cv_func_$ac_func=yes"
12105 +else
12106 +  echo "configure: failed program was:" >&5
12107 +  cat conftest.$ac_ext >&5
12108 +  rm -rf conftest*
12109 +  eval "ac_cv_func_$ac_func=no"
12110 +fi
12111 +rm -f conftest*
12112 +fi
12113 +
12114 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
12115 +  echo "$ac_t""yes" 1>&6
12116 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
12117 +  cat >> confdefs.h <<EOF
12118 +#define $ac_tr_func 1
12119 +EOF
12120 +
12121 +else
12122 +  echo "$ac_t""no" 1>&6
12123 +fi
12124 +done
12125 +
12126 +  for ac_hdr in time.h
12127 +do
12128 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
12129 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
12130 +echo "configure:82553: checking for $ac_hdr" >&5
12131 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
12132 +  echo $ac_n "(cached) $ac_c" 1>&6
12133 +else
12134 +  cat > conftest.$ac_ext <<EOF
12135 +#line 82558 "configure"
12136 +#include "confdefs.h"
12137 +#include <$ac_hdr>
12138 +EOF
12139 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
12140 +{ (eval echo configure:82563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12141 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
12142 +if test -z "$ac_err"; then
12143 +  rm -rf conftest*
12144 +  eval "ac_cv_header_$ac_safe=yes"
12145 +else
12146 +  echo "$ac_err" >&5
12147 +  echo "configure: failed program was:" >&5
12148 +  cat conftest.$ac_ext >&5
12149 +  rm -rf conftest*
12150 +  eval "ac_cv_header_$ac_safe=no"
12151 +fi
12152 +rm -f conftest*
12153 +fi
12154 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
12155 +  echo "$ac_t""yes" 1>&6
12156 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
12157 +  cat >> confdefs.h <<EOF
12158 +#define $ac_tr_hdr 1
12159 +EOF
12160 +
12161 +else
12162 +  echo "$ac_t""no" 1>&6
12163 +fi
12164 +done
12165 +
12166 +fi
12167 +
12168 +
12169 +
12170 +
12171
12172
12173
12174  for ac_func in getcwd getwd asinh acosh atanh log1p hypot
12175  do
12176  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
12177 -echo "configure:81557: checking for $ac_func" >&5
12178 +echo "configure:82600: checking for $ac_func" >&5
12179  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
12180    echo $ac_n "(cached) $ac_c" 1>&6
12181  else
12182    cat > conftest.$ac_ext <<EOF
12183 -#line 81562 "configure"
12184 +#line 82605 "configure"
12185  #include "confdefs.h"
12186  /* System header to define __stub macros and hopefully few prototypes,
12187      which can conflict with char $ac_func(); below.  */
12188 @@ -81581,7 +82624,7 @@
12189
12190  ; return 0; }
12191  EOF
12192 -if { (eval echo configure:81585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12193 +if { (eval echo configure:82628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12194    rm -rf conftest*
12195    eval "ac_cv_func_$ac_func=yes"
12196  else
12197 @@ -81610,7 +82653,7 @@
12198
12199    if test "$ac_cv_func_crypt" = "no"; then
12200    echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
12201 -echo "configure:81614: checking for crypt in -lcrypt" >&5
12202 +echo "configure:82657: checking for crypt in -lcrypt" >&5
12203  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
12204  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12205    echo $ac_n "(cached) $ac_c" 1>&6
12206 @@ -81618,7 +82661,7 @@
12207    ac_save_LIBS="$LIBS"
12208  LIBS="-lcrypt  $LIBS"
12209  cat > conftest.$ac_ext <<EOF
12210 -#line 81622 "configure"
12211 +#line 82665 "configure"
12212  #include "confdefs.h"
12213  /* Override any gcc2 internal prototype to avoid an error.  */
12214  /* We use char because int might match the return type of a gcc2
12215 @@ -81629,7 +82672,7 @@
12216  crypt()
12217  ; return 0; }
12218  EOF
12219 -if { (eval echo configure:81633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12220 +if { (eval echo configure:82676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12221    rm -rf conftest*
12222    eval "ac_cv_lib_$ac_lib_var=yes"
12223  else
12224 @@ -81658,7 +82701,7 @@
12225    fi
12226
12227    echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
12228 -echo "configure:81662: checking for standard DES crypt" >&5
12229 +echo "configure:82705: checking for standard DES crypt" >&5
12230  if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then
12231    echo $ac_n "(cached) $ac_c" 1>&6
12232  else
12233 @@ -81669,7 +82712,7 @@
12234
12235  else
12236    cat > conftest.$ac_ext <<EOF
12237 -#line 81673 "configure"
12238 +#line 82716 "configure"
12239  #include "confdefs.h"
12240
12241  #if HAVE_UNISTD_H
12242 @@ -81688,7 +82731,7 @@
12243  #endif
12244  }
12245  EOF
12246 -if { (eval echo configure:81692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12247 +if { (eval echo configure:82735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12248  then
12249
12250      ac_cv_crypt_des=yes
12251 @@ -81719,7 +82762,7 @@
12252
12253
12254    echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
12255 -echo "configure:81723: checking for extended DES crypt" >&5
12256 +echo "configure:82766: checking for extended DES crypt" >&5
12257  if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then
12258    echo $ac_n "(cached) $ac_c" 1>&6
12259  else
12260 @@ -81730,7 +82773,7 @@
12261
12262  else
12263    cat > conftest.$ac_ext <<EOF
12264 -#line 81734 "configure"
12265 +#line 82777 "configure"
12266  #include "confdefs.h"
12267
12268  #if HAVE_UNISTD_H
12269 @@ -81749,7 +82792,7 @@
12270  #endif
12271  }
12272  EOF
12273 -if { (eval echo configure:81753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12274 +if { (eval echo configure:82796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12275  then
12276
12277      ac_cv_crypt_ext_des=yes
12278 @@ -81780,7 +82823,7 @@
12279
12280
12281    echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
12282 -echo "configure:81784: checking for MD5 crypt" >&5
12283 +echo "configure:82827: checking for MD5 crypt" >&5
12284  if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then
12285    echo $ac_n "(cached) $ac_c" 1>&6
12286  else
12287 @@ -81791,7 +82834,7 @@
12288
12289  else
12290    cat > conftest.$ac_ext <<EOF
12291 -#line 81795 "configure"
12292 +#line 82838 "configure"
12293  #include "confdefs.h"
12294
12295  #if HAVE_UNISTD_H
12296 @@ -81819,7 +82862,7 @@
12297  #endif
12298  }
12299  EOF
12300 -if { (eval echo configure:81823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12301 +if { (eval echo configure:82866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12302  then
12303
12304      ac_cv_crypt_md5=yes
12305 @@ -81879,7 +82922,7 @@
12306
12307
12308    echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
12309 -echo "configure:81883: checking for Blowfish crypt" >&5
12310 +echo "configure:82926: checking for Blowfish crypt" >&5
12311  if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then
12312    echo $ac_n "(cached) $ac_c" 1>&6
12313  else
12314 @@ -81890,7 +82933,7 @@
12315
12316  else
12317    cat > conftest.$ac_ext <<EOF
12318 -#line 81894 "configure"
12319 +#line 82937 "configure"
12320  #include "confdefs.h"
12321
12322  #if HAVE_UNISTD_H
12323 @@ -81915,7 +82958,7 @@
12324  #endif
12325  }
12326  EOF
12327 -if { (eval echo configure:81919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12328 +if { (eval echo configure:82962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12329  then
12330
12331      ac_cv_crypt_blowfish=yes
12332 @@ -81947,7 +82990,7 @@
12333
12334
12335    echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
12336 -echo "configure:81951: checking whether flush should be called explicitly after a buffered io" >&5
12337 +echo "configure:82994: checking whether flush should be called explicitly after a buffered io" >&5
12338  if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then
12339    echo $ac_n "(cached) $ac_c" 1>&6
12340  else
12341 @@ -81958,7 +83001,7 @@
12342
12343  else
12344    cat > conftest.$ac_ext <<EOF
12345 -#line 81962 "configure"
12346 +#line 83005 "configure"
12347  #include "confdefs.h"
12348
12349  #include <stdio.h>
12350 @@ -81996,7 +83039,7 @@
12351  }
12352
12353  EOF
12354 -if { (eval echo configure:82000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12355 +if { (eval echo configure:83043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12356  then
12357
12358    ac_cv_flush_io=no
12359 @@ -82115,12 +83158,12 @@
12360  fi
12361
12362  echo $ac_n "checking which regex library to use""... $ac_c" 1>&6
12363 -echo "configure:82119: checking which regex library to use" >&5
12364 +echo "configure:83162: checking which regex library to use" >&5
12365  echo "$ac_t""$REGEX_TYPE" 1>&6
12366
12367
12368  echo $ac_n "checking whether rounding works as expected""... $ac_c" 1>&6
12369 -echo "configure:82124: checking whether rounding works as expected" >&5
12370 +echo "configure:83167: checking whether rounding works as expected" >&5
12371  if test "$cross_compiling" = yes; then
12372
12373    PHP_ROUND_FUZZ=0.50000000001
12374 @@ -82128,7 +83171,7 @@
12375
12376  else
12377    cat > conftest.$ac_ext <<EOF
12378 -#line 82132 "configure"
12379 +#line 83175 "configure"
12380  #include "confdefs.h"
12381
12382  #include <math.h>
12383 @@ -82137,7 +83180,7 @@
12384    }
12385
12386  EOF
12387 -if { (eval echo configure:82141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12388 +if { (eval echo configure:83184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12389  then
12390
12391    PHP_ROUND_FUZZ=0.5
12392 @@ -82161,7 +83204,7 @@
12393
12394
12395  echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
12396 -echo "configure:82165: checking for working fnmatch" >&5
12397 +echo "configure:83208: checking for working fnmatch" >&5
12398  if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
12399    echo $ac_n "(cached) $ac_c" 1>&6
12400  else
12401 @@ -82172,11 +83215,11 @@
12402    ac_cv_func_fnmatch_works=no
12403  else
12404    cat > conftest.$ac_ext <<EOF
12405 -#line 82176 "configure"
12406 +#line 83219 "configure"
12407  #include "confdefs.h"
12408  main() { exit (fnmatch ("a*", "abc", 0) != 0); }
12409  EOF
12410 -if { (eval echo configure:82180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12411 +if { (eval echo configure:83223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12412  then
12413    ac_cv_func_fnmatch_works=yes
12414  else
12415 @@ -82203,12 +83246,12 @@
12416  for ac_func in glob strfmon
12417  do
12418  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
12419 -echo "configure:82207: checking for $ac_func" >&5
12420 +echo "configure:83250: checking for $ac_func" >&5
12421  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
12422    echo $ac_n "(cached) $ac_c" 1>&6
12423  else
12424    cat > conftest.$ac_ext <<EOF
12425 -#line 82212 "configure"
12426 +#line 83255 "configure"
12427  #include "confdefs.h"
12428  /* System header to define __stub macros and hopefully few prototypes,
12429      which can conflict with char $ac_func(); below.  */
12430 @@ -82231,7 +83274,7 @@
12431
12432  ; return 0; }
12433  EOF
12434 -if { (eval echo configure:82235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12435 +if { (eval echo configure:83278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12436    rm -rf conftest*
12437    eval "ac_cv_func_$ac_func=yes"
12438  else
12439 @@ -82266,12 +83309,12 @@
12440  for ac_func in fpclass isinf isnan
12441  do
12442  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
12443 -echo "configure:82270: checking for $ac_func" >&5
12444 +echo "configure:83313: checking for $ac_func" >&5
12445  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
12446    echo $ac_n "(cached) $ac_c" 1>&6
12447  else
12448    cat > conftest.$ac_ext <<EOF
12449 -#line 82275 "configure"
12450 +#line 83318 "configure"
12451  #include "confdefs.h"
12452  /* System header to define __stub macros and hopefully few prototypes,
12453      which can conflict with char $ac_func(); below.  */
12454 @@ -82294,7 +83337,7 @@
12455
12456  ; return 0; }
12457  EOF
12458 -if { (eval echo configure:82298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12459 +if { (eval echo configure:83341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12460    rm -rf conftest*
12461    eval "ac_cv_func_$ac_func=yes"
12462  else
12463 @@ -82320,7 +83363,7 @@
12464
12465
12466  echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
12467 -echo "configure:82324: checking whether atof() accepts NAN" >&5
12468 +echo "configure:83367: checking whether atof() accepts NAN" >&5
12469  if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then
12470    echo $ac_n "(cached) $ac_c" 1>&6
12471  else
12472 @@ -82331,7 +83374,7 @@
12473
12474  else
12475    cat > conftest.$ac_ext <<EOF
12476 -#line 82335 "configure"
12477 +#line 83378 "configure"
12478  #include "confdefs.h"
12479
12480  #include <math.h>
12481 @@ -82351,7 +83394,7 @@
12482  }
12483
12484  EOF
12485 -if { (eval echo configure:82355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12486 +if { (eval echo configure:83398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12487  then
12488
12489        ac_cv_atof_accept_nan=yes
12490 @@ -82379,7 +83422,7 @@
12491  fi
12492
12493  echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
12494 -echo "configure:82383: checking whether atof() accepts INF" >&5
12495 +echo "configure:83426: checking whether atof() accepts INF" >&5
12496  if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then
12497    echo $ac_n "(cached) $ac_c" 1>&6
12498  else
12499 @@ -82390,7 +83433,7 @@
12500
12501  else
12502    cat > conftest.$ac_ext <<EOF
12503 -#line 82394 "configure"
12504 +#line 83437 "configure"
12505  #include "confdefs.h"
12506
12507  #include <math.h>
12508 @@ -82413,7 +83456,7 @@
12509  }
12510
12511  EOF
12512 -if { (eval echo configure:82417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12513 +if { (eval echo configure:83460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12514  then
12515
12516        ac_cv_atof_accept_inf=yes
12517 @@ -82441,7 +83484,7 @@
12518  fi
12519
12520  echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
12521 -echo "configure:82445: checking whether HUGE_VAL == INF" >&5
12522 +echo "configure:83488: checking whether HUGE_VAL == INF" >&5
12523  if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then
12524    echo $ac_n "(cached) $ac_c" 1>&6
12525  else
12526 @@ -82452,7 +83495,7 @@
12527
12528  else
12529    cat > conftest.$ac_ext <<EOF
12530 -#line 82456 "configure"
12531 +#line 83499 "configure"
12532  #include "confdefs.h"
12533
12534  #include <math.h>
12535 @@ -82475,7 +83518,7 @@
12536  }
12537
12538  EOF
12539 -if { (eval echo configure:82479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12540 +if { (eval echo configure:83522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12541  then
12542
12543        ac_cv_huge_val_inf=yes
12544 @@ -82503,7 +83546,7 @@
12545  fi
12546
12547  echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
12548 -echo "configure:82507: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
12549 +echo "configure:83550: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
12550  if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then
12551    echo $ac_n "(cached) $ac_c" 1>&6
12552  else
12553 @@ -82514,7 +83557,7 @@
12554
12555  else
12556    cat > conftest.$ac_ext <<EOF
12557 -#line 82518 "configure"
12558 +#line 83561 "configure"
12559  #include "confdefs.h"
12560
12561  #include <math.h>
12562 @@ -82539,7 +83582,7 @@
12563  }
12564
12565  EOF
12566 -if { (eval echo configure:82543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12567 +if { (eval echo configure:83586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12568  then
12569
12570        ac_cv_huge_val_nan=yes
12571 @@ -82835,7 +83878,7 @@
12572
12573
12574  echo $ac_n "checking for libswf support""... $ac_c" 1>&6
12575 -echo "configure:82839: checking for libswf support" >&5
12576 +echo "configure:83882: checking for libswf support" >&5
12577  # Check whether --with-swf or --without-swf was given.
12578  if test "${with_swf+set}" = set; then
12579    withval="$with_swf"
12580 @@ -82883,7 +83926,7 @@
12581      SWF_DIR=$PHP_SWF
12582    else
12583      echo $ac_n "checking for libswf in default path""... $ac_c" 1>&6
12584 -echo "configure:82887: checking for libswf in default path" >&5
12585 +echo "configure:83930: checking for libswf in default path" >&5
12586      for i in /usr/local /usr; do
12587        if test -r $i/lib/libswf.a; then
12588          SWF_DIR=$i
12589 @@ -83262,7 +84305,7 @@
12590
12591
12592  echo $ac_n "checking for Sybase support""... $ac_c" 1>&6
12593 -echo "configure:83266: checking for Sybase support" >&5
12594 +echo "configure:84309: checking for Sybase support" >&5
12595  # Check whether --with-sybase or --without-sybase was given.
12596  if test "${with_sybase+set}" = set; then
12597    withval="$with_sybase"
12598 @@ -83663,7 +84706,7 @@
12599
12600
12601    echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
12602 -echo "configure:83667: checking for dnet_addr in -ldnet_stub" >&5
12603 +echo "configure:84710: checking for dnet_addr in -ldnet_stub" >&5
12604  ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
12605  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12606    echo $ac_n "(cached) $ac_c" 1>&6
12607 @@ -83671,7 +84714,7 @@
12608    ac_save_LIBS="$LIBS"
12609  LIBS="-ldnet_stub  $LIBS"
12610  cat > conftest.$ac_ext <<EOF
12611 -#line 83675 "configure"
12612 +#line 84718 "configure"
12613  #include "confdefs.h"
12614  /* Override any gcc2 internal prototype to avoid an error.  */
12615  /* We use char because int might match the return type of a gcc2
12616 @@ -83682,7 +84725,7 @@
12617  dnet_addr()
12618  ; return 0; }
12619  EOF
12620 -if { (eval echo configure:83686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12621 +if { (eval echo configure:84729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12622    rm -rf conftest*
12623    eval "ac_cv_lib_$ac_lib_var=yes"
12624  else
12625 @@ -83807,7 +84850,7 @@
12626  EOF
12627
12628    echo $ac_n "checking for tdsdbopen in -lsybdb""... $ac_c" 1>&6
12629 -echo "configure:83811: checking for tdsdbopen in -lsybdb" >&5
12630 +echo "configure:84854: checking for tdsdbopen in -lsybdb" >&5
12631  ac_lib_var=`echo sybdb'_'tdsdbopen | sed 'y%./+-%__p_%'`
12632  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12633    echo $ac_n "(cached) $ac_c" 1>&6
12634 @@ -83815,7 +84858,7 @@
12635    ac_save_LIBS="$LIBS"
12636  LIBS="-lsybdb  $LIBS"
12637  cat > conftest.$ac_ext <<EOF
12638 -#line 83819 "configure"
12639 +#line 84862 "configure"
12640  #include "confdefs.h"
12641  /* Override any gcc2 internal prototype to avoid an error.  */
12642  /* We use char because int might match the return type of a gcc2
12643 @@ -83826,7 +84869,7 @@
12644  tdsdbopen()
12645  ; return 0; }
12646  EOF
12647 -if { (eval echo configure:83830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12648 +if { (eval echo configure:84873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12649    rm -rf conftest*
12650    eval "ac_cv_lib_$ac_lib_var=yes"
12651  else
12652 @@ -83863,7 +84906,7 @@
12653
12654
12655  echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
12656 -echo "configure:83867: checking for Sybase-CT support" >&5
12657 +echo "configure:84910: checking for Sybase-CT support" >&5
12658  # Check whether --with-sybase-ct or --without-sybase-ct was given.
12659  if test "${with_sybase_ct+set}" = set; then
12660    withval="$with_sybase_ct"
12661 @@ -84424,7 +85467,7 @@
12662    done
12663
12664    echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
12665 -echo "configure:84428: checking for netg_errstr in -ltcl" >&5
12666 +echo "configure:85471: checking for netg_errstr in -ltcl" >&5
12667  ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
12668  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12669    echo $ac_n "(cached) $ac_c" 1>&6
12670 @@ -84432,7 +85475,7 @@
12671    ac_save_LIBS="$LIBS"
12672  LIBS="-ltcl  $LIBS"
12673  cat > conftest.$ac_ext <<EOF
12674 -#line 84436 "configure"
12675 +#line 85479 "configure"
12676  #include "confdefs.h"
12677  /* Override any gcc2 internal prototype to avoid an error.  */
12678  /* We use char because int might match the return type of a gcc2
12679 @@ -84443,7 +85486,7 @@
12680  netg_errstr()
12681  ; return 0; }
12682  EOF
12683 -if { (eval echo configure:84447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12684 +if { (eval echo configure:85490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12685    rm -rf conftest*
12686    eval "ac_cv_lib_$ac_lib_var=yes"
12687  else
12688 @@ -84601,7 +85644,7 @@
12689    done
12690
12691    echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
12692 -echo "configure:84605: checking for insck__getVdate in -linsck" >&5
12693 +echo "configure:85648: checking for insck__getVdate in -linsck" >&5
12694  ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
12695  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12696    echo $ac_n "(cached) $ac_c" 1>&6
12697 @@ -84609,7 +85652,7 @@
12698    ac_save_LIBS="$LIBS"
12699  LIBS="-linsck  $LIBS"
12700  cat > conftest.$ac_ext <<EOF
12701 -#line 84613 "configure"
12702 +#line 85656 "configure"
12703  #include "confdefs.h"
12704  /* Override any gcc2 internal prototype to avoid an error.  */
12705  /* We use char because int might match the return type of a gcc2
12706 @@ -84620,7 +85663,7 @@
12707  insck__getVdate()
12708  ; return 0; }
12709  EOF
12710 -if { (eval echo configure:84624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12711 +if { (eval echo configure:85667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12712    rm -rf conftest*
12713    eval "ac_cv_lib_$ac_lib_var=yes"
12714  else
12715 @@ -84751,7 +85794,7 @@
12716    done
12717
12718    echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
12719 -echo "configure:84755: checking for bsd_tcp in -linsck" >&5
12720 +echo "configure:85798: checking for bsd_tcp in -linsck" >&5
12721  ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
12722  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12723    echo $ac_n "(cached) $ac_c" 1>&6
12724 @@ -84759,7 +85802,7 @@
12725    ac_save_LIBS="$LIBS"
12726  LIBS="-linsck  $LIBS"
12727  cat > conftest.$ac_ext <<EOF
12728 -#line 84763 "configure"
12729 +#line 85806 "configure"
12730  #include "confdefs.h"
12731  /* Override any gcc2 internal prototype to avoid an error.  */
12732  /* We use char because int might match the return type of a gcc2
12733 @@ -84770,7 +85813,7 @@
12734  bsd_tcp()
12735  ; return 0; }
12736  EOF
12737 -if { (eval echo configure:84774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12738 +if { (eval echo configure:85817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12739    rm -rf conftest*
12740    eval "ac_cv_lib_$ac_lib_var=yes"
12741  else
12742 @@ -84829,7 +85872,7 @@
12743
12744
12745  echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
12746 -echo "configure:84833: checking whether to enable System V IPC support" >&5
12747 +echo "configure:85876: checking whether to enable System V IPC support" >&5
12748  # Check whether --enable-sysvmsg or --disable-sysvmsg was given.
12749  if test "${enable_sysvmsg+set}" = set; then
12750    enableval="$enable_sysvmsg"
12751 @@ -85104,7 +86147,7 @@
12752
12753
12754  echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
12755 -echo "configure:85108: checking whether to enable System V semaphore support" >&5
12756 +echo "configure:86151: checking whether to enable System V semaphore support" >&5
12757  # Check whether --enable-sysvsem or --disable-sysvsem was given.
12758  if test "${enable_sysvsem+set}" = set; then
12759    enableval="$enable_sysvsem"
12760 @@ -85374,12 +86417,12 @@
12761  EOF
12762
12763   echo $ac_n "checking for union semun""... $ac_c" 1>&6
12764 -echo "configure:85378: checking for union semun" >&5
12765 +echo "configure:86421: checking for union semun" >&5
12766  if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
12767    echo $ac_n "(cached) $ac_c" 1>&6
12768  else
12769    cat > conftest.$ac_ext <<EOF
12770 -#line 85383 "configure"
12771 +#line 86426 "configure"
12772  #include "confdefs.h"
12773
12774  #include <sys/types.h>
12775 @@ -85390,7 +86433,7 @@
12776  union semun x;
12777  ; return 0; }
12778  EOF
12779 -if { (eval echo configure:85394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12780 +if { (eval echo configure:86437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12781    rm -rf conftest*
12782
12783       php_cv_semun=yes
12784 @@ -85425,7 +86468,7 @@
12785
12786
12787  echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
12788 -echo "configure:85429: checking whether to enable System V shared memory support" >&5
12789 +echo "configure:86472: checking whether to enable System V shared memory support" >&5
12790  # Check whether --enable-sysvshm or --disable-sysvshm was given.
12791  if test "${enable_sysvshm+set}" = set; then
12792    enableval="$enable_sysvshm"
12793 @@ -85701,7 +86744,7 @@
12794
12795
12796  echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
12797 -echo "configure:85705: checking whether to enable tokenizer support" >&5
12798 +echo "configure:86748: checking whether to enable tokenizer support" >&5
12799  # Check whether --enable-tokenizer or --disable-tokenizer was given.
12800  if test "${enable_tokenizer+set}" = set; then
12801    enableval="$enable_tokenizer"
12802 @@ -85978,7 +87021,7 @@
12803
12804
12805  echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
12806 -echo "configure:85982: checking whether to enable WDDX support" >&5
12807 +echo "configure:87025: checking whether to enable WDDX support" >&5
12808  # Check whether --enable-wddx or --disable-wddx was given.
12809  if test "${enable_wddx+set}" = set; then
12810    enableval="$enable_wddx"
12811 @@ -86255,7 +87298,7 @@
12812
12813
12814  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
12815 -echo "configure:86259: checking whether byte ordering is bigendian" >&5
12816 +echo "configure:87302: checking whether byte ordering is bigendian" >&5
12817  if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
12818    echo $ac_n "(cached) $ac_c" 1>&6
12819  else
12820 @@ -86265,7 +87308,7 @@
12821    ac_cv_c_bigendian_php=unknown
12822  else
12823    cat > conftest.$ac_ext <<EOF
12824 -#line 86269 "configure"
12825 +#line 87312 "configure"
12826  #include "confdefs.h"
12827
12828  int main(void)
12829 @@ -86281,7 +87324,7 @@
12830  }
12831
12832  EOF
12833 -if { (eval echo configure:86285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12834 +if { (eval echo configure:87328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12835  then
12836    ac_cv_c_bigendian_php=yes
12837  else
12838 @@ -86314,7 +87357,7 @@
12839
12840
12841  echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
12842 -echo "configure:86318: checking whether to enable XML support" >&5
12843 +echo "configure:87361: checking whether to enable XML support" >&5
12844  # Check whether --enable-xml or --disable-xml was given.
12845  if test "${enable_xml+set}" = set; then
12846    enableval="$enable_xml"
12847 @@ -86360,7 +87403,7 @@
12848
12849
12850  echo $ac_n "checking external libexpat install dir""... $ac_c" 1>&6
12851 -echo "configure:86364: checking external libexpat install dir" >&5
12852 +echo "configure:87407: checking external libexpat install dir" >&5
12853  # Check whether --with-expat-dir or --without-expat-dir was given.
12854  if test "${with_expat_dir+set}" = set; then
12855    withval="$with_expat_dir"
12856 @@ -87043,7 +88086,7 @@
12857
12858
12859  echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
12860 -echo "configure:87047: checking for XMLRPC-EPI support" >&5
12861 +echo "configure:88090: checking for XMLRPC-EPI support" >&5
12862  # Check whether --with-xmlrpc or --without-xmlrpc was given.
12863  if test "${with_xmlrpc+set}" = set; then
12864    withval="$with_xmlrpc"
12865 @@ -87089,7 +88132,7 @@
12866
12867
12868  echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
12869 -echo "configure:87093: checking libexpat dir for XMLRPC-EPI" >&5
12870 +echo "configure:88136: checking libexpat dir for XMLRPC-EPI" >&5
12871  # Check whether --with-expat-dir or --without-expat-dir was given.
12872  if test "${with_expat_dir+set}" = set; then
12873    withval="$with_expat_dir"
12874 @@ -87114,7 +88157,7 @@
12875
12876
12877  echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
12878 -echo "configure:87118: checking iconv dir for XMLRPC-EPI" >&5
12879 +echo "configure:88161: checking iconv dir for XMLRPC-EPI" >&5
12880  # Check whether --with-iconv-dir or --without-iconv-dir was given.
12881  if test "${with_iconv_dir+set}" = set; then
12882    withval="$with_iconv_dir"
12883 @@ -87315,12 +88358,12 @@
12884
12885          if test "$PHP_ICONV" = "yes"; then
12886      echo $ac_n "checking for iconv""... $ac_c" 1>&6
12887 -echo "configure:87319: checking for iconv" >&5
12888 +echo "configure:88362: checking for iconv" >&5
12889  if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
12890    echo $ac_n "(cached) $ac_c" 1>&6
12891  else
12892    cat > conftest.$ac_ext <<EOF
12893 -#line 87324 "configure"
12894 +#line 88367 "configure"
12895  #include "confdefs.h"
12896  /* System header to define __stub macros and hopefully few prototypes,
12897      which can conflict with char iconv(); below.  */
12898 @@ -87343,7 +88386,7 @@
12899
12900  ; return 0; }
12901  EOF
12902 -if { (eval echo configure:87347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12903 +if { (eval echo configure:88390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12904    rm -rf conftest*
12905    eval "ac_cv_func_iconv=yes"
12906  else
12907 @@ -87367,12 +88410,12 @@
12908    echo "$ac_t""no" 1>&6
12909
12910        echo $ac_n "checking for libiconv""... $ac_c" 1>&6
12911 -echo "configure:87371: checking for libiconv" >&5
12912 +echo "configure:88414: checking for libiconv" >&5
12913  if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
12914    echo $ac_n "(cached) $ac_c" 1>&6
12915  else
12916    cat > conftest.$ac_ext <<EOF
12917 -#line 87376 "configure"
12918 +#line 88419 "configure"
12919  #include "confdefs.h"
12920  /* System header to define __stub macros and hopefully few prototypes,
12921      which can conflict with char libiconv(); below.  */
12922 @@ -87395,7 +88438,7 @@
12923
12924  ; return 0; }
12925  EOF
12926 -if { (eval echo configure:87399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12927 +if { (eval echo configure:88442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12928    rm -rf conftest*
12929    eval "ac_cv_func_libiconv=yes"
12930  else
12931 @@ -87530,7 +88573,7 @@
12932    done
12933
12934    echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
12935 -echo "configure:87534: checking for libiconv in -l$iconv_lib_name" >&5
12936 +echo "configure:88577: checking for libiconv in -l$iconv_lib_name" >&5
12937  ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
12938  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12939    echo $ac_n "(cached) $ac_c" 1>&6
12940 @@ -87538,7 +88581,7 @@
12941    ac_save_LIBS="$LIBS"
12942  LIBS="-l$iconv_lib_name  $LIBS"
12943  cat > conftest.$ac_ext <<EOF
12944 -#line 87542 "configure"
12945 +#line 88585 "configure"
12946  #include "confdefs.h"
12947  /* Override any gcc2 internal prototype to avoid an error.  */
12948  /* We use char because int might match the return type of a gcc2
12949 @@ -87549,7 +88592,7 @@
12950  libiconv()
12951  ; return 0; }
12952  EOF
12953 -if { (eval echo configure:87553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12954 +if { (eval echo configure:88596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12955    rm -rf conftest*
12956    eval "ac_cv_lib_$ac_lib_var=yes"
12957  else
12958 @@ -87662,7 +88705,7 @@
12959    done
12960
12961    echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
12962 -echo "configure:87666: checking for iconv in -l$iconv_lib_name" >&5
12963 +echo "configure:88709: checking for iconv in -l$iconv_lib_name" >&5
12964  ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
12965  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12966    echo $ac_n "(cached) $ac_c" 1>&6
12967 @@ -87670,7 +88713,7 @@
12968    ac_save_LIBS="$LIBS"
12969  LIBS="-l$iconv_lib_name  $LIBS"
12970  cat > conftest.$ac_ext <<EOF
12971 -#line 87674 "configure"
12972 +#line 88717 "configure"
12973  #include "confdefs.h"
12974  /* Override any gcc2 internal prototype to avoid an error.  */
12975  /* We use char because int might match the return type of a gcc2
12976 @@ -87681,7 +88724,7 @@
12977  iconv()
12978  ; return 0; }
12979  EOF
12980 -if { (eval echo configure:87685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12981 +if { (eval echo configure:88728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12982    rm -rf conftest*
12983    eval "ac_cv_lib_$ac_lib_var=yes"
12984  else
12985 @@ -87880,12 +88923,12 @@
12986
12987
12988  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
12989 -echo "configure:87884: checking for ANSI C header files" >&5
12990 +echo "configure:88927: checking for ANSI C header files" >&5
12991  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
12992    echo $ac_n "(cached) $ac_c" 1>&6
12993  else
12994    cat > conftest.$ac_ext <<EOF
12995 -#line 87889 "configure"
12996 +#line 88932 "configure"
12997  #include "confdefs.h"
12998  #include <stdlib.h>
12999  #include <stdarg.h>
13000 @@ -87893,7 +88936,7 @@
13001  #include <float.h>
13002  EOF
13003  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
13004 -{ (eval echo configure:87897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13005 +{ (eval echo configure:88940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13006  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
13007  if test -z "$ac_err"; then
13008    rm -rf conftest*
13009 @@ -87910,7 +88953,7 @@
13010  if test $ac_cv_header_stdc = yes; then
13011    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
13012  cat > conftest.$ac_ext <<EOF
13013 -#line 87914 "configure"
13014 +#line 88957 "configure"
13015  #include "confdefs.h"
13016  #include <string.h>
13017  EOF
13018 @@ -87928,7 +88971,7 @@
13019  if test $ac_cv_header_stdc = yes; then
13020    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
13021  cat > conftest.$ac_ext <<EOF
13022 -#line 87932 "configure"
13023 +#line 88975 "configure"
13024  #include "confdefs.h"
13025  #include <stdlib.h>
13026  EOF
13027 @@ -87949,7 +88992,7 @@
13028    :
13029  else
13030    cat > conftest.$ac_ext <<EOF
13031 -#line 87953 "configure"
13032 +#line 88996 "configure"
13033  #include "confdefs.h"
13034  #include <ctype.h>
13035  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
13036 @@ -87960,7 +89003,7 @@
13037  exit (0); }
13038
13039  EOF
13040 -if { (eval echo configure:87964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13041 +if { (eval echo configure:89007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13042  then
13043    :
13044  else
13045 @@ -87987,17 +89030,17 @@
13046  do
13047  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
13048  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
13049 -echo "configure:87991: checking for $ac_hdr" >&5
13050 +echo "configure:89034: checking for $ac_hdr" >&5
13051  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
13052    echo $ac_n "(cached) $ac_c" 1>&6
13053  else
13054    cat > conftest.$ac_ext <<EOF
13055 -#line 87996 "configure"
13056 +#line 89039 "configure"
13057  #include "confdefs.h"
13058  #include <$ac_hdr>
13059  EOF
13060  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
13061 -{ (eval echo configure:88001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13062 +{ (eval echo configure:89044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13063  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
13064  if test -z "$ac_err"; then
13065    rm -rf conftest*
13066 @@ -88029,7 +89072,7 @@
13067
13068
13069  echo $ac_n "checking size of char""... $ac_c" 1>&6
13070 -echo "configure:88033: checking size of char" >&5
13071 +echo "configure:89076: checking size of char" >&5
13072  if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
13073    echo $ac_n "(cached) $ac_c" 1>&6
13074  else
13075 @@ -88037,9 +89080,10 @@
13076    ac_cv_sizeof_char=1
13077  else
13078    cat > conftest.$ac_ext <<EOF
13079 -#line 88041 "configure"
13080 +#line 89084 "configure"
13081  #include "confdefs.h"
13082  #include <stdio.h>
13083 +#include <sys/types.h>
13084  main()
13085  {
13086    FILE *f=fopen("conftestval", "w");
13087 @@ -88048,7 +89092,7 @@
13088    exit(0);
13089  }
13090  EOF
13091 -if { (eval echo configure:88052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13092 +if { (eval echo configure:89096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13093  then
13094    ac_cv_sizeof_char=`cat conftestval`
13095  else
13096 @@ -88069,7 +89113,7 @@
13097
13098
13099  echo $ac_n "checking size of int""... $ac_c" 1>&6
13100 -echo "configure:88073: checking size of int" >&5
13101 +echo "configure:89117: checking size of int" >&5
13102  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
13103    echo $ac_n "(cached) $ac_c" 1>&6
13104  else
13105 @@ -88077,9 +89121,10 @@
13106    ac_cv_sizeof_int=4
13107  else
13108    cat > conftest.$ac_ext <<EOF
13109 -#line 88081 "configure"
13110 +#line 89125 "configure"
13111  #include "confdefs.h"
13112  #include <stdio.h>
13113 +#include <sys/types.h>
13114  main()
13115  {
13116    FILE *f=fopen("conftestval", "w");
13117 @@ -88088,7 +89133,7 @@
13118    exit(0);
13119  }
13120  EOF
13121 -if { (eval echo configure:88092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13122 +if { (eval echo configure:89137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13123  then
13124    ac_cv_sizeof_int=`cat conftestval`
13125  else
13126 @@ -88108,7 +89153,7 @@
13127
13128
13129  echo $ac_n "checking size of long""... $ac_c" 1>&6
13130 -echo "configure:88112: checking size of long" >&5
13131 +echo "configure:89157: checking size of long" >&5
13132  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
13133    echo $ac_n "(cached) $ac_c" 1>&6
13134  else
13135 @@ -88116,9 +89161,10 @@
13136    ac_cv_sizeof_long=4
13137  else
13138    cat > conftest.$ac_ext <<EOF
13139 -#line 88120 "configure"
13140 +#line 89165 "configure"
13141  #include "confdefs.h"
13142  #include <stdio.h>
13143 +#include <sys/types.h>
13144  main()
13145  {
13146    FILE *f=fopen("conftestval", "w");
13147 @@ -88127,7 +89173,7 @@
13148    exit(0);
13149  }
13150  EOF
13151 -if { (eval echo configure:88131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13152 +if { (eval echo configure:89177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13153  then
13154    ac_cv_sizeof_long=`cat conftestval`
13155  else
13156 @@ -88147,7 +89193,7 @@
13157
13158
13159  echo $ac_n "checking size of long long""... $ac_c" 1>&6
13160 -echo "configure:88151: checking size of long long" >&5
13161 +echo "configure:89197: checking size of long long" >&5
13162  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
13163    echo $ac_n "(cached) $ac_c" 1>&6
13164  else
13165 @@ -88155,9 +89201,10 @@
13166    ac_cv_sizeof_long_long=8
13167  else
13168    cat > conftest.$ac_ext <<EOF
13169 -#line 88159 "configure"
13170 +#line 89205 "configure"
13171  #include "confdefs.h"
13172  #include <stdio.h>
13173 +#include <sys/types.h>
13174  main()
13175  {
13176    FILE *f=fopen("conftestval", "w");
13177 @@ -88166,7 +89213,7 @@
13178    exit(0);
13179  }
13180  EOF
13181 -if { (eval echo configure:88170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13182 +if { (eval echo configure:89217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13183  then
13184    ac_cv_sizeof_long_long=`cat conftestval`
13185  else
13186 @@ -88186,12 +89233,12 @@
13187
13188
13189  echo $ac_n "checking for size_t""... $ac_c" 1>&6
13190 -echo "configure:88190: checking for size_t" >&5
13191 +echo "configure:89237: checking for size_t" >&5
13192  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
13193    echo $ac_n "(cached) $ac_c" 1>&6
13194  else
13195    cat > conftest.$ac_ext <<EOF
13196 -#line 88195 "configure"
13197 +#line 89242 "configure"
13198  #include "confdefs.h"
13199  #include <sys/types.h>
13200  #if STDC_HEADERS
13201 @@ -88219,12 +89266,12 @@
13202  fi
13203
13204  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
13205 -echo "configure:88223: checking whether time.h and sys/time.h may both be included" >&5
13206 +echo "configure:89270: checking whether time.h and sys/time.h may both be included" >&5
13207  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
13208    echo $ac_n "(cached) $ac_c" 1>&6
13209  else
13210    cat > conftest.$ac_ext <<EOF
13211 -#line 88228 "configure"
13212 +#line 89275 "configure"
13213  #include "confdefs.h"
13214  #include <sys/types.h>
13215  #include <sys/time.h>
13216 @@ -88233,7 +89280,7 @@
13217  struct tm *tp;
13218  ; return 0; }
13219  EOF
13220 -if { (eval echo configure:88237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13221 +if { (eval echo configure:89284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13222    rm -rf conftest*
13223    ac_cv_header_time=yes
13224  else
13225 @@ -88254,12 +89301,12 @@
13226  fi
13227
13228  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
13229 -echo "configure:88258: checking for uid_t in sys/types.h" >&5
13230 +echo "configure:89305: checking for uid_t in sys/types.h" >&5
13231  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
13232    echo $ac_n "(cached) $ac_c" 1>&6
13233  else
13234    cat > conftest.$ac_ext <<EOF
13235 -#line 88263 "configure"
13236 +#line 89310 "configure"
13237  #include "confdefs.h"
13238  #include <sys/types.h>
13239  EOF
13240 @@ -88299,12 +89346,12 @@
13241   memcpy memmove
13242  do
13243  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
13244 -echo "configure:88303: checking for $ac_func" >&5
13245 +echo "configure:89350: checking for $ac_func" >&5
13246  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
13247    echo $ac_n "(cached) $ac_c" 1>&6
13248  else
13249    cat > conftest.$ac_ext <<EOF
13250 -#line 88308 "configure"
13251 +#line 89355 "configure"
13252  #include "confdefs.h"
13253  /* System header to define __stub macros and hopefully few prototypes,
13254      which can conflict with char $ac_func(); below.  */
13255 @@ -88327,7 +89374,7 @@
13256
13257  ; return 0; }
13258  EOF
13259 -if { (eval echo configure:88331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13260 +if { (eval echo configure:89378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13261    rm -rf conftest*
13262    eval "ac_cv_func_$ac_func=yes"
13263  else
13264 @@ -88608,7 +89655,7 @@
13265      XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
13266    else
13267      echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
13268 -echo "configure:88612: checking for XMLRPC-EPI in default path" >&5
13269 +echo "configure:89659: checking for XMLRPC-EPI in default path" >&5
13270      for i in /usr/local /usr; do
13271        if test -r $i/include/xmlrpc.h; then
13272          XMLRPC_DIR=$i/include
13273 @@ -88756,7 +89803,7 @@
13274
13275
13276  echo $ac_n "checking whether to enable xslt support""... $ac_c" 1>&6
13277 -echo "configure:88760: checking whether to enable xslt support" >&5
13278 +echo "configure:89807: checking whether to enable xslt support" >&5
13279  # Check whether --enable-xslt or --disable-xslt was given.
13280  if test "${enable_xslt+set}" = set; then
13281    enableval="$enable_xslt"
13282 @@ -88802,7 +89849,7 @@
13283
13284
13285  echo $ac_n "checking for XSLT Sablotron backend""... $ac_c" 1>&6
13286 -echo "configure:88806: checking for XSLT Sablotron backend" >&5
13287 +echo "configure:89853: checking for XSLT Sablotron backend" >&5
13288  # Check whether --with-xslt-sablot or --without-xslt-sablot was given.
13289  if test "${with_xslt_sablot+set}" = set; then
13290    withval="$with_xslt_sablot"
13291 @@ -88827,7 +89874,7 @@
13292
13293
13294  echo $ac_n "checking for libexpat dir for Sablotron XSL support""... $ac_c" 1>&6
13295 -echo "configure:88831: checking for libexpat dir for Sablotron XSL support" >&5
13296 +echo "configure:89878: checking for libexpat dir for Sablotron XSL support" >&5
13297  # Check whether --with-expat-dir or --without-expat-dir was given.
13298  if test "${with_expat_dir+set}" = set; then
13299    withval="$with_expat_dir"
13300 @@ -88852,7 +89899,7 @@
13301
13302
13303  echo $ac_n "checking for iconv dir for Sablotron XSL support""... $ac_c" 1>&6
13304 -echo "configure:88856: checking for iconv dir for Sablotron XSL support" >&5
13305 +echo "configure:89903: checking for iconv dir for Sablotron XSL support" >&5
13306  # Check whether --with-iconv-dir or --without-iconv-dir was given.
13307  if test "${with_iconv_dir+set}" = set; then
13308    withval="$with_iconv_dir"
13309 @@ -88877,7 +89924,7 @@
13310
13311
13312  echo $ac_n "checking for JavaScript for Sablotron XSL support""... $ac_c" 1>&6
13313 -echo "configure:88881: checking for JavaScript for Sablotron XSL support" >&5
13314 +echo "configure:89928: checking for JavaScript for Sablotron XSL support" >&5
13315  # Check whether --with-sablot-js or --without-sablot-js was given.
13316  if test "${with_sablot_js+set}" = set; then
13317    withval="$with_sablot_js"
13318 @@ -89144,7 +90191,7 @@
13319      XSLT_DIR=$XSLT_CHECK_DIR
13320    else
13321      echo $ac_n "checking for $XSLT_BACKEND_NAME libraries in the default path""... $ac_c" 1>&6
13322 -echo "configure:89148: checking for $XSLT_BACKEND_NAME libraries in the default path" >&5
13323 +echo "configure:90195: checking for $XSLT_BACKEND_NAME libraries in the default path" >&5
13324      for i in /usr/local /usr; do
13325        condition="$i$XSLT_TEST_FILE"
13326        if test -r $condition; then
13327 @@ -89161,7 +90208,7 @@
13328
13329    if test "$PHP_XSLT_SABLOT" != "no"; then
13330      echo $ac_n "checking for sablot-config""... $ac_c" 1>&6
13331 -echo "configure:89165: checking for sablot-config" >&5
13332 +echo "configure:90212: checking for sablot-config" >&5
13333      if test -x $XSLT_DIR/bin/sablot-config ; then
13334         echo "$ac_t""found" 1>&6
13335         cat >> confdefs.h <<\EOF
13336 @@ -89179,14 +90226,14 @@
13337         echo "$ac_t""not found" 1>&6
13338      fi
13339      echo $ac_n "checking for Sablotron version""... $ac_c" 1>&6
13340 -echo "configure:89183: checking for Sablotron version" >&5
13341 +echo "configure:90230: checking for Sablotron version" >&5
13342      old_CPPFLAGS=$CPPFLAGS
13343      CPPFLAGS="$CPPFLAGS -I$XSLT_DIR/include"
13344      if test "$cross_compiling" = yes; then
13345      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
13346  else
13347    cat > conftest.$ac_ext <<EOF
13348 -#line 89190 "configure"
13349 +#line 90237 "configure"
13350  #include "confdefs.h"
13351
13352  #include <stdlib.h>
13353 @@ -89204,7 +90251,7 @@
13354  }
13355
13356  EOF
13357 -if { (eval echo configure:89208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13358 +if { (eval echo configure:90255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13359  then
13360
13361        echo "$ac_t"">= 0.96" 1>&6
13362 @@ -89391,12 +90438,12 @@
13363
13364          if test "$PHP_ICONV" = "yes"; then
13365      echo $ac_n "checking for iconv""... $ac_c" 1>&6
13366 -echo "configure:89395: checking for iconv" >&5
13367 +echo "configure:90442: checking for iconv" >&5
13368  if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
13369    echo $ac_n "(cached) $ac_c" 1>&6
13370  else
13371    cat > conftest.$ac_ext <<EOF
13372 -#line 89400 "configure"
13373 +#line 90447 "configure"
13374  #include "confdefs.h"
13375  /* System header to define __stub macros and hopefully few prototypes,
13376      which can conflict with char iconv(); below.  */
13377 @@ -89419,7 +90466,7 @@
13378
13379  ; return 0; }
13380  EOF
13381 -if { (eval echo configure:89423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13382 +if { (eval echo configure:90470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13383    rm -rf conftest*
13384    eval "ac_cv_func_iconv=yes"
13385  else
13386 @@ -89443,12 +90490,12 @@
13387    echo "$ac_t""no" 1>&6
13388
13389        echo $ac_n "checking for libiconv""... $ac_c" 1>&6
13390 -echo "configure:89447: checking for libiconv" >&5
13391 +echo "configure:90494: checking for libiconv" >&5
13392  if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
13393    echo $ac_n "(cached) $ac_c" 1>&6
13394  else
13395    cat > conftest.$ac_ext <<EOF
13396 -#line 89452 "configure"
13397 +#line 90499 "configure"
13398  #include "confdefs.h"
13399  /* System header to define __stub macros and hopefully few prototypes,
13400      which can conflict with char libiconv(); below.  */
13401 @@ -89471,7 +90518,7 @@
13402
13403  ; return 0; }
13404  EOF
13405 -if { (eval echo configure:89475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13406 +if { (eval echo configure:90522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13407    rm -rf conftest*
13408    eval "ac_cv_func_libiconv=yes"
13409  else
13410 @@ -89606,7 +90653,7 @@
13411    done
13412
13413    echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
13414 -echo "configure:89610: checking for libiconv in -l$iconv_lib_name" >&5
13415 +echo "configure:90657: checking for libiconv in -l$iconv_lib_name" >&5
13416  ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
13417  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13418    echo $ac_n "(cached) $ac_c" 1>&6
13419 @@ -89614,7 +90661,7 @@
13420    ac_save_LIBS="$LIBS"
13421  LIBS="-l$iconv_lib_name  $LIBS"
13422  cat > conftest.$ac_ext <<EOF
13423 -#line 89618 "configure"
13424 +#line 90665 "configure"
13425  #include "confdefs.h"
13426  /* Override any gcc2 internal prototype to avoid an error.  */
13427  /* We use char because int might match the return type of a gcc2
13428 @@ -89625,7 +90672,7 @@
13429  libiconv()
13430  ; return 0; }
13431  EOF
13432 -if { (eval echo configure:89629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13433 +if { (eval echo configure:90676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13434    rm -rf conftest*
13435    eval "ac_cv_lib_$ac_lib_var=yes"
13436  else
13437 @@ -89738,7 +90785,7 @@
13438    done
13439
13440    echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
13441 -echo "configure:89742: checking for iconv in -l$iconv_lib_name" >&5
13442 +echo "configure:90789: checking for iconv in -l$iconv_lib_name" >&5
13443  ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
13444  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13445    echo $ac_n "(cached) $ac_c" 1>&6
13446 @@ -89746,7 +90793,7 @@
13447    ac_save_LIBS="$LIBS"
13448  LIBS="-l$iconv_lib_name  $LIBS"
13449  cat > conftest.$ac_ext <<EOF
13450 -#line 89750 "configure"
13451 +#line 90797 "configure"
13452  #include "confdefs.h"
13453  /* Override any gcc2 internal prototype to avoid an error.  */
13454  /* We use char because int might match the return type of a gcc2
13455 @@ -89757,7 +90804,7 @@
13456  iconv()
13457  ; return 0; }
13458  EOF
13459 -if { (eval echo configure:89761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13460 +if { (eval echo configure:90808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13461    rm -rf conftest*
13462    eval "ac_cv_lib_$ac_lib_var=yes"
13463  else
13464 @@ -90029,7 +91076,7 @@
13465    done
13466
13467    echo $ac_n "checking for JS_GetRuntime in -ljs""... $ac_c" 1>&6
13468 -echo "configure:90033: checking for JS_GetRuntime in -ljs" >&5
13469 +echo "configure:91080: checking for JS_GetRuntime in -ljs" >&5
13470  ac_lib_var=`echo js'_'JS_GetRuntime | sed 'y%./+-%__p_%'`
13471  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13472    echo $ac_n "(cached) $ac_c" 1>&6
13473 @@ -90037,7 +91084,7 @@
13474    ac_save_LIBS="$LIBS"
13475  LIBS="-ljs  $LIBS"
13476  cat > conftest.$ac_ext <<EOF
13477 -#line 90041 "configure"
13478 +#line 91088 "configure"
13479  #include "confdefs.h"
13480  /* Override any gcc2 internal prototype to avoid an error.  */
13481  /* We use char because int might match the return type of a gcc2
13482 @@ -90048,7 +91095,7 @@
13483  JS_GetRuntime()
13484  ; return 0; }
13485  EOF
13486 -if { (eval echo configure:90052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13487 +if { (eval echo configure:91099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13488    rm -rf conftest*
13489    eval "ac_cv_lib_$ac_lib_var=yes"
13490  else
13491 @@ -90261,7 +91308,7 @@
13492    done
13493
13494    echo $ac_n "checking for SablotSetEncoding in -lsablot""... $ac_c" 1>&6
13495 -echo "configure:90265: checking for SablotSetEncoding in -lsablot" >&5
13496 +echo "configure:91312: checking for SablotSetEncoding in -lsablot" >&5
13497  ac_lib_var=`echo sablot'_'SablotSetEncoding | sed 'y%./+-%__p_%'`
13498  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13499    echo $ac_n "(cached) $ac_c" 1>&6
13500 @@ -90269,7 +91316,7 @@
13501    ac_save_LIBS="$LIBS"
13502  LIBS="-lsablot  $LIBS"
13503  cat > conftest.$ac_ext <<EOF
13504 -#line 90273 "configure"
13505 +#line 91320 "configure"
13506  #include "confdefs.h"
13507  /* Override any gcc2 internal prototype to avoid an error.  */
13508  /* We use char because int might match the return type of a gcc2
13509 @@ -90280,7 +91327,7 @@
13510  SablotSetEncoding()
13511  ; return 0; }
13512  EOF
13513 -if { (eval echo configure:90284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13514 +if { (eval echo configure:91331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13515    rm -rf conftest*
13516    eval "ac_cv_lib_$ac_lib_var=yes"
13517  else
13518 @@ -90397,7 +91444,7 @@
13519    done
13520
13521    echo $ac_n "checking for SablotGetOptions in -lsablot""... $ac_c" 1>&6
13522 -echo "configure:90401: checking for SablotGetOptions in -lsablot" >&5
13523 +echo "configure:91448: checking for SablotGetOptions in -lsablot" >&5
13524  ac_lib_var=`echo sablot'_'SablotGetOptions | sed 'y%./+-%__p_%'`
13525  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13526    echo $ac_n "(cached) $ac_c" 1>&6
13527 @@ -90405,7 +91452,7 @@
13528    ac_save_LIBS="$LIBS"
13529  LIBS="-lsablot  $LIBS"
13530  cat > conftest.$ac_ext <<EOF
13531 -#line 90409 "configure"
13532 +#line 91456 "configure"
13533  #include "confdefs.h"
13534  /* Override any gcc2 internal prototype to avoid an error.  */
13535  /* We use char because int might match the return type of a gcc2
13536 @@ -90416,7 +91463,7 @@
13537  SablotGetOptions()
13538  ; return 0; }
13539  EOF
13540 -if { (eval echo configure:90420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13541 +if { (eval echo configure:91467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13542    rm -rf conftest*
13543    eval "ac_cv_lib_$ac_lib_var=yes"
13544  else
13545 @@ -90596,7 +91643,7 @@
13546
13547
13548  echo $ac_n "checking for YAZ support""... $ac_c" 1>&6
13549 -echo "configure:90600: checking for YAZ support" >&5
13550 +echo "configure:91647: checking for YAZ support" >&5
13551  # Check whether --with-yaz or --without-yaz was given.
13552  if test "${with_yaz+set}" = set; then
13553    withval="$with_yaz"
13554 @@ -90646,7 +91693,7 @@
13555      # Extract the first word of "yaz-config", so it can be a program name with args.
13556  set dummy yaz-config; ac_word=$2
13557  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
13558 -echo "configure:90650: checking for $ac_word" >&5
13559 +echo "configure:91697: checking for $ac_word" >&5
13560  if eval "test \"`echo '$''{'ac_cv_path_yazconfig'+set}'`\" = set"; then
13561    echo $ac_n "(cached) $ac_c" 1>&6
13562  else
13563 @@ -90695,7 +91742,7 @@
13564      . $yazconfig
13565
13566          echo $ac_n "checking for YAZ version""... $ac_c" 1>&6
13567 -echo "configure:90699: checking for YAZ version" >&5
13568 +echo "configure:91746: checking for YAZ version" >&5
13569      yaz_version=`echo $YAZVERSION | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
13570      if test "$yaz_version" -ge 1009000; then
13571        echo "$ac_t""$YAZVERSION" 1>&6
13572 @@ -91120,7 +92167,7 @@
13573
13574
13575  echo $ac_n "checking whether to include YP support""... $ac_c" 1>&6
13576 -echo "configure:91124: checking whether to include YP support" >&5
13577 +echo "configure:92171: checking whether to include YP support" >&5
13578  # Check whether --enable-yp or --disable-yp was given.
13579  if test "${enable_yp+set}" = set; then
13580    enableval="$enable_yp"
13581 @@ -91166,7 +92213,7 @@
13582  if test "$PHP_YP" != "no"; then
13583
13584    echo $ac_n "checking for yp_match in -lnsl""... $ac_c" 1>&6
13585 -echo "configure:91170: checking for yp_match in -lnsl" >&5
13586 +echo "configure:92217: checking for yp_match in -lnsl" >&5
13587  ac_lib_var=`echo nsl'_'yp_match | sed 'y%./+-%__p_%'`
13588  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13589    echo $ac_n "(cached) $ac_c" 1>&6
13590 @@ -91174,7 +92221,7 @@
13591    ac_save_LIBS="$LIBS"
13592  LIBS="-lnsl  $LIBS"
13593  cat > conftest.$ac_ext <<EOF
13594 -#line 91178 "configure"
13595 +#line 92225 "configure"
13596  #include "confdefs.h"
13597  /* Override any gcc2 internal prototype to avoid an error.  */
13598  /* We use char because int might match the return type of a gcc2
13599 @@ -91185,7 +92232,7 @@
13600  yp_match()
13601  ; return 0; }
13602  EOF
13603 -if { (eval echo configure:91189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13604 +if { (eval echo configure:92236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13605    rm -rf conftest*
13606    eval "ac_cv_lib_$ac_lib_var=yes"
13607  else
13608 @@ -91207,7 +92254,7 @@
13609  else
13610    echo "$ac_t""no" 1>&6
13611  echo $ac_n "checking for yp_match in -lc""... $ac_c" 1>&6
13612 -echo "configure:91211: checking for yp_match in -lc" >&5
13613 +echo "configure:92258: checking for yp_match in -lc" >&5
13614  ac_lib_var=`echo c'_'yp_match | sed 'y%./+-%__p_%'`
13615  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13616    echo $ac_n "(cached) $ac_c" 1>&6
13617 @@ -91215,7 +92262,7 @@
13618    ac_save_LIBS="$LIBS"
13619  LIBS="-lc  $LIBS"
13620  cat > conftest.$ac_ext <<EOF
13621 -#line 91219 "configure"
13622 +#line 92266 "configure"
13623  #include "confdefs.h"
13624  /* Override any gcc2 internal prototype to avoid an error.  */
13625  /* We use char because int might match the return type of a gcc2
13626 @@ -91226,7 +92273,7 @@
13627  yp_match()
13628  ; return 0; }
13629  EOF
13630 -if { (eval echo configure:91230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13631 +if { (eval echo configure:92277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13632    rm -rf conftest*
13633    eval "ac_cv_lib_$ac_lib_var=yes"
13634  else
13635 @@ -91601,7 +92648,7 @@
13636
13637
13638  echo $ac_n "checking for ZIP support""... $ac_c" 1>&6
13639 -echo "configure:91605: checking for ZIP support" >&5
13640 +echo "configure:92652: checking for ZIP support" >&5
13641  # Check whether --with-zip or --without-zip was given.
13642  if test "${with_zip+set}" = set; then
13643    withval="$with_zip"
13644 @@ -91749,7 +92796,7 @@
13645    done
13646
13647    echo $ac_n "checking for zzip_open in -lzzip""... $ac_c" 1>&6
13648 -echo "configure:91753: checking for zzip_open in -lzzip" >&5
13649 +echo "configure:92800: checking for zzip_open in -lzzip" >&5
13650  ac_lib_var=`echo zzip'_'zzip_open | sed 'y%./+-%__p_%'`
13651  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13652    echo $ac_n "(cached) $ac_c" 1>&6
13653 @@ -91757,7 +92804,7 @@
13654    ac_save_LIBS="$LIBS"
13655  LIBS="-lzzip  $LIBS"
13656  cat > conftest.$ac_ext <<EOF
13657 -#line 91761 "configure"
13658 +#line 92808 "configure"
13659  #include "confdefs.h"
13660  /* Override any gcc2 internal prototype to avoid an error.  */
13661  /* We use char because int might match the return type of a gcc2
13662 @@ -91768,7 +92815,7 @@
13663  zzip_open()
13664  ; return 0; }
13665  EOF
13666 -if { (eval echo configure:91772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13667 +if { (eval echo configure:92819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13668    rm -rf conftest*
13669    eval "ac_cv_lib_$ac_lib_var=yes"
13670  else
13671 @@ -92226,7 +93273,7 @@
13672
13673
13674  echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6
13675 -echo "configure:92230: checking whether to install PEAR" >&5
13676 +echo "configure:93277: checking whether to install PEAR" >&5
13677  # Check whether --with-pear or --without-pear was given.
13678  if test "${with_pear+set}" = set; then
13679    withval="$with_pear"
13680 @@ -92332,7 +93379,7 @@
13681      echo "configure: warning: You will need bison if you want to regenerate the Zend parser." 1>&2
13682  else
13683      echo $ac_n "checking bison version""... $ac_c" 1>&6
13684 -echo "configure:92336: checking bison version" >&5
13685 +echo "configure:93383: checking bison version" >&5
13686      set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /' | tr -d 'a-z'`
13687      if test "${1}" = "1" -a "${2}" -lt "28"; then
13688          echo "configure: warning: You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2})." 1>&2
13689 @@ -92367,17 +93414,17 @@
13690  do
13691  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
13692  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
13693 -echo "configure:92371: checking for $ac_hdr" >&5
13694 +echo "configure:93418: checking for $ac_hdr" >&5
13695  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
13696    echo $ac_n "(cached) $ac_c" 1>&6
13697  else
13698    cat > conftest.$ac_ext <<EOF
13699 -#line 92376 "configure"
13700 +#line 93423 "configure"
13701  #include "confdefs.h"
13702  #include <$ac_hdr>
13703  EOF
13704  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
13705 -{ (eval echo configure:92381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13706 +{ (eval echo configure:93428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13707  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
13708  if test -z "$ac_err"; then
13709    rm -rf conftest*
13710 @@ -92405,12 +93452,12 @@
13711
13712
13713  echo $ac_n "checking for size_t""... $ac_c" 1>&6
13714 -echo "configure:92409: checking for size_t" >&5
13715 +echo "configure:93456: checking for size_t" >&5
13716  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
13717    echo $ac_n "(cached) $ac_c" 1>&6
13718  else
13719    cat > conftest.$ac_ext <<EOF
13720 -#line 92414 "configure"
13721 +#line 93461 "configure"
13722  #include "confdefs.h"
13723  #include <sys/types.h>
13724  #if STDC_HEADERS
13725 @@ -92438,12 +93485,12 @@
13726  fi
13727
13728  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
13729 -echo "configure:92442: checking return type of signal handlers" >&5
13730 +echo "configure:93489: checking return type of signal handlers" >&5
13731  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
13732    echo $ac_n "(cached) $ac_c" 1>&6
13733  else
13734    cat > conftest.$ac_ext <<EOF
13735 -#line 92447 "configure"
13736 +#line 93494 "configure"
13737  #include "confdefs.h"
13738  #include <sys/types.h>
13739  #include <signal.h>
13740 @@ -92460,7 +93507,7 @@
13741  int i;
13742  ; return 0; }
13743  EOF
13744 -if { (eval echo configure:92464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13745 +if { (eval echo configure:93511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13746    rm -rf conftest*
13747    ac_cv_type_signal=void
13748  else
13749 @@ -92480,12 +93527,12 @@
13750
13751
13752  echo $ac_n "checking for uint""... $ac_c" 1>&6
13753 -echo "configure:92484: checking for uint" >&5
13754 +echo "configure:93531: checking for uint" >&5
13755  if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then
13756    echo $ac_n "(cached) $ac_c" 1>&6
13757  else
13758    cat > conftest.$ac_ext <<EOF
13759 -#line 92489 "configure"
13760 +#line 93536 "configure"
13761  #include "confdefs.h"
13762  #include <sys/types.h>
13763  #if STDC_HEADERS
13764 @@ -92513,12 +93560,12 @@
13765  fi
13766
13767  echo $ac_n "checking for ulong""... $ac_c" 1>&6
13768 -echo "configure:92517: checking for ulong" >&5
13769 +echo "configure:93564: checking for ulong" >&5
13770  if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then
13771    echo $ac_n "(cached) $ac_c" 1>&6
13772  else
13773    cat > conftest.$ac_ext <<EOF
13774 -#line 92522 "configure"
13775 +#line 93569 "configure"
13776  #include "confdefs.h"
13777  #include <sys/types.h>
13778  #if STDC_HEADERS
13779 @@ -92548,9 +93595,9 @@
13780
13781
13782  echo $ac_n "checking for int32_t""... $ac_c" 1>&6
13783 -echo "configure:92552: checking for int32_t" >&5
13784 +echo "configure:93599: checking for int32_t" >&5
13785  cat > conftest.$ac_ext <<EOF
13786 -#line 92554 "configure"
13787 +#line 93601 "configure"
13788  #include "confdefs.h"
13789
13790  #if HAVE_SYS_TYPES_H
13791 @@ -92569,7 +93616,7 @@
13792
13793  ; return 0; }
13794  EOF
13795 -if { (eval echo configure:92573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13796 +if { (eval echo configure:93620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13797    rm -rf conftest*
13798
13799    cat >> confdefs.h <<EOF
13800 @@ -92588,9 +93635,9 @@
13801  rm -f conftest*
13802
13803  echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
13804 -echo "configure:92592: checking for uint32_t" >&5
13805 +echo "configure:93639: checking for uint32_t" >&5
13806  cat > conftest.$ac_ext <<EOF
13807 -#line 92594 "configure"
13808 +#line 93641 "configure"
13809  #include "confdefs.h"
13810
13811  #if HAVE_SYS_TYPES_H
13812 @@ -92609,7 +93656,7 @@
13813
13814  ; return 0; }
13815  EOF
13816 -if { (eval echo configure:92613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13817 +if { (eval echo configure:93660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13818    rm -rf conftest*
13819
13820    cat >> confdefs.h <<EOF
13821 @@ -92628,12 +93675,12 @@
13822  rm -f conftest*
13823
13824  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
13825 -echo "configure:92632: checking for vprintf" >&5
13826 +echo "configure:93679: checking for vprintf" >&5
13827  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
13828    echo $ac_n "(cached) $ac_c" 1>&6
13829  else
13830    cat > conftest.$ac_ext <<EOF
13831 -#line 92637 "configure"
13832 +#line 93684 "configure"
13833  #include "confdefs.h"
13834  /* System header to define __stub macros and hopefully few prototypes,
13835      which can conflict with char vprintf(); below.  */
13836 @@ -92656,7 +93703,7 @@
13837
13838  ; return 0; }
13839  EOF
13840 -if { (eval echo configure:92660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13841 +if { (eval echo configure:93707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13842    rm -rf conftest*
13843    eval "ac_cv_func_vprintf=yes"
13844  else
13845 @@ -92680,12 +93727,12 @@
13846
13847  if test "$ac_cv_func_vprintf" != yes; then
13848  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
13849 -echo "configure:92684: checking for _doprnt" >&5
13850 +echo "configure:93731: checking for _doprnt" >&5
13851  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
13852    echo $ac_n "(cached) $ac_c" 1>&6
13853  else
13854    cat > conftest.$ac_ext <<EOF
13855 -#line 92689 "configure"
13856 +#line 93736 "configure"
13857  #include "confdefs.h"
13858  /* System header to define __stub macros and hopefully few prototypes,
13859      which can conflict with char _doprnt(); below.  */
13860 @@ -92708,7 +93755,7 @@
13861
13862  ; return 0; }
13863  EOF
13864 -if { (eval echo configure:92712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13865 +if { (eval echo configure:93759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13866    rm -rf conftest*
13867    eval "ac_cv_func__doprnt=yes"
13868  else
13869 @@ -92733,7 +93780,7 @@
13870  fi
13871
13872  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
13873 -echo "configure:92737: checking for 8-bit clean memcmp" >&5
13874 +echo "configure:93784: checking for 8-bit clean memcmp" >&5
13875  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
13876    echo $ac_n "(cached) $ac_c" 1>&6
13877  else
13878 @@ -92741,7 +93788,7 @@
13879    ac_cv_func_memcmp_clean=no
13880  else
13881    cat > conftest.$ac_ext <<EOF
13882 -#line 92745 "configure"
13883 +#line 93792 "configure"
13884  #include "confdefs.h"
13885
13886  main()
13887 @@ -92751,7 +93798,7 @@
13888  }
13889
13890  EOF
13891 -if { (eval echo configure:92755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13892 +if { (eval echo configure:93802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13893  then
13894    ac_cv_func_memcmp_clean=yes
13895  else
13896 @@ -92771,19 +93818,19 @@
13897  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
13898  # for constant arguments.  Useless!
13899  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
13900 -echo "configure:92775: checking for working alloca.h" >&5
13901 +echo "configure:93822: checking for working alloca.h" >&5
13902  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
13903    echo $ac_n "(cached) $ac_c" 1>&6
13904  else
13905    cat > conftest.$ac_ext <<EOF
13906 -#line 92780 "configure"
13907 +#line 93827 "configure"
13908  #include "confdefs.h"
13909  #include <alloca.h>
13910  int main() {
13911  char *p = alloca(2 * sizeof(int));
13912  ; return 0; }
13913  EOF
13914 -if { (eval echo configure:92787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13915 +if { (eval echo configure:93834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13916    rm -rf conftest*
13917    ac_cv_header_alloca_h=yes
13918  else
13919 @@ -92804,12 +93851,12 @@
13920  fi
13921
13922  echo $ac_n "checking for alloca""... $ac_c" 1>&6
13923 -echo "configure:92808: checking for alloca" >&5
13924 +echo "configure:93855: checking for alloca" >&5
13925  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
13926    echo $ac_n "(cached) $ac_c" 1>&6
13927  else
13928    cat > conftest.$ac_ext <<EOF
13929 -#line 92813 "configure"
13930 +#line 93860 "configure"
13931  #include "confdefs.h"
13932
13933  #ifdef __GNUC__
13934 @@ -92837,7 +93884,7 @@
13935  char *p = (char *) alloca(1);
13936  ; return 0; }
13937  EOF
13938 -if { (eval echo configure:92841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13939 +if { (eval echo configure:93888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13940    rm -rf conftest*
13941    ac_cv_func_alloca_works=yes
13942  else
13943 @@ -92869,12 +93916,12 @@
13944
13945
13946  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
13947 -echo "configure:92873: checking whether alloca needs Cray hooks" >&5
13948 +echo "configure:93920: checking whether alloca needs Cray hooks" >&5
13949  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
13950    echo $ac_n "(cached) $ac_c" 1>&6
13951  else
13952    cat > conftest.$ac_ext <<EOF
13953 -#line 92878 "configure"
13954 +#line 93925 "configure"
13955  #include "confdefs.h"
13956  #if defined(CRAY) && ! defined(CRAY2)
13957  webecray
13958 @@ -92899,12 +93946,12 @@
13959  if test $ac_cv_os_cray = yes; then
13960  for ac_func in _getb67 GETB67 getb67; do
13961    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
13962 -echo "configure:92903: checking for $ac_func" >&5
13963 +echo "configure:93950: checking for $ac_func" >&5
13964  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
13965    echo $ac_n "(cached) $ac_c" 1>&6
13966  else
13967    cat > conftest.$ac_ext <<EOF
13968 -#line 92908 "configure"
13969 +#line 93955 "configure"
13970  #include "confdefs.h"
13971  /* System header to define __stub macros and hopefully few prototypes,
13972      which can conflict with char $ac_func(); below.  */
13973 @@ -92927,7 +93974,7 @@
13974
13975  ; return 0; }
13976  EOF
13977 -if { (eval echo configure:92931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13978 +if { (eval echo configure:93978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13979    rm -rf conftest*
13980    eval "ac_cv_func_$ac_func=yes"
13981  else
13982 @@ -92954,7 +94001,7 @@
13983  fi
13984
13985  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
13986 -echo "configure:92958: checking stack direction for C alloca" >&5
13987 +echo "configure:94005: checking stack direction for C alloca" >&5
13988  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
13989    echo $ac_n "(cached) $ac_c" 1>&6
13990  else
13991 @@ -92962,7 +94009,7 @@
13992    ac_cv_c_stack_direction=0
13993  else
13994    cat > conftest.$ac_ext <<EOF
13995 -#line 92966 "configure"
13996 +#line 94013 "configure"
13997  #include "confdefs.h"
13998  find_stack_direction ()
13999  {
14000 @@ -92981,7 +94028,7 @@
14001    exit (find_stack_direction() < 0);
14002  }
14003  EOF
14004 -if { (eval echo configure:92985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14005 +if { (eval echo configure:94032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14006  then
14007    ac_cv_c_stack_direction=1
14008  else
14009 @@ -93005,12 +94052,12 @@
14010  for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass
14011  do
14012  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
14013 -echo "configure:93009: checking for $ac_func" >&5
14014 +echo "configure:94056: checking for $ac_func" >&5
14015  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
14016    echo $ac_n "(cached) $ac_c" 1>&6
14017  else
14018    cat > conftest.$ac_ext <<EOF
14019 -#line 93014 "configure"
14020 +#line 94061 "configure"
14021  #include "confdefs.h"
14022  /* System header to define __stub macros and hopefully few prototypes,
14023      which can conflict with char $ac_func(); below.  */
14024 @@ -93033,7 +94080,7 @@
14025
14026  ; return 0; }
14027  EOF
14028 -if { (eval echo configure:93037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14029 +if { (eval echo configure:94084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14030    rm -rf conftest*
14031    eval "ac_cv_func_$ac_func=yes"
14032  else
14033 @@ -93061,12 +94108,12 @@
14034  for ac_func in finite isfinite isinf isnan
14035  do
14036  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
14037 -echo "configure:93065: checking for $ac_func" >&5
14038 +echo "configure:94112: checking for $ac_func" >&5
14039  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
14040    echo $ac_n "(cached) $ac_c" 1>&6
14041  else
14042    cat > conftest.$ac_ext <<EOF
14043 -#line 93070 "configure"
14044 +#line 94117 "configure"
14045  #include "confdefs.h"
14046  /* System header to define __stub macros and hopefully few prototypes,
14047      which can conflict with char $ac_func(); below.  */
14048 @@ -93089,7 +94136,7 @@
14049
14050  ; return 0; }
14051  EOF
14052 -if { (eval echo configure:93093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14053 +if { (eval echo configure:94140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14054    rm -rf conftest*
14055    eval "ac_cv_func_$ac_func=yes"
14056  else
14057 @@ -93116,13 +94163,13 @@
14058
14059
14060    echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6
14061 -echo "configure:93120: checking whether fp_except is defined" >&5
14062 +echo "configure:94167: checking whether fp_except is defined" >&5
14063  if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then
14064    echo $ac_n "(cached) $ac_c" 1>&6
14065  else
14066
14067      cat > conftest.$ac_ext <<EOF
14068 -#line 93126 "configure"
14069 +#line 94173 "configure"
14070  #include "confdefs.h"
14071
14072  #include <floatingpoint.h>
14073 @@ -93133,7 +94180,7 @@
14074
14075  ; return 0; }
14076  EOF
14077 -if { (eval echo configure:93137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14078 +if { (eval echo configure:94184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14079    rm -rf conftest*
14080
14081       ac_cv_type_fp_except=yes
14082 @@ -93163,17 +94210,17 @@
14083  do
14084  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14085  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14086 -echo "configure:93167: checking for $ac_hdr" >&5
14087 +echo "configure:94214: checking for $ac_hdr" >&5
14088  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14089    echo $ac_n "(cached) $ac_c" 1>&6
14090  else
14091    cat > conftest.$ac_ext <<EOF
14092 -#line 93172 "configure"
14093 +#line 94219 "configure"
14094  #include "confdefs.h"
14095  #include <$ac_hdr>
14096  EOF
14097  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14098 -{ (eval echo configure:93177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14099 +{ (eval echo configure:94224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14100  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
14101  if test -z "$ac_err"; then
14102    rm -rf conftest*
14103 @@ -93202,14 +94249,14 @@
14104
14105
14106  echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6
14107 -echo "configure:93206: checking whether dlsym() requires a leading underscore in symbol names" >&5
14108 +echo "configure:94253: checking whether dlsym() requires a leading underscore in symbol names" >&5
14109  if test "$cross_compiling" = yes; then :
14110
14111  else
14112      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14113    lt_status=$lt_dlunknown
14114    cat > conftest.$ac_ext <<EOF
14115 -#line 93213 "configure"
14116 +#line 94260 "configure"
14117  #include "confdefs.h"
14118
14119  #if HAVE_DLFCN_H
14120 @@ -93270,7 +94317,7 @@
14121      exit (status);
14122  }
14123  EOF
14124 -  if { (eval echo configure:93274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
14125 +  if { (eval echo configure:94321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
14126      (./conftest; exit; ) 2>/dev/null
14127      lt_status=$?
14128      case x$lt_status in
14129 @@ -93353,23 +94400,23 @@
14130
14131
14132  echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6
14133 -echo "configure:93357: checking whether to enable thread-safety" >&5
14134 +echo "configure:94404: checking whether to enable thread-safety" >&5
14135  echo "$ac_t""$ZEND_EXPERIMENTAL_ZTS" 1>&6
14136
14137  echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6
14138 -echo "configure:93361: checking whether to enable inline optimization for GCC" >&5
14139 +echo "configure:94408: checking whether to enable inline optimization for GCC" >&5
14140  echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6
14141
14142  echo $ac_n "checking whether to enable a memory limit""... $ac_c" 1>&6
14143 -echo "configure:93365: checking whether to enable a memory limit" >&5
14144 +echo "configure:94412: checking whether to enable a memory limit" >&5
14145  echo "$ac_t""$ZEND_MEMORY_LIMIT" 1>&6
14146
14147  echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6
14148 -echo "configure:93369: checking whether to enable Zend debugging" >&5
14149 +echo "configure:94416: checking whether to enable Zend debugging" >&5
14150  echo "$ac_t""$ZEND_DEBUG" 1>&6
14151
14152  echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6
14153 -echo "configure:93373: checking whether to enable Zend multibyte" >&5
14154 +echo "configure:94420: checking whether to enable Zend multibyte" >&5
14155  echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
14156
14157  if test "$ZEND_DEBUG" = "yes"; then
14158 @@ -93429,21 +94476,21 @@
14159
14160
14161  echo $ac_n "checking for inline""... $ac_c" 1>&6
14162 -echo "configure:93433: checking for inline" >&5
14163 +echo "configure:94480: checking for inline" >&5
14164  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
14165    echo $ac_n "(cached) $ac_c" 1>&6
14166  else
14167    ac_cv_c_inline=no
14168  for ac_kw in inline __inline__ __inline; do
14169    cat > conftest.$ac_ext <<EOF
14170 -#line 93440 "configure"
14171 +#line 94487 "configure"
14172  #include "confdefs.h"
14173
14174  int main() {
14175  } $ac_kw foo() {
14176  ; return 0; }
14177  EOF
14178 -if { (eval echo configure:93447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14179 +if { (eval echo configure:94494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14180    rm -rf conftest*
14181    ac_cv_c_inline=$ac_kw; break
14182  else
14183 @@ -93513,17 +94560,17 @@
14184  do
14185  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14186  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14187 -echo "configure:93517: checking for $ac_hdr" >&5
14188 +echo "configure:94564: checking for $ac_hdr" >&5
14189  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14190    echo $ac_n "(cached) $ac_c" 1>&6
14191  else
14192    cat > conftest.$ac_ext <<EOF
14193 -#line 93522 "configure"
14194 +#line 94569 "configure"
14195  #include "confdefs.h"
14196  #include <$ac_hdr>
14197  EOF
14198  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14199 -{ (eval echo configure:93527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14200 +{ (eval echo configure:94574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14201  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
14202  if test -z "$ac_err"; then
14203    rm -rf conftest*
14204 @@ -93600,7 +94647,7 @@
14205
14206
14207  echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6
14208 -echo "configure:93604: checking for GNU Pth" >&5
14209 +echo "configure:94651: checking for GNU Pth" >&5
14210  PTH_PREFIX="`$TSRM_PTH --prefix`"
14211  if test -z "$PTH_PREFIX"; then
14212    echo "$ac_t""Please check your Pth installation" 1>&6
14213 @@ -93630,17 +94677,17 @@
14214  do
14215  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14216  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14217 -echo "configure:93634: checking for $ac_hdr" >&5
14218 +echo "configure:94681: checking for $ac_hdr" >&5
14219  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14220    echo $ac_n "(cached) $ac_c" 1>&6
14221  else
14222    cat > conftest.$ac_ext <<EOF
14223 -#line 93639 "configure"
14224 +#line 94686 "configure"
14225  #include "confdefs.h"
14226  #include <$ac_hdr>
14227  EOF
14228  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14229 -{ (eval echo configure:93644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14230 +{ (eval echo configure:94691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14231  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
14232  if test -z "$ac_err"; then
14233    rm -rf conftest*
14234 @@ -93670,7 +94717,7 @@
14235
14236    LIBS="$LIBS -lst"
14237    echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6
14238 -echo "configure:93674: checking for SGI's State Threads" >&5
14239 +echo "configure:94721: checking for SGI's State Threads" >&5
14240    echo "$ac_t""yes" 1>&6
14241    cat >> confdefs.h <<\EOF
14242  #define TSRM_ST 1
14243 @@ -93702,7 +94749,7 @@
14244    pthreads_working=no
14245  else
14246    cat > conftest.$ac_ext <<EOF
14247 -#line 93706 "configure"
14248 +#line 94753 "configure"
14249  #include "confdefs.h"
14250
14251  #include <pthread.h>
14252 @@ -93720,7 +94767,7 @@
14253      return pthread_create(&thd, NULL, thread_routine, &data);
14254  }
14255  EOF
14256 -if { (eval echo configure:93724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14257 +if { (eval echo configure:94771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14258  then
14259
14260    pthreads_working=yes
14261 @@ -93740,7 +94787,7 @@
14262    CFLAGS=$save_CFLAGS
14263
14264    echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
14265 -echo "configure:93744: checking for pthreads_cflags" >&5
14266 +echo "configure:94791: checking for pthreads_cflags" >&5
14267  if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
14268    echo $ac_n "(cached) $ac_c" 1>&6
14269  else
14270 @@ -93755,7 +94802,7 @@
14271    pthreads_working=no
14272  else
14273    cat > conftest.$ac_ext <<EOF
14274 -#line 93759 "configure"
14275 +#line 94806 "configure"
14276  #include "confdefs.h"
14277
14278  #include <pthread.h>
14279 @@ -93773,7 +94820,7 @@
14280      return pthread_create(&thd, NULL, thread_routine, &data);
14281  }
14282  EOF
14283 -if { (eval echo configure:93777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14284 +if { (eval echo configure:94824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14285  then
14286
14287    pthreads_working=yes
14288 @@ -93803,7 +94850,7 @@
14289  echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
14290
14291  echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
14292 -echo "configure:93807: checking for pthreads_lib" >&5
14293 +echo "configure:94854: checking for pthreads_lib" >&5
14294  if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
14295    echo $ac_n "(cached) $ac_c" 1>&6
14296  else
14297 @@ -93818,7 +94865,7 @@
14298    pthreads_working=no
14299  else
14300    cat > conftest.$ac_ext <<EOF
14301 -#line 93822 "configure"
14302 +#line 94869 "configure"
14303  #include "confdefs.h"
14304
14305  #include <pthread.h>
14306 @@ -93836,7 +94883,7 @@
14307      return pthread_create(&thd, NULL, thread_routine, &data);
14308  }
14309  EOF
14310 -if { (eval echo configure:93840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14311 +if { (eval echo configure:94887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14312  then
14313
14314    pthreads_working=yes
14315 @@ -93887,7 +94934,7 @@
14316
14317
14318    echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
14319 -echo "configure:93891: checking for POSIX threads" >&5
14320 +echo "configure:94938: checking for POSIX threads" >&5
14321    echo "$ac_t""yes" 1>&6
14322  fi
14323
14324 @@ -94412,12 +95459,12 @@
14325  fi
14326
14327  echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
14328 -echo "configure:94416: checking for Cygwin environment" >&5
14329 +echo "configure:95463: checking for Cygwin environment" >&5
14330  if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
14331    echo $ac_n "(cached) $ac_c" 1>&6
14332  else
14333    cat > conftest.$ac_ext <<EOF
14334 -#line 94421 "configure"
14335 +#line 95468 "configure"
14336  #include "confdefs.h"
14337
14338  int main() {
14339 @@ -94428,7 +95475,7 @@
14340  return __CYGWIN__;
14341  ; return 0; }
14342  EOF
14343 -if { (eval echo configure:94432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14344 +if { (eval echo configure:95479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14345    rm -rf conftest*
14346    ac_cv_cygwin=yes
14347  else
14348 @@ -94445,19 +95492,19 @@
14349  CYGWIN=
14350  test "$ac_cv_cygwin" = yes && CYGWIN=yes
14351  echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
14352 -echo "configure:94449: checking for mingw32 environment" >&5
14353 +echo "configure:95496: checking for mingw32 environment" >&5
14354  if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
14355    echo $ac_n "(cached) $ac_c" 1>&6
14356  else
14357    cat > conftest.$ac_ext <<EOF
14358 -#line 94454 "configure"
14359 +#line 95501 "configure"
14360  #include "confdefs.h"
14361
14362  int main() {
14363  return __MINGW32__;
14364  ; return 0; }
14365  EOF
14366 -if { (eval echo configure:94461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14367 +if { (eval echo configure:95508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14368    rm -rf conftest*
14369    ac_cv_mingw32=yes
14370  else
14371 @@ -94543,7 +95590,7 @@
14372  fi
14373
14374  echo $ac_n "checking build system type""... $ac_c" 1>&6
14375 -echo "configure:94547: checking build system type" >&5
14376 +echo "configure:95594: checking build system type" >&5
14377
14378  build_alias=$build
14379  case "$build_alias" in
14380 @@ -94572,7 +95619,7 @@
14381  if test "$GCC" = yes; then
14382    # Check if gcc -print-prog-name=ld gives a path.
14383    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
14384 -echo "configure:94576: checking for ld used by GCC" >&5
14385 +echo "configure:95623: checking for ld used by GCC" >&5
14386    case $host in
14387    *-*-mingw*)
14388      # gcc leaves a trailing carriage return which upsets mingw
14389 @@ -94602,10 +95649,10 @@
14390    esac
14391  elif test "$with_gnu_ld" = yes; then
14392    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
14393 -echo "configure:94606: checking for GNU ld" >&5
14394 +echo "configure:95653: checking for GNU ld" >&5
14395  else
14396    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
14397 -echo "configure:94609: checking for non-GNU ld" >&5
14398 +echo "configure:95656: checking for non-GNU ld" >&5
14399  fi
14400  if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
14401    echo $ac_n "(cached) $ac_c" 1>&6
14402 @@ -94640,7 +95687,7 @@
14403  fi
14404  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
14405  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
14406 -echo "configure:94644: checking if the linker ($LD) is GNU ld" >&5
14407 +echo "configure:95691: checking if the linker ($LD) is GNU ld" >&5
14408  if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
14409    echo $ac_n "(cached) $ac_c" 1>&6
14410  else
14411 @@ -94657,7 +95704,7 @@
14412
14413
14414  echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
14415 -echo "configure:94661: checking for $LD option to reload object files" >&5
14416 +echo "configure:95708: checking for $LD option to reload object files" >&5
14417  if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
14418    echo $ac_n "(cached) $ac_c" 1>&6
14419  else
14420 @@ -94669,7 +95716,7 @@
14421  test -n "$reload_flag" && reload_flag=" $reload_flag"
14422
14423  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
14424 -echo "configure:94673: checking for BSD-compatible nm" >&5
14425 +echo "configure:95720: checking for BSD-compatible nm" >&5
14426  if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
14427    echo $ac_n "(cached) $ac_c" 1>&6
14428  else
14429 @@ -94707,7 +95754,7 @@
14430  echo "$ac_t""$NM" 1>&6
14431
14432  echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
14433 -echo "configure:94711: checking for a sed that does not truncate output" >&5
14434 +echo "configure:95758: checking for a sed that does not truncate output" >&5
14435  if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
14436    echo $ac_n "(cached) $ac_c" 1>&6
14437  else
14438 @@ -94791,7 +95838,7 @@
14439  echo "$ac_t""$SED" 1>&6
14440
14441  echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
14442 -echo "configure:94795: checking how to recognise dependent libraries" >&5
14443 +echo "configure:95842: checking how to recognise dependent libraries" >&5
14444  if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
14445    echo $ac_n "(cached) $ac_c" 1>&6
14446  else
14447 @@ -94978,13 +96025,13 @@
14448  deplibs_check_method=$lt_cv_deplibs_check_method
14449
14450  echo $ac_n "checking for object suffix""... $ac_c" 1>&6
14451 -echo "configure:94982: checking for object suffix" >&5
14452 +echo "configure:96029: checking for object suffix" >&5
14453  if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
14454    echo $ac_n "(cached) $ac_c" 1>&6
14455  else
14456    rm -f conftest*
14457  echo 'int i = 1;' > conftest.$ac_ext
14458 -if { (eval echo configure:94988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14459 +if { (eval echo configure:96035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14460    for ac_file in conftest.*; do
14461      case $ac_file in
14462      *.c) ;;
14463 @@ -95004,7 +96051,7 @@
14464
14465
14466  echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
14467 -echo "configure:95008: checking for executable suffix" >&5
14468 +echo "configure:96055: checking for executable suffix" >&5
14469  if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
14470    echo $ac_n "(cached) $ac_c" 1>&6
14471  else
14472 @@ -95014,10 +96061,10 @@
14473    rm -f conftest*
14474    echo 'int main () { return 0; }' > conftest.$ac_ext
14475    ac_cv_exeext=
14476 -  if { (eval echo configure:95018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
14477 +  if { (eval echo configure:96065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
14478      for file in conftest.*; do
14479        case $file in
14480 -      *.c | *.o | *.obj) ;;
14481 +      *.$ac_ext | *.c | *.o | *.obj) ;;
14482        *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
14483        esac
14484      done
14485 @@ -95045,7 +96092,7 @@
14486
14487  # Check for command to grab the raw symbol name followed by C symbol from nm.
14488  echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
14489 -echo "configure:95049: checking command to parse $NM output" >&5
14490 +echo "configure:96096: checking command to parse $NM output" >&5
14491  if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
14492    echo $ac_n "(cached) $ac_c" 1>&6
14493  else
14494 @@ -95128,10 +96175,10 @@
14495  int main(){nm_test_var='a';nm_test_func();return(0);}
14496  EOF
14497
14498 -  if { (eval echo configure:95132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14499 +  if { (eval echo configure:96179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14500      # Now try to grab the symbols.
14501      nlist=conftest.nm
14502 -    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
14503 +    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
14504        # Try sorting and uniquifying the output.
14505        if sort "$nlist" | uniq > "$nlist"T; then
14506         mv -f "$nlist"T "$nlist"
14507 @@ -95182,7 +96229,7 @@
14508           save_CFLAGS="$CFLAGS"
14509           LIBS="conftstm.$ac_objext"
14510           CFLAGS="$CFLAGS$no_builtin_flag"
14511 -         if { (eval echo configure:95186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
14512 +         if { (eval echo configure:96233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
14513             pipe_works=yes
14514           fi
14515           LIBS="$save_LIBS"
14516 @@ -95236,7 +96283,7 @@
14517  file_magic*)
14518    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
14519      echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
14520 -echo "configure:95240: checking for ${ac_tool_prefix}file" >&5
14521 +echo "configure:96287: checking for ${ac_tool_prefix}file" >&5
14522  if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
14523    echo $ac_n "(cached) $ac_c" 1>&6
14524  else
14525 @@ -95298,7 +96345,7 @@
14526  if test -z "$lt_cv_path_MAGIC_CMD"; then
14527    if test -n "$ac_tool_prefix"; then
14528      echo $ac_n "checking for file""... $ac_c" 1>&6
14529 -echo "configure:95302: checking for file" >&5
14530 +echo "configure:96349: checking for file" >&5
14531  if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
14532    echo $ac_n "(cached) $ac_c" 1>&6
14533  else
14534 @@ -95369,7 +96416,7 @@
14535  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
14536  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
14537  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
14538 -echo "configure:95373: checking for $ac_word" >&5
14539 +echo "configure:96420: checking for $ac_word" >&5
14540  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
14541    echo $ac_n "(cached) $ac_c" 1>&6
14542  else
14543 @@ -95401,7 +96448,7 @@
14544    # Extract the first word of "ranlib", so it can be a program name with args.
14545  set dummy ranlib; ac_word=$2
14546  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
14547 -echo "configure:95405: checking for $ac_word" >&5
14548 +echo "configure:96452: checking for $ac_word" >&5
14549  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
14550    echo $ac_n "(cached) $ac_c" 1>&6
14551  else
14552 @@ -95436,7 +96483,7 @@
14553  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
14554  set dummy ${ac_tool_prefix}strip; ac_word=$2
14555  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
14556 -echo "configure:95440: checking for $ac_word" >&5
14557 +echo "configure:96487: checking for $ac_word" >&5
14558  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
14559    echo $ac_n "(cached) $ac_c" 1>&6
14560  else
14561 @@ -95468,7 +96515,7 @@
14562    # Extract the first word of "strip", so it can be a program name with args.
14563  set dummy strip; ac_word=$2
14564  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
14565 -echo "configure:95472: checking for $ac_word" >&5
14566 +echo "configure:96519: checking for $ac_word" >&5
14567  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
14568    echo $ac_n "(cached) $ac_c" 1>&6
14569  else
14570 @@ -95517,8 +96564,8 @@
14571  case $host in
14572  *-*-irix6*)
14573    # Find out which ABI we are using.
14574 -  echo '#line 95521 "configure"' > conftest.$ac_ext
14575 -  if { (eval echo configure:95522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14576 +  echo '#line 96568 "configure"' > conftest.$ac_ext
14577 +  if { (eval echo configure:96569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14578      case `/usr/bin/file conftest.$ac_objext` in
14579      *32-bit*)
14580        LD="${LD-ld} -32"
14581 @@ -95539,7 +96586,7 @@
14582    SAVE_CFLAGS="$CFLAGS"
14583    CFLAGS="$CFLAGS -belf"
14584    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
14585 -echo "configure:95543: checking whether the C compiler needs -belf" >&5
14586 +echo "configure:96590: checking whether the C compiler needs -belf" >&5
14587  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
14588    echo $ac_n "(cached) $ac_c" 1>&6
14589  else
14590 @@ -95552,14 +96599,14 @@
14591  cross_compiling=$ac_cv_prog_cc_cross
14592
14593       cat > conftest.$ac_ext <<EOF
14594 -#line 95556 "configure"
14595 +#line 96603 "configure"
14596  #include "confdefs.h"
14597
14598  int main() {
14599
14600  ; return 0; }
14601  EOF
14602 -if { (eval echo configure:95563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14603 +if { (eval echo configure:96610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14604    rm -rf conftest*
14605    lt_cv_cc_needs_belf=yes
14606  else
14607 @@ -95681,7 +96728,7 @@
14608  ## FIXME: this should be a separate macro
14609  ##
14610  echo $ac_n "checking for objdir""... $ac_c" 1>&6
14611 -echo "configure:95685: checking for objdir" >&5
14612 +echo "configure:96732: checking for objdir" >&5
14613  rm -f .libs 2>/dev/null
14614  mkdir .libs 2>/dev/null
14615  if test -d .libs; then
14616 @@ -95712,7 +96759,7 @@
14617  # in isolation, and that seeing it set (from the cache) indicates that
14618  # the associated values are set (in the cache) correctly too.
14619  echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
14620 -echo "configure:95716: checking for $compiler option to produce PIC" >&5
14621 +echo "configure:96763: checking for $compiler option to produce PIC" >&5
14622  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
14623    echo $ac_n "(cached) $ac_c" 1>&6
14624  else
14625 @@ -95860,21 +96907,21 @@
14626
14627    # Check to make sure the pic_flag actually works.
14628    echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
14629 -echo "configure:95864: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
14630 +echo "configure:96911: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
14631    if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
14632    echo $ac_n "(cached) $ac_c" 1>&6
14633  else
14634        save_CFLAGS="$CFLAGS"
14635      CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
14636      cat > conftest.$ac_ext <<EOF
14637 -#line 95871 "configure"
14638 +#line 96918 "configure"
14639  #include "confdefs.h"
14640
14641  int main() {
14642
14643  ; return 0; }
14644  EOF
14645 -if { (eval echo configure:95878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14646 +if { (eval echo configure:96925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14647    rm -rf conftest*
14648          case $host_os in
14649        hpux9* | hpux10* | hpux11*)
14650 @@ -95930,7 +96977,7 @@
14651  ## FIXME: this should be a separate macro
14652  ##
14653  echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
14654 -echo "configure:95934: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
14655 +echo "configure:96981: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
14656  if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
14657    echo $ac_n "(cached) $ac_c" 1>&6
14658  else
14659 @@ -95938,14 +96985,14 @@
14660    save_LDFLAGS="$LDFLAGS"
14661    LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
14662    cat > conftest.$ac_ext <<EOF
14663 -#line 95942 "configure"
14664 +#line 96989 "configure"
14665  #include "confdefs.h"
14666
14667  int main() {
14668
14669  ; return 0; }
14670  EOF
14671 -if { (eval echo configure:95949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14672 +if { (eval echo configure:96996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14673    rm -rf conftest*
14674    lt_cv_prog_cc_static_works=yes
14675  else
14676 @@ -95976,7 +97023,7 @@
14677  ##
14678  # Check to see if options -o and -c are simultaneously supported by compiler
14679  echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
14680 -echo "configure:95980: checking if $compiler supports -c -o file.$ac_objext" >&5
14681 +echo "configure:97027: checking if $compiler supports -c -o file.$ac_objext" >&5
14682  if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
14683    echo $ac_n "(cached) $ac_c" 1>&6
14684  else
14685 @@ -95995,7 +97042,7 @@
14686  save_CFLAGS="$CFLAGS"
14687  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
14688  compiler_c_o=no
14689 -if { (eval echo configure:95999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
14690 +if { (eval echo configure:97046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
14691    # The compiler can only warn and ignore the option if not recognized
14692    # So say no if there are warnings
14693    if test -s out/conftest.err; then
14694 @@ -96024,7 +97071,7 @@
14695  if test x"$compiler_c_o" = x"yes"; then
14696    # Check to see if we can write to a .lo
14697    echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
14698 -echo "configure:96028: checking if $compiler supports -c -o file.lo" >&5
14699 +echo "configure:97075: checking if $compiler supports -c -o file.lo" >&5
14700    if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
14701    echo $ac_n "(cached) $ac_c" 1>&6
14702  else
14703 @@ -96035,14 +97082,14 @@
14704    save_objext="$ac_objext"
14705    ac_objext=lo
14706    cat > conftest.$ac_ext <<EOF
14707 -#line 96039 "configure"
14708 +#line 97086 "configure"
14709  #include "confdefs.h"
14710
14711  int main() {
14712  int some_variable = 0;
14713  ; return 0; }
14714  EOF
14715 -if { (eval echo configure:96046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14716 +if { (eval echo configure:97093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14717    rm -rf conftest*
14718        # The compiler can only warn and ignore the option if not recognized
14719      # So say no if there are warnings
14720 @@ -96077,7 +97124,7 @@
14721  if test "$compiler_c_o" = no && test "$need_locks" != no; then
14722    # do not overwrite the value of need_locks provided by the user
14723    echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
14724 -echo "configure:96081: checking if we can lock with hard links" >&5
14725 +echo "configure:97128: checking if we can lock with hard links" >&5
14726    hard_links=yes
14727    $rm conftest*
14728    ln conftest.a conftest.b 2>/dev/null && hard_links=no
14729 @@ -96100,20 +97147,20 @@
14730  if test "$GCC" = yes; then
14731    # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
14732    echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
14733 -echo "configure:96104: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
14734 +echo "configure:97151: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
14735    echo "int some_variable = 0;" > conftest.$ac_ext
14736    save_CFLAGS="$CFLAGS"
14737    CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
14738    compiler_rtti_exceptions=no
14739    cat > conftest.$ac_ext <<EOF
14740 -#line 96110 "configure"
14741 +#line 97157 "configure"
14742  #include "confdefs.h"
14743
14744  int main() {
14745  int some_variable = 0;
14746  ; return 0; }
14747  EOF
14748 -if { (eval echo configure:96117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14749 +if { (eval echo configure:97164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14750    rm -rf conftest*
14751        # The compiler can only warn and ignore the option if not recognized
14752      # So say no if there are warnings
14753 @@ -96144,7 +97191,7 @@
14754  ##
14755  # See if the linker supports building shared libraries.
14756  echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
14757 -echo "configure:96148: checking whether the linker ($LD) supports shared libraries" >&5
14758 +echo "configure:97195: checking whether the linker ($LD) supports shared libraries" >&5
14759
14760  allow_undefined_flag=
14761  no_undefined_flag=
14762 @@ -96835,7 +97882,7 @@
14763  ##
14764  # Check hardcoding attributes.
14765  echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
14766 -echo "configure:96839: checking how to hardcode library paths into programs" >&5
14767 +echo "configure:97886: checking how to hardcode library paths into programs" >&5
14768  hardcode_action=
14769  if test -n "$hardcode_libdir_flag_spec" || \
14770     test -n "$runpath_var"; then
14771 @@ -96867,7 +97914,7 @@
14772  striplib=
14773  old_striplib=
14774  echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
14775 -echo "configure:96871: checking whether stripping libraries is possible" >&5
14776 +echo "configure:97918: checking whether stripping libraries is possible" >&5
14777  if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
14778    test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
14779    test -z "$striplib" && striplib="$STRIP --strip-unneeded"
14780 @@ -96885,7 +97932,7 @@
14781  ##
14782  # PORTME Fill in your ld.so characteristics
14783  echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
14784 -echo "configure:96889: checking dynamic linker characteristics" >&5
14785 +echo "configure:97936: checking dynamic linker characteristics" >&5
14786  library_names_spec=
14787  libname_spec='lib$name'
14788  soname_spec=
14789 @@ -97144,8 +98191,8 @@
14790    libsuff=
14791    case "$host_cpu" in
14792    x86_64*|s390x*)
14793 -    echo '#line 97148 "configure"' > conftest.$ac_ext
14794 -    if { (eval echo configure:97149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14795 +    echo '#line 98195 "configure"' > conftest.$ac_ext
14796 +    if { (eval echo configure:98196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14797        case `/usr/bin/file conftest.$ac_objext` in
14798        *64-bit*)
14799          libsuff=64
14800 @@ -97320,7 +98367,7 @@
14801  ##
14802  # Report the final consequences.
14803  echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
14804 -echo "configure:97324: checking if libtool supports shared libraries" >&5
14805 +echo "configure:98371: checking if libtool supports shared libraries" >&5
14806  echo "$ac_t""$can_build_shared" 1>&6
14807  ##
14808  ## END FIXME
14809 @@ -97328,7 +98375,7 @@
14810  ## FIXME: this should be a separate macro
14811  ##
14812  echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
14813 -echo "configure:97332: checking whether to build shared libraries" >&5
14814 +echo "configure:98379: checking whether to build shared libraries" >&5
14815  test "$can_build_shared" = "no" && enable_shared=no
14816
14817  # On AIX, shared libraries and static libraries use the same namespace, and
14818 @@ -97355,7 +98402,7 @@
14819  ## FIXME: this should be a separate macro
14820  ##
14821  echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
14822 -echo "configure:97359: checking whether to build static libraries" >&5
14823 +echo "configure:98406: checking whether to build static libraries" >&5
14824  # Make sure either enable_shared or enable_static is yes.
14825  test "$enable_shared" = yes || enable_static=yes
14826  echo "$ac_t""$enable_static" 1>&6
14827 @@ -97398,12 +98445,12 @@
14828
14829    *)
14830      echo $ac_n "checking for shl_load""... $ac_c" 1>&6
14831 -echo "configure:97402: checking for shl_load" >&5
14832 +echo "configure:98449: checking for shl_load" >&5
14833  if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
14834    echo $ac_n "(cached) $ac_c" 1>&6
14835  else
14836    cat > conftest.$ac_ext <<EOF
14837 -#line 97407 "configure"
14838 +#line 98454 "configure"
14839  #include "confdefs.h"
14840  /* System header to define __stub macros and hopefully few prototypes,
14841      which can conflict with char shl_load(); below.  */
14842 @@ -97426,7 +98473,7 @@
14843
14844  ; return 0; }
14845  EOF
14846 -if { (eval echo configure:97430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14847 +if { (eval echo configure:98477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14848    rm -rf conftest*
14849    eval "ac_cv_func_shl_load=yes"
14850  else
14851 @@ -97444,7 +98491,7 @@
14852  else
14853    echo "$ac_t""no" 1>&6
14854  echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
14855 -echo "configure:97448: checking for shl_load in -ldld" >&5
14856 +echo "configure:98495: checking for shl_load in -ldld" >&5
14857  ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
14858  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
14859    echo $ac_n "(cached) $ac_c" 1>&6
14860 @@ -97452,7 +98499,7 @@
14861    ac_save_LIBS="$LIBS"
14862  LIBS="-ldld  $LIBS"
14863  cat > conftest.$ac_ext <<EOF
14864 -#line 97456 "configure"
14865 +#line 98503 "configure"
14866  #include "confdefs.h"
14867  /* Override any gcc2 internal prototype to avoid an error.  */
14868  /* We use char because int might match the return type of a gcc2
14869 @@ -97463,7 +98510,7 @@
14870  shl_load()
14871  ; return 0; }
14872  EOF
14873 -if { (eval echo configure:97467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14874 +if { (eval echo configure:98514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14875    rm -rf conftest*
14876    eval "ac_cv_lib_$ac_lib_var=yes"
14877  else
14878 @@ -97482,12 +98529,12 @@
14879  else
14880    echo "$ac_t""no" 1>&6
14881  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
14882 -echo "configure:97486: checking for dlopen" >&5
14883 +echo "configure:98533: checking for dlopen" >&5
14884  if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
14885    echo $ac_n "(cached) $ac_c" 1>&6
14886  else
14887    cat > conftest.$ac_ext <<EOF
14888 -#line 97491 "configure"
14889 +#line 98538 "configure"
14890  #include "confdefs.h"
14891  /* System header to define __stub macros and hopefully few prototypes,
14892      which can conflict with char dlopen(); below.  */
14893 @@ -97510,7 +98557,7 @@
14894
14895  ; return 0; }
14896  EOF
14897 -if { (eval echo configure:97514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14898 +if { (eval echo configure:98561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14899    rm -rf conftest*
14900    eval "ac_cv_func_dlopen=yes"
14901  else
14902 @@ -97528,7 +98575,7 @@
14903  else
14904    echo "$ac_t""no" 1>&6
14905  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
14906 -echo "configure:97532: checking for dlopen in -ldl" >&5
14907 +echo "configure:98579: checking for dlopen in -ldl" >&5
14908  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
14909  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
14910    echo $ac_n "(cached) $ac_c" 1>&6
14911 @@ -97536,7 +98583,7 @@
14912    ac_save_LIBS="$LIBS"
14913  LIBS="-ldl  $LIBS"
14914  cat > conftest.$ac_ext <<EOF
14915 -#line 97540 "configure"
14916 +#line 98587 "configure"
14917  #include "confdefs.h"
14918  /* Override any gcc2 internal prototype to avoid an error.  */
14919  /* We use char because int might match the return type of a gcc2
14920 @@ -97547,7 +98594,7 @@
14921  dlopen()
14922  ; return 0; }
14923  EOF
14924 -if { (eval echo configure:97551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14925 +if { (eval echo configure:98598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14926    rm -rf conftest*
14927    eval "ac_cv_lib_$ac_lib_var=yes"
14928  else
14929 @@ -97566,7 +98613,7 @@
14930  else
14931    echo "$ac_t""no" 1>&6
14932  echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
14933 -echo "configure:97570: checking for dlopen in -lsvld" >&5
14934 +echo "configure:98617: checking for dlopen in -lsvld" >&5
14935  ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
14936  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
14937    echo $ac_n "(cached) $ac_c" 1>&6
14938 @@ -97574,7 +98621,7 @@
14939    ac_save_LIBS="$LIBS"
14940  LIBS="-lsvld  $LIBS"
14941  cat > conftest.$ac_ext <<EOF
14942 -#line 97578 "configure"
14943 +#line 98625 "configure"
14944  #include "confdefs.h"
14945  /* Override any gcc2 internal prototype to avoid an error.  */
14946  /* We use char because int might match the return type of a gcc2
14947 @@ -97585,7 +98632,7 @@
14948  dlopen()
14949  ; return 0; }
14950  EOF
14951 -if { (eval echo configure:97589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14952 +if { (eval echo configure:98636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14953    rm -rf conftest*
14954    eval "ac_cv_lib_$ac_lib_var=yes"
14955  else
14956 @@ -97604,7 +98651,7 @@
14957  else
14958    echo "$ac_t""no" 1>&6
14959  echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
14960 -echo "configure:97608: checking for dld_link in -ldld" >&5
14961 +echo "configure:98655: checking for dld_link in -ldld" >&5
14962  ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
14963  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
14964    echo $ac_n "(cached) $ac_c" 1>&6
14965 @@ -97612,7 +98659,7 @@
14966    ac_save_LIBS="$LIBS"
14967  LIBS="-ldld  $LIBS"
14968  cat > conftest.$ac_ext <<EOF
14969 -#line 97616 "configure"
14970 +#line 98663 "configure"
14971  #include "confdefs.h"
14972  /* Override any gcc2 internal prototype to avoid an error.  */
14973  /* We use char because int might match the return type of a gcc2
14974 @@ -97623,7 +98670,7 @@
14975  dld_link()
14976  ; return 0; }
14977  EOF
14978 -if { (eval echo configure:97627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14979 +if { (eval echo configure:98674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14980    rm -rf conftest*
14981    eval "ac_cv_lib_$ac_lib_var=yes"
14982  else
14983 @@ -97679,7 +98726,7 @@
14984      LIBS="$lt_cv_dlopen_libs $LIBS"
14985
14986      echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
14987 -echo "configure:97683: checking whether a program can dlopen itself" >&5
14988 +echo "configure:98730: checking whether a program can dlopen itself" >&5
14989  if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
14990    echo $ac_n "(cached) $ac_c" 1>&6
14991  else
14992 @@ -97689,7 +98736,7 @@
14993      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14994    lt_status=$lt_dlunknown
14995    cat > conftest.$ac_ext <<EOF
14996 -#line 97693 "configure"
14997 +#line 98740 "configure"
14998  #include "confdefs.h"
14999
15000  #if HAVE_DLFCN_H
15001 @@ -97750,7 +98797,7 @@
15002      exit (status);
15003  }
15004  EOF
15005 -  if { (eval echo configure:97754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
15006 +  if { (eval echo configure:98801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
15007      (./conftest; exit; ) 2>/dev/null
15008      lt_status=$?
15009      case x$lt_status in
15010 @@ -97773,7 +98820,7 @@
15011      if test "x$lt_cv_dlopen_self" = xyes; then
15012        LDFLAGS="$LDFLAGS $link_static_flag"
15013        echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
15014 -echo "configure:97777: checking whether a statically linked program can dlopen itself" >&5
15015 +echo "configure:98824: checking whether a statically linked program can dlopen itself" >&5
15016  if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
15017    echo $ac_n "(cached) $ac_c" 1>&6
15018  else
15019 @@ -97783,7 +98830,7 @@
15020      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
15021    lt_status=$lt_dlunknown
15022    cat > conftest.$ac_ext <<EOF
15023 -#line 97787 "configure"
15024 +#line 98834 "configure"
15025  #include "confdefs.h"
15026
15027  #if HAVE_DLFCN_H
15028 @@ -97844,7 +98891,7 @@
15029      exit (status);
15030  }
15031  EOF
15032 -  if { (eval echo configure:97848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
15033 +  if { (eval echo configure:98895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
15034      (./conftest; exit; ) 2>/dev/null
15035      lt_status=$?
15036      case x$lt_status in
15037 @@ -97895,14 +98942,14 @@
15038      # systems, -lgcc has to come before -lc. If gcc already passes -lc
15039      # to ld, don't add -lc before -lgcc.
15040      echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
15041 -echo "configure:97899: checking whether -lc should be explicitly linked in" >&5
15042 +echo "configure:98946: checking whether -lc should be explicitly linked in" >&5
15043      if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
15044    echo $ac_n "(cached) $ac_c" 1>&6
15045  else
15046    $rm conftest*
15047      echo 'static int dummy;' > conftest.$ac_ext
15048
15049 -    if { (eval echo configure:97906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
15050 +    if { (eval echo configure:98953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
15051        soname=conftest
15052        lib=conftest
15053        libobjs=conftest.$ac_objext
15054 @@ -97915,7 +98962,7 @@
15055        libname=conftest
15056        save_allow_undefined_flag=$allow_undefined_flag
15057        allow_undefined_flag=
15058 -      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; }
15059 +      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; }
15060        then
15061         lt_cv_archive_cmds_need_lc=no
15062        else
15063 @@ -99147,6 +100194,7 @@
15064  s%@ORACLE_DIR@%$ORACLE_DIR%g
15065  s%@ORACLE_VERSION@%$ORACLE_VERSION%g
15066  s%@SNMP_CONFIG@%$SNMP_CONFIG%g
15067 +s%@LEMON@%$LEMON%g
15068  s%@yazconfig@%$yazconfig%g
15069  s%@INLINE_CFLAGS@%$INLINE_CFLAGS%g
15070  s%@INCLUDE_PATH@%$INCLUDE_PATH%g
15071 diff -ruN php-4.3.11-old/ext/sqlite/CREDITS php-4.3.11-new/ext/sqlite/CREDITS
15072 --- php-4.3.11-old/ext/sqlite/CREDITS   1970-01-01 01:00:00.000000000 +0100
15073 +++ php-4.3.11-new/ext/sqlite/CREDITS   2003-05-13 17:52:16.000000000 +0200
15074 @@ -0,0 +1,2 @@
15075 +sqlite
15076 +Wez Furlong, Tal Peer, Marcus Börger
15077 diff -ruN php-4.3.11-old/ext/sqlite/README php-4.3.11-new/ext/sqlite/README
15078 --- php-4.3.11-old/ext/sqlite/README    1970-01-01 01:00:00.000000000 +0100
15079 +++ php-4.3.11-new/ext/sqlite/README    2003-04-17 03:33:52.000000000 +0200
15080 @@ -0,0 +1,14 @@
15081 +This is an extension for the SQLite Embeddable SQL Database Engine.
15082 +http://www.sqlite.org/
15083 +
15084 +SQLite is a C library that implements an embeddable SQL database engine.
15085 +Programs that link with the SQLite library can have SQL database access
15086 +without running a separate RDBMS process.
15087 +
15088 +SQLite is not a client library used to connect to a big database server.
15089 +SQLite is the server. The SQLite library reads and writes directly to and from
15090 +the database files on disk
15091 +
15092 +
15093 +
15094 +vim:tw=78:et
15095 diff -ruN php-4.3.11-old/ext/sqlite/TODO php-4.3.11-new/ext/sqlite/TODO
15096 --- php-4.3.11-old/ext/sqlite/TODO      1970-01-01 01:00:00.000000000 +0100
15097 +++ php-4.3.11-new/ext/sqlite/TODO      2003-04-20 17:11:15.000000000 +0200
15098 @@ -0,0 +1,22 @@
15099 +- Transparent binary encoding of return values from PHP callback functions.
15100 +
15101 +- Add user-space callback for the authorizer function (this is potentially
15102 +  very slow, so it needs to be implemented carefully).
15103 +
15104 +- Add user-space callback to handle busy databases.
15105 +
15106 +- Test-suite
15107 +
15108 +  o Test how robust we are when a user-space function is registered as
15109 +    a callback for a persistent connection in script A, then script B is
15110 +       called that doesn't register the callback but does make use of the
15111 +       function in an SQL query.
15112 +       --> Our test suite doesn't allow us to test persistent connections
15113 +           at this time :/
15114 +
15115 +- If building a ZTS build, -DTHREADSAFE while compiling libsqlite
15116 +
15117 +- If building a non-debug build, -DNDEBUG will disable the expensive
15118 +  asserts in the inner loop. (and double performance)
15119 +
15120 +vim:tw=78
15121 diff -ruN php-4.3.11-old/ext/sqlite/config.m4 php-4.3.11-new/ext/sqlite/config.m4
15122 --- php-4.3.11-old/ext/sqlite/config.m4 1970-01-01 01:00:00.000000000 +0100
15123 +++ php-4.3.11-new/ext/sqlite/config.m4 2005-07-04 17:22:39.000000000 +0200
15124 @@ -0,0 +1,106 @@
15125 +dnl $Id$
15126 +dnl config.m4 for extension sqlite
15127 +dnl vim:et:ts=2:sw=2
15128 +
15129 +PHP_ARG_WITH(sqlite, for sqlite support,
15130 +[  --with-sqlite           Include sqlite support])
15131 +
15132 +if test "$PHP_SQLITE" != "no"; then
15133 +
15134 +  if test "$PHP_SQLITE" != "yes"; then
15135 +    SEARCH_PATH="/usr/local /usr"
15136 +    SEARCH_FOR="/include/sqlite.h"
15137 +    if test -r $PHP_SQLITE/; then # path given as parameter
15138 +        SQLITE_DIR=$PHP_SQLITE
15139 +    else # search default path list
15140 +        AC_MSG_CHECKING([for sqlite files in default path])
15141 +        for i in $SEARCH_PATH ; do
15142 +        if test -r $i/$SEARCH_FOR; then
15143 +            SQLITE_DIR=$i
15144 +            AC_MSG_RESULT(found in $i)
15145 +        fi
15146 +        done
15147 +    fi
15148 +
15149 +    if test -z "$SQLITE_DIR"; then
15150 +        AC_MSG_RESULT([not found])
15151 +        AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org])
15152 +    fi
15153 +
15154 +    PHP_ADD_INCLUDE($SQLITE_DIR/include)
15155 +
15156 +    LIBNAME=sqlite
15157 +    LIBSYMBOL=sqlite_open
15158 +
15159 +    PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
15160 +    [
15161 +        PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/lib, SQLITE_SHARED_LIBADD)
15162 +        AC_DEFINE(HAVE_SQLITELIB,1,[ ])
15163 +    ],[
15164 +        AC_MSG_ERROR([wrong sqlite lib version or lib not found])
15165 +    ],[
15166 +        -L$SQLITE_DIR/lib -lm -ldl
15167 +    ])
15168 +
15169 +    PHP_SUBST(SQLITE_SHARED_LIBADD)
15170 +    PHP_NEW_EXTENSION(sqlite, sqlite.c, $ext_shared)
15171 +  else
15172 +    # use bundled library
15173 +
15174 +    PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src"
15175 +
15176 +    sources="libsqlite/src/opcodes.c
15177 +        libsqlite/src/parse.c libsqlite/src/encode.c \
15178 +        libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
15179 +        libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
15180 +        libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
15181 +        libsqlite/src/os.c libsqlite/src/pager.c \
15182 +        libsqlite/src/printf.c libsqlite/src/random.c \
15183 +        libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
15184 +        libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
15185 +        libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \
15186 +        libsqlite/src/vacuum.c libsqlite/src/copy.c \
15187 +        libsqlite/src/where.c libsqlite/src/trigger.c"
15188 +
15189 +    PHP_NEW_EXTENSION(sqlite, sqlite.c $sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
15190 +    PHP_ADD_BUILD_DIR($ext_builddir/libsqlite)
15191 +    PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
15192 +    AC_CHECK_SIZEOF(char *,4)
15193 +    AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
15194 +    AC_DEFINE(OS_UNIX, 1, [if this is unix])
15195 +    AC_DEFINE(OS_WIN, 0, [if this is windows])
15196 +    dnl use latin 1 for now; the utf-8 handling in funcs.c uses assert(),
15197 +    dnl which is a bit silly and something we want to avoid
15198 +    SQLITE_ENCODING="ISO8859"
15199 +    dnl SQLITE_ENCODING="UTF-8"
15200 +    dnl AC_DEFINE(SQLITE_UTF8,1,[if SQLite should use utf-8 encoding])
15201 +    PHP_SUBST(SQLITE_ENCODING)
15202 +
15203 +    AC_PATH_PROG(LEMON,lemon,no)
15204 +    PHP_SUBST(LEMON)
15205 +
15206 +    SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
15207 +    PHP_SUBST(SQLITE_VERSION)
15208 +
15209 +    if test "$ext_shared" = "no"; then
15210 +      echo '#include "php_config.h"' > $ext_srcdir/libsqlite/src/config.h
15211 +    else
15212 +      echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/libsqlite/src/config.h
15213 +    fi
15214 +
15215 +    cat >> $ext_srcdir/libsqlite/src/config.h <<EOF
15216 +#if ZTS
15217 +# define THREADSAFE 1
15218 +#endif
15219 +#if !ZEND_DEBUG
15220 +# define NDEBUG
15221 +#endif
15222 +EOF
15223 +
15224 +    PHP_ADD_MAKEFILE_FRAGMENT
15225 +
15226 +  fi
15227 +
15228 +  AC_CHECK_FUNCS(usleep nanosleep)
15229 +  AC_CHECK_HEADERS(time.h)
15230 +fi
15231 diff -ruN php-4.3.11-old/ext/sqlite/php_sqlite.def php-4.3.11-new/ext/sqlite/php_sqlite.def
15232 --- php-4.3.11-old/ext/sqlite/php_sqlite.def    1970-01-01 01:00:00.000000000 +0100
15233 +++ php-4.3.11-new/ext/sqlite/php_sqlite.def    2003-06-13 01:22:33.000000000 +0200
15234 @@ -0,0 +1,37 @@
15235 +EXPORTS
15236 +sqlite_open
15237 +sqlite_close
15238 +sqlite_exec
15239 +sqlite_last_insert_rowid
15240 +sqlite_changes
15241 +sqlite_error_string
15242 +sqlite_interrupt
15243 +sqlite_complete
15244 +sqlite_busy_handler
15245 +sqlite_busy_timeout
15246 +sqlite_get_table
15247 +sqlite_free_table
15248 +sqlite_exec_printf
15249 +sqlite_exec_vprintf
15250 +sqlite_get_table_printf
15251 +sqlite_get_table_vprintf
15252 +sqlite_mprintf
15253 +sqlite_vmprintf
15254 +sqlite_freemem
15255 +sqlite_libversion
15256 +sqlite_libencoding
15257 +sqlite_create_function
15258 +sqlite_create_aggregate
15259 +sqlite_function_type
15260 +sqlite_set_result_string
15261 +sqlite_set_result_int
15262 +sqlite_set_result_double
15263 +sqlite_set_result_error
15264 +sqlite_user_data
15265 +sqlite_aggregate_context
15266 +sqlite_aggregate_count
15267 +sqlite_set_authorizer
15268 +sqlite_trace
15269 +sqlite_compile
15270 +sqlite_step
15271 +sqlite_finalize
15272 diff -ruN php-4.3.11-old/ext/sqlite/php_sqlite.h php-4.3.11-new/ext/sqlite/php_sqlite.h
15273 --- php-4.3.11-old/ext/sqlite/php_sqlite.h      1970-01-01 01:00:00.000000000 +0100
15274 +++ php-4.3.11-new/ext/sqlite/php_sqlite.h      2003-06-21 14:29:32.000000000 +0200
15275 @@ -0,0 +1,103 @@
15276 +/*
15277 +   +----------------------------------------------------------------------+
15278 +   | PHP Version 4                                                        |
15279 +   +----------------------------------------------------------------------+
15280 +   | Copyright (c) 1997-2003 The PHP Group                                |
15281 +   +----------------------------------------------------------------------+
15282 +   | This source file is subject to version 3.0 of the PHP license,       |
15283 +   | that is bundled with this package in the file LICENSE, and is        |
15284 +   | available through the world-wide-web at the following url:           |
15285 +   | http://www.php.net/license/3_0.txt.                                  |
15286 +   | If you did not receive a copy of the PHP license and are unable to   |
15287 +   | obtain it through the world-wide-web, please send a note to          |
15288 +   | license@php.net so we can mail you a copy immediately.               |
15289 +   +----------------------------------------------------------------------+
15290 +   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
15291 +   |          Tal Peer <tal@php.net>                                      |
15292 +   |          Marcus Boerger <helly@php.net>                              |
15293 +   +----------------------------------------------------------------------+
15294 +
15295 +   $Id$
15296 +*/
15297 +
15298 +#ifndef PHP_SQLITE_H
15299 +#define PHP_SQLITE_H
15300 +
15301 +extern zend_module_entry sqlite_module_entry;
15302 +#define phpext_sqlite_ptr &sqlite_module_entry
15303 +
15304 +#ifdef PHP_WIN32
15305 +#define PHP_SQLITE_API __declspec(dllexport)
15306 +#else
15307 +#define PHP_SQLITE_API
15308 +#endif
15309 +
15310 +#ifdef ZTS
15311 +#include "TSRM.h"
15312 +#endif
15313 +
15314 +PHP_MINIT_FUNCTION(sqlite);
15315 +PHP_MSHUTDOWN_FUNCTION(sqlite);
15316 +PHP_RINIT_FUNCTION(sqlite);
15317 +PHP_RSHUTDOWN_FUNCTION(sqlite);
15318 +PHP_MINFO_FUNCTION(sqlite);
15319 +
15320 +PHP_FUNCTION(sqlite_open);
15321 +PHP_FUNCTION(sqlite_popen);
15322 +PHP_FUNCTION(sqlite_close);
15323 +PHP_FUNCTION(sqlite_query);
15324 +PHP_FUNCTION(sqlite_unbuffered_query);
15325 +PHP_FUNCTION(sqlite_array_query);
15326 +
15327 +PHP_FUNCTION(sqlite_fetch_array);
15328 +PHP_FUNCTION(sqlite_fetch_string);
15329 +PHP_FUNCTION(sqlite_fetch_all);
15330 +PHP_FUNCTION(sqlite_current);
15331 +PHP_FUNCTION(sqlite_column);
15332 +
15333 +PHP_FUNCTION(sqlite_num_rows);
15334 +PHP_FUNCTION(sqlite_num_fields);
15335 +PHP_FUNCTION(sqlite_field_name);
15336 +PHP_FUNCTION(sqlite_seek);
15337 +PHP_FUNCTION(sqlite_rewind);
15338 +PHP_FUNCTION(sqlite_next);
15339 +PHP_FUNCTION(sqlite_has_more);
15340 +
15341 +PHP_FUNCTION(sqlite_libversion);
15342 +PHP_FUNCTION(sqlite_libencoding);
15343 +
15344 +PHP_FUNCTION(sqlite_changes);
15345 +PHP_FUNCTION(sqlite_last_insert_rowid);
15346 +
15347 +PHP_FUNCTION(sqlite_escape_string);
15348 +
15349 +PHP_FUNCTION(sqlite_busy_timeout);
15350 +
15351 +PHP_FUNCTION(sqlite_last_error);
15352 +PHP_FUNCTION(sqlite_error_string);
15353 +
15354 +PHP_FUNCTION(sqlite_create_aggregate);
15355 +PHP_FUNCTION(sqlite_create_function);
15356 +PHP_FUNCTION(sqlite_udf_decode_binary);
15357 +PHP_FUNCTION(sqlite_udf_encode_binary);
15358 +
15359 +ZEND_BEGIN_MODULE_GLOBALS(sqlite)
15360 +        long assoc_case;
15361 +ZEND_END_MODULE_GLOBALS(sqlite)
15362 +
15363 +#ifdef ZTS
15364 +#define SQLITE_G(v) TSRMG(sqlite_globals_id, zend_sqlite_globals *, v)
15365 +#else
15366 +#define SQLITE_G(v) (sqlite_globals.v)
15367 +#endif
15368 +
15369 +#endif
15370 +
15371 +
15372 +/*
15373 + * Local variables:
15374 + * tab-width: 4
15375 + * c-basic-offset: 4
15376 + * indent-tabs-mode: t
15377 + * End:
15378 + */
15379 diff -ruN php-4.3.11-old/ext/sqlite/sqlite.c php-4.3.11-new/ext/sqlite/sqlite.c
15380 --- php-4.3.11-old/ext/sqlite/sqlite.c  1970-01-01 01:00:00.000000000 +0100
15381 +++ php-4.3.11-new/ext/sqlite/sqlite.c  2003-06-21 15:29:26.000000000 +0200
15382 @@ -0,0 +1,1879 @@
15383 +/*
15384 +   +----------------------------------------------------------------------+
15385 +   | PHP Version 4                                                        |
15386 +   +----------------------------------------------------------------------+
15387 +   | Copyright (c) 1997-2003 The PHP Group                                |
15388 +   +----------------------------------------------------------------------+
15389 +   | This source file is subject to version 3.0 of the PHP license,       |
15390 +   | that is bundled with this package in the file LICENSE, and is        |
15391 +   | available through the world-wide-web at the following url:           |
15392 +   | http://www.php.net/license/3_0.txt.                                  |
15393 +   | If you did not receive a copy of the PHP license and are unable to   |
15394 +   | obtain it through the world-wide-web, please send a note to          |
15395 +   | license@php.net so we can mail you a copy immediately.               |
15396 +   +----------------------------------------------------------------------+
15397 +   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
15398 +   |          Tal Peer <tal@php.net>                                      |
15399 +   |          Marcus Boerger <helly@php.net>                              |
15400 +   +----------------------------------------------------------------------+
15401 +
15402 +   $Id$
15403 +*/
15404 +
15405 +#ifdef HAVE_CONFIG_H
15406 +#include "config.h"
15407 +#endif
15408 +
15409 +#define PHP_SQLITE_MODULE_VERSION      "1.0"
15410 +
15411 +#include "php.h"
15412 +#include "php_ini.h"
15413 +#include "ext/standard/info.h"
15414 +#include "php_sqlite.h"
15415 +
15416 +#if HAVE_TIME_H
15417 +# include <time.h>
15418 +#endif
15419 +#include <unistd.h>
15420 +
15421 +#include <sqlite.h>
15422 +
15423 +#ifndef safe_emalloc
15424 +# define safe_emalloc(a,b,c) emalloc((a)*(b)+(c))
15425 +#endif
15426 +
15427 +#ifndef ZEND_ENGINE_2
15428 +# define OnUpdateLong OnUpdateInt
15429 +#endif
15430 +
15431 +ZEND_DECLARE_MODULE_GLOBALS(sqlite)
15432 +
15433 +extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out);
15434 +extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out);
15435 +
15436 +static unsigned char arg3_force_ref[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
15437 +
15438 +static int le_sqlite_db, le_sqlite_result, le_sqlite_pdb;
15439 +
15440 +static inline void php_sqlite_strtoupper(char *s)
15441 +{
15442 +       while (*s!='\0') {
15443 +               *s = toupper(*s);
15444 +               s++;
15445 +       }
15446 +}
15447 +
15448 +static inline void php_sqlite_strtolower(char *s)
15449 +{
15450 +       while (*s!='\0') {
15451 +               *s = tolower(*s);
15452 +               s++;
15453 +       }
15454 +}
15455 +
15456 +/* {{{ PHP_INI
15457 + */
15458 +PHP_INI_BEGIN()
15459 +STD_PHP_INI_ENTRY_EX("sqlite.assoc_case", "0", PHP_INI_ALL, OnUpdateLong, assoc_case, zend_sqlite_globals, sqlite_globals, display_link_numbers)
15460 +PHP_INI_END()
15461 +/* }}} */
15462 +
15463 +
15464 +#define DB_FROM_ZVAL(db, zv)   ZEND_FETCH_RESOURCE2(db, struct php_sqlite_db *, zv, -1, "sqlite database", le_sqlite_db, le_sqlite_pdb)
15465 +
15466 +struct php_sqlite_result {
15467 +       struct php_sqlite_db *db;
15468 +       sqlite_vm *vm;
15469 +       int buffered;
15470 +       int ncolumns;
15471 +       int nrows;
15472 +       int curr_row;
15473 +       char **col_names;
15474 +       int alloc_rows;
15475 +       char **table;
15476 +       int mode;
15477 +};
15478 +
15479 +struct php_sqlite_db {
15480 +       sqlite *db;
15481 +       int last_err_code;
15482 +       int is_persistent;
15483 +       int rsrc_id;
15484 +
15485 +       HashTable callbacks;
15486 +};
15487 +
15488 +struct php_sqlite_agg_functions {
15489 +       struct php_sqlite_db *db;
15490 +       int is_valid;
15491 +       zval *step;
15492 +       zval *fini;
15493 +};
15494 +
15495 +
15496 +enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM };
15497 +
15498 +function_entry sqlite_functions[] = {
15499 +       PHP_FE(sqlite_open, arg3_force_ref)
15500 +       PHP_FE(sqlite_popen, arg3_force_ref)
15501 +       PHP_FE(sqlite_close, NULL)
15502 +       PHP_FE(sqlite_query, NULL)
15503 +       PHP_FE(sqlite_array_query, NULL)
15504 +       PHP_FE(sqlite_fetch_array, NULL)
15505 +       PHP_FE(sqlite_fetch_string, NULL)
15506 +       PHP_FE(sqlite_fetch_all, NULL)
15507 +       PHP_FE(sqlite_current, NULL)
15508 +       PHP_FE(sqlite_column, NULL)
15509 +       PHP_FE(sqlite_libversion, NULL)
15510 +       PHP_FE(sqlite_libencoding, NULL)
15511 +       PHP_FE(sqlite_changes, NULL)
15512 +       PHP_FE(sqlite_last_insert_rowid, NULL)
15513 +       PHP_FE(sqlite_num_rows, NULL)
15514 +       PHP_FE(sqlite_num_fields, NULL)
15515 +       PHP_FE(sqlite_field_name, NULL)
15516 +       PHP_FE(sqlite_seek, NULL)
15517 +       PHP_FE(sqlite_rewind, NULL)
15518 +       PHP_FE(sqlite_next, NULL)
15519 +       PHP_FE(sqlite_has_more, NULL)
15520 +       PHP_FE(sqlite_escape_string, NULL)
15521 +       PHP_FE(sqlite_busy_timeout, NULL)
15522 +       PHP_FE(sqlite_last_error, NULL)
15523 +       PHP_FE(sqlite_error_string, NULL)
15524 +       PHP_FE(sqlite_unbuffered_query, NULL)
15525 +       PHP_FE(sqlite_create_aggregate, NULL)
15526 +       PHP_FE(sqlite_create_function, NULL)
15527 +       PHP_FE(sqlite_udf_encode_binary, NULL)
15528 +       PHP_FE(sqlite_udf_decode_binary, NULL)
15529 +       {NULL, NULL, NULL}
15530 +};
15531 +
15532 +
15533 +zend_module_entry sqlite_module_entry = {
15534 +#if ZEND_MODULE_API_NO >= 20010901
15535 +       STANDARD_MODULE_HEADER,
15536 +#endif
15537 +       "sqlite",
15538 +       sqlite_functions,
15539 +       PHP_MINIT(sqlite),
15540 +       NULL,
15541 +       NULL,
15542 +       PHP_RSHUTDOWN(sqlite),
15543 +       PHP_MINFO(sqlite),
15544 +#if ZEND_MODULE_API_NO >= 20010901
15545 +       PHP_SQLITE_MODULE_VERSION,
15546 +#endif
15547 +       STANDARD_MODULE_PROPERTIES
15548 +};
15549 +
15550 +
15551 +#ifdef COMPILE_DL_SQLITE
15552 +ZEND_GET_MODULE(sqlite)
15553 +#endif
15554 +
15555 +static int php_sqlite_callback_invalidator(struct php_sqlite_agg_functions *funcs TSRMLS_DC)
15556 +{
15557 +       if (!funcs->is_valid) {
15558 +               return 0;
15559 +       }
15560 +
15561 +       if (funcs->step) {
15562 +               zval_ptr_dtor(&funcs->step);
15563 +               funcs->step = NULL;
15564 +       }
15565 +
15566 +       if (funcs->fini) {
15567 +               zval_ptr_dtor(&funcs->fini);
15568 +               funcs->fini = NULL;
15569 +       }
15570 +
15571 +       funcs->is_valid = 0;
15572 +
15573 +       return 0;
15574 +}
15575 +
15576 +
15577 +static void php_sqlite_callback_dtor(void *pDest)
15578 +{
15579 +       struct php_sqlite_agg_functions *funcs = (struct php_sqlite_agg_functions*)pDest;
15580 +
15581 +       if (funcs->is_valid) {
15582 +               TSRMLS_FETCH();
15583 +
15584 +               php_sqlite_callback_invalidator(funcs TSRMLS_CC);
15585 +       }
15586 +}
15587 +
15588 +static ZEND_RSRC_DTOR_FUNC(php_sqlite_db_dtor)
15589 +{
15590 +       if (rsrc->ptr) {
15591 +               struct php_sqlite_db *db = (struct php_sqlite_db*)rsrc->ptr;
15592 +               sqlite_close(db->db);
15593 +
15594 +               zend_hash_destroy(&db->callbacks);
15595 +
15596 +               pefree(db, db->is_persistent);
15597 +
15598 +               rsrc->ptr = NULL;
15599 +       }
15600 +}
15601 +
15602 +static void real_result_dtor(struct php_sqlite_result *res TSRMLS_DC)
15603 +{
15604 +       int i, j, base;
15605 +
15606 +       if (res->vm) {
15607 +               sqlite_finalize(res->vm, NULL);
15608 +       }
15609 +
15610 +       if (res->table) {
15611 +               if (!res->buffered && res->nrows) {
15612 +                       res->nrows = 1; /* only one row is stored */
15613 +               }
15614 +               for (i = 0; i < res->nrows; i++) {
15615 +                       base = i * res->ncolumns;
15616 +                       for (j = 0; j < res->ncolumns; j++) {
15617 +                               if (res->table[base + j] != NULL) {
15618 +                                       efree(res->table[base + j]);
15619 +                               }
15620 +                       }
15621 +               }
15622 +               efree(res->table);
15623 +       }
15624 +       if (res->col_names) {
15625 +               for (j = 0; j < res->ncolumns; j++) {
15626 +                       efree(res->col_names[j]);
15627 +               }
15628 +               efree(res->col_names);
15629 +       }
15630 +
15631 +       zend_list_delete(res->db->rsrc_id);
15632 +       efree(res);
15633 +}
15634 +
15635 +static ZEND_RSRC_DTOR_FUNC(php_sqlite_result_dtor)
15636 +{
15637 +       struct php_sqlite_result *res = (struct php_sqlite_result *)rsrc->ptr;
15638 +       real_result_dtor(res TSRMLS_CC);
15639 +}
15640 +
15641 +static int php_sqlite_forget_persistent_id_numbers(zend_rsrc_list_entry *rsrc TSRMLS_DC)
15642 +{
15643 +       struct php_sqlite_db *db;
15644 +
15645 +       if (Z_TYPE_P(rsrc) != le_sqlite_pdb) {
15646 +               return 0;
15647 +       }
15648 +
15649 +       db = (struct php_sqlite_db*)rsrc->ptr;
15650 +
15651 +       db->rsrc_id = FAILURE;
15652 +
15653 +       /* don't leave pending commits hanging around */
15654 +       sqlite_exec(db->db, "ROLLBACK", NULL, NULL, NULL);
15655 +
15656 +       /* prevent bad mojo if someone tries to use a previously registered function in the next request */
15657 +       zend_hash_apply(&db->callbacks, (apply_func_t)php_sqlite_callback_invalidator TSRMLS_CC);
15658 +
15659 +       return 0;
15660 +}
15661 +
15662 +PHP_RSHUTDOWN_FUNCTION(sqlite)
15663 +{
15664 +       zend_hash_apply(&EG(persistent_list), (apply_func_t)php_sqlite_forget_persistent_id_numbers TSRMLS_CC);
15665 +       return SUCCESS;
15666 +}
15667 +
15668 +/* {{{ PHP Function interface */
15669 +static void php_sqlite_generic_function_callback(sqlite_func *func, int argc, const char **argv)
15670 +{
15671 +       zval *retval = NULL;
15672 +       zval ***zargs = NULL;
15673 +       zval funcname;
15674 +       int i, res;
15675 +       char *callable = NULL, *errbuf=NULL;
15676 +       TSRMLS_FETCH();
15677 +
15678 +       /* sanity check the args */
15679 +       if (argc == 0) {
15680 +               sqlite_set_result_error(func, "not enough parameters", -1);
15681 +               return;
15682 +       }
15683 +
15684 +       ZVAL_STRING(&funcname, (char*)argv[0], 0);
15685 +
15686 +       if (!zend_is_callable(&funcname, 0, &callable)) {
15687 +               spprintf(&errbuf, 0, "function `%s' is not callable", callable);
15688 +               sqlite_set_result_error(func, errbuf, -1);
15689 +               efree(errbuf);
15690 +               efree(callable);
15691 +               return;
15692 +       }
15693 +       efree(callable);
15694 +
15695 +       if (argc > 1) {
15696 +               zargs = (zval ***)safe_emalloc((argc - 1), sizeof(zval **), 0);
15697 +
15698 +               for (i = 0; i < argc-1; i++) {
15699 +                       zargs[i] = emalloc(sizeof(zval *));
15700 +                       MAKE_STD_ZVAL(*zargs[i]);
15701 +                       ZVAL_STRING(*zargs[i], (char*)argv[i+1], 1);
15702 +               }
15703 +       }
15704 +
15705 +       res = call_user_function_ex(EG(function_table),
15706 +                       NULL,
15707 +                       &funcname,
15708 +                       &retval,
15709 +                       argc-1,
15710 +                       zargs,
15711 +                       0, NULL TSRMLS_CC);
15712 +
15713 +       if (res == SUCCESS) {
15714 +               if (retval == NULL) {
15715 +                       sqlite_set_result_string(func, NULL, 0);
15716 +               } else {
15717 +                       switch (Z_TYPE_P(retval)) {
15718 +                               case IS_STRING:
15719 +                                       sqlite_set_result_string(func, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
15720 +                                       break;
15721 +                               case IS_LONG:
15722 +                               case IS_BOOL:
15723 +                                       sqlite_set_result_int(func, Z_LVAL_P(retval));
15724 +                                       break;
15725 +                               case IS_DOUBLE:
15726 +                                       sqlite_set_result_double(func, Z_DVAL_P(retval));
15727 +                                       break;
15728 +                               case IS_NULL:
15729 +                               default:
15730 +                                       sqlite_set_result_string(func, NULL, 0);
15731 +                       }
15732 +               }
15733 +       } else {
15734 +               sqlite_set_result_error(func, "call_user_function_ex failed", -1);
15735 +       }
15736 +
15737 +       if (retval) {
15738 +               zval_ptr_dtor(&retval);
15739 +       }
15740 +
15741 +       if (zargs) {
15742 +               for (i = 0; i < argc-1; i++) {
15743 +                       zval_ptr_dtor(zargs[i]);
15744 +                       efree(zargs[i]);
15745 +               }
15746 +               efree(zargs);
15747 +       }
15748 +}
15749 +/* }}} */
15750 +
15751 +/* {{{ callback for sqlite_create_function */
15752 +static void php_sqlite_function_callback(sqlite_func *func, int argc, const char **argv)
15753 +{
15754 +       zval *retval = NULL;
15755 +       zval ***zargs = NULL;
15756 +       int i, res;
15757 +       struct php_sqlite_agg_functions *funcs = sqlite_user_data(func);
15758 +       TSRMLS_FETCH();
15759 +
15760 +       if (!funcs->is_valid) {
15761 +               sqlite_set_result_error(func, "this function has not been correctly defined for this request", -1);
15762 +               return;
15763 +       }
15764 +
15765 +       if (argc > 0) {
15766 +               zargs = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
15767 +
15768 +               for (i = 0; i < argc; i++) {
15769 +                       zargs[i] = emalloc(sizeof(zval *));
15770 +                       MAKE_STD_ZVAL(*zargs[i]);
15771 +
15772 +                       if (argv[i] == NULL) {
15773 +                               ZVAL_NULL(*zargs[i]);
15774 +                       } else {
15775 +                               ZVAL_STRING(*zargs[i], (char*)argv[i], 1);
15776 +                       }
15777 +               }
15778 +       }
15779 +
15780 +       res = call_user_function_ex(EG(function_table),
15781 +                       NULL,
15782 +                       funcs->step,
15783 +                       &retval,
15784 +                       argc,
15785 +                       zargs,
15786 +                       0, NULL TSRMLS_CC);
15787 +
15788 +       if (res == SUCCESS) {
15789 +               if (retval == NULL) {
15790 +                       sqlite_set_result_string(func, NULL, 0);
15791 +               } else {
15792 +                       switch (Z_TYPE_P(retval)) {
15793 +                               case IS_STRING:
15794 +                                       /* TODO: for binary results, need to encode the string */
15795 +                                       sqlite_set_result_string(func, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
15796 +                                       break;
15797 +                               case IS_LONG:
15798 +                               case IS_BOOL:
15799 +                                       sqlite_set_result_int(func, Z_LVAL_P(retval));
15800 +                                       break;
15801 +                               case IS_DOUBLE:
15802 +                                       sqlite_set_result_double(func, Z_DVAL_P(retval));
15803 +                                       break;
15804 +                               case IS_NULL:
15805 +                               default:
15806 +                                       sqlite_set_result_string(func, NULL, 0);
15807 +                       }
15808 +               }
15809 +       } else {
15810 +               sqlite_set_result_error(func, "call_user_function_ex failed", -1);
15811 +       }
15812 +
15813 +       if (retval) {
15814 +               zval_ptr_dtor(&retval);
15815 +       }
15816 +
15817 +       if (zargs) {
15818 +               for (i = 0; i < argc; i++) {
15819 +                       zval_ptr_dtor(zargs[i]);
15820 +                       efree(zargs[i]);
15821 +               }
15822 +               efree(zargs);
15823 +       }
15824 +}
15825 +/* }}} */
15826 +
15827 +/* {{{ callback for sqlite_create_aggregate: step function */
15828 +static void php_sqlite_agg_step_function_callback(sqlite_func *func, int argc, const char **argv)
15829 +{
15830 +       zval *retval = NULL;
15831 +       zval ***zargs;
15832 +       zval **context_p;
15833 +       int i, res, zargc;
15834 +       struct php_sqlite_agg_functions *funcs = sqlite_user_data(func);
15835 +       TSRMLS_FETCH();
15836 +
15837 +       if (!funcs->is_valid) {
15838 +               sqlite_set_result_error(func, "this function has not been correctly defined for this request", -1);
15839 +               return;
15840 +       }
15841 +
15842 +       /* sanity check the args */
15843 +       if (argc < 1) {
15844 +               return;
15845 +       }
15846 +
15847 +       zargc = argc + 1;
15848 +       zargs = (zval ***)safe_emalloc(zargc, sizeof(zval **), 0);
15849 +
15850 +       /* first arg is always the context zval */
15851 +       context_p = (zval **)sqlite_aggregate_context(func, sizeof(*context_p));
15852 +
15853 +       if (*context_p == NULL) {
15854 +               MAKE_STD_ZVAL(*context_p);
15855 +               (*context_p)->is_ref = 1;
15856 +               Z_TYPE_PP(context_p) = IS_NULL;
15857 +       }
15858 +
15859 +       zargs[0] = context_p;
15860 +
15861 +       /* copy the other args */
15862 +       for (i = 0; i < argc; i++) {
15863 +               zargs[i+1] = emalloc(sizeof(zval *));
15864 +               MAKE_STD_ZVAL(*zargs[i+1]);
15865 +               if (argv[i] == NULL) {
15866 +                       ZVAL_NULL(*zargs[i+1]);
15867 +               } else {
15868 +                       ZVAL_STRING(*zargs[i+1], (char*)argv[i], 1);
15869 +               }
15870 +       }
15871 +
15872 +       res = call_user_function_ex(EG(function_table),
15873 +                       NULL,
15874 +                       funcs->step,
15875 +                       &retval,
15876 +                       zargc,
15877 +                       zargs,
15878 +                       0, NULL TSRMLS_CC);
15879 +
15880 +       if (res != SUCCESS) {
15881 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "call_user_function_ex failed");
15882 +       }
15883 +
15884 +       if (retval) {
15885 +               zval_ptr_dtor(&retval);
15886 +       }
15887 +
15888 +       if (zargs) {
15889 +               for (i = 1; i < zargc; i++) {
15890 +                       zval_ptr_dtor(zargs[i]);
15891 +                       efree(zargs[i]);
15892 +               }
15893 +               efree(zargs);
15894 +       }
15895 +}
15896 +/* }}} */
15897 +
15898 +/* {{{ callback for sqlite_create_aggregate: finalize function */
15899 +static void php_sqlite_agg_fini_function_callback(sqlite_func *func)
15900 +{
15901 +       zval *retval = NULL;
15902 +       int res;
15903 +       struct php_sqlite_agg_functions *funcs = sqlite_user_data(func);
15904 +       zval **context_p;
15905 +       TSRMLS_FETCH();
15906 +
15907 +       if (!funcs->is_valid) {
15908 +               sqlite_set_result_error(func, "this function has not been correctly defined for this request", -1);
15909 +               return;
15910 +       }
15911 +
15912 +       context_p = (zval **)sqlite_aggregate_context(func, sizeof(*context_p));
15913 +
15914 +       res = call_user_function_ex(EG(function_table),
15915 +                       NULL,
15916 +                       funcs->fini,
15917 +                       &retval,
15918 +                       1,
15919 +                       &context_p,
15920 +                       0, NULL TSRMLS_CC);
15921 +
15922 +       if (res == SUCCESS) {
15923 +               if (retval == NULL) {
15924 +                       sqlite_set_result_string(func, NULL, 0);
15925 +               } else {
15926 +                       switch (Z_TYPE_P(retval)) {
15927 +                               case IS_STRING:
15928 +                                       /* TODO: for binary results, need to encode the string */
15929 +                                       sqlite_set_result_string(func, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
15930 +                                       break;
15931 +                               case IS_LONG:
15932 +                               case IS_BOOL:
15933 +                                       sqlite_set_result_int(func, Z_LVAL_P(retval));
15934 +                                       break;
15935 +                               case IS_DOUBLE:
15936 +                                       sqlite_set_result_double(func, Z_DVAL_P(retval));
15937 +                                       break;
15938 +                               case IS_NULL:
15939 +                               default:
15940 +                                       sqlite_set_result_string(func, NULL, 0);
15941 +                       }
15942 +               }
15943 +       } else {
15944 +               sqlite_set_result_error(func, "call_user_function_ex failed", -1);
15945 +       }
15946 +
15947 +       if (retval) {
15948 +               zval_ptr_dtor(&retval);
15949 +       }
15950 +
15951 +       zval_ptr_dtor(context_p);
15952 +}
15953 +/* }}} */
15954 +
15955 +/* {{{ Authorization Callback */
15956 +static int php_sqlite_authorizer(void *autharg, int access_type, const char *arg3, const char *arg4,
15957 +               const char *arg5, const char *arg6)
15958 +{
15959 +       switch (access_type) {
15960 +               case SQLITE_COPY:
15961 +                       {
15962 +                               TSRMLS_FETCH();
15963 +                               if (PG(safe_mode) && (!php_checkuid(arg4, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
15964 +                                       return SQLITE_DENY;
15965 +                               }
15966 +
15967 +                               if (php_check_open_basedir(arg4 TSRMLS_CC)) {
15968 +                                       return SQLITE_DENY;
15969 +                               }
15970 +                       }
15971 +                       return SQLITE_OK;
15972 +#ifdef SQLITE_ATTACH
15973 +               case SQLITE_ATTACH:
15974 +                       {
15975 +                               TSRMLS_FETCH();
15976 +                               if (PG(safe_mode) && (!php_checkuid(arg3, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
15977 +                                       return SQLITE_DENY;
15978 +                               }
15979 +
15980 +                               if (php_check_open_basedir(arg3 TSRMLS_CC)) {
15981 +                                       return SQLITE_DENY;
15982 +                               }
15983 +                       }
15984 +                       return SQLITE_OK;
15985 +#endif
15986 +
15987 +               default:
15988 +                       /* access allowed */
15989 +                       return SQLITE_OK;
15990 +       }
15991 +}
15992 +/* }}} */
15993 +
15994 +static int init_sqlite_globals(zend_sqlite_globals *g)
15995 +{
15996 +       g->assoc_case = 0;
15997 +       return SUCCESS;
15998 +}
15999 +
16000 +PHP_MINIT_FUNCTION(sqlite)
16001 +{
16002 +       ZEND_INIT_MODULE_GLOBALS(sqlite, init_sqlite_globals, NULL);
16003 +
16004 +       REGISTER_INI_ENTRIES();
16005 +
16006 +       le_sqlite_db = zend_register_list_destructors_ex(php_sqlite_db_dtor, NULL, "sqlite database", module_number);
16007 +       le_sqlite_pdb = zend_register_list_destructors_ex(NULL, php_sqlite_db_dtor, "sqlite database (persistent)", module_number);
16008 +       le_sqlite_result = zend_register_list_destructors_ex(php_sqlite_result_dtor, NULL, "sqlite result", module_number);
16009 +
16010 +       REGISTER_LONG_CONSTANT("SQLITE_BOTH",   PHPSQLITE_BOTH, CONST_CS|CONST_PERSISTENT);
16011 +       REGISTER_LONG_CONSTANT("SQLITE_NUM",    PHPSQLITE_NUM, CONST_CS|CONST_PERSISTENT);
16012 +       REGISTER_LONG_CONSTANT("SQLITE_ASSOC",  PHPSQLITE_ASSOC, CONST_CS|CONST_PERSISTENT);
16013 +
16014 +       REGISTER_LONG_CONSTANT("SQLITE_OK",                             SQLITE_OK, CONST_CS|CONST_PERSISTENT);
16015 +       REGISTER_LONG_CONSTANT("SQLITE_ERROR",                  SQLITE_ERROR, CONST_CS|CONST_PERSISTENT);
16016 +       REGISTER_LONG_CONSTANT("SQLITE_INTERNAL",               SQLITE_INTERNAL, CONST_CS|CONST_PERSISTENT);
16017 +       REGISTER_LONG_CONSTANT("SQLITE_PERM",                   SQLITE_PERM, CONST_CS|CONST_PERSISTENT);
16018 +       REGISTER_LONG_CONSTANT("SQLITE_ABORT",                  SQLITE_ABORT, CONST_CS|CONST_PERSISTENT);
16019 +       REGISTER_LONG_CONSTANT("SQLITE_BUSY",                   SQLITE_BUSY, CONST_CS|CONST_PERSISTENT);
16020 +       REGISTER_LONG_CONSTANT("SQLITE_LOCKED",                 SQLITE_LOCKED, CONST_CS|CONST_PERSISTENT);
16021 +       REGISTER_LONG_CONSTANT("SQLITE_NOMEM",                  SQLITE_NOMEM, CONST_CS|CONST_PERSISTENT);
16022 +       REGISTER_LONG_CONSTANT("SQLITE_READONLY",               SQLITE_READONLY, CONST_CS|CONST_PERSISTENT);
16023 +       REGISTER_LONG_CONSTANT("SQLITE_INTERRUPT",              SQLITE_INTERRUPT, CONST_CS|CONST_PERSISTENT);
16024 +       REGISTER_LONG_CONSTANT("SQLITE_IOERR",                  SQLITE_IOERR, CONST_CS|CONST_PERSISTENT);
16025 +       REGISTER_LONG_CONSTANT("SQLITE_CORRUPT",                SQLITE_CORRUPT, CONST_CS|CONST_PERSISTENT);
16026 +       REGISTER_LONG_CONSTANT("SQLITE_NOTFOUND",               SQLITE_NOTFOUND, CONST_CS|CONST_PERSISTENT);
16027 +       REGISTER_LONG_CONSTANT("SQLITE_FULL",                   SQLITE_FULL, CONST_CS|CONST_PERSISTENT);
16028 +       REGISTER_LONG_CONSTANT("SQLITE_CANTOPEN",               SQLITE_CANTOPEN, CONST_CS|CONST_PERSISTENT);
16029 +       REGISTER_LONG_CONSTANT("SQLITE_PROTOCOL",               SQLITE_PROTOCOL, CONST_CS|CONST_PERSISTENT);
16030 +       REGISTER_LONG_CONSTANT("SQLITE_EMPTY",                  SQLITE_EMPTY, CONST_CS|CONST_PERSISTENT);
16031 +       REGISTER_LONG_CONSTANT("SQLITE_SCHEMA",                 SQLITE_SCHEMA, CONST_CS|CONST_PERSISTENT);
16032 +       REGISTER_LONG_CONSTANT("SQLITE_TOOBIG",                 SQLITE_TOOBIG, CONST_CS|CONST_PERSISTENT);
16033 +       REGISTER_LONG_CONSTANT("SQLITE_CONSTRAINT",             SQLITE_CONSTRAINT, CONST_CS|CONST_PERSISTENT);
16034 +       REGISTER_LONG_CONSTANT("SQLITE_MISMATCH",               SQLITE_MISMATCH, CONST_CS|CONST_PERSISTENT);
16035 +       REGISTER_LONG_CONSTANT("SQLITE_MISUSE",                 SQLITE_MISUSE, CONST_CS|CONST_PERSISTENT);
16036 +       REGISTER_LONG_CONSTANT("SQLITE_NOLFS",                  SQLITE_NOLFS, CONST_CS|CONST_PERSISTENT);
16037 +       REGISTER_LONG_CONSTANT("SQLITE_AUTH",                   SQLITE_AUTH, CONST_CS|CONST_PERSISTENT);
16038 +#ifdef SQLITE_FORMAT
16039 +       REGISTER_LONG_CONSTANT("SQLITE_FORMAT",                 SQLITE_FORMAT, CONST_CS|CONST_PERSISTENT);
16040 +#endif
16041 +       REGISTER_LONG_CONSTANT("SQLITE_ROW",                    SQLITE_ROW, CONST_CS|CONST_PERSISTENT);
16042 +       REGISTER_LONG_CONSTANT("SQLITE_DONE",                   SQLITE_DONE, CONST_CS|CONST_PERSISTENT);
16043 +
16044 +       return SUCCESS;
16045 +}
16046 +
16047 +PHP_MINFO_FUNCTION(sqlite)
16048 +{
16049 +       php_info_print_table_start();
16050 +       php_info_print_table_header(2, "SQLite support", "enabled");
16051 +       php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id$");
16052 +       php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
16053 +       php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
16054 +       php_info_print_table_end();
16055 +
16056 +       DISPLAY_INI_ENTRIES();
16057 +}
16058 +
16059 +static struct php_sqlite_db *php_sqlite_open(char *filename, int mode, char *persistent_id, zval *return_value, zval *errmsg TSRMLS_DC)
16060 +{
16061 +       char *errtext = NULL;
16062 +       sqlite *sdb = NULL;
16063 +       struct php_sqlite_db *db = NULL;
16064 +
16065 +       sdb = sqlite_open(filename, mode, &errtext);
16066 +
16067 +       if (sdb == NULL) {
16068 +
16069 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
16070 +
16071 +               if (errmsg) {
16072 +                       ZVAL_STRING(errmsg, errtext, 1);
16073 +               }
16074 +
16075 +               sqlite_freemem(errtext);
16076 +
16077 +               RETVAL_FALSE;
16078 +               return NULL;
16079 +       }
16080 +
16081 +       db = (struct php_sqlite_db *)pemalloc(sizeof(struct php_sqlite_db), persistent_id ? 1 : 0);
16082 +       db->is_persistent = persistent_id ? 1 : 0;
16083 +       db->last_err_code = SQLITE_OK;
16084 +       db->db = sdb;
16085 +
16086 +       zend_hash_init(&db->callbacks, 0, NULL, php_sqlite_callback_dtor, db->is_persistent);
16087 +
16088 +       /* register the PHP functions */
16089 +       sqlite_create_function(sdb, "php", -1, php_sqlite_generic_function_callback, 0);
16090 +
16091 +       /* set default busy handler; keep retrying up until 1 minute has passed,
16092 +        * then fail with a busy status code */
16093 +       sqlite_busy_timeout(sdb, 60000);
16094 +
16095 +       /* authorizer hook so we can enforce safe mode
16096 +        * Note: the declaration of php_sqlite_authorizer is correct for 2.8.2 of libsqlite,
16097 +        * and IS backwards binary compatible with earlier versions */
16098 +       sqlite_set_authorizer(sdb, php_sqlite_authorizer, NULL);
16099 +
16100 +       db->rsrc_id = ZEND_REGISTER_RESOURCE(return_value, db, persistent_id ? le_sqlite_pdb : le_sqlite_db);
16101 +
16102 +       if (persistent_id) {
16103 +               list_entry le;
16104 +
16105 +               Z_TYPE(le) = le_sqlite_pdb;
16106 +               le.ptr = db;
16107 +
16108 +               if (FAILURE == zend_hash_update(&EG(persistent_list), persistent_id,
16109 +                                       strlen(persistent_id)+1,
16110 +                                       (void *)&le, sizeof(le), NULL)) {
16111 +                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to register persistent resource");
16112 +               }
16113 +       }
16114 +
16115 +       return db;
16116 +}
16117 +
16118 +/* {{{ proto resource sqlite_popen(string filename [, int mode, string &errmessage])
16119 +   Opens a persistent handle to an SQLite database.  Will create the database if it does not exist */
16120 +PHP_FUNCTION(sqlite_popen)
16121 +{
16122 +       int mode = 0666;
16123 +       char *filename, *fullpath, *hashkey;
16124 +       long filename_len, hashkeylen;
16125 +       zval *errmsg = NULL;
16126 +       struct php_sqlite_db *db = NULL;
16127 +       list_entry *le;
16128 +
16129 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/",
16130 +                               &filename, &filename_len, &mode, &errmsg)) {
16131 +               return;
16132 +       }
16133 +
16134 +       if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
16135 +               /* resolve the fully-qualified path name to use as the hash key */
16136 +               fullpath = expand_filepath(filename, NULL TSRMLS_CC);
16137 +
16138 +               if (PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
16139 +                       RETURN_FALSE;
16140 +               }
16141 +
16142 +               if (php_check_open_basedir(fullpath TSRMLS_CC)) {
16143 +                       RETURN_FALSE;
16144 +               }
16145 +       } else {
16146 +               fullpath = estrndup(filename, filename_len);
16147 +       }
16148 +
16149 +       hashkeylen = spprintf(&hashkey, 0, "sqlite_pdb_%s:%d", fullpath, mode);
16150 +
16151 +       /* do we have an existing persistent connection ? */
16152 +       if (SUCCESS == zend_hash_find(&EG(persistent_list), hashkey, hashkeylen+1, (void*)&le)) {
16153 +               if (Z_TYPE_P(le) == le_sqlite_pdb) {
16154 +                       db = (struct php_sqlite_db*)le->ptr;
16155 +
16156 +                       if (db->rsrc_id == FAILURE) {
16157 +                               /* give it a valid resource id for this request */
16158 +                               db->rsrc_id = ZEND_REGISTER_RESOURCE(return_value, db, le_sqlite_pdb);
16159 +                       } else {
16160 +                               /* already accessed this request; map it */
16161 +                               ZVAL_RESOURCE(return_value, db->rsrc_id);
16162 +                       }
16163 +
16164 +                       /* all set */
16165 +                       efree(fullpath);
16166 +                       efree(hashkey);
16167 +                       return;
16168 +               }
16169 +
16170 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Some other type of persistent resource is using this hash key!?");
16171 +               RETURN_FALSE;
16172 +       }
16173 +
16174 +       /* now we need to open the database */
16175 +       php_sqlite_open(fullpath, mode, hashkey, return_value, errmsg TSRMLS_CC);
16176 +
16177 +       efree(fullpath);
16178 +       efree(hashkey);
16179 +}
16180 +/* }}} */
16181 +
16182 +/* {{{ proto resource sqlite_open(string filename [, int mode, string &errmessage])
16183 +   Opens an SQLite database.  Will create the database if it does not exist */
16184 +PHP_FUNCTION(sqlite_open)
16185 +{
16186 +       int mode = 0666;
16187 +       char *filename;
16188 +       long filename_len;
16189 +       zval *errmsg = NULL;
16190 +
16191 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/",
16192 +                               &filename, &filename_len, &mode, &errmsg)) {
16193 +               return;
16194 +       }
16195 +
16196 +       if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
16197 +               if (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
16198 +                       RETURN_FALSE;
16199 +               }
16200 +
16201 +               if (php_check_open_basedir(filename TSRMLS_CC)) {
16202 +                       RETURN_FALSE;
16203 +               }
16204 +       }
16205 +
16206 +       php_sqlite_open(filename, mode, NULL, return_value, errmsg TSRMLS_CC);
16207 +}
16208 +/* }}} */
16209 +
16210 +/* {{{ proto void sqlite_busy_timeout(resource db, int ms)
16211 +   Set busy timeout duration. If ms <= 0, all busy handlers are disabled */
16212 +PHP_FUNCTION(sqlite_busy_timeout)
16213 +{
16214 +       zval *zdb;
16215 +       struct php_sqlite_db *db;
16216 +       long ms;
16217 +
16218 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zdb, &ms)) {
16219 +               return;
16220 +       }
16221 +
16222 +       DB_FROM_ZVAL(db, &zdb);
16223 +
16224 +       sqlite_busy_timeout(db->db, ms);
16225 +}
16226 +/* }}} */
16227 +
16228 +/* {{{ proto void sqlite_close(resource db)
16229 +   Closes an open sqlite database */
16230 +PHP_FUNCTION(sqlite_close)
16231 +{
16232 +       zval *zdb;
16233 +       struct php_sqlite_db *db;
16234 +
16235 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
16236 +               return;
16237 +       }
16238 +       DB_FROM_ZVAL(db, &zdb);
16239 +
16240 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
16241 +               return;
16242 +       }
16243 +
16244 +       DB_FROM_ZVAL(db, &zdb);
16245 +
16246 +       zend_list_delete(Z_RESVAL_P(zdb));
16247 +}
16248 +/* }}} */
16249 +
16250 +/* {{{ php_sqlite_fetch */
16251 +int php_sqlite_fetch(struct php_sqlite_result *rres TSRMLS_DC)
16252 +{
16253 +       const char **rowdata, **colnames;
16254 +       int ret, i, base;
16255 +       char *errtext = NULL, *colname;
16256 +
16257 +next_row:
16258 +       ret = sqlite_step(rres->vm, &rres->ncolumns, &rowdata, &colnames);
16259 +       if (!rres->nrows) {
16260 +               /* first row - lets copy the column names */
16261 +               rres->col_names = safe_emalloc(rres->ncolumns, sizeof(char *), 0);
16262 +               for (i = 0; i < rres->ncolumns; i++) {
16263 +                       colname = strchr(colnames[i], '.');
16264 +                       if (!colname++) {
16265 +                               colname = (char*)colnames[i];
16266 +                       }
16267 +                       if (SQLITE_G(assoc_case) == 1) {
16268 +                               php_sqlite_strtoupper(colname);
16269 +                       } else if (SQLITE_G(assoc_case) == 2) {
16270 +                               php_sqlite_strtolower(colname);
16271 +                       }
16272 +                       rres->col_names[i] = estrdup(colname);
16273 +               }
16274 +               if (!rres->buffered) {
16275 +                       /* non buffered mode - also fetch memory for on single row */
16276 +                       rres->table = safe_emalloc(rres->ncolumns, sizeof(char *), 0);
16277 +               }
16278 +       }
16279 +
16280 +       switch (ret) {
16281 +               case SQLITE_ROW:
16282 +                       if (rres->buffered) {
16283 +                               /* add the row to our collection */
16284 +                               if (rres->nrows + 1 >= rres->alloc_rows) {
16285 +                                       rres->alloc_rows = rres->alloc_rows ? rres->alloc_rows * 2 : 16;
16286 +                                       rres->table = erealloc(rres->table, rres->alloc_rows * rres->ncolumns * sizeof(char *));
16287 +                               }
16288 +                               base = rres->nrows * rres->ncolumns;
16289 +                               for (i = 0; i < rres->ncolumns; i++) {
16290 +                                       if (rowdata[i]) {
16291 +                                               rres->table[base + i] = estrdup(rowdata[i]);
16292 +                                       } else {
16293 +                                               rres->table[base + i] = NULL;
16294 +                                       }
16295 +                               }
16296 +                               rres->nrows++;
16297 +                               goto next_row;
16298 +                       } else {
16299 +                               /* non buffered: only fetch one row but first free data if not first row */
16300 +                               if (rres->nrows++) {
16301 +                                       for (i = 0; i < rres->ncolumns; i++) {
16302 +                                               if (rres->table[i]) {
16303 +                                                       efree(rres->table[i]);
16304 +                                               }
16305 +                                       }
16306 +                               }
16307 +                               for (i = 0; i < rres->ncolumns; i++) {
16308 +                                       if (rowdata[i]) {
16309 +                                               rres->table[i] = estrdup(rowdata[i]);
16310 +                                       } else {
16311 +                                               rres->table[i] = NULL;
16312 +                                       }
16313 +                               }
16314 +                       }
16315 +                       ret = SQLITE_OK;
16316 +                       break;
16317 +
16318 +               case SQLITE_BUSY:
16319 +               case SQLITE_ERROR:
16320 +               case SQLITE_MISUSE:
16321 +               case SQLITE_DONE:
16322 +               default:
16323 +                       if (rres->vm) {
16324 +                               ret = sqlite_finalize(rres->vm, &errtext);
16325 +                       }
16326 +                       rres->vm = NULL;
16327 +                       if (ret != SQLITE_OK) {
16328 +                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
16329 +                               sqlite_freemem(errtext);
16330 +                       }
16331 +                       break;
16332 +       }
16333 +       rres->db->last_err_code = ret;
16334 +
16335 +       return ret;
16336 +}
16337 +/* }}} */
16338 +
16339 +/* {{{ sqlite_query */
16340 +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)
16341 +{
16342 +       struct php_sqlite_result res;
16343 +       int ret;
16344 +       char *errtext = NULL;
16345 +       const char *tail;
16346 +
16347 +       memset(&res, 0, sizeof(res));
16348 +       res.buffered = buffered;
16349 +       res.mode = mode;
16350 +
16351 +       ret = sqlite_compile(db->db, sql, &tail, &res.vm, &errtext);
16352 +       db->last_err_code = ret;
16353 +
16354 +       if (ret != SQLITE_OK) {
16355 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
16356 +               sqlite_freemem(errtext);
16357 +
16358 +               RETURN_FALSE;
16359 +       }
16360 +
16361 +       if (!rres) {
16362 +               rres = (struct php_sqlite_result*)emalloc(sizeof(*rres));
16363 +       }
16364 +       memcpy(rres, &res, sizeof(*rres));
16365 +       rres->db = db;
16366 +       zend_list_addref(db->rsrc_id);
16367 +
16368 +
16369 +       /* now the result set is ready for stepping: get first row */
16370 +       if (php_sqlite_fetch(rres TSRMLS_CC) != SQLITE_OK) {
16371 +               real_result_dtor(rres TSRMLS_CC);
16372 +               RETURN_FALSE;
16373 +       }
16374 +
16375 +       rres->curr_row = 0;
16376 +
16377 +       if (return_value) {
16378 +               ZEND_REGISTER_RESOURCE(return_value, rres, le_sqlite_result);
16379 +       }
16380 +}
16381 +/* }}} */
16382 +
16383 +/* {{{ proto resource sqlite_unbuffered_query(string query, resource db [ , int result_type ])
16384 +   Execute a query that does not prefetch and buffer all data */
16385 +PHP_FUNCTION(sqlite_unbuffered_query)
16386 +{
16387 +       zval *zdb;
16388 +       struct php_sqlite_db *db;
16389 +       char *sql;
16390 +       long sql_len;
16391 +       int mode = PHPSQLITE_BOTH;
16392 +       char *errtext = NULL;
16393 +
16394 +       if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
16395 +                               ZEND_NUM_ARGS() TSRMLS_CC, "sr|l", &sql, &sql_len, &zdb, &mode) &&
16396 +                       FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &zdb, &sql, &sql_len, &mode)) {
16397 +               return;
16398 +       }
16399 +
16400 +       DB_FROM_ZVAL(db, &zdb);
16401 +
16402 +       /* avoid doing work if we can */
16403 +       if (!return_value_used) {
16404 +               db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
16405 +
16406 +               if (db->last_err_code != SQLITE_OK) {
16407 +                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
16408 +                       sqlite_freemem(errtext);
16409 +               }
16410 +               return;
16411 +       }
16412 +
16413 +       sqlite_query(db, sql, sql_len, mode, 0, return_value, NULL TSRMLS_CC);
16414 +}
16415 +/* }}} */
16416 +
16417 +/* {{{ proto resource sqlite_query(string query, resource db [ , int result_type ])
16418 +   Executes a query against a given database and returns a result handle */
16419 +PHP_FUNCTION(sqlite_query)
16420 +{
16421 +       zval *zdb;
16422 +       struct php_sqlite_db *db;
16423 +       char *sql;
16424 +       long sql_len;
16425 +       int mode = PHPSQLITE_BOTH;
16426 +       char *errtext = NULL;
16427 +
16428 +       if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
16429 +                       ZEND_NUM_ARGS() TSRMLS_CC, "sr|l", &sql, &sql_len, &zdb, &mode) &&
16430 +               FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &zdb, &sql, &sql_len, &mode)) {
16431 +               return;
16432 +       }
16433 +       DB_FROM_ZVAL(db, &zdb);
16434 +
16435 +       /* avoid doing work if we can */
16436 +       if (!return_value_used) {
16437 +               db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
16438 +
16439 +               if (db->last_err_code != SQLITE_OK) {
16440 +                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
16441 +                       sqlite_freemem(errtext);
16442 +               }
16443 +               return;
16444 +       }
16445 +
16446 +       sqlite_query(db, sql, sql_len, mode, 1, return_value, NULL TSRMLS_CC);
16447 +}
16448 +/* }}} */
16449 +
16450 +/* {{{ php_sqlite_fetch_array */
16451 +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)
16452 +{
16453 +       int j, buffered = res->buffered;
16454 +       const char **rowdata, **colnames;
16455 +
16456 +       /* check range of the row */
16457 +       if (res->curr_row >= res->nrows) {
16458 +               /* no more */
16459 +               RETURN_FALSE;
16460 +       }
16461 +       colnames = (const char**)res->col_names;
16462 +       if (res->buffered) {
16463 +               rowdata = (const char**)&res->table[res->curr_row * res->ncolumns];
16464 +       } else {
16465 +               rowdata = (const char**)res->table;
16466 +       }
16467 +
16468 +       /* now populate the result */
16469 +       array_init(return_value);
16470 +
16471 +       for (j = 0; j < res->ncolumns; j++) {
16472 +               zval *decoded;
16473 +               MAKE_STD_ZVAL(decoded);
16474 +
16475 +               if (rowdata[j] == NULL) {
16476 +                       ZVAL_NULL(decoded);
16477 +               } else if (decode_binary && rowdata[j][0] == '\x01') {
16478 +                       Z_STRVAL_P(decoded) = emalloc(strlen(rowdata[j]));
16479 +                       Z_STRLEN_P(decoded) = sqlite_decode_binary(rowdata[j]+1, Z_STRVAL_P(decoded));
16480 +                       Z_STRVAL_P(decoded)[Z_STRLEN_P(decoded)] = '\0';
16481 +                       Z_TYPE_P(decoded) = IS_STRING;
16482 +                       if (!buffered) {
16483 +                               efree((char*)rowdata[j]);
16484 +                               rowdata[j] = NULL;
16485 +                       }
16486 +               } else {
16487 +                       ZVAL_STRING(decoded, (char*)rowdata[j], buffered);
16488 +                       if (!buffered) {
16489 +                               rowdata[j] = NULL;
16490 +                       }
16491 +               }
16492 +
16493 +               if (mode & PHPSQLITE_NUM) {
16494 +                       if (mode & PHPSQLITE_ASSOC) {
16495 +                               add_index_zval(return_value, j, decoded);
16496 +                               ZVAL_ADDREF(decoded);
16497 +                               add_assoc_zval(return_value, (char*)colnames[j], decoded);
16498 +                       } else {
16499 +                               add_next_index_zval(return_value, decoded);
16500 +                       }
16501 +               } else {
16502 +                       add_assoc_zval(return_value, (char*)colnames[j], decoded);
16503 +               }
16504 +       }
16505 +
16506 +       if (move_next) {
16507 +               if (!res->buffered) {
16508 +                       /* non buffered: fetch next row */
16509 +                       php_sqlite_fetch(res TSRMLS_CC);
16510 +               }
16511 +               /* advance the row pointer */
16512 +               res->curr_row++;
16513 +       }
16514 +}
16515 +/* }}} */
16516 +
16517 +/* {{{ php_sqlite_fetch_column */
16518 +static void php_sqlite_fetch_column(struct php_sqlite_result *res, zval *which, zend_bool decode_binary, zval *return_value TSRMLS_DC)
16519 +{
16520 +       int j;
16521 +       const char **rowdata, **colnames;
16522 +
16523 +       /* check range of the row */
16524 +       if (res->curr_row >= res->nrows) {
16525 +               /* no more */
16526 +               RETURN_FALSE;
16527 +       }
16528 +       colnames = (const char**)res->col_names;
16529 +
16530 +       if (Z_TYPE_P(which) == IS_LONG) {
16531 +               j = Z_LVAL_P(which);
16532 +       } else {
16533 +               convert_to_string_ex(&which);
16534 +               for (j = 0; j < res->ncolumns; j++) {
16535 +                       if (!strcasecmp((char*)colnames[j], Z_STRVAL_P(which))) {
16536 +                               break;
16537 +                       }
16538 +               }
16539 +       }
16540 +       if (j < 0 || j >= res->ncolumns) {
16541 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such column %d", j);
16542 +               RETURN_FALSE;
16543 +       }
16544 +
16545 +       if (res->buffered) {
16546 +               rowdata = (const char**)&res->table[res->curr_row * res->ncolumns];
16547 +       } else {
16548 +               rowdata = (const char**)res->table;
16549 +       }
16550 +
16551 +       if (rowdata[j] == NULL) {
16552 +               RETURN_NULL();
16553 +       } else if (decode_binary && rowdata[j][0] == '\x01') {
16554 +               int l = strlen(rowdata[j]);
16555 +               char *decoded = emalloc(l);
16556 +               l = sqlite_decode_binary(rowdata[j]+1, decoded);
16557 +               decoded[l] = '\0';
16558 +               RETVAL_STRINGL(decoded, l, 0);
16559 +               if (!res->buffered) {
16560 +                       efree((char*)rowdata[j]);
16561 +                       rowdata[j] = NULL;
16562 +               }
16563 +       } else {
16564 +               RETVAL_STRING((char*)rowdata[j], res->buffered);
16565 +               if (!res->buffered) {
16566 +                       rowdata[j] = NULL;
16567 +               }
16568 +       }
16569 +}
16570 +/* }}} */
16571 +
16572 +/* {{{ proto array sqlite_fetch_all(resource result [, int result_type, bool decode_binary])
16573 +   Fetches all rows from a result set as an array */
16574 +PHP_FUNCTION(sqlite_fetch_all)
16575 +{
16576 +       zval *zres, *ent;
16577 +       int mode = PHPSQLITE_BOTH;
16578 +       zend_bool decode_binary = 1;
16579 +       struct php_sqlite_result *res;
16580 +
16581 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lb", &zres, &mode, &decode_binary)) {
16582 +               return;
16583 +       }
16584 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16585 +       if (ZEND_NUM_ARGS() < 2) {
16586 +               mode = res->mode;
16587 +       }
16588 +
16589 +       if (res->curr_row >= res->nrows && res->nrows) {
16590 +               if (!res->buffered) {
16591 +                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "One or more rowsets were already returned");
16592 +               } else {
16593 +                       res->curr_row = 0;
16594 +               }
16595 +       }
16596 +
16597 +       array_init(return_value);
16598 +
16599 +       while (res->curr_row < res->nrows) {
16600 +               MAKE_STD_ZVAL(ent);
16601 +               php_sqlite_fetch_array(res, mode, decode_binary, 1, ent TSRMLS_CC);
16602 +               add_next_index_zval(return_value, ent);
16603 +       }
16604 +}
16605 +/* }}} */
16606 +
16607 +/* {{{ proto array sqlite_fetch_array(resource result [, int result_type, bool decode_binary])
16608 +   Fetches the next row from a result set as an array */
16609 +PHP_FUNCTION(sqlite_fetch_array)
16610 +{
16611 +       zval *zres;
16612 +       int mode = PHPSQLITE_BOTH;
16613 +       zend_bool decode_binary = 1;
16614 +       struct php_sqlite_result *res;
16615 +
16616 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lb", &zres, &mode, &decode_binary)) {
16617 +               return;
16618 +       }
16619 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16620 +       if (ZEND_NUM_ARGS() < 2) {
16621 +               mode = res->mode;
16622 +       }
16623 +
16624 +       php_sqlite_fetch_array(res, mode, decode_binary, 1, return_value TSRMLS_CC);
16625 +}
16626 +/* }}} */
16627 +
16628 +/* {{{ proto array sqlite_array_query(resource db, string query [ , int result_type, bool decode_binary ])
16629 +   Executes a query against a given database and returns an array */
16630 +PHP_FUNCTION(sqlite_array_query)
16631 +{
16632 +       zval *zdb, *ent;
16633 +       struct php_sqlite_db *db;
16634 +       struct php_sqlite_result *rres;
16635 +       char *sql;
16636 +       long sql_len;
16637 +       int mode = PHPSQLITE_BOTH;
16638 +       char *errtext = NULL;
16639 +       zend_bool decode_binary = 1;
16640 +
16641 +       if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
16642 +                       ZEND_NUM_ARGS() TSRMLS_CC, "sr|l", &sql, &sql_len, &zdb, &mode, &decode_binary) &&
16643 +               FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &zdb, &sql, &sql_len, &mode, &decode_binary)) {
16644 +               return;
16645 +       }
16646 +       DB_FROM_ZVAL(db, &zdb);
16647 +
16648 +       /* avoid doing work if we can */
16649 +       if (!return_value_used) {
16650 +               db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
16651 +
16652 +               if (db->last_err_code != SQLITE_OK) {
16653 +                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
16654 +                       sqlite_freemem(errtext);
16655 +               }
16656 +               return;
16657 +       }
16658 +
16659 +       rres = (struct php_sqlite_result *)emalloc(sizeof(*rres));
16660 +       sqlite_query(db, sql, sql_len, mode, 0, NULL, rres TSRMLS_CC);
16661 +
16662 +       array_init(return_value);
16663 +
16664 +       while (rres->curr_row < rres->nrows) {
16665 +               MAKE_STD_ZVAL(ent);
16666 +               php_sqlite_fetch_array(rres, mode, decode_binary, 1, ent TSRMLS_CC);
16667 +               add_next_index_zval(return_value, ent);
16668 +       }
16669 +       real_result_dtor(rres TSRMLS_CC);
16670 +}
16671 +/* }}} */
16672 +
16673 +/* {{{ proto string sqlite_fetch_array(resource result [, bool decode_binary])
16674 +   Fetches first column of a result set as a string */
16675 +PHP_FUNCTION(sqlite_fetch_string)
16676 +{
16677 +       zval *zres;
16678 +       zend_bool decode_binary = 1;
16679 +       struct php_sqlite_result *res;
16680 +       char *decoded = NULL;
16681 +       int decoded_len;
16682 +       const char **rowdata;
16683 +
16684 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|b", &zres, &decode_binary)) {
16685 +               return;
16686 +       }
16687 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16688 +
16689 +       /* check if there are any more rows on the cursor */
16690 +       if (res->curr_row >= res->nrows) {
16691 +               RETURN_FALSE;
16692 +       }
16693 +
16694 +       if (res->buffered) {
16695 +               rowdata = (const char**)&res->table[res->curr_row * res->ncolumns];
16696 +       } else {
16697 +               rowdata = (const char**)res->table;
16698 +       }
16699 +
16700 +       if (decode_binary && rowdata[0] != NULL && rowdata[0][0] == '\x01') {
16701 +               decoded = emalloc(strlen(rowdata[0]));
16702 +               decoded_len = sqlite_decode_binary(rowdata[0]+1, decoded);
16703 +               if (!res->buffered) {
16704 +                       efree((char*)rowdata[0]);
16705 +                       rowdata[0] = NULL;
16706 +               }
16707 +       } else {
16708 +               if (rowdata[0]) {
16709 +                       decoded_len = strlen((char*)rowdata[0]);
16710 +                       if (res->buffered) {
16711 +                               decoded = estrndup((char*)rowdata[0], decoded_len);
16712 +                       } else {
16713 +                               decoded = (char*)rowdata[0];
16714 +                               rowdata[0] = NULL;
16715 +                       }
16716 +               } else {
16717 +                       decoded_len = 0;
16718 +                       decoded = NULL;
16719 +               }
16720 +       }
16721 +
16722 +       if (!res->buffered) {
16723 +               /* non buffered: fetch next row */
16724 +               php_sqlite_fetch(res TSRMLS_CC);
16725 +       }
16726 +       /* advance the row pointer */
16727 +       res->curr_row++;
16728 +
16729 +       if (decoded == NULL) {
16730 +               RETURN_NULL();
16731 +       } else {
16732 +               RETURN_STRINGL(decoded, decoded_len, 0);
16733 +       }
16734 +}
16735 +/* }}} */
16736 +
16737 +/* {{{ proto array sqlite_fetch_array(resource result [, int result_type, bool decode_binary])
16738 +   Fetches the current row from a result set as an array */
16739 +PHP_FUNCTION(sqlite_current)
16740 +{
16741 +       zval *zres;
16742 +       int mode = PHPSQLITE_BOTH;
16743 +       zend_bool decode_binary = 1;
16744 +       struct php_sqlite_result *res;
16745 +
16746 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lb", &zres, &mode, &decode_binary)) {
16747 +               return;
16748 +       }
16749 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16750 +       if (ZEND_NUM_ARGS() < 2) {
16751 +               mode = res->mode;
16752 +       }
16753 +
16754 +       php_sqlite_fetch_array(res, mode, decode_binary, 0, return_value TSRMLS_CC);
16755 +}
16756 +/* }}} */
16757 +
16758 +/* {{{ proto mixed sqlite_column(resource result, mixed index_or_name [, bool decode_binary])
16759 +   Fetches a column from the current row of a result set */
16760 +PHP_FUNCTION(sqlite_column)
16761 +{
16762 +       zval *zres;
16763 +       zval *which;
16764 +       zend_bool decode_binary = 1;
16765 +       struct php_sqlite_result *res;
16766 +
16767 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|b", &zres, &which, &decode_binary)) {
16768 +               return;
16769 +       }
16770 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16771 +
16772 +       php_sqlite_fetch_column(res, which, decode_binary, return_value TSRMLS_CC);
16773 +}
16774 +/* }}} */
16775 +
16776 +/* {{{ proto string sqlite_libversion()
16777 +   Returns the version of the linked SQLite library */
16778 +PHP_FUNCTION(sqlite_libversion)
16779 +{
16780 +       if (ZEND_NUM_ARGS() != 0) {
16781 +               WRONG_PARAM_COUNT;
16782 +       }
16783 +       RETURN_STRING((char*)sqlite_libversion(), 1);
16784 +}
16785 +/* }}} */
16786 +
16787 +/* {{{ proto string sqlite_libencoding()
16788 +   Returns the encoding (iso8859 or UTF-8) of the linked SQLite library */
16789 +PHP_FUNCTION(sqlite_libencoding)
16790 +{
16791 +       if (ZEND_NUM_ARGS() != 0) {
16792 +               WRONG_PARAM_COUNT;
16793 +       }
16794 +       RETURN_STRING((char*)sqlite_libencoding(), 1);
16795 +}
16796 +/* }}} */
16797 +
16798 +/* {{{ proto int sqlite_changes(resource db)
16799 +   Returns the number of rows that were changed by the most recent SQL statement */
16800 +PHP_FUNCTION(sqlite_changes)
16801 +{
16802 +       zval *zdb;
16803 +       struct php_sqlite_db *db;
16804 +
16805 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
16806 +               return;
16807 +       }
16808 +
16809 +       DB_FROM_ZVAL(db, &zdb);
16810 +
16811 +       RETURN_LONG(sqlite_changes(db->db));
16812 +}
16813 +/* }}} */
16814 +
16815 +/* {{{ proto int sqlite_last_insert_rowid(resource db)
16816 +   Returns the rowid of the most recently inserted row */
16817 +PHP_FUNCTION(sqlite_last_insert_rowid)
16818 +{
16819 +       zval *zdb;
16820 +       struct php_sqlite_db *db;
16821 +
16822 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
16823 +               return;
16824 +       }
16825 +
16826 +       DB_FROM_ZVAL(db, &zdb);
16827 +
16828 +       RETURN_LONG(sqlite_last_insert_rowid(db->db));
16829 +}
16830 +/* }}} */
16831 +
16832 +/* {{{ proto int sqlite_num_rows(resource result)
16833 +   Returns the number of rows in a result set */
16834 +PHP_FUNCTION(sqlite_num_rows)
16835 +{
16836 +       zval *zres;
16837 +       struct php_sqlite_result *res;
16838 +
16839 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
16840 +               return;
16841 +       }
16842 +
16843 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16844 +
16845 +       if (res->buffered) {
16846 +               RETURN_LONG(res->nrows);
16847 +       } else {
16848 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Row count is not available for unbuffered queries");
16849 +               RETURN_FALSE;
16850 +       }
16851 +}
16852 +/* }}} */
16853 +
16854 +/* {{{ proto bool sqlite_has_more(resource result)
16855 +   Returns whether or not more rows are available */
16856 +PHP_FUNCTION(sqlite_has_more)
16857 +{
16858 +       zval *zres;
16859 +       struct php_sqlite_result *res;
16860 +
16861 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
16862 +               return;
16863 +       }
16864 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16865 +
16866 +       RETURN_BOOL(res->nrows && res->curr_row < res->nrows); /* curr_row may be -1 */
16867 +}
16868 +/* }}} */
16869 +
16870 +/* {{{ proto int sqlite_num_fields(resource result)
16871 +   Returns the number of fields in a result set */
16872 +PHP_FUNCTION(sqlite_num_fields)
16873 +{
16874 +       zval *zres;
16875 +       struct php_sqlite_result *res;
16876 +
16877 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
16878 +               return;
16879 +       }
16880 +
16881 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16882 +
16883 +       RETURN_LONG(res->ncolumns);
16884 +}
16885 +/* }}} */
16886 +
16887 +/* {{{ proto string sqlite_field_name(resource result, int field)
16888 +   Returns the name of a particular field */
16889 +PHP_FUNCTION(sqlite_field_name)
16890 +{
16891 +       zval *zres;
16892 +       struct php_sqlite_result *res;
16893 +       int field;
16894 +
16895 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zres, &field)) {
16896 +               return;
16897 +       }
16898 +
16899 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16900 +
16901 +       if (field < 0 || field >= res->ncolumns) {
16902 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "field %d out of range", field);
16903 +               RETURN_FALSE;
16904 +       }
16905 +
16906 +       RETURN_STRING(res->col_names[field], 1);
16907 +}
16908 +/* }}} */
16909 +
16910 +/* {{{ proto bool sqlite_seek(resource result, int row)
16911 +   Seek to a particular row number */
16912 +PHP_FUNCTION(sqlite_seek)
16913 +{
16914 +       zval *zres;
16915 +       struct php_sqlite_result *res;
16916 +       int row;
16917 +
16918 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zres, &row)) {
16919 +               return;
16920 +       }
16921 +
16922 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16923 +
16924 +       if (!res->buffered) {
16925 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot seek an unbuffered result set");
16926 +               RETURN_FALSE;
16927 +       }
16928 +
16929 +       if (row < 1 || row >= res->nrows) {
16930 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "row %d out of range", row);
16931 +               RETURN_FALSE;
16932 +       }
16933 +
16934 +       res->curr_row = row;
16935 +       RETURN_TRUE;
16936 +}
16937 +/* }}} */
16938 +
16939 +/* {{{ proto bool sqlite_rewind(resource result)
16940 +   Seek to first row number */
16941 +PHP_FUNCTION(sqlite_rewind)
16942 +{
16943 +       zval *zres;
16944 +       struct php_sqlite_result *res;
16945 +
16946 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
16947 +               return;
16948 +       }
16949 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16950 +
16951 +       if (!res->buffered) {
16952 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot seek an unbuffered result set");
16953 +               RETURN_FALSE;
16954 +       }
16955 +
16956 +       if (!res->nrows) {
16957 +               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "no rows received");
16958 +               RETURN_FALSE;
16959 +       }
16960 +
16961 +       res->curr_row = 0;
16962 +       RETURN_TRUE;
16963 +}
16964 +/* }}} */
16965 +
16966 +/* {{{ proto bool sqlite_next(resource result)
16967 +   Seek to next row number */
16968 +PHP_FUNCTION(sqlite_next)
16969 +{
16970 +       zval *zres;
16971 +       struct php_sqlite_result *res;
16972 +
16973 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
16974 +               return;
16975 +       }
16976 +       ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
16977 +
16978 +       if (!res->buffered && res->vm) {
16979 +               php_sqlite_fetch(res TSRMLS_CC);
16980 +       }
16981 +
16982 +       if (res->curr_row >= res->nrows) {
16983 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "no more rows available");
16984 +               RETURN_FALSE;
16985 +       }
16986 +
16987 +       res->curr_row++;
16988 +
16989 +       RETURN_TRUE;
16990 +}
16991 +/* }}} */
16992 +
16993 +/* {{{ proto string sqlite_escape_string(string item)
16994 +   Escapes a string for use as a query parameter */
16995 +PHP_FUNCTION(sqlite_escape_string)
16996 +{
16997 +       char *string = NULL;
16998 +       long stringlen;
16999 +       char *ret;
17000 +
17001 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &stringlen)) {
17002 +               return;
17003 +       }
17004 +
17005 +       if (stringlen && (string[0] == '\x01' || memchr(string, '\0', stringlen) != NULL)) {
17006 +               /* binary string */
17007 +               int enclen;
17008 +
17009 +               ret = emalloc( 1 + ((256 * stringlen + 1262) / 253) );
17010 +               ret[0] = '\x01';
17011 +               enclen = sqlite_encode_binary((const unsigned char*)string, stringlen, ret+1);
17012 +               RETVAL_STRINGL(ret, enclen+1, 0);
17013 +
17014 +       } else  {
17015 +               ret = sqlite_mprintf("%q", string);
17016 +               if (ret) {
17017 +                       RETVAL_STRING(ret, 1);
17018 +                       sqlite_freemem(ret);
17019 +               }
17020 +       }
17021 +}
17022 +/* }}} */
17023 +
17024 +/* {{{ proto int sqlite_last_error(resource db)
17025 +   Returns the error code of the last error for a database */
17026 +PHP_FUNCTION(sqlite_last_error)
17027 +{
17028 +       zval *zdb;
17029 +       struct php_sqlite_db *db;
17030 +
17031 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
17032 +               return;
17033 +       }
17034 +
17035 +       DB_FROM_ZVAL(db, &zdb);
17036 +
17037 +       RETURN_LONG(db->last_err_code);
17038 +}
17039 +/* }}} */
17040 +
17041 +/* {{{ proto string sqlite_error_string(int error_code)
17042 +   Returns the textual description of an error code */
17043 +PHP_FUNCTION(sqlite_error_string)
17044 +{
17045 +       long code;
17046 +       const char *msg;
17047 +
17048 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
17049 +               return;
17050 +       }
17051 +
17052 +       msg = sqlite_error_string(code);
17053 +
17054 +       if (msg) {
17055 +               RETURN_STRING((char*)msg, 1);
17056 +       } else {
17057 +               RETURN_NULL();
17058 +       }
17059 +}
17060 +/* }}} */
17061 +
17062 +/* manages duplicate registrations of a particular function, and
17063 + * also handles the case where the db is using a persistent connection */
17064 +enum callback_prep_t { DO_REG, SKIP_REG, ERR };
17065 +
17066 +static enum callback_prep_t prep_callback_struct(struct php_sqlite_db *db, int is_agg,
17067 +               char *funcname,
17068 +               zval *step, zval *fini, struct php_sqlite_agg_functions **funcs)
17069 +{
17070 +       struct php_sqlite_agg_functions *alloc_funcs, func_tmp;
17071 +       char *hashkey;
17072 +       int hashkeylen;
17073 +       enum callback_prep_t ret;
17074 +
17075 +       hashkeylen = spprintf(&hashkey, 0, "%s-%s", is_agg ? "agg" : "reg", funcname);
17076 +
17077 +       /* is it already registered ? */
17078 +       if (SUCCESS == zend_hash_find(&db->callbacks, hashkey, hashkeylen+1, (void*)&alloc_funcs)) {
17079 +               /* override the previous definition */
17080 +
17081 +               if (alloc_funcs->is_valid) {
17082 +                       /* release these */
17083 +
17084 +                       if (alloc_funcs->step) {
17085 +                               zval_ptr_dtor(&alloc_funcs->step);
17086 +                               alloc_funcs->step = NULL;
17087 +                       }
17088 +
17089 +                       if (alloc_funcs->fini) {
17090 +                               zval_ptr_dtor(&alloc_funcs->fini);
17091 +                               alloc_funcs->fini = NULL;
17092 +                       }
17093 +               }
17094 +
17095 +               ret = SKIP_REG;
17096 +       } else {
17097 +               /* add a new one */
17098 +               func_tmp.db = db;
17099 +
17100 +               ret = SUCCESS == zend_hash_update(&db->callbacks, hashkey, hashkeylen+1,
17101 +                               (void*)&func_tmp, sizeof(func_tmp), (void**)&alloc_funcs) ? DO_REG : ERR;
17102 +       }
17103 +
17104 +       efree(hashkey);
17105 +
17106 +       MAKE_STD_ZVAL(alloc_funcs->step);
17107 +       *(alloc_funcs->step)  = *step;
17108 +       zval_copy_ctor(alloc_funcs->step);
17109 +
17110 +       if (is_agg) {
17111 +               MAKE_STD_ZVAL(alloc_funcs->fini);
17112 +               *(alloc_funcs->fini) = *fini;
17113 +               zval_copy_ctor(alloc_funcs->fini);
17114 +       } else {
17115 +               alloc_funcs->fini = NULL;
17116 +       }
17117 +       alloc_funcs->is_valid = 1;
17118 +       *funcs = alloc_funcs;
17119 +
17120 +       return ret;
17121 +}
17122 +
17123 +
17124 +/* {{{ proto bool sqlite_create_aggregate(resource db, string funcname, mixed step_func, mixed finalize_func[, long num_args])
17125 +    Registers an aggregated function for queries*/
17126 +PHP_FUNCTION(sqlite_create_aggregate)
17127 +{
17128 +       char *funcname = NULL;
17129 +       long funcname_len;
17130 +       zval *zstep, *zfinal, *zdb;
17131 +       struct php_sqlite_db *db;
17132 +       struct php_sqlite_agg_functions *funcs;
17133 +       char *callable = NULL;
17134 +       long num_args = -1;
17135 +
17136 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rszz|l", &zdb, &funcname, &funcname_len, &zstep, &zfinal, &num_args)) {
17137 +               return;
17138 +       }
17139 +       DB_FROM_ZVAL(db, &zdb);
17140 +
17141 +       if (!zend_is_callable(zstep, 0, &callable)) {
17142 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "step function `%s' is not callable", callable);
17143 +               efree(callable);
17144 +               return;
17145 +       }
17146 +       efree(callable);
17147 +
17148 +       if (!zend_is_callable(zfinal, 0, &callable)) {
17149 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "finalize function `%s' is not callable", callable);
17150 +               efree(callable);
17151 +               return;
17152 +       }
17153 +       efree(callable);
17154 +
17155 +       if (prep_callback_struct(db, 1, funcname, zstep, zfinal, &funcs) == DO_REG) {
17156 +               sqlite_create_aggregate(db->db, funcname, num_args,
17157 +                               php_sqlite_agg_step_function_callback,
17158 +                               php_sqlite_agg_fini_function_callback, funcs);
17159 +       }
17160 +
17161 +
17162 +}
17163 +/* }}} */
17164 +
17165 +/* {{{ proto bool sqlite_create_function(resource db, string funcname, mixed callback[, long num_args])
17166 +    Registers a "regular" function for queries */
17167 +PHP_FUNCTION(sqlite_create_function)
17168 +{
17169 +       char *funcname = NULL;
17170 +       long funcname_len;
17171 +       zval *zcall, *zdb;
17172 +       struct php_sqlite_db *db;
17173 +       struct php_sqlite_agg_functions *funcs;
17174 +       char *callable = NULL;
17175 +       long num_args = -1;
17176 +
17177 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz|l", &zdb, &funcname, &funcname_len, &zcall, &num_args)) {
17178 +               return;
17179 +       }
17180 +       DB_FROM_ZVAL(db, &zdb);
17181 +
17182 +       if (!zend_is_callable(zcall, 0, &callable)) {
17183 +               php_error_docref(NULL TSRMLS_CC, E_WARNING, "function `%s' is not callable", callable);
17184 +               efree(callable);
17185 +               return;
17186 +       }
17187 +       efree(callable);
17188 +
17189 +       if (prep_callback_struct(db, 0, funcname, zcall, NULL, &funcs) == DO_REG) {
17190 +               sqlite_create_function(db->db, funcname, num_args, php_sqlite_function_callback, funcs);
17191 +       }
17192 +}
17193 +/* }}} */
17194 +
17195 +/* {{{ proto string sqlite_udf_encode_binary(string data)
17196 +   Apply binary encoding (if required) to a string to return from an UDF */
17197 +PHP_FUNCTION(sqlite_udf_encode_binary)
17198 +{
17199 +       char *data = NULL;
17200 +       long datalen;
17201 +
17202 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &data, &datalen)) {
17203 +               return;
17204 +       }
17205 +
17206 +       if (data == NULL) {
17207 +               RETURN_NULL();
17208 +       }
17209 +       if (datalen && (data[0] == '\x01' || memchr(data, '\0', datalen) != NULL)) {
17210 +               /* binary string */
17211 +               int enclen;
17212 +               char *ret;
17213 +
17214 +               ret = emalloc( 1 + ((256 * datalen + 1262) / 253) );
17215 +               ret[0] = '\x01';
17216 +               enclen = sqlite_encode_binary((const unsigned char*)data, datalen, ret+1);
17217 +               RETVAL_STRINGL(ret, enclen+1, 0);
17218 +       } else {
17219 +               RETVAL_STRINGL(data, datalen, 1);
17220 +       }
17221 +}
17222 +/* }}} */
17223 +
17224 +/* {{{ proto string sqlite_udf_decode_binary(string data)
17225 +   Decode binary encoding on a string parameter passed to an UDF */
17226 +PHP_FUNCTION(sqlite_udf_decode_binary)
17227 +{
17228 +       char *data = NULL;
17229 +       long datalen;
17230 +
17231 +       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &data, &datalen)) {
17232 +               return;
17233 +       }
17234 +
17235 +       if (data == NULL) {
17236 +               RETURN_NULL();
17237 +       }
17238 +       if (datalen && data[0] == '\x01') {
17239 +               /* encoded string */
17240 +               int enclen;
17241 +               char *ret;
17242 +
17243 +               ret = emalloc(datalen);
17244 +               enclen = sqlite_decode_binary((const unsigned char*)data+1, ret);
17245 +               ret[enclen] = '\0';
17246 +               RETVAL_STRINGL(ret, enclen, 0);
17247 +       } else {
17248 +               RETVAL_STRINGL(data, datalen, 1);
17249 +       }
17250 +}
17251 +/* }}} */
17252 +
17253 +
17254 +/*
17255 + * Local variables:
17256 + * tab-width: 4
17257 + * c-basic-offset: 4
17258 + * End:
17259 + * vim600: sw=4 ts=4 fdm=marker
17260 + * vim<600: sw=4 ts=4
17261 + */
17262 diff -ruN php-4.3.11-old/ext/sqlite/sqlite.dsp php-4.3.11-new/ext/sqlite/sqlite.dsp
17263 --- php-4.3.11-old/ext/sqlite/sqlite.dsp        1970-01-01 01:00:00.000000000 +0100
17264 +++ php-4.3.11-new/ext/sqlite/sqlite.dsp        2003-06-16 16:13:58.000000000 +0200
17265 @@ -0,0 +1,331 @@
17266 +# Microsoft Developer Studio Project File - Name="sqlite" - Package Owner=<4>
17267 +# Microsoft Developer Studio Generated Build File, Format Version 6.00
17268 +# ** DO NOT EDIT **
17269 +
17270 +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
17271 +
17272 +CFG=sqlite - Win32 Debug_TS
17273 +!MESSAGE This is not a valid makefile. To build this project using NMAKE,
17274 +!MESSAGE use the Export Makefile command and run
17275 +!MESSAGE
17276 +!MESSAGE NMAKE /f "sqlite.mak".
17277 +!MESSAGE
17278 +!MESSAGE You can specify a configuration when running NMAKE
17279 +!MESSAGE by defining the macro CFG on the command line. For example:
17280 +!MESSAGE
17281 +!MESSAGE NMAKE /f "sqlite.mak" CFG="sqlite - Win32 Debug_TS"
17282 +!MESSAGE
17283 +!MESSAGE Possible choices for configuration are:
17284 +!MESSAGE
17285 +!MESSAGE "sqlite - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
17286 +!MESSAGE "sqlite - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
17287 +!MESSAGE
17288 +
17289 +# Begin Project
17290 +# PROP AllowPerConfigDependencies 0
17291 +# PROP Scc_ProjName ""
17292 +# PROP Scc_LocalPath ""
17293 +CPP=cl.exe
17294 +MTL=midl.exe
17295 +RSC=rc.exe
17296 +
17297 +!IF  "$(CFG)" == "sqlite - Win32 Release_TS"
17298 +
17299 +# PROP BASE Use_MFC 0
17300 +# PROP BASE Use_Debug_Libraries 0
17301 +# PROP BASE Output_Dir "Release_TS"
17302 +# PROP BASE Intermediate_Dir "Release_TS"
17303 +# PROP BASE Ignore_Export_Lib 0
17304 +# PROP BASE Target_Dir ""
17305 +# PROP Use_MFC 0
17306 +# PROP Use_Debug_Libraries 0
17307 +# PROP Output_Dir "Release_TS"
17308 +# PROP Intermediate_Dir "Release_TS"
17309 +# PROP Ignore_Export_Lib 0
17310 +# PROP Target_Dir ""
17311 +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /c
17312 +# 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
17313 +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
17314 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
17315 +# ADD BASE RSC /l 0x407 /d "NDEBUG"
17316 +# ADD RSC /l 0x407 /d "NDEBUG"
17317 +BSC32=bscmake.exe
17318 +# ADD BASE BSC32 /nologo
17319 +# ADD BSC32 /nologo
17320 +LINK32=link.exe
17321 +# 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
17322 +# 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"
17323 +
17324 +!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"
17325 +
17326 +# PROP BASE Use_MFC 0
17327 +# PROP BASE Use_Debug_Libraries 1
17328 +# PROP BASE Output_Dir "Debug_TS"
17329 +# PROP BASE Intermediate_Dir "Debug_TS"
17330 +# PROP BASE Target_Dir ""
17331 +# PROP Use_MFC 0
17332 +# PROP Use_Debug_Libraries 1
17333 +# PROP Output_Dir "Debug_TS"
17334 +# PROP Intermediate_Dir "Debug_TS"
17335 +# PROP Ignore_Export_Lib 0
17336 +# PROP Target_Dir ""
17337 +# 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
17338 +# 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
17339 +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
17340 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
17341 +# ADD BASE RSC /l 0x407 /d "_DEBUG"
17342 +# ADD RSC /l 0x407 /d "_DEBUG"
17343 +BSC32=bscmake.exe
17344 +# ADD BASE BSC32 /nologo
17345 +# ADD BSC32 /nologo
17346 +LINK32=link.exe
17347 +# 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
17348 +# 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"
17349 +
17350 +!ENDIF
17351 +
17352 +# Begin Target
17353 +
17354 +# Name "sqlite - Win32 Release_TS"
17355 +# Name "sqlite - Win32 Debug_TS"
17356 +# Begin Group "Source Files"
17357 +
17358 +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
17359 +# Begin Group "libsqlite"
17360 +
17361 +# PROP Default_Filter ""
17362 +# Begin Source File
17363 +
17364 +SOURCE=.\libsqlite\src\attach.c
17365 +# End Source File
17366 +# Begin Source File
17367 +
17368 +SOURCE=.\libsqlite\src\auth.c
17369 +# End Source File
17370 +# Begin Source File
17371 +
17372 +SOURCE=.\libsqlite\src\btree.c
17373 +# End Source File
17374 +# Begin Source File
17375 +
17376 +SOURCE=.\libsqlite\src\btree.h
17377 +# End Source File
17378 +# Begin Source File
17379 +
17380 +SOURCE=.\libsqlite\src\btree_rb.c
17381 +# End Source File
17382 +# Begin Source File
17383 +
17384 +SOURCE=.\libsqlite\src\build.c
17385 +# End Source File
17386 +# Begin Source File
17387 +
17388 +SOURCE=.\libsqlite\src\config.h
17389 +# End Source File
17390 +# Begin Source File
17391 +
17392 +SOURCE=.\libsqlite\src\copy.c
17393 +# End Source File
17394 +# Begin Source File
17395 +
17396 +SOURCE=.\libsqlite\src\delete.c
17397 +# End Source File
17398 +# Begin Source File
17399 +
17400 +SOURCE=.\libsqlite\src\encode.c
17401 +# End Source File
17402 +# Begin Source File
17403 +
17404 +SOURCE=.\libsqlite\src\expr.c
17405 +# End Source File
17406 +# Begin Source File
17407 +
17408 +SOURCE=.\libsqlite\src\func.c
17409 +# End Source File
17410 +# Begin Source File
17411 +
17412 +SOURCE=.\libsqlite\src\hash.c
17413 +# End Source File
17414 +# Begin Source File
17415 +
17416 +SOURCE=.\libsqlite\src\hash.h
17417 +# End Source File
17418 +# Begin Source File
17419 +
17420 +SOURCE=.\libsqlite\src\insert.c
17421 +# End Source File
17422 +# Begin Source File
17423 +
17424 +SOURCE=.\libsqlite\src\main.c
17425 +# End Source File
17426 +# Begin Source File
17427 +
17428 +SOURCE=.\libsqlite\src\opcodes.c
17429 +# End Source File
17430 +# Begin Source File
17431 +
17432 +SOURCE=.\libsqlite\src\opcodes.h
17433 +# End Source File
17434 +# Begin Source File
17435 +
17436 +SOURCE=.\libsqlite\src\os.c
17437 +# End Source File
17438 +# Begin Source File
17439 +
17440 +SOURCE=.\libsqlite\src\os.h
17441 +# End Source File
17442 +# Begin Source File
17443 +
17444 +SOURCE=.\libsqlite\src\pager.c
17445 +# End Source File
17446 +# Begin Source File
17447 +
17448 +SOURCE=.\libsqlite\src\pager.h
17449 +# End Source File
17450 +# Begin Source File
17451 +
17452 +SOURCE=.\libsqlite\src\parse.c
17453 +# End Source File
17454 +# Begin Source File
17455 +
17456 +SOURCE=.\libsqlite\src\parse.h
17457 +# End Source File
17458 +# Begin Source File
17459 +
17460 +SOURCE=.\libsqlite\src\pragma.c
17461 +# End Source File
17462 +# Begin Source File
17463 +
17464 +SOURCE=.\libsqlite\src\printf.c
17465 +# End Source File
17466 +# Begin Source File
17467 +
17468 +SOURCE=.\libsqlite\src\random.c
17469 +# End Source File
17470 +# Begin Source File
17471 +
17472 +SOURCE=.\libsqlite\src\select.c
17473 +# End Source File
17474 +# Begin Source File
17475 +
17476 +SOURCE=.\libsqlite\src\sqlite.h
17477 +# End Source File
17478 +# Begin Source File
17479 +
17480 +SOURCE=.\libsqlite\src\sqlite.w32.h
17481 +
17482 +!IF  "$(CFG)" == "sqlite - Win32 Release_TS"
17483 +
17484 +# Begin Custom Build
17485 +InputDir=.\libsqlite\src
17486 +InputPath=.\libsqlite\src\sqlite.w32.h
17487 +
17488 +"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
17489 +       copy $(InputPath) $(InputDir)\sqlite.h
17490 +
17491 +# End Custom Build
17492 +
17493 +!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"
17494 +
17495 +# Begin Custom Build
17496 +InputDir=.\libsqlite\src
17497 +InputPath=.\libsqlite\src\sqlite.w32.h
17498 +
17499 +"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
17500 +       copy $(InputPath) $(InputDir)\sqlite.h
17501 +
17502 +# End Custom Build
17503 +
17504 +!ENDIF
17505 +
17506 +# End Source File
17507 +# Begin Source File
17508 +
17509 +SOURCE=.\libsqlite\src\sqlite_config.w32.h
17510 +
17511 +!IF  "$(CFG)" == "sqlite - Win32 Release_TS"
17512 +
17513 +# Begin Custom Build
17514 +InputDir=.\libsqlite\src
17515 +InputPath=.\libsqlite\src\sqlite_config.w32.h
17516 +
17517 +"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
17518 +       copy $(InputPath) $(InputDir)\config.h
17519 +
17520 +# End Custom Build
17521 +
17522 +!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"
17523 +
17524 +# Begin Custom Build
17525 +InputDir=.\libsqlite\src
17526 +InputPath=.\libsqlite\src\sqlite_config.w32.h
17527 +
17528 +"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
17529 +       copy $(InputPath) $(InputDir)\config.h
17530 +
17531 +# End Custom Build
17532 +
17533 +!ENDIF
17534 +
17535 +# End Source File
17536 +# Begin Source File
17537 +
17538 +SOURCE=.\libsqlite\src\sqliteInt.h
17539 +# End Source File
17540 +# Begin Source File
17541 +
17542 +SOURCE=.\libsqlite\src\table.c
17543 +# End Source File
17544 +# Begin Source File
17545 +
17546 +SOURCE=.\libsqlite\src\tokenize.c
17547 +# End Source File
17548 +# Begin Source File
17549 +
17550 +SOURCE=.\libsqlite\src\trigger.c
17551 +# End Source File
17552 +# Begin Source File
17553 +
17554 +SOURCE=.\libsqlite\src\update.c
17555 +# End Source File
17556 +# Begin Source File
17557 +
17558 +SOURCE=.\libsqlite\src\util.c
17559 +# End Source File
17560 +# Begin Source File
17561 +
17562 +SOURCE=.\libsqlite\src\vacuum.c
17563 +# End Source File
17564 +# Begin Source File
17565 +
17566 +SOURCE=.\libsqlite\src\vdbe.c
17567 +# End Source File
17568 +# Begin Source File
17569 +
17570 +SOURCE=.\libsqlite\src\vdbe.h
17571 +# End Source File
17572 +# Begin Source File
17573 +
17574 +SOURCE=.\libsqlite\src\where.c
17575 +# End Source File
17576 +# End Group
17577 +# Begin Source File
17578 +
17579 +SOURCE=.\php_sqlite.def
17580 +# End Source File
17581 +# Begin Source File
17582 +
17583 +SOURCE=.\sqlite.c
17584 +# ADD CPP /I "libsqlite\src"
17585 +# End Source File
17586 +# End Group
17587 +# Begin Group "Header Files"
17588 +
17589 +# PROP Default_Filter "h;hpp;hxx;hm;inl"
17590 +# Begin Source File
17591 +
17592 +SOURCE=.\php_sqlite.h
17593 +# End Source File
17594 +# End Group
17595 +# End Target
17596 +# End Project
17597 diff -ruN php-4.3.11-old/ext/sqlite/sqlite.php php-4.3.11-new/ext/sqlite/sqlite.php
17598 --- php-4.3.11-old/ext/sqlite/sqlite.php        1970-01-01 01:00:00.000000000 +0100
17599 +++ php-4.3.11-new/ext/sqlite/sqlite.php        2003-04-17 22:01:35.000000000 +0200
17600 @@ -0,0 +1,33 @@
17601 +<?php
17602 +if (!extension_loaded("sqlite")) {
17603 +       dl("sqlite.so");
17604 +}
17605 +
17606 +debug_zval_dump(sqlite_libversion());
17607 +debug_zval_dump(sqlite_libencoding());
17608 +
17609 +$s = sqlite_open("weztest.sqlite", 0666, $err);
17610 +
17611 +debug_zval_dump($err);
17612 +debug_zval_dump($s);
17613 +
17614 +$r = sqlite_query("create table foo (a INTEGER PRIMARY KEY, b INTEGER )", $s);
17615 +debug_zval_dump(sqlite_last_error($s));
17616 +debug_zval_dump(sqlite_error_string(sqlite_last_error($s)));
17617 +
17618 +$r = sqlite_query("select *, php('md5', sql) as o from sqlite_master", $s);
17619 +debug_zval_dump($r);
17620 +debug_zval_dump(sqlite_num_rows($r));
17621 +debug_zval_dump(sqlite_num_fields($r));
17622 +
17623 +for ($j = 0; $j < sqlite_num_fields($r); $j++) {
17624 +       echo "Field $j is " . sqlite_field_name($r, $j) . "\n";
17625 +}
17626 +
17627 +while ($row = sqlite_fetch_array($r, SQLITE_ASSOC)) {
17628 +       print_r($row);
17629 +}
17630 +
17631 +sqlite_close($s);
17632 +
17633 +?>
17634 diff -ruN php-4.3.11-old/generated_lists php-4.3.11-new/generated_lists
17635 --- php-4.3.11-old/generated_lists      2005-03-30 16:35:19.000000000 +0200
17636 +++ php-4.3.11-new/generated_lists      2005-07-04 17:29:27.000000000 +0200
17637 @@ -1,3 +1,3 @@
17638  makefile_am_files = Zend/Makefile.am TSRM/Makefile.am
17639  config_h_files = Zend/acconfig.h TSRM/acconfig.h
17640 -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
17641 +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
17642 diff -ruN php-4.3.11-old/main/php_config.h.in php-4.3.11-new/main/php_config.h.in
17643 --- php-4.3.11-old/main/php_config.h.in 2005-03-30 16:35:47.000000000 +0200
17644 +++ php-4.3.11-new/main/php_config.h.in 2005-07-04 17:29:44.000000000 +0200
17645 @@ -1,4 +1,4 @@
17646 -/* main/php_config.h.in.  Generated automatically from configure.in by autoheader.  */
17647 +/* main/php_config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
17648  /* Leave this file alone */
17649  #define ZEND_API
17650  #define ZEND_DLEXPORT
17651 @@ -101,6 +101,9 @@
17652  /* The number of bytes in a char.  */
17653  #undef SIZEOF_CHAR
17654
17655 +/* The number of bytes in a char *.  */
17656 +#undef SIZEOF_CHAR_P
17657 +
17658  /* The number of bytes in a int.  */
17659  #undef SIZEOF_INT
17660
17661 @@ -353,6 +356,9 @@
17662  /* Define if you have the mmap function.  */
17663  #undef HAVE_MMAP
17664
17665 +/* Define if you have the nanosleep function.  */
17666 +#undef HAVE_NANOSLEEP
17667 +
17668  /* Define if you have the nl_langinfo function.  */
17669  #undef HAVE_NL_LANGINFO
17670
17671 @@ -803,6 +809,9 @@
17672  /* Define if you have the <termios.h> header file.  */
17673  #undef HAVE_TERMIOS_H
17674
17675 +/* Define if you have the <time.h> header file.  */
17676 +#undef HAVE_TIME_H
17677 +
17678  /* Define if you have the <tuxmodule.h> header file.  */
17679  #undef HAVE_TUXMODULE_H
17680
17681 @@ -2302,6 +2311,24 @@
17682  #undef COMPILE_DL_SOCKETS
17683
17684  /*   */
17685 +#undef HAVE_SQLITELIB
17686 +
17687 +/* Whether to build sqlite as dynamic module */
17688 +#undef COMPILE_DL_SQLITE
17689 +
17690 +/* Whether to build sqlite as dynamic module */
17691 +#undef COMPILE_DL_SQLITE
17692 +
17693 +/* Size of a pointer */
17694 +#undef SQLITE_PTR_SZ
17695 +
17696 +/* if this is unix */
17697 +#undef OS_UNIX
17698 +
17699 +/* if this is windows */
17700 +#undef OS_WIN
17701 +
17702 +/*   */
17703  #undef HAVE_CRYPT
17704
17705  /* Whether the system supports standard DES salt */