lang/php5/patches/900-prevent_buildconf_force.patch

   1 --- a/configure
   2 +++ b/configure
   3 @@ -847,6 +847,30 @@ ac_help="$ac_help
   4  ac_help="$ac_help
   5    --with-zlib-dir=<DIR>   Define the location of zlib install directory"
   6  ac_help="$ac_help
   7 +  --enable-apc           Enable APC support"
   8 +ac_help="$ac_help
   9 +  --enable-apc-debug     Enable APC debugging"
  10 +ac_help="$ac_help
  11 +  --enable-apc-filehits   Enable per request file info about files used from the APC cache (ie: apc_cache_info('filehits')) "
  12 +ac_help="$ac_help
  13 +  --disable-apc-mmap
  14 +                          Disable mmap support and use IPC shm instead"
  15 +ac_help="$ac_help
  16 +  --enable-apc-sem
  17 +                          Enable semaphore locks instead of fcntl"
  18 +ac_help="$ac_help
  19 +  --disable-apc-pthreadmutex
  20 +                          Disable pthread mutex locking "
  21 +ac_help="$ac_help
  22 +  --enable-apc-spinlocks
  23 +                          Enable spin locks  EXPERIMENTAL "
  24 +ac_help="$ac_help
  25 +  --enable-apc-memprotect
  26 +                          Enable mmap/shm memory protection"
  27 +ac_help="$ac_help
  28 +  --disable-valgrind-checks
  29 +                          Disable valgrind based memory checks"
  30 +ac_help="$ac_help
  31    --enable-bcmath         Enable bc style precision math functions"
  32  ac_help="$ac_help
  33    --with-bz2[=DIR]        Include BZip2 support"
  34 @@ -884,6 +908,8 @@ ac_help="$ac_help
  35  ac_help="$ac_help
  36    --disable-flatfile        DBA: FlatFile support (bundled)"
  37  ac_help="$ac_help
  38 +  --enable-dio            Enable direct I/O support"
  39 +ac_help="$ac_help
  40    --disable-dom           Disable DOM support"
  41  ac_help="$ac_help
  42    --with-libxml-dir[=DIR]   DOM: libxml2 install prefix"
  43 @@ -951,6 +977,8 @@ ac_help="$ac_help
  44  ac_help="$ac_help
  45    --with-ldap-sasl[=DIR]    LDAP: Include Cyrus SASL support"
  46  ac_help="$ac_help
  47 +  --with-libevent             Include libevent support"
  48 +ac_help="$ac_help
  49    --enable-mbstring       Enable multibyte string support"
  50  ac_help="$ac_help
  51    --disable-mbregex         MBSTRING: Disable multibyte regex support"
  52 @@ -1165,6 +1193,24 @@ ac_help="$ac_help
  53  ac_help="$ac_help
  54    --with-pcre-dir           ZIP: pcre install prefix"
  55  ac_help="$ac_help
  56 +  --enable-http           Enable extended HTTP support"
  57 +ac_help="$ac_help
  58 +  --with-http-shared-deps
  59 +                           HTTP: disable to not depend on extensions like hash,
  60 +                                 iconv and session (when built shared)"
  61 +ac_help="$ac_help
  62 +  --with-http-curl-requests[=LIBCURLDIR]
  63 +                           HTTP: with cURL request support"
  64 +ac_help="$ac_help
  65 +  --with-http-curl-libevent[=LIBEVENTDIR]
  66 +                           HTTP: libevent install directory"
  67 +ac_help="$ac_help
  68 +  --with-http-zlib-compression[=LIBZDIR]
  69 +                           HTTP: with zlib encodings support"
  70 +ac_help="$ac_help
  71 +  --with-http-magic-mime[=LIBMAGICDIR]
  72 +                           HTTP: with magic mime response content type guessing"
  73 +ac_help="$ac_help
  74    --disable-mysqlnd-compression-support
  75                              Enable support for the MySQL compressed protocol in mysqlnd"
  76  ac_help="$ac_help
  77 @@ -1888,12 +1934,12 @@ fi
  78
  79
  80  echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
  81 -echo "configure:1892: checking for Cygwin environment" >&5
  82 +echo "configure:1938: checking for Cygwin environment" >&5
  83  if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
  84    echo $ac_n "(cached) $ac_c" 1>&6
  85  else
  86    cat > conftest.$ac_ext <<EOF
  87 -#line 1897 "configure"
  88 +#line 1943 "configure"
  89  #include "confdefs.h"
  90
  91  int main() {
  92 @@ -1904,7 +1950,7 @@ int main() {
  93  return __CYGWIN__;
  94  ; return 0; }
  95  EOF
  96 -if { (eval echo configure:1908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  97 +if { (eval echo configure:1954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  98    rm -rf conftest*
  99    ac_cv_cygwin=yes
 100  else
 101 @@ -1921,19 +1967,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 102  CYGWIN=
 103  test "$ac_cv_cygwin" = yes && CYGWIN=yes
 104  echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
 105 -echo "configure:1925: checking for mingw32 environment" >&5
 106 +echo "configure:1971: checking for mingw32 environment" >&5
 107  if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
 108    echo $ac_n "(cached) $ac_c" 1>&6
 109  else
 110    cat > conftest.$ac_ext <<EOF
 111 -#line 1930 "configure"
 112 +#line 1976 "configure"
 113  #include "confdefs.h"
 114
 115  int main() {
 116  return __MINGW32__;
 117  ; return 0; }
 118  EOF
 119 -if { (eval echo configure:1937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 120 +if { (eval echo configure:1983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 121    rm -rf conftest*
 122    ac_cv_mingw32=yes
 123  else
 124 @@ -1952,7 +1998,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y
 125
 126
 127  echo $ac_n "checking for egrep""... $ac_c" 1>&6
 128 -echo "configure:1956: checking for egrep" >&5
 129 +echo "configure:2002: checking for egrep" >&5
 130  if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then
 131    echo $ac_n "(cached) $ac_c" 1>&6
 132  else
 133 @@ -1967,7 +2013,7 @@ echo "$ac_t""$ac_cv_prog_egrep" 1>&6
 134
 135
 136  echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
 137 -echo "configure:1971: checking for a sed that does not truncate output" >&5
 138 +echo "configure:2017: checking for a sed that does not truncate output" >&5
 139  if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
 140    echo $ac_n "(cached) $ac_c" 1>&6
 141  else
 142 @@ -2117,7 +2163,7 @@ else { echo "configure: error: can not r
 143  fi
 144
 145  echo $ac_n "checking host system type""... $ac_c" 1>&6
 146 -echo "configure:2121: checking host system type" >&5
 147 +echo "configure:2167: checking host system type" >&5
 148
 149  host_alias=$host
 150  case "$host_alias" in
 151 @@ -2138,7 +2184,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
 152  echo "$ac_t""$host" 1>&6
 153
 154  echo $ac_n "checking target system type""... $ac_c" 1>&6
 155 -echo "configure:2142: checking target system type" >&5
 156 +echo "configure:2188: checking target system type" >&5
 157
 158  target_alias=$target
 159  case "$target_alias" in
 160 @@ -2250,7 +2296,7 @@ rm -f libs/*
 161  # Extract the first word of "gcc", so it can be a program name with args.
 162  set dummy gcc; ac_word=$2
 163  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 164 -echo "configure:2254: checking for $ac_word" >&5
 165 +echo "configure:2300: checking for $ac_word" >&5
 166  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 167    echo $ac_n "(cached) $ac_c" 1>&6
 168  else
 169 @@ -2280,7 +2326,7 @@ if test -z "$CC"; then
 170    # Extract the first word of "cc", so it can be a program name with args.
 171  set dummy cc; ac_word=$2
 172  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 173 -echo "configure:2284: checking for $ac_word" >&5
 174 +echo "configure:2330: checking for $ac_word" >&5
 175  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 176    echo $ac_n "(cached) $ac_c" 1>&6
 177  else
 178 @@ -2331,7 +2377,7 @@ fi
 179        # Extract the first word of "cl", so it can be a program name with args.
 180  set dummy cl; ac_word=$2
 181  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 182 -echo "configure:2335: checking for $ac_word" >&5
 183 +echo "configure:2381: checking for $ac_word" >&5
 184  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 185    echo $ac_n "(cached) $ac_c" 1>&6
 186  else
 187 @@ -2363,7 +2409,7 @@ fi
 188  fi
 189
 190  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 191 -echo "configure:2367: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 192 +echo "configure:2413: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 193
 194  ac_ext=c
 195  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 196 @@ -2374,12 +2420,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 197
 198  cat > conftest.$ac_ext << EOF
 199
 200 -#line 2378 "configure"
 201 +#line 2424 "configure"
 202  #include "confdefs.h"
 203
 204  main(){return(0);}
 205  EOF
 206 -if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 207 +if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 208    ac_cv_prog_cc_works=yes
 209    # If we can't run a trivial program, we are probably using a cross compiler.
 210    if (./conftest; exit) 2>/dev/null; then
 211 @@ -2405,12 +2451,12 @@ if test $ac_cv_prog_cc_works = no; then
 212    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 213  fi
 214  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
 215 -echo "configure:2409: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 216 +echo "configure:2455: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 217  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 218  cross_compiling=$ac_cv_prog_cc_cross
 219
 220  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
 221 -echo "configure:2414: checking whether we are using GNU C" >&5
 222 +echo "configure:2460: checking whether we are using GNU C" >&5
 223  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
 224    echo $ac_n "(cached) $ac_c" 1>&6
 225  else
 226 @@ -2419,7 +2465,7 @@ else
 227    yes;
 228  #endif
 229  EOF
 230 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 231 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 232    ac_cv_prog_gcc=yes
 233  else
 234    ac_cv_prog_gcc=no
 235 @@ -2438,7 +2484,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 236  ac_save_CFLAGS="$CFLAGS"
 237  CFLAGS=
 238  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 239 -echo "configure:2442: checking whether ${CC-cc} accepts -g" >&5
 240 +echo "configure:2488: checking whether ${CC-cc} accepts -g" >&5
 241  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
 242    echo $ac_n "(cached) $ac_c" 1>&6
 243  else
 244 @@ -2470,7 +2516,7 @@ else
 245  fi
 246
 247  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 248 -echo "configure:2474: checking how to run the C preprocessor" >&5
 249 +echo "configure:2520: checking how to run the C preprocessor" >&5
 250  # On Suns, sometimes $CPP names a directory.
 251  if test -n "$CPP" && test -d "$CPP"; then
 252    CPP=
 253 @@ -2485,13 +2531,13 @@ else
 254    # On the NeXT, cc -E runs the code through the compiler's parser,
 255    # not just through cpp.
 256    cat > conftest.$ac_ext <<EOF
 257 -#line 2489 "configure"
 258 +#line 2535 "configure"
 259  #include "confdefs.h"
 260  #include <assert.h>
 261  Syntax Error
 262  EOF
 263  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 264 -{ (eval echo configure:2495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 265 +{ (eval echo configure:2541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 266  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 267  if test -z "$ac_err"; then
 268    :
 269 @@ -2502,13 +2548,13 @@ else
 270    rm -rf conftest*
 271    CPP="${CC-cc} -E -traditional-cpp"
 272    cat > conftest.$ac_ext <<EOF
 273 -#line 2506 "configure"
 274 +#line 2552 "configure"
 275  #include "confdefs.h"
 276  #include <assert.h>
 277  Syntax Error
 278  EOF
 279  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 280 -{ (eval echo configure:2512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 281 +{ (eval echo configure:2558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 282  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 283  if test -z "$ac_err"; then
 284    :
 285 @@ -2519,13 +2565,13 @@ else
 286    rm -rf conftest*
 287    CPP="${CC-cc} -nologo -E"
 288    cat > conftest.$ac_ext <<EOF
 289 -#line 2523 "configure"
 290 +#line 2569 "configure"
 291  #include "confdefs.h"
 292  #include <assert.h>
 293  Syntax Error
 294  EOF
 295  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 296 -{ (eval echo configure:2529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 297 +{ (eval echo configure:2575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 298  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 299  if test -z "$ac_err"; then
 300    :
 301 @@ -2552,9 +2598,9 @@ echo "$ac_t""$CPP" 1>&6
 302
 303    ICC="no"
 304    echo $ac_n "checking for icc""... $ac_c" 1>&6
 305 -echo "configure:2556: checking for icc" >&5
 306 +echo "configure:2602: checking for icc" >&5
 307    cat > conftest.$ac_ext <<EOF
 308 -#line 2558 "configure"
 309 +#line 2604 "configure"
 310  #include "confdefs.h"
 311  __INTEL_COMPILER
 312  EOF
 313 @@ -2576,9 +2622,9 @@ rm -f conftest*
 314
 315    SUNCC="no"
 316    echo $ac_n "checking for suncc""... $ac_c" 1>&6
 317 -echo "configure:2580: checking for suncc" >&5
 318 +echo "configure:2626: checking for suncc" >&5
 319    cat > conftest.$ac_ext <<EOF
 320 -#line 2582 "configure"
 321 +#line 2628 "configure"
 322  #include "confdefs.h"
 323  __SUNPRO_C
 324  EOF
 325 @@ -2601,10 +2647,10 @@ rm -f conftest*
 326
 327  if test "x$CC" != xcc; then
 328    echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
 329 -echo "configure:2605: checking whether $CC and cc understand -c and -o together" >&5
 330 +echo "configure:2651: checking whether $CC and cc understand -c and -o together" >&5
 331  else
 332    echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
 333 -echo "configure:2608: checking whether cc understands -c and -o together" >&5
 334 +echo "configure:2654: checking whether cc understands -c and -o together" >&5
 335  fi
 336  set dummy $CC; ac_cc="`echo $2 |
 337                        sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
 338 @@ -2616,16 +2662,16 @@ else
 339  # We do the test twice because some compilers refuse to overwrite an
 340  # existing .o file with -o, though they will create one.
 341  ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
 342 -if { (eval echo configure:2620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 343 -   test -f conftest.o && { (eval echo configure:2621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 344 +if { (eval echo configure:2666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 345 +   test -f conftest.o && { (eval echo configure:2667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 346  then
 347    eval ac_cv_prog_cc_${ac_cc}_c_o=yes
 348    if test "x$CC" != xcc; then
 349      # Test first that cc exists at all.
 350 -    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
 351 +    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
 352        ac_try='cc -c conftest.c -o conftest.o 1>&5'
 353 -      if { (eval echo configure:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 354 -        test -f conftest.o && { (eval echo configure:2629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 355 +      if { (eval echo configure:2674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 356 +        test -f conftest.o && { (eval echo configure:2675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 357        then
 358          # cc works too.
 359          :
 360 @@ -2652,7 +2698,7 @@ EOF
 361  fi
 362
 363  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 364 -echo "configure:2656: checking how to run the C preprocessor" >&5
 365 +echo "configure:2702: checking how to run the C preprocessor" >&5
 366  # On Suns, sometimes $CPP names a directory.
 367  if test -n "$CPP" && test -d "$CPP"; then
 368    CPP=
 369 @@ -2667,13 +2713,13 @@ else
 370    # On the NeXT, cc -E runs the code through the compiler's parser,
 371    # not just through cpp.
 372    cat > conftest.$ac_ext <<EOF
 373 -#line 2671 "configure"
 374 +#line 2717 "configure"
 375  #include "confdefs.h"
 376  #include <assert.h>
 377  Syntax Error
 378  EOF
 379  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 380 -{ (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 381 +{ (eval echo configure:2723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 382  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 383  if test -z "$ac_err"; then
 384    :
 385 @@ -2684,13 +2730,13 @@ else
 386    rm -rf conftest*
 387    CPP="${CC-cc} -E -traditional-cpp"
 388    cat > conftest.$ac_ext <<EOF
 389 -#line 2688 "configure"
 390 +#line 2734 "configure"
 391  #include "confdefs.h"
 392  #include <assert.h>
 393  Syntax Error
 394  EOF
 395  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 396 -{ (eval echo configure:2694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 397 +{ (eval echo configure:2740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 398  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 399  if test -z "$ac_err"; then
 400    :
 401 @@ -2701,13 +2747,13 @@ else
 402    rm -rf conftest*
 403    CPP="${CC-cc} -nologo -E"
 404    cat > conftest.$ac_ext <<EOF
 405 -#line 2705 "configure"
 406 +#line 2751 "configure"
 407  #include "confdefs.h"
 408  #include <assert.h>
 409  Syntax Error
 410  EOF
 411  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 412 -{ (eval echo configure:2711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 413 +{ (eval echo configure:2757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 414  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 415  if test -z "$ac_err"; then
 416    :
 417 @@ -2732,9 +2778,9 @@ fi
 418  echo "$ac_t""$CPP" 1>&6
 419
 420  echo $ac_n "checking for AIX""... $ac_c" 1>&6
 421 -echo "configure:2736: checking for AIX" >&5
 422 +echo "configure:2782: checking for AIX" >&5
 423  cat > conftest.$ac_ext <<EOF
 424 -#line 2738 "configure"
 425 +#line 2784 "configure"
 426  #include "confdefs.h"
 427  #ifdef _AIX
 428    yes
 429 @@ -2756,7 +2802,7 @@ rm -f conftest*
 430
 431
 432  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
 433 -echo "configure:2760: checking whether ln -s works" >&5
 434 +echo "configure:2806: checking whether ln -s works" >&5
 435  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
 436    echo $ac_n "(cached) $ac_c" 1>&6
 437  else
 438 @@ -2781,7 +2827,7 @@ fi
 439  php_with_libdir=lib
 440
 441  echo $ac_n "checking for system library directory""... $ac_c" 1>&6
 442 -echo "configure:2785: checking for system library directory" >&5
 443 +echo "configure:2831: checking for system library directory" >&5
 444  # Check whether --with-libdir or --without-libdir was given.
 445  if test "${with_libdir+set}" = set; then
 446    withval="$with_libdir"
 447 @@ -2804,7 +2850,7 @@ echo "$ac_t""$ext_output" 1>&6
 448  php_enable_rpath=yes
 449
 450  echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6
 451 -echo "configure:2808: checking whether to enable runpaths" >&5
 452 +echo "configure:2854: checking whether to enable runpaths" >&5
 453  # Check whether --enable-rpath or --disable-rpath was given.
 454  if test "${enable_rpath+set}" = set; then
 455    enableval="$enable_rpath"
 456 @@ -2825,7 +2871,7 @@ echo "$ac_t""$ext_output" 1>&6
 457
 458
 459  echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6
 460 -echo "configure:2829: checking if compiler supports -R" >&5
 461 +echo "configure:2875: checking if compiler supports -R" >&5
 462  if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then
 463    echo $ac_n "(cached) $ac_c" 1>&6
 464  else
 465 @@ -2833,14 +2879,14 @@ else
 466    SAVE_LIBS=$LIBS
 467    LIBS="-R /usr/$PHP_LIBDIR $LIBS"
 468    cat > conftest.$ac_ext <<EOF
 469 -#line 2837 "configure"
 470 +#line 2883 "configure"
 471  #include "confdefs.h"
 472
 473  int main() {
 474
 475  ; return 0; }
 476  EOF
 477 -if { (eval echo configure:2844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 478 +if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 479    rm -rf conftest*
 480    php_cv_cc_dashr=yes
 481  else
 482 @@ -2858,7 +2904,7 @@ if test $php_cv_cc_dashr = "yes"; then
 483    ld_runpath_switch=-R
 484  else
 485    echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
 486 -echo "configure:2862: checking if compiler supports -Wl,-rpath," >&5
 487 +echo "configure:2908: checking if compiler supports -Wl,-rpath," >&5
 488    if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then
 489    echo $ac_n "(cached) $ac_c" 1>&6
 490  else
 491 @@ -2866,14 +2912,14 @@ else
 492      SAVE_LIBS=$LIBS
 493      LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
 494      cat > conftest.$ac_ext <<EOF
 495 -#line 2870 "configure"
 496 +#line 2916 "configure"
 497  #include "confdefs.h"
 498
 499  int main() {
 500
 501  ; return 0; }
 502  EOF
 503 -if { (eval echo configure:2877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 504 +if { (eval echo configure:2923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 505    rm -rf conftest*
 506    php_cv_cc_rpath=yes
 507  else
 508 @@ -2904,7 +2950,7 @@ do
 509  # Extract the first word of "$ac_prog", so it can be a program name with args.
 510  set dummy $ac_prog; ac_word=$2
 511  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 512 -echo "configure:2908: checking for $ac_word" >&5
 513 +echo "configure:2954: checking for $ac_word" >&5
 514  if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
 515    echo $ac_n "(cached) $ac_c" 1>&6
 516  else
 517 @@ -2945,7 +2991,7 @@ test -n "$AWK" || AWK="bork"
 518        ;;
 519      *)
 520        echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6
 521 -echo "configure:2949: checking if $AWK is broken" >&5
 522 +echo "configure:2995: checking if $AWK is broken" >&5
 523        if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then
 524          echo "$ac_t""yes" 1>&6
 525          { echo "configure: error: You should install GNU awk" 1>&2; exit 1; }
 526 @@ -2964,7 +3010,7 @@ do
 527  # Extract the first word of "$ac_prog", so it can be a program name with args.
 528  set dummy $ac_prog; ac_word=$2
 529  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 530 -echo "configure:2968: checking for $ac_word" >&5
 531 +echo "configure:3014: checking for $ac_word" >&5
 532  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
 533    echo $ac_n "(cached) $ac_c" 1>&6
 534  else
 535 @@ -3004,7 +3050,7 @@ test -n "$YACC" || YACC="yacc"
 536    bison_version=none
 537    if test "$YACC"; then
 538      echo $ac_n "checking for bison version""... $ac_c" 1>&6
 539 -echo "configure:3008: checking for bison version" >&5
 540 +echo "configure:3054: checking for bison version" >&5
 541  if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then
 542    echo $ac_n "(cached) $ac_c" 1>&6
 543  else
 544 @@ -3042,7 +3088,7 @@ echo "$ac_t""$php_cv_bison_version" 1>&6
 545    # Extract the first word of "re2c", so it can be a program name with args.
 546  set dummy re2c; ac_word=$2
 547  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 548 -echo "configure:3046: checking for $ac_word" >&5
 549 +echo "configure:3092: checking for $ac_word" >&5
 550  if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then
 551    echo $ac_n "(cached) $ac_c" 1>&6
 552  else
 553 @@ -3070,7 +3116,7 @@ fi
 554
 555    if test -n "$RE2C"; then
 556      echo $ac_n "checking for re2c version""... $ac_c" 1>&6
 557 -echo "configure:3074: checking for re2c version" >&5
 558 +echo "configure:3120: checking for re2c version" >&5
 559  if eval "test \"`echo '$''{'php_cv_re2c_version'+set}'`\" = set"; then
 560    echo $ac_n "(cached) $ac_c" 1>&6
 561  else
 562 @@ -3109,7 +3155,7 @@ esac
 563  php_enable_re2c_cgoto=no
 564
 565  echo $ac_n "checking whether to enable computed goto gcc extension with re2c""... $ac_c" 1>&6
 566 -echo "configure:3113: checking whether to enable computed goto gcc extension with re2c" >&5
 567 +echo "configure:3159: checking whether to enable computed goto gcc extension with re2c" >&5
 568  # Check whether --enable-re2c-cgoto or --disable-re2c-cgoto was given.
 569  if test "${enable_re2c_cgoto+set}" = set; then
 570    enableval="$enable_re2c_cgoto"
 571 @@ -3132,9 +3178,9 @@ if test "$PHP_RE2C_CGOTO" = "no"; then
 572    RE2C_FLAGS=""
 573  else
 574    echo $ac_n "checking whether re2c -g works""... $ac_c" 1>&6
 575 -echo "configure:3136: checking whether re2c -g works" >&5
 576 +echo "configure:3182: checking whether re2c -g works" >&5
 577    cat > conftest.$ac_ext <<EOF
 578 -#line 3138 "configure"
 579 +#line 3184 "configure"
 580  #include "confdefs.h"
 581
 582  int main() {
 583 @@ -3152,7 +3198,7 @@ label2:
 584
 585  ; return 0; }
 586  EOF
 587 -if { (eval echo configure:3156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 588 +if { (eval echo configure:3202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 589    rm -rf conftest*
 590
 591      RE2C_FLAGS=""
 592 @@ -3218,7 +3264,7 @@ case $host_alias in
 593
 594    gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp
 595    echo $ac_n "checking whether $CC supports -no-cpp-precomp""... $ac_c" 1>&6
 596 -echo "configure:3222: checking whether $CC supports -no-cpp-precomp" >&5
 597 +echo "configure:3268: checking whether $CC supports -no-cpp-precomp" >&5
 598  if eval "test \"`echo '$''{'ac_cv_gcc_arg_no_cpp_precomp'+set}'`\" = set"; then
 599    echo $ac_n "(cached) $ac_c" 1>&6
 600  else
 601 @@ -3419,7 +3465,7 @@ esac
 602  # Disable PIC mode by default where it is known to be safe to do so,
 603  # to avoid the performance hit from the lost register
 604  echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6
 605 -echo "configure:3423: checking whether to force non-PIC code in shared modules" >&5
 606 +echo "configure:3469: checking whether to force non-PIC code in shared modules" >&5
 607  case $host_alias in
 608    i?86-*-linux*|i?86-*-freebsd*)
 609      if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
 610 @@ -3449,7 +3495,7 @@ esac
 611
 612
 613  echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6
 614 -echo "configure:3453: checking whether /dev/urandom exists" >&5
 615 +echo "configure:3499: checking whether /dev/urandom exists" >&5
 616  if test -r "/dev/urandom" && test -c "/dev/urandom"; then
 617    cat >> confdefs.h <<\EOF
 618  #define HAVE_DEV_URANDOM 1
 619 @@ -3510,7 +3556,7 @@ if test "$cross_compiling" = yes; then
 620
 621  else
 622    cat > conftest.$ac_ext <<EOF
 623 -#line 3514 "configure"
 624 +#line 3560 "configure"
 625  #include "confdefs.h"
 626
 627  #include <pthread.h>
 628 @@ -3528,7 +3574,7 @@ int main() {
 629      return pthread_create(&thd, NULL, thread_routine, &data);
 630  }
 631  EOF
 632 -if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 633 +if { (eval echo configure:3578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 634  then
 635
 636    pthreads_working=yes
 637 @@ -3548,7 +3594,7 @@ fi
 638    CFLAGS=$save_CFLAGS
 639
 640    echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
 641 -echo "configure:3552: checking for pthreads_cflags" >&5
 642 +echo "configure:3598: checking for pthreads_cflags" >&5
 643  if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
 644    echo $ac_n "(cached) $ac_c" 1>&6
 645  else
 646 @@ -3570,7 +3616,7 @@ if test "$cross_compiling" = yes; then
 647
 648  else
 649    cat > conftest.$ac_ext <<EOF
 650 -#line 3574 "configure"
 651 +#line 3620 "configure"
 652  #include "confdefs.h"
 653
 654  #include <pthread.h>
 655 @@ -3588,7 +3634,7 @@ int main() {
 656      return pthread_create(&thd, NULL, thread_routine, &data);
 657  }
 658  EOF
 659 -if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 660 +if { (eval echo configure:3638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 661  then
 662
 663    pthreads_working=yes
 664 @@ -3618,7 +3664,7 @@ fi
 665  echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
 666
 667  echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
 668 -echo "configure:3622: checking for pthreads_lib" >&5
 669 +echo "configure:3668: checking for pthreads_lib" >&5
 670  if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
 671    echo $ac_n "(cached) $ac_c" 1>&6
 672  else
 673 @@ -3640,7 +3686,7 @@ if test "$cross_compiling" = yes; then
 674
 675  else
 676    cat > conftest.$ac_ext <<EOF
 677 -#line 3644 "configure"
 678 +#line 3690 "configure"
 679  #include "confdefs.h"
 680
 681  #include <pthread.h>
 682 @@ -3658,7 +3704,7 @@ int main() {
 683      return pthread_create(&thd, NULL, thread_routine, &data);
 684  }
 685  EOF
 686 -if { (eval echo configure:3662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 687 +if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 688  then
 689
 690    pthreads_working=yes
 691 @@ -3789,7 +3835,7 @@ ext_output=$PHP_AOLSERVER
 692
 693
 694  echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6
 695 -echo "configure:3793: checking for AOLserver support" >&5
 696 +echo "configure:3839: checking for AOLserver support" >&5
 697
 698  if test "$PHP_AOLSERVER" != "no"; then
 699    if test -d "$PHP_AOLSERVER/include"; then
 700 @@ -4054,7 +4100,7 @@ ext_output=$PHP_APXS
 701
 702
 703  echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6
 704 -echo "configure:4058: checking for Apache 1.x module support via DSO through APXS" >&5
 705 +echo "configure:4104: checking for Apache 1.x module support via DSO through APXS" >&5
 706
 707  if test "$PHP_APXS" != "no"; then
 708    if test "$PHP_APXS" = "yes"; then
 709 @@ -4385,7 +4431,7 @@ ext_output=$PHP_APACHE
 710
 711
 712  echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6
 713 -echo "configure:4389: checking for Apache 1.x module support" >&5
 714 +echo "configure:4435: checking for Apache 1.x module support" >&5
 715
 716  if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
 717
 718 @@ -5262,7 +5308,7 @@ fi
 719  php_enable_mod_charset=no
 720
 721  echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
 722 -echo "configure:5266: checking whether to enable Apache charset compatibility option" >&5
 723 +echo "configure:5312: checking whether to enable Apache charset compatibility option" >&5
 724  # Check whether --enable-mod-charset or --disable-mod-charset was given.
 725  if test "${enable_mod_charset+set}" = set; then
 726    enableval="$enable_mod_charset"
 727 @@ -5294,7 +5340,7 @@ if test "$APACHE_MODULE" = "yes"; then
 728
 729    gcc_arg_name=ac_cv_gcc_arg_rdynamic
 730    echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
 731 -echo "configure:5298: checking whether $CC supports -rdynamic" >&5
 732 +echo "configure:5344: checking whether $CC supports -rdynamic" >&5
 733  if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
 734    echo $ac_n "(cached) $ac_c" 1>&6
 735  else
 736 @@ -5337,7 +5383,7 @@ if test -n "$APACHE_INSTALL"; then
 737
 738
 739  echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
 740 -echo "configure:5341: checking for member fd in BUFF *" >&5
 741 +echo "configure:5387: checking for member fd in BUFF *" >&5
 742  if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then
 743    echo $ac_n "(cached) $ac_c" 1>&6
 744  else
 745 @@ -5349,14 +5395,14 @@ else
 746      CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
 747    fi
 748    cat > conftest.$ac_ext <<EOF
 749 -#line 5353 "configure"
 750 +#line 5399 "configure"
 751  #include "confdefs.h"
 752  #include <httpd.h>
 753  int main() {
 754  conn_rec *c; int fd = c->client->fd;
 755  ; return 0; }
 756  EOF
 757 -if { (eval echo configure:5360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 758 +if { (eval echo configure:5406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 759    rm -rf conftest*
 760
 761      ac_cv_php_fd_in_buff=yes
 762 @@ -5429,7 +5475,7 @@ ext_output=$PHP_APXS2FILTER
 763
 764
 765  echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6
 766 -echo "configure:5433: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
 767 +echo "configure:5479: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
 768
 769  if test "$PHP_APXS2FILTER" != "no"; then
 770    if test "$PHP_APXS2FILTER" = "yes"; then
 771 @@ -6318,7 +6364,7 @@ ext_output=$PHP_APXS2
 772
 773
 774  echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6
 775 -echo "configure:6322: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
 776 +echo "configure:6368: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
 777
 778  if test "$PHP_APXS2" != "no"; then
 779    if test "$PHP_APXS2" = "yes"; then
 780 @@ -7208,7 +7254,7 @@ ext_output=$PHP_APACHE_HOOKS
 781
 782
 783  echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6
 784 -echo "configure:7212: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
 785 +echo "configure:7258: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
 786
 787  if test "$PHP_APACHE_HOOKS" != "no"; then
 788    if test "$PHP_APACHE_HOOKS" = "yes"; then
 789 @@ -7539,7 +7585,7 @@ ext_output=$PHP_APACHE_HOOKS_STATIC
 790
 791
 792  echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6
 793 -echo "configure:7543: checking for Apache 1.x (hooks) module support" >&5
 794 +echo "configure:7589: checking for Apache 1.x (hooks) module support" >&5
 795
 796  if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then
 797
 798 @@ -8416,7 +8462,7 @@ fi
 799  php_enable_mod_charset=no
 800
 801  echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
 802 -echo "configure:8420: checking whether to enable Apache charset compatibility option" >&5
 803 +echo "configure:8466: checking whether to enable Apache charset compatibility option" >&5
 804  # Check whether --enable-mod-charset or --disable-mod-charset was given.
 805  if test "${enable_mod_charset+set}" = set; then
 806    enableval="$enable_mod_charset"
 807 @@ -8448,7 +8494,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes";
 808
 809    gcc_arg_name=ac_cv_gcc_arg_rdynamic
 810    echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
 811 -echo "configure:8452: checking whether $CC supports -rdynamic" >&5
 812 +echo "configure:8498: checking whether $CC supports -rdynamic" >&5
 813  if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
 814    echo $ac_n "(cached) $ac_c" 1>&6
 815  else
 816 @@ -8491,7 +8537,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then
 817
 818
 819  echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
 820 -echo "configure:8495: checking for member fd in BUFF *" >&5
 821 +echo "configure:8541: checking for member fd in BUFF *" >&5
 822  if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then
 823    echo $ac_n "(cached) $ac_c" 1>&6
 824  else
 825 @@ -8503,14 +8549,14 @@ else
 826      CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
 827    fi
 828    cat > conftest.$ac_ext <<EOF
 829 -#line 8507 "configure"
 830 +#line 8553 "configure"
 831  #include "confdefs.h"
 832  #include <httpd.h>
 833  int main() {
 834  conn_rec *c; int fd = c->client->fd;
 835  ; return 0; }
 836  EOF
 837 -if { (eval echo configure:8514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 838 +if { (eval echo configure:8560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 839    rm -rf conftest*
 840
 841      ac_cv_php_fd_in_buff=yes
 842 @@ -8584,7 +8630,7 @@ ext_output=$PHP_CAUDIUM
 843
 844
 845  echo $ac_n "checking for Caudium support""... $ac_c" 1>&6
 846 -echo "configure:8588: checking for Caudium support" >&5
 847 +echo "configure:8634: checking for Caudium support" >&5
 848
 849  if test "$PHP_CAUDIUM" != "no"; then
 850    if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi
 851 @@ -8654,7 +8700,7 @@ if test "$PHP_CAUDIUM" != "no"; then
 852        PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE`
 853      fi
 854      echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6
 855 -echo "configure:8658: checking for C includes in $PIKE_C_INCLUDE" >&5
 856 +echo "configure:8704: checking for C includes in $PIKE_C_INCLUDE" >&5
 857      if test -f $PIKE_C_INCLUDE/version.h; then
 858        PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
 859        ###### VERSION MATCH CHECK #######
 860 @@ -8943,7 +8989,7 @@ ext_output=$PHP_CLI
 861
 862
 863  echo $ac_n "checking for CLI build""... $ac_c" 1>&6
 864 -echo "configure:8947: checking for CLI build" >&5
 865 +echo "configure:8993: checking for CLI build" >&5
 866  if test "$PHP_CLI" != "no"; then
 867
 868    src=$abs_srcdir/sapi/cli/Makefile.frag
 869 @@ -8993,7 +9039,7 @@ echo "$ac_t""$PHP_CLI" 1>&6
 870  php_with_continuity=no
 871
 872  echo $ac_n "checking for Continuity support""... $ac_c" 1>&6
 873 -echo "configure:8997: checking for Continuity support" >&5
 874 +echo "configure:9043: checking for Continuity support" >&5
 875  # Check whether --with-continuity or --without-continuity was given.
 876  if test "${with_continuity+set}" = set; then
 877    withval="$with_continuity"
 878 @@ -9017,7 +9063,7 @@ if test "$PHP_CONTINUITY" != "no"; then
 879      { echo "configure: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" 1>&2; exit 1; }
 880    fi
 881    echo $ac_n "checking for Continuity include files""... $ac_c" 1>&6
 882 -echo "configure:9021: checking for Continuity include files" >&5
 883 +echo "configure:9067: checking for Continuity include files" >&5
 884    if test -d $PHP_CONTINUITY/include ; then
 885      CAPI_INCLUDE=$PHP_CONTINUITY/include
 886      echo "$ac_t""Continuity Binary Distribution" 1>&6
 887 @@ -9275,7 +9321,7 @@ ext_output=$PHP_EMBED
 888
 889
 890  echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6
 891 -echo "configure:9279: checking for embedded SAPI library support" >&5
 892 +echo "configure:9325: checking for embedded SAPI library support" >&5
 893
 894  if test "$PHP_EMBED" != "no"; then
 895    case "$PHP_EMBED" in
 896 @@ -9534,7 +9580,7 @@ ext_output=$PHP_FPM
 897
 898
 899  echo $ac_n "checking for FPM build""... $ac_c" 1>&6
 900 -echo "configure:9538: checking for FPM build" >&5
 901 +echo "configure:9584: checking for FPM build" >&5
 902  if test "$PHP_FPM" != "no"; then
 903    echo "$ac_t""$PHP_FPM" 1>&6
 904
 905 @@ -9542,12 +9588,12 @@ if test "$PHP_FPM" != "no"; then
 906    for ac_func in setenv clearenv setproctitle
 907  do
 908  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 909 -echo "configure:9546: checking for $ac_func" >&5
 910 +echo "configure:9592: checking for $ac_func" >&5
 911  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
 912    echo $ac_n "(cached) $ac_c" 1>&6
 913  else
 914    cat > conftest.$ac_ext <<EOF
 915 -#line 9551 "configure"
 916 +#line 9597 "configure"
 917  #include "confdefs.h"
 918  /* System header to define __stub macros and hopefully few prototypes,
 919      which can conflict with char $ac_func(); below.  */
 920 @@ -9570,7 +9616,7 @@ $ac_func();
 921
 922  ; return 0; }
 923  EOF
 924 -if { (eval echo configure:9574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 925 +if { (eval echo configure:9620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 926    rm -rf conftest*
 927    eval "ac_cv_func_$ac_func=yes"
 928  else
 929 @@ -9597,14 +9643,14 @@ done
 930
 931
 932  echo $ac_n "checking for library containing socket""... $ac_c" 1>&6
 933 -echo "configure:9601: checking for library containing socket" >&5
 934 +echo "configure:9647: checking for library containing socket" >&5
 935  if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then
 936    echo $ac_n "(cached) $ac_c" 1>&6
 937  else
 938    ac_func_search_save_LIBS="$LIBS"
 939  ac_cv_search_socket="no"
 940  cat > conftest.$ac_ext <<EOF
 941 -#line 9608 "configure"
 942 +#line 9654 "configure"
 943  #include "confdefs.h"
 944  /* Override any gcc2 internal prototype to avoid an error.  */
 945  /* We use char because int might match the return type of a gcc2
 946 @@ -9615,7 +9661,7 @@ int main() {
 947  socket()
 948  ; return 0; }
 949  EOF
 950 -if { (eval echo configure:9619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 951 +if { (eval echo configure:9665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 952    rm -rf conftest*
 953    ac_cv_search_socket="none required"
 954  else
 955 @@ -9626,7 +9672,7 @@ rm -f conftest*
 956  test "$ac_cv_search_socket" = "no" && for i in socket; do
 957  LIBS="-l$i  $ac_func_search_save_LIBS"
 958  cat > conftest.$ac_ext <<EOF
 959 -#line 9630 "configure"
 960 +#line 9676 "configure"
 961  #include "confdefs.h"
 962  /* Override any gcc2 internal prototype to avoid an error.  */
 963  /* We use char because int might match the return type of a gcc2
 964 @@ -9637,7 +9683,7 @@ int main() {
 965  socket()
 966  ; return 0; }
 967  EOF
 968 -if { (eval echo configure:9641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 969 +if { (eval echo configure:9687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 970    rm -rf conftest*
 971    ac_cv_search_socket="-l$i"
 972  break
 973 @@ -9659,14 +9705,14 @@ else :
 974  fi
 975
 976  echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6
 977 -echo "configure:9663: checking for library containing inet_addr" >&5
 978 +echo "configure:9709: checking for library containing inet_addr" >&5
 979  if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then
 980    echo $ac_n "(cached) $ac_c" 1>&6
 981  else
 982    ac_func_search_save_LIBS="$LIBS"
 983  ac_cv_search_inet_addr="no"
 984  cat > conftest.$ac_ext <<EOF
 985 -#line 9670 "configure"
 986 +#line 9716 "configure"
 987  #include "confdefs.h"
 988  /* Override any gcc2 internal prototype to avoid an error.  */
 989  /* We use char because int might match the return type of a gcc2
 990 @@ -9677,7 +9723,7 @@ int main() {
 991  inet_addr()
 992  ; return 0; }
 993  EOF
 994 -if { (eval echo configure:9681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 995 +if { (eval echo configure:9727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 996    rm -rf conftest*
 997    ac_cv_search_inet_addr="none required"
 998  else
 999 @@ -9688,7 +9734,7 @@ rm -f conftest*
1000  test "$ac_cv_search_inet_addr" = "no" && for i in nsl; do
1001  LIBS="-l$i  $ac_func_search_save_LIBS"
1002  cat > conftest.$ac_ext <<EOF
1003 -#line 9692 "configure"
1004 +#line 9738 "configure"
1005  #include "confdefs.h"
1006  /* Override any gcc2 internal prototype to avoid an error.  */
1007  /* We use char because int might match the return type of a gcc2
1008 @@ -9699,7 +9745,7 @@ int main() {
1009  inet_addr()
1010  ; return 0; }
1011  EOF
1012 -if { (eval echo configure:9703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1013 +if { (eval echo configure:9749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1014    rm -rf conftest*
1015    ac_cv_search_inet_addr="-l$i"
1016  break
1017 @@ -9724,17 +9770,17 @@ fi
1018  do
1019  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1020  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1021 -echo "configure:9728: checking for $ac_hdr" >&5
1022 +echo "configure:9774: checking for $ac_hdr" >&5
1023  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1024    echo $ac_n "(cached) $ac_c" 1>&6
1025  else
1026    cat > conftest.$ac_ext <<EOF
1027 -#line 9733 "configure"
1028 +#line 9779 "configure"
1029  #include "confdefs.h"
1030  #include <$ac_hdr>
1031  EOF
1032  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1033 -{ (eval echo configure:9738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1034 +{ (eval echo configure:9784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1035  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1036  if test -z "$ac_err"; then
1037    rm -rf conftest*
1038 @@ -9764,17 +9810,17 @@ done
1039  do
1040  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1041  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1042 -echo "configure:9768: checking for $ac_hdr" >&5
1043 +echo "configure:9814: checking for $ac_hdr" >&5
1044  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1045    echo $ac_n "(cached) $ac_c" 1>&6
1046  else
1047    cat > conftest.$ac_ext <<EOF
1048 -#line 9773 "configure"
1049 +#line 9819 "configure"
1050  #include "confdefs.h"
1051  #include <$ac_hdr>
1052  EOF
1053  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1054 -{ (eval echo configure:9778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1055 +{ (eval echo configure:9824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1056  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1057  if test -z "$ac_err"; then
1058    rm -rf conftest*
1059 @@ -9804,17 +9850,17 @@ done
1060  do
1061  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1062  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1063 -echo "configure:9808: checking for $ac_hdr" >&5
1064 +echo "configure:9854: checking for $ac_hdr" >&5
1065  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1066    echo $ac_n "(cached) $ac_c" 1>&6
1067  else
1068    cat > conftest.$ac_ext <<EOF
1069 -#line 9813 "configure"
1070 +#line 9859 "configure"
1071  #include "confdefs.h"
1072  #include <$ac_hdr>
1073  EOF
1074  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1075 -{ (eval echo configure:9818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1076 +{ (eval echo configure:9864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1077  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1078  if test -z "$ac_err"; then
1079    rm -rf conftest*
1080 @@ -9843,17 +9889,17 @@ done
1081
1082
1083    echo $ac_n "checking for prctl""... $ac_c" 1>&6
1084 -echo "configure:9847: checking for prctl" >&5
1085 +echo "configure:9893: checking for prctl" >&5
1086
1087    cat > conftest.$ac_ext <<EOF
1088 -#line 9850 "configure"
1089 +#line 9896 "configure"
1090  #include "confdefs.h"
1091   #include <sys/prctl.h>
1092  int main() {
1093  prctl(0, 0, 0, 0, 0);
1094  ; return 0; }
1095  EOF
1096 -if { (eval echo configure:9857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1097 +if { (eval echo configure:9903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1098    rm -rf conftest*
1099
1100      cat >> confdefs.h <<\EOF
1101 @@ -9876,17 +9922,17 @@ rm -f conftest*
1102    have_clock_gettime=no
1103
1104    echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6
1105 -echo "configure:9880: checking for clock_gettime" >&5
1106 +echo "configure:9926: checking for clock_gettime" >&5
1107
1108    cat > conftest.$ac_ext <<EOF
1109 -#line 9883 "configure"
1110 +#line 9929 "configure"
1111  #include "confdefs.h"
1112   #include <time.h>
1113  int main() {
1114  struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
1115  ; return 0; }
1116  EOF
1117 -if { (eval echo configure:9890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1118 +if { (eval echo configure:9936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1119    rm -rf conftest*
1120
1121      have_clock_gettime=yes
1122 @@ -9904,20 +9950,20 @@ rm -f conftest*
1123
1124    if test "$have_clock_gettime" = "no"; then
1125      echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6
1126 -echo "configure:9908: checking for clock_gettime in -lrt" >&5
1127 +echo "configure:9954: checking for clock_gettime in -lrt" >&5
1128
1129      SAVED_LIBS="$LIBS"
1130      LIBS="$LIBS -lrt"
1131
1132      cat > conftest.$ac_ext <<EOF
1133 -#line 9914 "configure"
1134 +#line 9960 "configure"
1135  #include "confdefs.h"
1136   #include <time.h>
1137  int main() {
1138  struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
1139  ; return 0; }
1140  EOF
1141 -if { (eval echo configure:9921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1142 +if { (eval echo configure:9967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1143    rm -rf conftest*
1144
1145        have_clock_gettime=yes
1146 @@ -9946,13 +9992,13 @@ EOF
1147
1148    if test "$have_clock_gettime" = "no"; then
1149      echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6
1150 -echo "configure:9950: checking for clock_get_time" >&5
1151 +echo "configure:9996: checking for clock_get_time" >&5
1152
1153      if test "$cross_compiling" = yes; then
1154      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1155  else
1156    cat > conftest.$ac_ext <<EOF
1157 -#line 9956 "configure"
1158 +#line 10002 "configure"
1159  #include "confdefs.h"
1160   #include <mach/mach.h>
1161        #include <mach/clock.h>
1162 @@ -9976,7 +10022,7 @@ else
1163        }
1164
1165  EOF
1166 -if { (eval echo configure:9980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1167 +if { (eval echo configure:10026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1168  then
1169
1170        have_clock_get_time=yes
1171 @@ -10007,10 +10053,10 @@ EOF
1172    have_broken_ptrace=no
1173
1174    echo $ac_n "checking for ptrace""... $ac_c" 1>&6
1175 -echo "configure:10011: checking for ptrace" >&5
1176 +echo "configure:10057: checking for ptrace" >&5
1177
1178    cat > conftest.$ac_ext <<EOF
1179 -#line 10014 "configure"
1180 +#line 10060 "configure"
1181  #include "confdefs.h"
1182
1183      #include <sys/types.h>
1184 @@ -10019,7 +10065,7 @@ int main() {
1185  ptrace(0, 0, (void *) 0, 0);
1186  ; return 0; }
1187  EOF
1188 -if { (eval echo configure:10023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1189 +if { (eval echo configure:10069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1190    rm -rf conftest*
1191
1192      have_ptrace=yes
1193 @@ -10037,13 +10083,13 @@ rm -f conftest*
1194
1195    if test "$have_ptrace" = "yes"; then
1196      echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6
1197 -echo "configure:10041: checking whether ptrace works" >&5
1198 +echo "configure:10087: checking whether ptrace works" >&5
1199
1200      if test "$cross_compiling" = yes; then
1201      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1202  else
1203    cat > conftest.$ac_ext <<EOF
1204 -#line 10047 "configure"
1205 +#line 10093 "configure"
1206  #include "confdefs.h"
1207
1208        #include <unistd.h>
1209 @@ -10114,7 +10160,7 @@ else
1210        }
1211
1212  EOF
1213 -if { (eval echo configure:10118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1214 +if { (eval echo configure:10164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1215  then
1216
1217        echo "$ac_t""yes" 1>&6
1218 @@ -10145,10 +10191,10 @@ EOF
1219
1220    if test "$have_broken_ptrace" = "yes"; then
1221      echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6
1222 -echo "configure:10149: checking for mach_vm_read" >&5
1223 +echo "configure:10195: checking for mach_vm_read" >&5
1224
1225      cat > conftest.$ac_ext <<EOF
1226 -#line 10152 "configure"
1227 +#line 10198 "configure"
1228  #include "confdefs.h"
1229   #include <mach/mach.h>
1230        #include <mach/mach_vm.h>
1231 @@ -10159,7 +10205,7 @@ int main() {
1232
1233  ; return 0; }
1234  EOF
1235 -if { (eval echo configure:10163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1236 +if { (eval echo configure:10209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1237    rm -rf conftest*
1238
1239        have_mach_vm_read=yes
1240 @@ -10195,13 +10241,13 @@ EOF
1241
1242    if test -n "$proc_mem_file" ; then
1243      echo $ac_n "checking for proc mem file""... $ac_c" 1>&6
1244 -echo "configure:10199: checking for proc mem file" >&5
1245 +echo "configure:10245: checking for proc mem file" >&5
1246
1247      if test "$cross_compiling" = yes; then
1248      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1249  else
1250    cat > conftest.$ac_ext <<EOF
1251 -#line 10205 "configure"
1252 +#line 10251 "configure"
1253  #include "confdefs.h"
1254
1255        #define _GNU_SOURCE
1256 @@ -10231,7 +10277,7 @@ else
1257        }
1258
1259  EOF
1260 -if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1261 +if { (eval echo configure:10281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1262  then
1263
1264        echo "$ac_t""$proc_mem_file" 1>&6
1265 @@ -10275,9 +10321,9 @@ EOF
1266
1267
1268    echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6
1269 -echo "configure:10279: checking if gcc supports __sync_bool_compare_and_swap" >&5
1270 +echo "configure:10325: checking if gcc supports __sync_bool_compare_and_swap" >&5
1271    cat > conftest.$ac_ext <<EOF
1272 -#line 10281 "configure"
1273 +#line 10327 "configure"
1274  #include "confdefs.h"
1275
1276  int main() {
1277 @@ -10288,7 +10334,7 @@ int main() {
1278
1279  ; return 0; }
1280  EOF
1281 -if { (eval echo configure:10292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1282 +if { (eval echo configure:10338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1283    rm -rf conftest*
1284
1285      echo "$ac_t""yes" 1>&6
1286 @@ -10311,17 +10357,17 @@ rm -f conftest*
1287    have_lq=no
1288
1289    echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6
1290 -echo "configure:10315: checking for TCP_INFO" >&5
1291 +echo "configure:10361: checking for TCP_INFO" >&5
1292
1293    cat > conftest.$ac_ext <<EOF
1294 -#line 10318 "configure"
1295 +#line 10364 "configure"
1296  #include "confdefs.h"
1297   #include <netinet/tcp.h>
1298  int main() {
1299  struct tcp_info ti; int x = TCP_INFO;
1300  ; return 0; }
1301  EOF
1302 -if { (eval echo configure:10325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1303 +if { (eval echo configure:10371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1304    rm -rf conftest*
1305
1306      have_lq=tcp_info
1307 @@ -10346,17 +10392,17 @@ EOF
1308
1309    if test "$have_lq" = "no" ; then
1310      echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6
1311 -echo "configure:10350: checking for SO_LISTENQLEN" >&5
1312 +echo "configure:10396: checking for SO_LISTENQLEN" >&5
1313
1314      cat > conftest.$ac_ext <<EOF
1315 -#line 10353 "configure"
1316 +#line 10399 "configure"
1317  #include "confdefs.h"
1318   #include <sys/socket.h>
1319  int main() {
1320  int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN;
1321  ; return 0; }
1322  EOF
1323 -if { (eval echo configure:10360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1324 +if { (eval echo configure:10406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1325    rm -rf conftest*
1326
1327        have_lq=so_listenq
1328 @@ -10732,7 +10778,7 @@ fi
1329  php_with_isapi=no
1330
1331  echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6
1332 -echo "configure:10736: checking for Zeus ISAPI support" >&5
1333 +echo "configure:10782: checking for Zeus ISAPI support" >&5
1334  # Check whether --with-isapi or --without-isapi was given.
1335  if test "${with_isapi+set}" = set; then
1336    withval="$with_isapi"
1337 @@ -10986,7 +11032,7 @@ fi
1338
1339
1340  echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6
1341 -echo "configure:10990: checking for LiteSpeed support" >&5
1342 +echo "configure:11036: checking for LiteSpeed support" >&5
1343
1344
1345  php_with_litespeed=no
1346 @@ -11249,7 +11295,7 @@ echo "$ac_t""$PHP_LITESPEED" 1>&6
1347  php_with_milter=no
1348
1349  echo $ac_n "checking for Milter support""... $ac_c" 1>&6
1350 -echo "configure:11253: checking for Milter support" >&5
1351 +echo "configure:11299: checking for Milter support" >&5
1352  # Check whether --with-milter or --without-milter was given.
1353  if test "${with_milter+set}" = set; then
1354    withval="$with_milter"
1355 @@ -11541,7 +11587,7 @@ fi
1356  php_with_nsapi=no
1357
1358  echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6
1359 -echo "configure:11545: checking for NSAPI support" >&5
1360 +echo "configure:11591: checking for NSAPI support" >&5
1361  # Check whether --with-nsapi or --without-nsapi was given.
1362  if test "${with_nsapi+set}" = set; then
1363    withval="$with_nsapi"
1364 @@ -11565,7 +11611,7 @@ if test "$PHP_NSAPI" != "no"; then
1365      { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" 1>&2; exit 1; }
1366    fi
1367    echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6
1368 -echo "configure:11569: checking for NSAPI include files" >&5
1369 +echo "configure:11615: checking for NSAPI include files" >&5
1370    if test -d $PHP_NSAPI/include ; then
1371      NSAPI_INC_DIR="$PHP_NSAPI/include"
1372      echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6
1373 @@ -11573,17 +11619,17 @@ echo "configure:11569: checking for NSAP
1374  do
1375  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1376  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1377 -echo "configure:11577: checking for $ac_hdr" >&5
1378 +echo "configure:11623: checking for $ac_hdr" >&5
1379  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1380    echo $ac_n "(cached) $ac_c" 1>&6
1381  else
1382    cat > conftest.$ac_ext <<EOF
1383 -#line 11582 "configure"
1384 +#line 11628 "configure"
1385  #include "confdefs.h"
1386  #include <$ac_hdr>
1387  EOF
1388  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1389 -{ (eval echo configure:11587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1390 +{ (eval echo configure:11633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1391  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1392  if test -z "$ac_err"; then
1393    rm -rf conftest*
1394 @@ -11618,17 +11664,17 @@ done
1395  do
1396  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1397  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1398 -echo "configure:11622: checking for $ac_hdr" >&5
1399 +echo "configure:11668: checking for $ac_hdr" >&5
1400  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1401    echo $ac_n "(cached) $ac_c" 1>&6
1402  else
1403    cat > conftest.$ac_ext <<EOF
1404 -#line 11627 "configure"
1405 +#line 11673 "configure"
1406  #include "confdefs.h"
1407  #include <$ac_hdr>
1408  EOF
1409  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1410 -{ (eval echo configure:11632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1411 +{ (eval echo configure:11678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1412  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1413  if test -z "$ac_err"; then
1414    rm -rf conftest*
1415 @@ -11901,7 +11947,7 @@ fi
1416  php_with_phttpd=no
1417
1418  echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6
1419 -echo "configure:11905: checking for PHTTPD support" >&5
1420 +echo "configure:11951: checking for PHTTPD support" >&5
1421  # Check whether --with-phttpd or --without-phttpd was given.
1422  if test "${with_phttpd+set}" = set; then
1423    withval="$with_phttpd"
1424 @@ -12155,7 +12201,7 @@ fi
1425  php_with_pi3web=no
1426
1427  echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6
1428 -echo "configure:12159: checking for Pi3Web support" >&5
1429 +echo "configure:12205: checking for Pi3Web support" >&5
1430  # Check whether --with-pi3web or --without-pi3web was given.
1431  if test "${with_pi3web+set}" = set; then
1432    withval="$with_pi3web"
1433 @@ -12527,7 +12573,7 @@ ext_output=$PHP_ROXEN
1434  php_enable_roxen_zts=no
1435
1436  echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6
1437 -echo "configure:12531: checking whether Roxen module is build using ZTS" >&5
1438 +echo "configure:12577: checking whether Roxen module is build using ZTS" >&5
1439  # Check whether --enable-roxen-zts or --disable-roxen-zts was given.
1440  if test "${enable_roxen_zts+set}" = set; then
1441    enableval="$enable_roxen_zts"
1442 @@ -12548,7 +12594,7 @@ echo "$ac_t""$ext_output" 1>&6
1443
1444  RESULT=
1445  echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6
1446 -echo "configure:12552: checking for Roxen/Pike support" >&5
1447 +echo "configure:12598: checking for Roxen/Pike support" >&5
1448  if test "$PHP_ROXEN" != "no"; then
1449    if test ! -d $PHP_ROXEN ; then
1450      { echo "configure: error: You did not specify a directory" 1>&2; exit 1; }
1451 @@ -12834,7 +12880,7 @@ ext_output=$PHP_THTTPD
1452
1453
1454  echo $ac_n "checking for thttpd""... $ac_c" 1>&6
1455 -echo "configure:12838: checking for thttpd" >&5
1456 +echo "configure:12884: checking for thttpd" >&5
1457
1458  if test "$PHP_THTTPD" != "no"; then
1459    if test ! -d $PHP_THTTPD; then
1460 @@ -12867,7 +12913,7 @@ if test "$PHP_THTTPD" != "no"; then
1461
1462    gcc_arg_name=ac_cv_gcc_arg_rdynamic
1463    echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
1464 -echo "configure:12871: checking whether $CC supports -rdynamic" >&5
1465 +echo "configure:12917: checking whether $CC supports -rdynamic" >&5
1466  if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
1467    echo $ac_n "(cached) $ac_c" 1>&6
1468  else
1469 @@ -13103,24 +13149,24 @@ ext_output=$PHP_TUX
1470
1471
1472  echo $ac_n "checking for TUX""... $ac_c" 1>&6
1473 -echo "configure:13107: checking for TUX" >&5
1474 +echo "configure:13153: checking for TUX" >&5
1475  if test "$PHP_TUX" != "no"; then
1476    INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so"
1477    for ac_hdr in tuxmodule.h
1478  do
1479  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1480  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1481 -echo "configure:13114: checking for $ac_hdr" >&5
1482 +echo "configure:13160: checking for $ac_hdr" >&5
1483  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1484    echo $ac_n "(cached) $ac_c" 1>&6
1485  else
1486    cat > conftest.$ac_ext <<EOF
1487 -#line 13119 "configure"
1488 +#line 13165 "configure"
1489  #include "confdefs.h"
1490  #include <$ac_hdr>
1491  EOF
1492  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1493 -{ (eval echo configure:13124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1494 +{ (eval echo configure:13170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1495  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1496  if test -z "$ac_err"; then
1497    rm -rf conftest*
1498 @@ -13357,7 +13403,7 @@ ext_output=$PHP_WEBJAMES
1499
1500
1501  echo $ac_n "checking for webjames""... $ac_c" 1>&6
1502 -echo "configure:13361: checking for webjames" >&5
1503 +echo "configure:13407: checking for webjames" >&5
1504
1505  if test "$PHP_WEBJAMES" != "no"; then
1506
1507 @@ -13617,14 +13663,14 @@ ext_output=$PHP_CGI
1508
1509  if test "$PHP_SAPI" = "default"; then
1510    echo $ac_n "checking whether to build CGI binary""... $ac_c" 1>&6
1511 -echo "configure:13621: checking whether to build CGI binary" >&5
1512 +echo "configure:13667: checking whether to build CGI binary" >&5
1513    if test "$PHP_CGI" != "no"; then
1514      echo "$ac_t""yes" 1>&6
1515
1516      echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
1517 -echo "configure:13626: checking for socklen_t in sys/socket.h" >&5
1518 +echo "configure:13672: checking for socklen_t in sys/socket.h" >&5
1519      cat > conftest.$ac_ext <<EOF
1520 -#line 13628 "configure"
1521 +#line 13674 "configure"
1522  #include "confdefs.h"
1523  #include <sys/socket.h>
1524  EOF
1525 @@ -13644,9 +13690,9 @@ rm -f conftest*
1526
1527
1528      echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6
1529 -echo "configure:13648: checking for sun_len in sys/un.h" >&5
1530 +echo "configure:13694: checking for sun_len in sys/un.h" >&5
1531      cat > conftest.$ac_ext <<EOF
1532 -#line 13650 "configure"
1533 +#line 13696 "configure"
1534  #include "confdefs.h"
1535  #include <sys/un.h>
1536  EOF
1537 @@ -13666,7 +13712,7 @@ rm -f conftest*
1538
1539
1540      echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6
1541 -echo "configure:13670: checking whether cross-process locking is required by accept()" >&5
1542 +echo "configure:13716: checking whether cross-process locking is required by accept()" >&5
1543      case "`uname -sr`" in
1544        IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
1545          echo "$ac_t""yes" 1>&6
1546 @@ -13910,7 +13956,7 @@ fi
1547
1548
1549  echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6
1550 -echo "configure:13914: checking for chosen SAPI module" >&5
1551 +echo "configure:13960: checking for chosen SAPI module" >&5
1552  echo "$ac_t""$PHP_SAPI" 1>&6
1553
1554  if test "$enable_maintainer_zts" = "yes"; then
1555 @@ -13967,7 +14013,7 @@ fi
1556    # Extract the first word of "sendmail", so it can be a program name with args.
1557  set dummy sendmail; ac_word=$2
1558  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1559 -echo "configure:13971: checking for $ac_word" >&5
1560 +echo "configure:14017: checking for $ac_word" >&5
1561  if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then
1562    echo $ac_n "(cached) $ac_c" 1>&6
1563  else
1564 @@ -14006,7 +14052,7 @@ fi
1565
1566
1567    echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6
1568 -echo "configure:14010: checking whether system uses EBCDIC" >&5
1569 +echo "configure:14056: checking whether system uses EBCDIC" >&5
1570  if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then
1571    echo $ac_n "(cached) $ac_c" 1>&6
1572  else
1573 @@ -14017,7 +14063,7 @@ else
1574
1575  else
1576    cat > conftest.$ac_ext <<EOF
1577 -#line 14021 "configure"
1578 +#line 14067 "configure"
1579  #include "confdefs.h"
1580
1581  int main(void) {
1582 @@ -14025,7 +14071,7 @@ int main(void) {
1583  }
1584
1585  EOF
1586 -if { (eval echo configure:14029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1587 +if { (eval echo configure:14075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1588  then
1589
1590    ac_cv_ebcdic=yes
1591 @@ -14053,7 +14099,7 @@ EOF
1592
1593
1594  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
1595 -echo "configure:14057: checking whether byte ordering is bigendian" >&5
1596 +echo "configure:14103: checking whether byte ordering is bigendian" >&5
1597  if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
1598    echo $ac_n "(cached) $ac_c" 1>&6
1599  else
1600 @@ -14063,7 +14109,7 @@ else
1601    ac_cv_c_bigendian_php=unknown
1602  else
1603    cat > conftest.$ac_ext <<EOF
1604 -#line 14067 "configure"
1605 +#line 14113 "configure"
1606  #include "confdefs.h"
1607
1608  int main(void)
1609 @@ -14079,7 +14125,7 @@ int main(void)
1610  }
1611
1612  EOF
1613 -if { (eval echo configure:14083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1614 +if { (eval echo configure:14129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1615  then
1616    ac_cv_c_bigendian_php=yes
1617  else
1618 @@ -14105,7 +14151,7 @@ EOF
1619
1620
1621    echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6
1622 -echo "configure:14109: checking whether writing to stdout works" >&5
1623 +echo "configure:14155: checking whether writing to stdout works" >&5
1624  if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then
1625    echo $ac_n "(cached) $ac_c" 1>&6
1626  else
1627 @@ -14116,7 +14162,7 @@ else
1628
1629  else
1630    cat > conftest.$ac_ext <<EOF
1631 -#line 14120 "configure"
1632 +#line 14166 "configure"
1633  #include "confdefs.h"
1634
1635  #ifdef HAVE_UNISTD_H
1636 @@ -14134,7 +14180,7 @@ main()
1637  }
1638
1639  EOF
1640 -if { (eval echo configure:14138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1641 +if { (eval echo configure:14184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1642  then
1643
1644        ac_cv_write_stdout=yes
1645 @@ -14209,12 +14255,12 @@ test -d /usr/ucblib &&
1646    unset found
1647
1648    echo $ac_n "checking for socket""... $ac_c" 1>&6
1649 -echo "configure:14213: checking for socket" >&5
1650 +echo "configure:14259: checking for socket" >&5
1651  if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
1652    echo $ac_n "(cached) $ac_c" 1>&6
1653  else
1654    cat > conftest.$ac_ext <<EOF
1655 -#line 14218 "configure"
1656 +#line 14264 "configure"
1657  #include "confdefs.h"
1658  /* System header to define __stub macros and hopefully few prototypes,
1659      which can conflict with char socket(); below.  */
1660 @@ -14237,7 +14283,7 @@ socket();
1661
1662  ; return 0; }
1663  EOF
1664 -if { (eval echo configure:14241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1665 +if { (eval echo configure:14287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1666    rm -rf conftest*
1667    eval "ac_cv_func_socket=yes"
1668  else
1669 @@ -14255,12 +14301,12 @@ if eval "test \"`echo '$ac_cv_func_'sock
1670  else
1671    echo "$ac_t""no" 1>&6
1672   echo $ac_n "checking for __socket""... $ac_c" 1>&6
1673 -echo "configure:14259: checking for __socket" >&5
1674 +echo "configure:14305: checking for __socket" >&5
1675  if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then
1676    echo $ac_n "(cached) $ac_c" 1>&6
1677  else
1678    cat > conftest.$ac_ext <<EOF
1679 -#line 14264 "configure"
1680 +#line 14310 "configure"
1681  #include "confdefs.h"
1682  /* System header to define __stub macros and hopefully few prototypes,
1683      which can conflict with char __socket(); below.  */
1684 @@ -14283,7 +14329,7 @@ __socket();
1685
1686  ; return 0; }
1687  EOF
1688 -if { (eval echo configure:14287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1689 +if { (eval echo configure:14333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1690    rm -rf conftest*
1691    eval "ac_cv_func___socket=yes"
1692  else
1693 @@ -14321,7 +14367,7 @@ EOF
1694    unset ac_cv_lib_socket___socket
1695    unset found
1696    echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
1697 -echo "configure:14325: checking for socket in -lsocket" >&5
1698 +echo "configure:14371: checking for socket in -lsocket" >&5
1699  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
1700  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1701    echo $ac_n "(cached) $ac_c" 1>&6
1702 @@ -14329,7 +14375,7 @@ else
1703    ac_save_LIBS="$LIBS"
1704  LIBS="-lsocket  $LIBS"
1705  cat > conftest.$ac_ext <<EOF
1706 -#line 14333 "configure"
1707 +#line 14379 "configure"
1708  #include "confdefs.h"
1709  /* Override any gcc2 internal prototype to avoid an error.  */
1710  /* We use char because int might match the return type of a gcc2
1711 @@ -14340,7 +14386,7 @@ int main() {
1712  socket()
1713  ; return 0; }
1714  EOF
1715 -if { (eval echo configure:14344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1716 +if { (eval echo configure:14390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1717    rm -rf conftest*
1718    eval "ac_cv_lib_$ac_lib_var=yes"
1719  else
1720 @@ -14360,7 +14406,7 @@ else
1721    echo "$ac_t""no" 1>&6
1722
1723      echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6
1724 -echo "configure:14364: checking for __socket in -lsocket" >&5
1725 +echo "configure:14410: checking for __socket in -lsocket" >&5
1726  ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'`
1727  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1728    echo $ac_n "(cached) $ac_c" 1>&6
1729 @@ -14368,7 +14414,7 @@ else
1730    ac_save_LIBS="$LIBS"
1731  LIBS="-lsocket  $LIBS"
1732  cat > conftest.$ac_ext <<EOF
1733 -#line 14372 "configure"
1734 +#line 14418 "configure"
1735  #include "confdefs.h"
1736  /* Override any gcc2 internal prototype to avoid an error.  */
1737  /* We use char because int might match the return type of a gcc2
1738 @@ -14379,7 +14425,7 @@ int main() {
1739  __socket()
1740  ; return 0; }
1741  EOF
1742 -if { (eval echo configure:14383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1743 +if { (eval echo configure:14429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1744    rm -rf conftest*
1745    eval "ac_cv_lib_$ac_lib_var=yes"
1746  else
1747 @@ -14411,11 +14457,11 @@ fi
1748    found=no
1749  else
1750    cat > conftest.$ac_ext <<EOF
1751 -#line 14415 "configure"
1752 +#line 14461 "configure"
1753  #include "confdefs.h"
1754  main() { return (0); }
1755  EOF
1756 -if { (eval echo configure:14419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1757 +if { (eval echo configure:14465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1758  then
1759    found=yes
1760  else
1761 @@ -14466,12 +14512,12 @@ EOF
1762    unset found
1763
1764    echo $ac_n "checking for socketpair""... $ac_c" 1>&6
1765 -echo "configure:14470: checking for socketpair" >&5
1766 +echo "configure:14516: checking for socketpair" >&5
1767  if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then
1768    echo $ac_n "(cached) $ac_c" 1>&6
1769  else
1770    cat > conftest.$ac_ext <<EOF
1771 -#line 14475 "configure"
1772 +#line 14521 "configure"
1773  #include "confdefs.h"
1774  /* System header to define __stub macros and hopefully few prototypes,
1775      which can conflict with char socketpair(); below.  */
1776 @@ -14494,7 +14540,7 @@ socketpair();
1777
1778  ; return 0; }
1779  EOF
1780 -if { (eval echo configure:14498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1781 +if { (eval echo configure:14544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1782    rm -rf conftest*
1783    eval "ac_cv_func_socketpair=yes"
1784  else
1785 @@ -14512,12 +14558,12 @@ if eval "test \"`echo '$ac_cv_func_'sock
1786  else
1787    echo "$ac_t""no" 1>&6
1788   echo $ac_n "checking for __socketpair""... $ac_c" 1>&6
1789 -echo "configure:14516: checking for __socketpair" >&5
1790 +echo "configure:14562: checking for __socketpair" >&5
1791  if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then
1792    echo $ac_n "(cached) $ac_c" 1>&6
1793  else
1794    cat > conftest.$ac_ext <<EOF
1795 -#line 14521 "configure"
1796 +#line 14567 "configure"
1797  #include "confdefs.h"
1798  /* System header to define __stub macros and hopefully few prototypes,
1799      which can conflict with char __socketpair(); below.  */
1800 @@ -14540,7 +14586,7 @@ __socketpair();
1801
1802  ; return 0; }
1803  EOF
1804 -if { (eval echo configure:14544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1805 +if { (eval echo configure:14590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1806    rm -rf conftest*
1807    eval "ac_cv_func___socketpair=yes"
1808  else
1809 @@ -14578,7 +14624,7 @@ EOF
1810    unset ac_cv_lib_socket___socketpair
1811    unset found
1812    echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6
1813 -echo "configure:14582: checking for socketpair in -lsocket" >&5
1814 +echo "configure:14628: checking for socketpair in -lsocket" >&5
1815  ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'`
1816  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1817    echo $ac_n "(cached) $ac_c" 1>&6
1818 @@ -14586,7 +14632,7 @@ else
1819    ac_save_LIBS="$LIBS"
1820  LIBS="-lsocket  $LIBS"
1821  cat > conftest.$ac_ext <<EOF
1822 -#line 14590 "configure"
1823 +#line 14636 "configure"
1824  #include "confdefs.h"
1825  /* Override any gcc2 internal prototype to avoid an error.  */
1826  /* We use char because int might match the return type of a gcc2
1827 @@ -14597,7 +14643,7 @@ int main() {
1828  socketpair()
1829  ; return 0; }
1830  EOF
1831 -if { (eval echo configure:14601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1832 +if { (eval echo configure:14647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1833    rm -rf conftest*
1834    eval "ac_cv_lib_$ac_lib_var=yes"
1835  else
1836 @@ -14617,7 +14663,7 @@ else
1837    echo "$ac_t""no" 1>&6
1838
1839      echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6
1840 -echo "configure:14621: checking for __socketpair in -lsocket" >&5
1841 +echo "configure:14667: checking for __socketpair in -lsocket" >&5
1842  ac_lib_var=`echo socket'_'__socketpair | sed 'y%./+-%__p_%'`
1843  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1844    echo $ac_n "(cached) $ac_c" 1>&6
1845 @@ -14625,7 +14671,7 @@ else
1846    ac_save_LIBS="$LIBS"
1847  LIBS="-lsocket  $LIBS"
1848  cat > conftest.$ac_ext <<EOF
1849 -#line 14629 "configure"
1850 +#line 14675 "configure"
1851  #include "confdefs.h"
1852  /* Override any gcc2 internal prototype to avoid an error.  */
1853  /* We use char because int might match the return type of a gcc2
1854 @@ -14636,7 +14682,7 @@ int main() {
1855  __socketpair()
1856  ; return 0; }
1857  EOF
1858 -if { (eval echo configure:14640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1859 +if { (eval echo configure:14686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1860    rm -rf conftest*
1861    eval "ac_cv_lib_$ac_lib_var=yes"
1862  else
1863 @@ -14668,11 +14714,11 @@ fi
1864    found=no
1865  else
1866    cat > conftest.$ac_ext <<EOF
1867 -#line 14672 "configure"
1868 +#line 14718 "configure"
1869  #include "confdefs.h"
1870  main() { return (0); }
1871  EOF
1872 -if { (eval echo configure:14676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1873 +if { (eval echo configure:14722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1874  then
1875    found=yes
1876  else
1877 @@ -14723,12 +14769,12 @@ EOF
1878    unset found
1879
1880    echo $ac_n "checking for htonl""... $ac_c" 1>&6
1881 -echo "configure:14727: checking for htonl" >&5
1882 +echo "configure:14773: checking for htonl" >&5
1883  if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then
1884    echo $ac_n "(cached) $ac_c" 1>&6
1885  else
1886    cat > conftest.$ac_ext <<EOF
1887 -#line 14732 "configure"
1888 +#line 14778 "configure"
1889  #include "confdefs.h"
1890  /* System header to define __stub macros and hopefully few prototypes,
1891      which can conflict with char htonl(); below.  */
1892 @@ -14751,7 +14797,7 @@ htonl();
1893
1894  ; return 0; }
1895  EOF
1896 -if { (eval echo configure:14755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1897 +if { (eval echo configure:14801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1898    rm -rf conftest*
1899    eval "ac_cv_func_htonl=yes"
1900  else
1901 @@ -14769,12 +14815,12 @@ if eval "test \"`echo '$ac_cv_func_'hton
1902  else
1903    echo "$ac_t""no" 1>&6
1904   echo $ac_n "checking for __htonl""... $ac_c" 1>&6
1905 -echo "configure:14773: checking for __htonl" >&5
1906 +echo "configure:14819: checking for __htonl" >&5
1907  if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then
1908    echo $ac_n "(cached) $ac_c" 1>&6
1909  else
1910    cat > conftest.$ac_ext <<EOF
1911 -#line 14778 "configure"
1912 +#line 14824 "configure"
1913  #include "confdefs.h"
1914  /* System header to define __stub macros and hopefully few prototypes,
1915      which can conflict with char __htonl(); below.  */
1916 @@ -14797,7 +14843,7 @@ __htonl();
1917
1918  ; return 0; }
1919  EOF
1920 -if { (eval echo configure:14801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1921 +if { (eval echo configure:14847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1922    rm -rf conftest*
1923    eval "ac_cv_func___htonl=yes"
1924  else
1925 @@ -14835,7 +14881,7 @@ EOF
1926    unset ac_cv_lib_socket___htonl
1927    unset found
1928    echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6
1929 -echo "configure:14839: checking for htonl in -lsocket" >&5
1930 +echo "configure:14885: checking for htonl in -lsocket" >&5
1931  ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'`
1932  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1933    echo $ac_n "(cached) $ac_c" 1>&6
1934 @@ -14843,7 +14889,7 @@ else
1935    ac_save_LIBS="$LIBS"
1936  LIBS="-lsocket  $LIBS"
1937  cat > conftest.$ac_ext <<EOF
1938 -#line 14847 "configure"
1939 +#line 14893 "configure"
1940  #include "confdefs.h"
1941  /* Override any gcc2 internal prototype to avoid an error.  */
1942  /* We use char because int might match the return type of a gcc2
1943 @@ -14854,7 +14900,7 @@ int main() {
1944  htonl()
1945  ; return 0; }
1946  EOF
1947 -if { (eval echo configure:14858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1948 +if { (eval echo configure:14904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1949    rm -rf conftest*
1950    eval "ac_cv_lib_$ac_lib_var=yes"
1951  else
1952 @@ -14874,7 +14920,7 @@ else
1953    echo "$ac_t""no" 1>&6
1954
1955      echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6
1956 -echo "configure:14878: checking for __htonl in -lsocket" >&5
1957 +echo "configure:14924: checking for __htonl in -lsocket" >&5
1958  ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'`
1959  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1960    echo $ac_n "(cached) $ac_c" 1>&6
1961 @@ -14882,7 +14928,7 @@ else
1962    ac_save_LIBS="$LIBS"
1963  LIBS="-lsocket  $LIBS"
1964  cat > conftest.$ac_ext <<EOF
1965 -#line 14886 "configure"
1966 +#line 14932 "configure"
1967  #include "confdefs.h"
1968  /* Override any gcc2 internal prototype to avoid an error.  */
1969  /* We use char because int might match the return type of a gcc2
1970 @@ -14893,7 +14939,7 @@ int main() {
1971  __htonl()
1972  ; return 0; }
1973  EOF
1974 -if { (eval echo configure:14897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1975 +if { (eval echo configure:14943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1976    rm -rf conftest*
1977    eval "ac_cv_lib_$ac_lib_var=yes"
1978  else
1979 @@ -14925,11 +14971,11 @@ fi
1980    found=no
1981  else
1982    cat > conftest.$ac_ext <<EOF
1983 -#line 14929 "configure"
1984 +#line 14975 "configure"
1985  #include "confdefs.h"
1986  main() { return (0); }
1987  EOF
1988 -if { (eval echo configure:14933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1989 +if { (eval echo configure:14979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1990  then
1991    found=yes
1992  else
1993 @@ -14980,12 +15026,12 @@ EOF
1994    unset found
1995
1996    echo $ac_n "checking for gethostname""... $ac_c" 1>&6
1997 -echo "configure:14984: checking for gethostname" >&5
1998 +echo "configure:15030: checking for gethostname" >&5
1999  if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
2000    echo $ac_n "(cached) $ac_c" 1>&6
2001  else
2002    cat > conftest.$ac_ext <<EOF
2003 -#line 14989 "configure"
2004 +#line 15035 "configure"
2005  #include "confdefs.h"
2006  /* System header to define __stub macros and hopefully few prototypes,
2007      which can conflict with char gethostname(); below.  */
2008 @@ -15008,7 +15054,7 @@ gethostname();
2009
2010  ; return 0; }
2011  EOF
2012 -if { (eval echo configure:15012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2013 +if { (eval echo configure:15058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2014    rm -rf conftest*
2015    eval "ac_cv_func_gethostname=yes"
2016  else
2017 @@ -15026,12 +15072,12 @@ if eval "test \"`echo '$ac_cv_func_'geth
2018  else
2019    echo "$ac_t""no" 1>&6
2020   echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
2021 -echo "configure:15030: checking for __gethostname" >&5
2022 +echo "configure:15076: checking for __gethostname" >&5
2023  if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then
2024    echo $ac_n "(cached) $ac_c" 1>&6
2025  else
2026    cat > conftest.$ac_ext <<EOF
2027 -#line 15035 "configure"
2028 +#line 15081 "configure"
2029  #include "confdefs.h"
2030  /* System header to define __stub macros and hopefully few prototypes,
2031      which can conflict with char __gethostname(); below.  */
2032 @@ -15054,7 +15100,7 @@ __gethostname();
2033
2034  ; return 0; }
2035  EOF
2036 -if { (eval echo configure:15058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2037 +if { (eval echo configure:15104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2038    rm -rf conftest*
2039    eval "ac_cv_func___gethostname=yes"
2040  else
2041 @@ -15092,7 +15138,7 @@ EOF
2042    unset ac_cv_lib_nsl___gethostname
2043    unset found
2044    echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
2045 -echo "configure:15096: checking for gethostname in -lnsl" >&5
2046 +echo "configure:15142: checking for gethostname in -lnsl" >&5
2047  ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
2048  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2049    echo $ac_n "(cached) $ac_c" 1>&6
2050 @@ -15100,7 +15146,7 @@ else
2051    ac_save_LIBS="$LIBS"
2052  LIBS="-lnsl  $LIBS"
2053  cat > conftest.$ac_ext <<EOF
2054 -#line 15104 "configure"
2055 +#line 15150 "configure"
2056  #include "confdefs.h"
2057  /* Override any gcc2 internal prototype to avoid an error.  */
2058  /* We use char because int might match the return type of a gcc2
2059 @@ -15111,7 +15157,7 @@ int main() {
2060  gethostname()
2061  ; return 0; }
2062  EOF
2063 -if { (eval echo configure:15115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2064 +if { (eval echo configure:15161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2065    rm -rf conftest*
2066    eval "ac_cv_lib_$ac_lib_var=yes"
2067  else
2068 @@ -15131,7 +15177,7 @@ else
2069    echo "$ac_t""no" 1>&6
2070
2071      echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
2072 -echo "configure:15135: checking for __gethostname in -lnsl" >&5
2073 +echo "configure:15181: checking for __gethostname in -lnsl" >&5
2074  ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'`
2075  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2076    echo $ac_n "(cached) $ac_c" 1>&6
2077 @@ -15139,7 +15185,7 @@ else
2078    ac_save_LIBS="$LIBS"
2079  LIBS="-lnsl  $LIBS"
2080  cat > conftest.$ac_ext <<EOF
2081 -#line 15143 "configure"
2082 +#line 15189 "configure"
2083  #include "confdefs.h"
2084  /* Override any gcc2 internal prototype to avoid an error.  */
2085  /* We use char because int might match the return type of a gcc2
2086 @@ -15150,7 +15196,7 @@ int main() {
2087  __gethostname()
2088  ; return 0; }
2089  EOF
2090 -if { (eval echo configure:15154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2091 +if { (eval echo configure:15200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2092    rm -rf conftest*
2093    eval "ac_cv_lib_$ac_lib_var=yes"
2094  else
2095 @@ -15182,11 +15228,11 @@ fi
2096    found=no
2097  else
2098    cat > conftest.$ac_ext <<EOF
2099 -#line 15186 "configure"
2100 +#line 15232 "configure"
2101  #include "confdefs.h"
2102  main() { return (0); }
2103  EOF
2104 -if { (eval echo configure:15190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2105 +if { (eval echo configure:15236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2106  then
2107    found=yes
2108  else
2109 @@ -15237,12 +15283,12 @@ EOF
2110    unset found
2111
2112    echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
2113 -echo "configure:15241: checking for gethostbyaddr" >&5
2114 +echo "configure:15287: checking for gethostbyaddr" >&5
2115  if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then
2116    echo $ac_n "(cached) $ac_c" 1>&6
2117  else
2118    cat > conftest.$ac_ext <<EOF
2119 -#line 15246 "configure"
2120 +#line 15292 "configure"
2121  #include "confdefs.h"
2122  /* System header to define __stub macros and hopefully few prototypes,
2123      which can conflict with char gethostbyaddr(); below.  */
2124 @@ -15265,7 +15311,7 @@ gethostbyaddr();
2125
2126  ; return 0; }
2127  EOF
2128 -if { (eval echo configure:15269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2129 +if { (eval echo configure:15315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2130    rm -rf conftest*
2131    eval "ac_cv_func_gethostbyaddr=yes"
2132  else
2133 @@ -15283,12 +15329,12 @@ if eval "test \"`echo '$ac_cv_func_'geth
2134  else
2135    echo "$ac_t""no" 1>&6
2136   echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6
2137 -echo "configure:15287: checking for __gethostbyaddr" >&5
2138 +echo "configure:15333: checking for __gethostbyaddr" >&5
2139  if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then
2140    echo $ac_n "(cached) $ac_c" 1>&6
2141  else
2142    cat > conftest.$ac_ext <<EOF
2143 -#line 15292 "configure"
2144 +#line 15338 "configure"
2145  #include "confdefs.h"
2146  /* System header to define __stub macros and hopefully few prototypes,
2147      which can conflict with char __gethostbyaddr(); below.  */
2148 @@ -15311,7 +15357,7 @@ __gethostbyaddr();
2149
2150  ; return 0; }
2151  EOF
2152 -if { (eval echo configure:15315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2153 +if { (eval echo configure:15361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2154    rm -rf conftest*
2155    eval "ac_cv_func___gethostbyaddr=yes"
2156  else
2157 @@ -15349,7 +15395,7 @@ EOF
2158    unset ac_cv_lib_nsl___gethostbyaddr
2159    unset found
2160    echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
2161 -echo "configure:15353: checking for gethostbyaddr in -lnsl" >&5
2162 +echo "configure:15399: checking for gethostbyaddr in -lnsl" >&5
2163  ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
2164  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2165    echo $ac_n "(cached) $ac_c" 1>&6
2166 @@ -15357,7 +15403,7 @@ else
2167    ac_save_LIBS="$LIBS"
2168  LIBS="-lnsl  $LIBS"
2169  cat > conftest.$ac_ext <<EOF
2170 -#line 15361 "configure"
2171 +#line 15407 "configure"
2172  #include "confdefs.h"
2173  /* Override any gcc2 internal prototype to avoid an error.  */
2174  /* We use char because int might match the return type of a gcc2
2175 @@ -15368,7 +15414,7 @@ int main() {
2176  gethostbyaddr()
2177  ; return 0; }
2178  EOF
2179 -if { (eval echo configure:15372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2180 +if { (eval echo configure:15418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2181    rm -rf conftest*
2182    eval "ac_cv_lib_$ac_lib_var=yes"
2183  else
2184 @@ -15388,7 +15434,7 @@ else
2185    echo "$ac_t""no" 1>&6
2186
2187      echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6
2188 -echo "configure:15392: checking for __gethostbyaddr in -lnsl" >&5
2189 +echo "configure:15438: checking for __gethostbyaddr in -lnsl" >&5
2190  ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'`
2191  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2192    echo $ac_n "(cached) $ac_c" 1>&6
2193 @@ -15396,7 +15442,7 @@ else
2194    ac_save_LIBS="$LIBS"
2195  LIBS="-lnsl  $LIBS"
2196  cat > conftest.$ac_ext <<EOF
2197 -#line 15400 "configure"
2198 +#line 15446 "configure"
2199  #include "confdefs.h"
2200  /* Override any gcc2 internal prototype to avoid an error.  */
2201  /* We use char because int might match the return type of a gcc2
2202 @@ -15407,7 +15453,7 @@ int main() {
2203  __gethostbyaddr()
2204  ; return 0; }
2205  EOF
2206 -if { (eval echo configure:15411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2207 +if { (eval echo configure:15457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2208    rm -rf conftest*
2209    eval "ac_cv_lib_$ac_lib_var=yes"
2210  else
2211 @@ -15439,11 +15485,11 @@ fi
2212    found=no
2213  else
2214    cat > conftest.$ac_ext <<EOF
2215 -#line 15443 "configure"
2216 +#line 15489 "configure"
2217  #include "confdefs.h"
2218  main() { return (0); }
2219  EOF
2220 -if { (eval echo configure:15447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2221 +if { (eval echo configure:15493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2222  then
2223    found=yes
2224  else
2225 @@ -15494,12 +15540,12 @@ EOF
2226    unset found
2227
2228    echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6
2229 -echo "configure:15498: checking for yp_get_default_domain" >&5
2230 +echo "configure:15544: checking for yp_get_default_domain" >&5
2231  if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then
2232    echo $ac_n "(cached) $ac_c" 1>&6
2233  else
2234    cat > conftest.$ac_ext <<EOF
2235 -#line 15503 "configure"
2236 +#line 15549 "configure"
2237  #include "confdefs.h"
2238  /* System header to define __stub macros and hopefully few prototypes,
2239      which can conflict with char yp_get_default_domain(); below.  */
2240 @@ -15522,7 +15568,7 @@ yp_get_default_domain();
2241
2242  ; return 0; }
2243  EOF
2244 -if { (eval echo configure:15526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2245 +if { (eval echo configure:15572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2246    rm -rf conftest*
2247    eval "ac_cv_func_yp_get_default_domain=yes"
2248  else
2249 @@ -15540,12 +15586,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_g
2250  else
2251    echo "$ac_t""no" 1>&6
2252   echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6
2253 -echo "configure:15544: checking for __yp_get_default_domain" >&5
2254 +echo "configure:15590: checking for __yp_get_default_domain" >&5
2255  if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then
2256    echo $ac_n "(cached) $ac_c" 1>&6
2257  else
2258    cat > conftest.$ac_ext <<EOF
2259 -#line 15549 "configure"
2260 +#line 15595 "configure"
2261  #include "confdefs.h"
2262  /* System header to define __stub macros and hopefully few prototypes,
2263      which can conflict with char __yp_get_default_domain(); below.  */
2264 @@ -15568,7 +15614,7 @@ __yp_get_default_domain();
2265
2266  ; return 0; }
2267  EOF
2268 -if { (eval echo configure:15572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2269 +if { (eval echo configure:15618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2270    rm -rf conftest*
2271    eval "ac_cv_func___yp_get_default_domain=yes"
2272  else
2273 @@ -15606,7 +15652,7 @@ EOF
2274    unset ac_cv_lib_nsl___yp_get_default_domain
2275    unset found
2276    echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
2277 -echo "configure:15610: checking for yp_get_default_domain in -lnsl" >&5
2278 +echo "configure:15656: checking for yp_get_default_domain in -lnsl" >&5
2279  ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'`
2280  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2281    echo $ac_n "(cached) $ac_c" 1>&6
2282 @@ -15614,7 +15660,7 @@ else
2283    ac_save_LIBS="$LIBS"
2284  LIBS="-lnsl  $LIBS"
2285  cat > conftest.$ac_ext <<EOF
2286 -#line 15618 "configure"
2287 +#line 15664 "configure"
2288  #include "confdefs.h"
2289  /* Override any gcc2 internal prototype to avoid an error.  */
2290  /* We use char because int might match the return type of a gcc2
2291 @@ -15625,7 +15671,7 @@ int main() {
2292  yp_get_default_domain()
2293  ; return 0; }
2294  EOF
2295 -if { (eval echo configure:15629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2296 +if { (eval echo configure:15675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2297    rm -rf conftest*
2298    eval "ac_cv_lib_$ac_lib_var=yes"
2299  else
2300 @@ -15645,7 +15691,7 @@ else
2301    echo "$ac_t""no" 1>&6
2302
2303      echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6
2304 -echo "configure:15649: checking for __yp_get_default_domain in -lnsl" >&5
2305 +echo "configure:15695: checking for __yp_get_default_domain in -lnsl" >&5
2306  ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'`
2307  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2308    echo $ac_n "(cached) $ac_c" 1>&6
2309 @@ -15653,7 +15699,7 @@ else
2310    ac_save_LIBS="$LIBS"
2311  LIBS="-lnsl  $LIBS"
2312  cat > conftest.$ac_ext <<EOF
2313 -#line 15657 "configure"
2314 +#line 15703 "configure"
2315  #include "confdefs.h"
2316  /* Override any gcc2 internal prototype to avoid an error.  */
2317  /* We use char because int might match the return type of a gcc2
2318 @@ -15664,7 +15710,7 @@ int main() {
2319  __yp_get_default_domain()
2320  ; return 0; }
2321  EOF
2322 -if { (eval echo configure:15668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2323 +if { (eval echo configure:15714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2324    rm -rf conftest*
2325    eval "ac_cv_lib_$ac_lib_var=yes"
2326  else
2327 @@ -15696,11 +15742,11 @@ fi
2328    found=no
2329  else
2330    cat > conftest.$ac_ext <<EOF
2331 -#line 15700 "configure"
2332 +#line 15746 "configure"
2333  #include "confdefs.h"
2334  main() { return (0); }
2335  EOF
2336 -if { (eval echo configure:15704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2337 +if { (eval echo configure:15750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2338  then
2339    found=yes
2340  else
2341 @@ -15752,12 +15798,12 @@ EOF
2342    unset found
2343
2344    echo $ac_n "checking for dlopen""... $ac_c" 1>&6
2345 -echo "configure:15756: checking for dlopen" >&5
2346 +echo "configure:15802: checking for dlopen" >&5
2347  if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
2348    echo $ac_n "(cached) $ac_c" 1>&6
2349  else
2350    cat > conftest.$ac_ext <<EOF
2351 -#line 15761 "configure"
2352 +#line 15807 "configure"
2353  #include "confdefs.h"
2354  /* System header to define __stub macros and hopefully few prototypes,
2355      which can conflict with char dlopen(); below.  */
2356 @@ -15780,7 +15826,7 @@ dlopen();
2357
2358  ; return 0; }
2359  EOF
2360 -if { (eval echo configure:15784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2361 +if { (eval echo configure:15830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2362    rm -rf conftest*
2363    eval "ac_cv_func_dlopen=yes"
2364  else
2365 @@ -15798,12 +15844,12 @@ if eval "test \"`echo '$ac_cv_func_'dlop
2366  else
2367    echo "$ac_t""no" 1>&6
2368   echo $ac_n "checking for __dlopen""... $ac_c" 1>&6
2369 -echo "configure:15802: checking for __dlopen" >&5
2370 +echo "configure:15848: checking for __dlopen" >&5
2371  if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then
2372    echo $ac_n "(cached) $ac_c" 1>&6
2373  else
2374    cat > conftest.$ac_ext <<EOF
2375 -#line 15807 "configure"
2376 +#line 15853 "configure"
2377  #include "confdefs.h"
2378  /* System header to define __stub macros and hopefully few prototypes,
2379      which can conflict with char __dlopen(); below.  */
2380 @@ -15826,7 +15872,7 @@ __dlopen();
2381
2382  ; return 0; }
2383  EOF
2384 -if { (eval echo configure:15830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2385 +if { (eval echo configure:15876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2386    rm -rf conftest*
2387    eval "ac_cv_func___dlopen=yes"
2388  else
2389 @@ -15864,7 +15910,7 @@ EOF
2390    unset ac_cv_lib_dl___dlopen
2391    unset found
2392    echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
2393 -echo "configure:15868: checking for dlopen in -ldl" >&5
2394 +echo "configure:15914: checking for dlopen in -ldl" >&5
2395  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
2396  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2397    echo $ac_n "(cached) $ac_c" 1>&6
2398 @@ -15872,7 +15918,7 @@ else
2399    ac_save_LIBS="$LIBS"
2400  LIBS="-ldl  $LIBS"
2401  cat > conftest.$ac_ext <<EOF
2402 -#line 15876 "configure"
2403 +#line 15922 "configure"
2404  #include "confdefs.h"
2405  /* Override any gcc2 internal prototype to avoid an error.  */
2406  /* We use char because int might match the return type of a gcc2
2407 @@ -15883,7 +15929,7 @@ int main() {
2408  dlopen()
2409  ; return 0; }
2410  EOF
2411 -if { (eval echo configure:15887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2412 +if { (eval echo configure:15933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2413    rm -rf conftest*
2414    eval "ac_cv_lib_$ac_lib_var=yes"
2415  else
2416 @@ -15903,7 +15949,7 @@ else
2417    echo "$ac_t""no" 1>&6
2418
2419      echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6
2420 -echo "configure:15907: checking for __dlopen in -ldl" >&5
2421 +echo "configure:15953: checking for __dlopen in -ldl" >&5
2422  ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'`
2423  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2424    echo $ac_n "(cached) $ac_c" 1>&6
2425 @@ -15911,7 +15957,7 @@ else
2426    ac_save_LIBS="$LIBS"
2427  LIBS="-ldl  $LIBS"
2428  cat > conftest.$ac_ext <<EOF
2429 -#line 15915 "configure"
2430 +#line 15961 "configure"
2431  #include "confdefs.h"
2432  /* Override any gcc2 internal prototype to avoid an error.  */
2433  /* We use char because int might match the return type of a gcc2
2434 @@ -15922,7 +15968,7 @@ int main() {
2435  __dlopen()
2436  ; return 0; }
2437  EOF
2438 -if { (eval echo configure:15926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2439 +if { (eval echo configure:15972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2440    rm -rf conftest*
2441    eval "ac_cv_lib_$ac_lib_var=yes"
2442  else
2443 @@ -15954,11 +16000,11 @@ fi
2444    found=no
2445  else
2446    cat > conftest.$ac_ext <<EOF
2447 -#line 15958 "configure"
2448 +#line 16004 "configure"
2449  #include "confdefs.h"
2450  main() { return (0); }
2451  EOF
2452 -if { (eval echo configure:15962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2453 +if { (eval echo configure:16008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2454  then
2455    found=yes
2456  else
2457 @@ -16010,7 +16056,7 @@ EOF
2458
2459  fi
2460  echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
2461 -echo "configure:16014: checking for sin in -lm" >&5
2462 +echo "configure:16060: checking for sin in -lm" >&5
2463  ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
2464  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2465    echo $ac_n "(cached) $ac_c" 1>&6
2466 @@ -16018,7 +16064,7 @@ else
2467    ac_save_LIBS="$LIBS"
2468  LIBS="-lm  $LIBS"
2469  cat > conftest.$ac_ext <<EOF
2470 -#line 16022 "configure"
2471 +#line 16068 "configure"
2472  #include "confdefs.h"
2473  /* Override any gcc2 internal prototype to avoid an error.  */
2474  /* We use char because int might match the return type of a gcc2
2475 @@ -16029,7 +16075,7 @@ int main() {
2476  sin()
2477  ; return 0; }
2478  EOF
2479 -if { (eval echo configure:16033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2480 +if { (eval echo configure:16079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2481    rm -rf conftest*
2482    eval "ac_cv_lib_$ac_lib_var=yes"
2483  else
2484 @@ -16063,12 +16109,12 @@ fi
2485    unset found
2486
2487    echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
2488 -echo "configure:16067: checking for inet_aton" >&5
2489 +echo "configure:16113: checking for inet_aton" >&5
2490  if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
2491    echo $ac_n "(cached) $ac_c" 1>&6
2492  else
2493    cat > conftest.$ac_ext <<EOF
2494 -#line 16072 "configure"
2495 +#line 16118 "configure"
2496  #include "confdefs.h"
2497  /* System header to define __stub macros and hopefully few prototypes,
2498      which can conflict with char inet_aton(); below.  */
2499 @@ -16091,7 +16137,7 @@ inet_aton();
2500
2501  ; return 0; }
2502  EOF
2503 -if { (eval echo configure:16095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2504 +if { (eval echo configure:16141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2505    rm -rf conftest*
2506    eval "ac_cv_func_inet_aton=yes"
2507  else
2508 @@ -16109,12 +16155,12 @@ if eval "test \"`echo '$ac_cv_func_'inet
2509  else
2510    echo "$ac_t""no" 1>&6
2511   echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6
2512 -echo "configure:16113: checking for __inet_aton" >&5
2513 +echo "configure:16159: checking for __inet_aton" >&5
2514  if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then
2515    echo $ac_n "(cached) $ac_c" 1>&6
2516  else
2517    cat > conftest.$ac_ext <<EOF
2518 -#line 16118 "configure"
2519 +#line 16164 "configure"
2520  #include "confdefs.h"
2521  /* System header to define __stub macros and hopefully few prototypes,
2522      which can conflict with char __inet_aton(); below.  */
2523 @@ -16137,7 +16183,7 @@ __inet_aton();
2524
2525  ; return 0; }
2526  EOF
2527 -if { (eval echo configure:16141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2528 +if { (eval echo configure:16187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2529    rm -rf conftest*
2530    eval "ac_cv_func___inet_aton=yes"
2531  else
2532 @@ -16175,7 +16221,7 @@ EOF
2533    unset ac_cv_lib_resolv___inet_aton
2534    unset found
2535    echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
2536 -echo "configure:16179: checking for inet_aton in -lresolv" >&5
2537 +echo "configure:16225: checking for inet_aton in -lresolv" >&5
2538  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
2539  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2540    echo $ac_n "(cached) $ac_c" 1>&6
2541 @@ -16183,7 +16229,7 @@ else
2542    ac_save_LIBS="$LIBS"
2543  LIBS="-lresolv  $LIBS"
2544  cat > conftest.$ac_ext <<EOF
2545 -#line 16187 "configure"
2546 +#line 16233 "configure"
2547  #include "confdefs.h"
2548  /* Override any gcc2 internal prototype to avoid an error.  */
2549  /* We use char because int might match the return type of a gcc2
2550 @@ -16194,7 +16240,7 @@ int main() {
2551  inet_aton()
2552  ; return 0; }
2553  EOF
2554 -if { (eval echo configure:16198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2555 +if { (eval echo configure:16244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2556    rm -rf conftest*
2557    eval "ac_cv_lib_$ac_lib_var=yes"
2558  else
2559 @@ -16214,7 +16260,7 @@ else
2560    echo "$ac_t""no" 1>&6
2561
2562      echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6
2563 -echo "configure:16218: checking for __inet_aton in -lresolv" >&5
2564 +echo "configure:16264: checking for __inet_aton in -lresolv" >&5
2565  ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'`
2566  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2567    echo $ac_n "(cached) $ac_c" 1>&6
2568 @@ -16222,7 +16268,7 @@ else
2569    ac_save_LIBS="$LIBS"
2570  LIBS="-lresolv  $LIBS"
2571  cat > conftest.$ac_ext <<EOF
2572 -#line 16226 "configure"
2573 +#line 16272 "configure"
2574  #include "confdefs.h"
2575  /* Override any gcc2 internal prototype to avoid an error.  */
2576  /* We use char because int might match the return type of a gcc2
2577 @@ -16233,7 +16279,7 @@ int main() {
2578  __inet_aton()
2579  ; return 0; }
2580  EOF
2581 -if { (eval echo configure:16237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2582 +if { (eval echo configure:16283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2583    rm -rf conftest*
2584    eval "ac_cv_lib_$ac_lib_var=yes"
2585  else
2586 @@ -16265,11 +16311,11 @@ fi
2587    found=no
2588  else
2589    cat > conftest.$ac_ext <<EOF
2590 -#line 16269 "configure"
2591 +#line 16315 "configure"
2592  #include "confdefs.h"
2593  main() { return (0); }
2594  EOF
2595 -if { (eval echo configure:16273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2596 +if { (eval echo configure:16319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2597  then
2598    found=yes
2599  else
2600 @@ -16311,7 +16357,7 @@ EOF
2601    unset ac_cv_lib_bind___inet_aton
2602    unset found
2603    echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
2604 -echo "configure:16315: checking for inet_aton in -lbind" >&5
2605 +echo "configure:16361: checking for inet_aton in -lbind" >&5
2606  ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'`
2607  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2608    echo $ac_n "(cached) $ac_c" 1>&6
2609 @@ -16319,7 +16365,7 @@ else
2610    ac_save_LIBS="$LIBS"
2611  LIBS="-lbind  $LIBS"
2612  cat > conftest.$ac_ext <<EOF
2613 -#line 16323 "configure"
2614 +#line 16369 "configure"
2615  #include "confdefs.h"
2616  /* Override any gcc2 internal prototype to avoid an error.  */
2617  /* We use char because int might match the return type of a gcc2
2618 @@ -16330,7 +16376,7 @@ int main() {
2619  inet_aton()
2620  ; return 0; }
2621  EOF
2622 -if { (eval echo configure:16334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2623 +if { (eval echo configure:16380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2624    rm -rf conftest*
2625    eval "ac_cv_lib_$ac_lib_var=yes"
2626  else
2627 @@ -16350,7 +16396,7 @@ else
2628    echo "$ac_t""no" 1>&6
2629
2630      echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
2631 -echo "configure:16354: checking for __inet_aton in -lbind" >&5
2632 +echo "configure:16400: checking for __inet_aton in -lbind" >&5
2633  ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'`
2634  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2635    echo $ac_n "(cached) $ac_c" 1>&6
2636 @@ -16358,7 +16404,7 @@ else
2637    ac_save_LIBS="$LIBS"
2638  LIBS="-lbind  $LIBS"
2639  cat > conftest.$ac_ext <<EOF
2640 -#line 16362 "configure"
2641 +#line 16408 "configure"
2642  #include "confdefs.h"
2643  /* Override any gcc2 internal prototype to avoid an error.  */
2644  /* We use char because int might match the return type of a gcc2
2645 @@ -16369,7 +16415,7 @@ int main() {
2646  __inet_aton()
2647  ; return 0; }
2648  EOF
2649 -if { (eval echo configure:16373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2650 +if { (eval echo configure:16419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2651    rm -rf conftest*
2652    eval "ac_cv_lib_$ac_lib_var=yes"
2653  else
2654 @@ -16401,11 +16447,11 @@ fi
2655    found=no
2656  else
2657    cat > conftest.$ac_ext <<EOF
2658 -#line 16405 "configure"
2659 +#line 16451 "configure"
2660  #include "confdefs.h"
2661  main() { return (0); }
2662  EOF
2663 -if { (eval echo configure:16409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2664 +if { (eval echo configure:16455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2665  then
2666    found=yes
2667  else
2668 @@ -16456,12 +16502,12 @@ EOF
2669
2670
2671  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2672 -echo "configure:16460: checking for ANSI C header files" >&5
2673 +echo "configure:16506: checking for ANSI C header files" >&5
2674  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2675    echo $ac_n "(cached) $ac_c" 1>&6
2676  else
2677    cat > conftest.$ac_ext <<EOF
2678 -#line 16465 "configure"
2679 +#line 16511 "configure"
2680  #include "confdefs.h"
2681  #include <stdlib.h>
2682  #include <stdarg.h>
2683 @@ -16469,7 +16515,7 @@ else
2684  #include <float.h>
2685  EOF
2686  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2687 -{ (eval echo configure:16473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2688 +{ (eval echo configure:16519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2689  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2690  if test -z "$ac_err"; then
2691    rm -rf conftest*
2692 @@ -16486,7 +16532,7 @@ rm -f conftest*
2693  if test $ac_cv_header_stdc = yes; then
2694    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2695  cat > conftest.$ac_ext <<EOF
2696 -#line 16490 "configure"
2697 +#line 16536 "configure"
2698  #include "confdefs.h"
2699  #include <string.h>
2700  EOF
2701 @@ -16504,7 +16550,7 @@ fi
2702  if test $ac_cv_header_stdc = yes; then
2703    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2704  cat > conftest.$ac_ext <<EOF
2705 -#line 16508 "configure"
2706 +#line 16554 "configure"
2707  #include "confdefs.h"
2708  #include <stdlib.h>
2709  EOF
2710 @@ -16525,7 +16571,7 @@ if test "$cross_compiling" = yes; then
2711    :
2712  else
2713    cat > conftest.$ac_ext <<EOF
2714 -#line 16529 "configure"
2715 +#line 16575 "configure"
2716  #include "confdefs.h"
2717  #include <ctype.h>
2718  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
2719 @@ -16536,7 +16582,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
2720  exit (0); }
2721
2722  EOF
2723 -if { (eval echo configure:16540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2724 +if { (eval echo configure:16586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2725  then
2726    :
2727  else
2728 @@ -16564,12 +16610,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
2729  do
2730  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2731  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
2732 -echo "configure:16568: checking for $ac_hdr that defines DIR" >&5
2733 +echo "configure:16614: checking for $ac_hdr that defines DIR" >&5
2734  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
2735    echo $ac_n "(cached) $ac_c" 1>&6
2736  else
2737    cat > conftest.$ac_ext <<EOF
2738 -#line 16573 "configure"
2739 +#line 16619 "configure"
2740  #include "confdefs.h"
2741  #include <sys/types.h>
2742  #include <$ac_hdr>
2743 @@ -16577,7 +16623,7 @@ int main() {
2744  DIR *dirp = 0;
2745  ; return 0; }
2746  EOF
2747 -if { (eval echo configure:16581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2748 +if { (eval echo configure:16627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2749    rm -rf conftest*
2750    eval "ac_cv_header_dirent_$ac_safe=yes"
2751  else
2752 @@ -16602,7 +16648,7 @@ done
2753  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
2754  if test $ac_header_dirent = dirent.h; then
2755  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
2756 -echo "configure:16606: checking for opendir in -ldir" >&5
2757 +echo "configure:16652: checking for opendir in -ldir" >&5
2758  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
2759  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2760    echo $ac_n "(cached) $ac_c" 1>&6
2761 @@ -16610,7 +16656,7 @@ else
2762    ac_save_LIBS="$LIBS"
2763  LIBS="-ldir  $LIBS"
2764  cat > conftest.$ac_ext <<EOF
2765 -#line 16614 "configure"
2766 +#line 16660 "configure"
2767  #include "confdefs.h"
2768  /* Override any gcc2 internal prototype to avoid an error.  */
2769  /* We use char because int might match the return type of a gcc2
2770 @@ -16621,7 +16667,7 @@ int main() {
2771  opendir()
2772  ; return 0; }
2773  EOF
2774 -if { (eval echo configure:16625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2775 +if { (eval echo configure:16671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2776    rm -rf conftest*
2777    eval "ac_cv_lib_$ac_lib_var=yes"
2778  else
2779 @@ -16643,7 +16689,7 @@ fi
2780
2781  else
2782  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
2783 -echo "configure:16647: checking for opendir in -lx" >&5
2784 +echo "configure:16693: checking for opendir in -lx" >&5
2785  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
2786  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2787    echo $ac_n "(cached) $ac_c" 1>&6
2788 @@ -16651,7 +16697,7 @@ else
2789    ac_save_LIBS="$LIBS"
2790  LIBS="-lx  $LIBS"
2791  cat > conftest.$ac_ext <<EOF
2792 -#line 16655 "configure"
2793 +#line 16701 "configure"
2794  #include "confdefs.h"
2795  /* Override any gcc2 internal prototype to avoid an error.  */
2796  /* We use char because int might match the return type of a gcc2
2797 @@ -16662,7 +16708,7 @@ int main() {
2798  opendir()
2799  ; return 0; }
2800  EOF
2801 -if { (eval echo configure:16666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2802 +if { (eval echo configure:16712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2803    rm -rf conftest*
2804    eval "ac_cv_lib_$ac_lib_var=yes"
2805  else
2806 @@ -16744,17 +16790,17 @@ assert.h
2807  do
2808  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2809  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2810 -echo "configure:16748: checking for $ac_hdr" >&5
2811 +echo "configure:16794: checking for $ac_hdr" >&5
2812  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2813    echo $ac_n "(cached) $ac_c" 1>&6
2814  else
2815    cat > conftest.$ac_ext <<EOF
2816 -#line 16753 "configure"
2817 +#line 16799 "configure"
2818  #include "confdefs.h"
2819  #include <$ac_hdr>
2820  EOF
2821  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2822 -{ (eval echo configure:16758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2823 +{ (eval echo configure:16804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2824  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2825  if test -z "$ac_err"; then
2826    rm -rf conftest*
2827 @@ -16783,12 +16829,12 @@ done
2828
2829
2830    echo $ac_n "checking for fopencookie""... $ac_c" 1>&6
2831 -echo "configure:16787: checking for fopencookie" >&5
2832 +echo "configure:16833: checking for fopencookie" >&5
2833  if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then
2834    echo $ac_n "(cached) $ac_c" 1>&6
2835  else
2836    cat > conftest.$ac_ext <<EOF
2837 -#line 16792 "configure"
2838 +#line 16838 "configure"
2839  #include "confdefs.h"
2840  /* System header to define __stub macros and hopefully few prototypes,
2841      which can conflict with char fopencookie(); below.  */
2842 @@ -16811,7 +16857,7 @@ fopencookie();
2843
2844  ; return 0; }
2845  EOF
2846 -if { (eval echo configure:16815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2847 +if { (eval echo configure:16861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2848    rm -rf conftest*
2849    eval "ac_cv_func_fopencookie=yes"
2850  else
2851 @@ -16833,7 +16879,7 @@ fi
2852
2853    if test "$have_glibc_fopencookie" = "yes"; then
2854  cat > conftest.$ac_ext <<EOF
2855 -#line 16837 "configure"
2856 +#line 16883 "configure"
2857  #include "confdefs.h"
2858
2859  #define _GNU_SOURCE
2860 @@ -16843,7 +16889,7 @@ int main() {
2861  cookie_io_functions_t cookie;
2862  ; return 0; }
2863  EOF
2864 -if { (eval echo configure:16847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2865 +if { (eval echo configure:16893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2866    rm -rf conftest*
2867    have_cookie_io_functions_t=yes
2868  else
2869 @@ -16862,7 +16908,7 @@ if test "$cross_compiling" = yes; then
2870
2871  else
2872    cat > conftest.$ac_ext <<EOF
2873 -#line 16866 "configure"
2874 +#line 16912 "configure"
2875  #include "confdefs.h"
2876
2877  #define _GNU_SOURCE
2878 @@ -16894,7 +16940,7 @@ main() {
2879
2880
2881  EOF
2882 -if { (eval echo configure:16898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2883 +if { (eval echo configure:16944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2884  then
2885
2886    cookie_io_functions_use_off64_t=yes
2887 @@ -16914,7 +16960,7 @@ fi
2888      else
2889
2890  cat > conftest.$ac_ext <<EOF
2891 -#line 16918 "configure"
2892 +#line 16964 "configure"
2893  #include "confdefs.h"
2894
2895  #define _GNU_SOURCE
2896 @@ -16924,7 +16970,7 @@ int main() {
2897   _IO_cookie_io_functions_t cookie;
2898  ; return 0; }
2899  EOF
2900 -if { (eval echo configure:16928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2901 +if { (eval echo configure:16974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2902    rm -rf conftest*
2903    have_IO_cookie_io_functions_t=yes
2904  else
2905 @@ -16958,7 +17004,7 @@ EOF
2906
2907
2908    echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6
2909 -echo "configure:16962: checking for broken getcwd" >&5
2910 +echo "configure:17008: checking for broken getcwd" >&5
2911    os=`uname -sr 2>/dev/null`
2912    case $os in
2913      SunOS*)
2914 @@ -16973,14 +17019,14 @@ EOF
2915
2916
2917    echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6
2918 -echo "configure:16977: checking for broken libc stdio" >&5
2919 +echo "configure:17023: checking for broken libc stdio" >&5
2920    if eval "test \"`echo '$''{'_cv_have_broken_glibc_fopen_append'+set}'`\" = set"; then
2921    echo $ac_n "(cached) $ac_c" 1>&6
2922  else
2923
2924    if test "$cross_compiling" = yes; then
2925    cat > conftest.$ac_ext <<EOF
2926 -#line 16984 "configure"
2927 +#line 17030 "configure"
2928  #include "confdefs.h"
2929
2930  #include <features.h>
2931 @@ -16993,7 +17039,7 @@ choke me
2932
2933  ; return 0; }
2934  EOF
2935 -if { (eval echo configure:16997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2936 +if { (eval echo configure:17043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2937    rm -rf conftest*
2938    _cv_have_broken_glibc_fopen_append=yes
2939  else
2940 @@ -17006,7 +17052,7 @@ rm -f conftest*
2941
2942  else
2943    cat > conftest.$ac_ext <<EOF
2944 -#line 17010 "configure"
2945 +#line 17056 "configure"
2946  #include "confdefs.h"
2947
2948  #include <stdio.h>
2949 @@ -17034,7 +17080,7 @@ int main(int argc, char *argv[])
2950  }
2951
2952  EOF
2953 -if { (eval echo configure:17038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2954 +if { (eval echo configure:17084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2955  then
2956    _cv_have_broken_glibc_fopen_append=no
2957  else
2958 @@ -17062,12 +17108,12 @@ EOF
2959
2960
2961  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
2962 -echo "configure:17066: checking whether struct tm is in sys/time.h or time.h" >&5
2963 +echo "configure:17112: checking whether struct tm is in sys/time.h or time.h" >&5
2964  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
2965    echo $ac_n "(cached) $ac_c" 1>&6
2966  else
2967    cat > conftest.$ac_ext <<EOF
2968 -#line 17071 "configure"
2969 +#line 17117 "configure"
2970  #include "confdefs.h"
2971  #include <sys/types.h>
2972  #include <time.h>
2973 @@ -17075,7 +17121,7 @@ int main() {
2974  struct tm *tp; tp->tm_sec;
2975  ; return 0; }
2976  EOF
2977 -if { (eval echo configure:17079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2978 +if { (eval echo configure:17125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2979    rm -rf conftest*
2980    ac_cv_struct_tm=time.h
2981  else
2982 @@ -17096,12 +17142,12 @@ EOF
2983  fi
2984
2985  echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
2986 -echo "configure:17100: checking for tm_zone in struct tm" >&5
2987 +echo "configure:17146: checking for tm_zone in struct tm" >&5
2988  if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
2989    echo $ac_n "(cached) $ac_c" 1>&6
2990  else
2991    cat > conftest.$ac_ext <<EOF
2992 -#line 17105 "configure"
2993 +#line 17151 "configure"
2994  #include "confdefs.h"
2995  #include <sys/types.h>
2996  #include <$ac_cv_struct_tm>
2997 @@ -17109,7 +17155,7 @@ int main() {
2998  struct tm tm; tm.tm_zone;
2999  ; return 0; }
3000  EOF
3001 -if { (eval echo configure:17113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3002 +if { (eval echo configure:17159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3003    rm -rf conftest*
3004    ac_cv_struct_tm_zone=yes
3005  else
3006 @@ -17129,12 +17175,12 @@ EOF
3007
3008  else
3009    echo $ac_n "checking for tzname""... $ac_c" 1>&6
3010 -echo "configure:17133: checking for tzname" >&5
3011 +echo "configure:17179: checking for tzname" >&5
3012  if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
3013    echo $ac_n "(cached) $ac_c" 1>&6
3014  else
3015    cat > conftest.$ac_ext <<EOF
3016 -#line 17138 "configure"
3017 +#line 17184 "configure"
3018  #include "confdefs.h"
3019  #include <time.h>
3020  #ifndef tzname /* For SGI.  */
3021 @@ -17144,7 +17190,7 @@ int main() {
3022  atoi(*tzname);
3023  ; return 0; }
3024  EOF
3025 -if { (eval echo configure:17148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3026 +if { (eval echo configure:17194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3027    rm -rf conftest*
3028    ac_cv_var_tzname=yes
3029  else
3030 @@ -17168,16 +17214,16 @@ fi
3031
3032
3033    echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6
3034 -echo "configure:17172: checking for missing declarations of reentrant functions" >&5
3035 +echo "configure:17218: checking for missing declarations of reentrant functions" >&5
3036    cat > conftest.$ac_ext <<EOF
3037 -#line 17174 "configure"
3038 +#line 17220 "configure"
3039  #include "confdefs.h"
3040  #include <time.h>
3041  int main() {
3042  struct tm *(*func)() = localtime_r
3043  ; return 0; }
3044  EOF
3045 -if { (eval echo configure:17181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3046 +if { (eval echo configure:17227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3047    rm -rf conftest*
3048
3049      :
3050 @@ -17195,14 +17241,14 @@ EOF
3051  fi
3052  rm -f conftest*
3053    cat > conftest.$ac_ext <<EOF
3054 -#line 17199 "configure"
3055 +#line 17245 "configure"
3056  #include "confdefs.h"
3057  #include <time.h>
3058  int main() {
3059  struct tm *(*func)() = gmtime_r
3060  ; return 0; }
3061  EOF
3062 -if { (eval echo configure:17206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3063 +if { (eval echo configure:17252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3064    rm -rf conftest*
3065
3066      :
3067 @@ -17220,14 +17266,14 @@ EOF
3068  fi
3069  rm -f conftest*
3070    cat > conftest.$ac_ext <<EOF
3071 -#line 17224 "configure"
3072 +#line 17270 "configure"
3073  #include "confdefs.h"
3074  #include <time.h>
3075  int main() {
3076  char *(*func)() = asctime_r
3077  ; return 0; }
3078  EOF
3079 -if { (eval echo configure:17231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3080 +if { (eval echo configure:17277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3081    rm -rf conftest*
3082
3083      :
3084 @@ -17245,14 +17291,14 @@ EOF
3085  fi
3086  rm -f conftest*
3087    cat > conftest.$ac_ext <<EOF
3088 -#line 17249 "configure"
3089 +#line 17295 "configure"
3090  #include "confdefs.h"
3091  #include <time.h>
3092  int main() {
3093  char *(*func)() = ctime_r
3094  ; return 0; }
3095  EOF
3096 -if { (eval echo configure:17256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3097 +if { (eval echo configure:17302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3098    rm -rf conftest*
3099
3100      :
3101 @@ -17270,14 +17316,14 @@ EOF
3102  fi
3103  rm -f conftest*
3104    cat > conftest.$ac_ext <<EOF
3105 -#line 17274 "configure"
3106 +#line 17320 "configure"
3107  #include "confdefs.h"
3108  #include <string.h>
3109  int main() {
3110  char *(*func)() = strtok_r
3111  ; return 0; }
3112  EOF
3113 -if { (eval echo configure:17281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3114 +if { (eval echo configure:17327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3115    rm -rf conftest*
3116
3117      :
3118 @@ -17298,16 +17344,16 @@ rm -f conftest*
3119
3120
3121    echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6
3122 -echo "configure:17302: checking for fclose declaration" >&5
3123 +echo "configure:17348: checking for fclose declaration" >&5
3124    cat > conftest.$ac_ext <<EOF
3125 -#line 17304 "configure"
3126 +#line 17350 "configure"
3127  #include "confdefs.h"
3128  #include <stdio.h>
3129  int main() {
3130  int (*func)() = fclose
3131  ; return 0; }
3132  EOF
3133 -if { (eval echo configure:17311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3134 +if { (eval echo configure:17357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3135    rm -rf conftest*
3136
3137      cat >> confdefs.h <<\EOF
3138 @@ -17333,12 +17379,12 @@ rm -f conftest*
3139
3140
3141  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
3142 -echo "configure:17337: checking for tm_gmtoff in struct tm" >&5
3143 +echo "configure:17383: checking for tm_gmtoff in struct tm" >&5
3144  if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then
3145    echo $ac_n "(cached) $ac_c" 1>&6
3146  else
3147    cat > conftest.$ac_ext <<EOF
3148 -#line 17342 "configure"
3149 +#line 17388 "configure"
3150  #include "confdefs.h"
3151  #include <sys/types.h>
3152  #include <$ac_cv_struct_tm>
3153 @@ -17346,7 +17392,7 @@ int main() {
3154  struct tm tm; tm.tm_gmtoff;
3155  ; return 0; }
3156  EOF
3157 -if { (eval echo configure:17350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3158 +if { (eval echo configure:17396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3159    rm -rf conftest*
3160    ac_cv_struct_tm_gmtoff=yes
3161  else
3162 @@ -17369,12 +17415,12 @@ fi
3163
3164
3165  echo $ac_n "checking for struct flock""... $ac_c" 1>&6
3166 -echo "configure:17373: checking for struct flock" >&5
3167 +echo "configure:17419: checking for struct flock" >&5
3168  if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then
3169    echo $ac_n "(cached) $ac_c" 1>&6
3170  else
3171    cat > conftest.$ac_ext <<EOF
3172 -#line 17378 "configure"
3173 +#line 17424 "configure"
3174  #include "confdefs.h"
3175
3176  #include <unistd.h>
3177 @@ -17384,7 +17430,7 @@ int main() {
3178  struct flock x;
3179  ; return 0; }
3180  EOF
3181 -if { (eval echo configure:17388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3182 +if { (eval echo configure:17434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3183    rm -rf conftest*
3184
3185            ac_cv_struct_flock=yes
3186 @@ -17411,12 +17457,12 @@ fi
3187
3188
3189  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
3190 -echo "configure:17415: checking for socklen_t" >&5
3191 +echo "configure:17461: checking for socklen_t" >&5
3192  if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
3193    echo $ac_n "(cached) $ac_c" 1>&6
3194  else
3195    cat > conftest.$ac_ext <<EOF
3196 -#line 17420 "configure"
3197 +#line 17466 "configure"
3198  #include "confdefs.h"
3199
3200  #include <sys/types.h>
3201 @@ -17428,7 +17474,7 @@ socklen_t x;
3202
3203  ; return 0; }
3204  EOF
3205 -if { (eval echo configure:17432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3206 +if { (eval echo configure:17478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3207    rm -rf conftest*
3208
3209    ac_cv_socklen_t=yes
3210 @@ -17454,7 +17500,7 @@ fi
3211
3212
3213  echo $ac_n "checking size of size_t""... $ac_c" 1>&6
3214 -echo "configure:17458: checking size of size_t" >&5
3215 +echo "configure:17504: checking size of size_t" >&5
3216  if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then
3217    echo $ac_n "(cached) $ac_c" 1>&6
3218  else
3219 @@ -17462,18 +17508,19 @@ else
3220    ac_cv_sizeof_size_t=8
3221  else
3222    cat > conftest.$ac_ext <<EOF
3223 -#line 17466 "configure"
3224 +#line 17512 "configure"
3225  #include "confdefs.h"
3226  #include <stdio.h>
3227 -int main()
3228 +#include <sys/types.h>
3229 +main()
3230  {
3231    FILE *f=fopen("conftestval", "w");
3232 -  if (!f) return(1);
3233 +  if (!f) exit(1);
3234    fprintf(f, "%d\n", sizeof(size_t));
3235 -  return(0);
3236 +  exit(0);
3237  }
3238  EOF
3239 -if { (eval echo configure:17477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3240 +if { (eval echo configure:17524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3241  then
3242    ac_cv_sizeof_size_t=`cat conftestval`
3243  else
3244 @@ -17493,7 +17540,7 @@ EOF
3245
3246
3247  echo $ac_n "checking size of long long""... $ac_c" 1>&6
3248 -echo "configure:17497: checking size of long long" >&5
3249 +echo "configure:17544: checking size of long long" >&5
3250  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3251    echo $ac_n "(cached) $ac_c" 1>&6
3252  else
3253 @@ -17501,18 +17548,19 @@ else
3254    ac_cv_sizeof_long_long=8
3255  else
3256    cat > conftest.$ac_ext <<EOF
3257 -#line 17505 "configure"
3258 +#line 17552 "configure"
3259  #include "confdefs.h"
3260  #include <stdio.h>
3261 -int main()
3262 +#include <sys/types.h>
3263 +main()
3264  {
3265    FILE *f=fopen("conftestval", "w");
3266 -  if (!f) return(1);
3267 +  if (!f) exit(1);
3268    fprintf(f, "%d\n", sizeof(long long));
3269 -  return(0);
3270 +  exit(0);
3271  }
3272  EOF
3273 -if { (eval echo configure:17516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3274 +if { (eval echo configure:17564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3275  then
3276    ac_cv_sizeof_long_long=`cat conftestval`
3277  else
3278 @@ -17532,7 +17580,7 @@ EOF
3279
3280
3281  echo $ac_n "checking size of long long int""... $ac_c" 1>&6
3282 -echo "configure:17536: checking size of long long int" >&5
3283 +echo "configure:17584: checking size of long long int" >&5
3284  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then
3285    echo $ac_n "(cached) $ac_c" 1>&6
3286  else
3287 @@ -17540,18 +17588,19 @@ else
3288    ac_cv_sizeof_long_long_int=8
3289  else
3290    cat > conftest.$ac_ext <<EOF
3291 -#line 17544 "configure"
3292 +#line 17592 "configure"
3293  #include "confdefs.h"
3294  #include <stdio.h>
3295 -int main()
3296 +#include <sys/types.h>
3297 +main()
3298  {
3299    FILE *f=fopen("conftestval", "w");
3300 -  if (!f) return(1);
3301 +  if (!f) exit(1);
3302    fprintf(f, "%d\n", sizeof(long long int));
3303 -  return(0);
3304 +  exit(0);
3305  }
3306  EOF
3307 -if { (eval echo configure:17555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3308 +if { (eval echo configure:17604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3309  then
3310    ac_cv_sizeof_long_long_int=`cat conftestval`
3311  else
3312 @@ -17571,7 +17620,7 @@ EOF
3313
3314
3315  echo $ac_n "checking size of long""... $ac_c" 1>&6
3316 -echo "configure:17575: checking size of long" >&5
3317 +echo "configure:17624: checking size of long" >&5
3318  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3319    echo $ac_n "(cached) $ac_c" 1>&6
3320  else
3321 @@ -17579,18 +17628,19 @@ else
3322    ac_cv_sizeof_long=8
3323  else
3324    cat > conftest.$ac_ext <<EOF
3325 -#line 17583 "configure"
3326 +#line 17632 "configure"
3327  #include "confdefs.h"
3328  #include <stdio.h>
3329 -int main()
3330 +#include <sys/types.h>
3331 +main()
3332  {
3333    FILE *f=fopen("conftestval", "w");
3334 -  if (!f) return(1);
3335 +  if (!f) exit(1);
3336    fprintf(f, "%d\n", sizeof(long));
3337 -  return(0);
3338 +  exit(0);
3339  }
3340  EOF
3341 -if { (eval echo configure:17594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3342 +if { (eval echo configure:17644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3343  then
3344    ac_cv_sizeof_long=`cat conftestval`
3345  else
3346 @@ -17610,7 +17660,7 @@ EOF
3347
3348
3349  echo $ac_n "checking size of int""... $ac_c" 1>&6
3350 -echo "configure:17614: checking size of int" >&5
3351 +echo "configure:17664: checking size of int" >&5
3352  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3353    echo $ac_n "(cached) $ac_c" 1>&6
3354  else
3355 @@ -17618,18 +17668,19 @@ else
3356    ac_cv_sizeof_int=4
3357  else
3358    cat > conftest.$ac_ext <<EOF
3359 -#line 17622 "configure"
3360 +#line 17672 "configure"
3361  #include "confdefs.h"
3362  #include <stdio.h>
3363 -int main()
3364 +#include <sys/types.h>
3365 +main()
3366  {
3367    FILE *f=fopen("conftestval", "w");
3368 -  if (!f) return(1);
3369 +  if (!f) exit(1);
3370    fprintf(f, "%d\n", sizeof(int));
3371 -  return(0);
3372 +  exit(0);
3373  }
3374  EOF
3375 -if { (eval echo configure:17633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3376 +if { (eval echo configure:17684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3377  then
3378    ac_cv_sizeof_int=`cat conftestval`
3379  else
3380 @@ -17651,7 +17702,7 @@ EOF
3381
3382
3383    echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6
3384 -echo "configure:17655: checking size of intmax_t" >&5
3385 +echo "configure:17706: checking size of intmax_t" >&5
3386
3387    php_cache_value=php_cv_sizeof_intmax_t
3388    if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then
3389 @@ -17668,7 +17719,7 @@ else
3390
3391  else
3392    cat > conftest.$ac_ext <<EOF
3393 -#line 17672 "configure"
3394 +#line 17723 "configure"
3395  #include "confdefs.h"
3396  #include <stdio.h>
3397  #if STDC_HEADERS
3398 @@ -17692,7 +17743,7 @@ int main()
3399  }
3400
3401  EOF
3402 -if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3403 +if { (eval echo configure:17747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3404  then
3405
3406      eval $php_cache_value=`cat conftestval`
3407 @@ -17731,7 +17782,7 @@ EOF
3408
3409
3410    echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6
3411 -echo "configure:17735: checking size of ssize_t" >&5
3412 +echo "configure:17786: checking size of ssize_t" >&5
3413
3414    php_cache_value=php_cv_sizeof_ssize_t
3415    if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then
3416 @@ -17748,7 +17799,7 @@ else
3417
3418  else
3419    cat > conftest.$ac_ext <<EOF
3420 -#line 17752 "configure"
3421 +#line 17803 "configure"
3422  #include "confdefs.h"
3423  #include <stdio.h>
3424  #if STDC_HEADERS
3425 @@ -17772,7 +17823,7 @@ int main()
3426  }
3427
3428  EOF
3429 -if { (eval echo configure:17776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3430 +if { (eval echo configure:17827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3431  then
3432
3433      eval $php_cache_value=`cat conftestval`
3434 @@ -17811,7 +17862,7 @@ EOF
3435
3436
3437    echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6
3438 -echo "configure:17815: checking size of ptrdiff_t" >&5
3439 +echo "configure:17866: checking size of ptrdiff_t" >&5
3440
3441    php_cache_value=php_cv_sizeof_ptrdiff_t
3442    if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then
3443 @@ -17828,7 +17879,7 @@ else
3444
3445  else
3446    cat > conftest.$ac_ext <<EOF
3447 -#line 17832 "configure"
3448 +#line 17883 "configure"
3449  #include "confdefs.h"
3450  #include <stdio.h>
3451  #if STDC_HEADERS
3452 @@ -17852,7 +17903,7 @@ int main()
3453  }
3454
3455  EOF
3456 -if { (eval echo configure:17856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3457 +if { (eval echo configure:17907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3458  then
3459
3460      eval $php_cache_value=`cat conftestval`
3461 @@ -17891,12 +17942,12 @@ EOF
3462
3463
3464  echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
3465 -echo "configure:17895: checking for st_blksize in struct stat" >&5
3466 +echo "configure:17946: checking for st_blksize in struct stat" >&5
3467  if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
3468    echo $ac_n "(cached) $ac_c" 1>&6
3469  else
3470    cat > conftest.$ac_ext <<EOF
3471 -#line 17900 "configure"
3472 +#line 17951 "configure"
3473  #include "confdefs.h"
3474  #include <sys/types.h>
3475  #include <sys/stat.h>
3476 @@ -17904,7 +17955,7 @@ int main() {
3477  struct stat s; s.st_blksize;
3478  ; return 0; }
3479  EOF
3480 -if { (eval echo configure:17908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3481 +if { (eval echo configure:17959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3482    rm -rf conftest*
3483    ac_cv_struct_st_blksize=yes
3484  else
3485 @@ -17926,12 +17977,12 @@ fi
3486
3487  if test "`uname -s 2>/dev/null`" != "QNX"; then
3488    echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
3489 -echo "configure:17930: checking for st_blocks in struct stat" >&5
3490 +echo "configure:17981: checking for st_blocks in struct stat" >&5
3491  if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
3492    echo $ac_n "(cached) $ac_c" 1>&6
3493  else
3494    cat > conftest.$ac_ext <<EOF
3495 -#line 17935 "configure"
3496 +#line 17986 "configure"
3497  #include "confdefs.h"
3498  #include <sys/types.h>
3499  #include <sys/stat.h>
3500 @@ -17939,7 +17990,7 @@ int main() {
3501  struct stat s; s.st_blocks;
3502  ; return 0; }
3503  EOF
3504 -if { (eval echo configure:17943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3505 +if { (eval echo configure:17994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3506    rm -rf conftest*
3507    ac_cv_struct_st_blocks=yes
3508  else
3509 @@ -17966,12 +18017,12 @@ else
3510    WARNING_LEVEL=0
3511  fi
3512  echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
3513 -echo "configure:17970: checking for st_rdev in struct stat" >&5
3514 +echo "configure:18021: checking for st_rdev in struct stat" >&5
3515  if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
3516    echo $ac_n "(cached) $ac_c" 1>&6
3517  else
3518    cat > conftest.$ac_ext <<EOF
3519 -#line 17975 "configure"
3520 +#line 18026 "configure"
3521  #include "confdefs.h"
3522  #include <sys/types.h>
3523  #include <sys/stat.h>
3524 @@ -17979,7 +18030,7 @@ int main() {
3525  struct stat s; s.st_rdev;
3526  ; return 0; }
3527  EOF
3528 -if { (eval echo configure:17983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3529 +if { (eval echo configure:18034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3530    rm -rf conftest*
3531    ac_cv_struct_st_rdev=yes
3532  else
3533 @@ -18001,12 +18052,12 @@ fi
3534
3535
3536  echo $ac_n "checking for size_t""... $ac_c" 1>&6
3537 -echo "configure:18005: checking for size_t" >&5
3538 +echo "configure:18056: checking for size_t" >&5
3539  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3540    echo $ac_n "(cached) $ac_c" 1>&6
3541  else
3542    cat > conftest.$ac_ext <<EOF
3543 -#line 18010 "configure"
3544 +#line 18061 "configure"
3545  #include "confdefs.h"
3546  #include <sys/types.h>
3547  #if STDC_HEADERS
3548 @@ -18034,12 +18085,12 @@ EOF
3549  fi
3550
3551  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
3552 -echo "configure:18038: checking for uid_t in sys/types.h" >&5
3553 +echo "configure:18089: checking for uid_t in sys/types.h" >&5
3554  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
3555    echo $ac_n "(cached) $ac_c" 1>&6
3556  else
3557    cat > conftest.$ac_ext <<EOF
3558 -#line 18043 "configure"
3559 +#line 18094 "configure"
3560  #include "confdefs.h"
3561  #include <sys/types.h>
3562  EOF
3563 @@ -18070,12 +18121,12 @@ fi
3564
3565
3566      echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
3567 -echo "configure:18074: checking for struct sockaddr_storage" >&5
3568 +echo "configure:18125: checking for struct sockaddr_storage" >&5
3569  if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then
3570    echo $ac_n "(cached) $ac_c" 1>&6
3571  else
3572    cat > conftest.$ac_ext <<EOF
3573 -#line 18079 "configure"
3574 +#line 18130 "configure"
3575  #include "confdefs.h"
3576  #include <sys/types.h>
3577  #include <sys/socket.h>
3578 @@ -18083,7 +18134,7 @@ int main() {
3579  struct sockaddr_storage s; s
3580  ; return 0; }
3581  EOF
3582 -if { (eval echo configure:18087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3583 +if { (eval echo configure:18138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3584    rm -rf conftest*
3585    ac_cv_sockaddr_storage=yes
3586  else
3587 @@ -18104,13 +18155,13 @@ EOF
3588
3589    fi
3590      echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6
3591 -echo "configure:18108: checking for field sa_len in struct sockaddr" >&5
3592 +echo "configure:18159: checking for field sa_len in struct sockaddr" >&5
3593  if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then
3594    echo $ac_n "(cached) $ac_c" 1>&6
3595  else
3596
3597      cat > conftest.$ac_ext <<EOF
3598 -#line 18114 "configure"
3599 +#line 18165 "configure"
3600  #include "confdefs.h"
3601  #include <sys/types.h>
3602  #include <sys/socket.h>
3603 @@ -18118,7 +18169,7 @@ int main() {
3604  static struct sockaddr sa; int n = (int) sa.sa_len; return n;
3605  ; return 0; }
3606  EOF
3607 -if { (eval echo configure:18122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3608 +if { (eval echo configure:18173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3609    rm -rf conftest*
3610    ac_cv_sockaddr_sa_len=yes
3611  else
3612 @@ -18141,12 +18192,12 @@ EOF
3613
3614
3615  echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6
3616 -echo "configure:18145: checking for IPv6 support" >&5
3617 +echo "configure:18196: checking for IPv6 support" >&5
3618  if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then
3619    echo $ac_n "(cached) $ac_c" 1>&6
3620  else
3621    cat > conftest.$ac_ext <<EOF
3622 -#line 18150 "configure"
3623 +#line 18201 "configure"
3624  #include "confdefs.h"
3625   #include <sys/types.h>
3626  #include <sys/socket.h>
3627 @@ -18155,7 +18206,7 @@ int main() {
3628  struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;
3629  ; return 0; }
3630  EOF
3631 -if { (eval echo configure:18159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3632 +if { (eval echo configure:18210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3633    rm -rf conftest*
3634    ac_cv_ipv6_support=yes
3635  else
3636 @@ -18171,12 +18222,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6
3637
3638
3639  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
3640 -echo "configure:18175: checking for vprintf" >&5
3641 +echo "configure:18226: checking for vprintf" >&5
3642  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
3643    echo $ac_n "(cached) $ac_c" 1>&6
3644  else
3645    cat > conftest.$ac_ext <<EOF
3646 -#line 18180 "configure"
3647 +#line 18231 "configure"
3648  #include "confdefs.h"
3649  /* System header to define __stub macros and hopefully few prototypes,
3650      which can conflict with char vprintf(); below.  */
3651 @@ -18199,7 +18250,7 @@ vprintf();
3652
3653  ; return 0; }
3654  EOF
3655 -if { (eval echo configure:18203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3656 +if { (eval echo configure:18254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3657    rm -rf conftest*
3658    eval "ac_cv_func_vprintf=yes"
3659  else
3660 @@ -18223,12 +18274,12 @@ fi
3661
3662  if test "$ac_cv_func_vprintf" != yes; then
3663  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
3664 -echo "configure:18227: checking for _doprnt" >&5
3665 +echo "configure:18278: checking for _doprnt" >&5
3666  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
3667    echo $ac_n "(cached) $ac_c" 1>&6
3668  else
3669    cat > conftest.$ac_ext <<EOF
3670 -#line 18232 "configure"
3671 +#line 18283 "configure"
3672  #include "confdefs.h"
3673  /* System header to define __stub macros and hopefully few prototypes,
3674      which can conflict with char _doprnt(); below.  */
3675 @@ -18251,7 +18302,7 @@ _doprnt();
3676
3677  ; return 0; }
3678  EOF
3679 -if { (eval echo configure:18255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3680 +if { (eval echo configure:18306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3681    rm -rf conftest*
3682    eval "ac_cv_func__doprnt=yes"
3683  else
3684 @@ -18359,12 +18410,12 @@ asprintf \
3685
3686  do
3687  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3688 -echo "configure:18363: checking for $ac_func" >&5
3689 +echo "configure:18414: checking for $ac_func" >&5
3690  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3691    echo $ac_n "(cached) $ac_c" 1>&6
3692  else
3693    cat > conftest.$ac_ext <<EOF
3694 -#line 18368 "configure"
3695 +#line 18419 "configure"
3696  #include "confdefs.h"
3697  /* System header to define __stub macros and hopefully few prototypes,
3698      which can conflict with char $ac_func(); below.  */
3699 @@ -18387,7 +18438,7 @@ $ac_func();
3700
3701  ; return 0; }
3702  EOF
3703 -if { (eval echo configure:18391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3704 +if { (eval echo configure:18442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3705    rm -rf conftest*
3706    eval "ac_cv_func_$ac_func=yes"
3707  else
3708 @@ -18418,7 +18469,7 @@ done
3709    unset ac_cv_lib_rt___nanosleep
3710    unset found
3711    echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
3712 -echo "configure:18422: checking for nanosleep in -lrt" >&5
3713 +echo "configure:18473: checking for nanosleep in -lrt" >&5
3714  ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'`
3715  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3716    echo $ac_n "(cached) $ac_c" 1>&6
3717 @@ -18426,7 +18477,7 @@ else
3718    ac_save_LIBS="$LIBS"
3719  LIBS="-lrt  $LIBS"
3720  cat > conftest.$ac_ext <<EOF
3721 -#line 18430 "configure"
3722 +#line 18481 "configure"
3723  #include "confdefs.h"
3724  /* Override any gcc2 internal prototype to avoid an error.  */
3725  /* We use char because int might match the return type of a gcc2
3726 @@ -18437,7 +18488,7 @@ int main() {
3727  nanosleep()
3728  ; return 0; }
3729  EOF
3730 -if { (eval echo configure:18441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3731 +if { (eval echo configure:18492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3732    rm -rf conftest*
3733    eval "ac_cv_lib_$ac_lib_var=yes"
3734  else
3735 @@ -18457,7 +18508,7 @@ else
3736    echo "$ac_t""no" 1>&6
3737
3738      echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6
3739 -echo "configure:18461: checking for __nanosleep in -lrt" >&5
3740 +echo "configure:18512: checking for __nanosleep in -lrt" >&5
3741  ac_lib_var=`echo rt'_'__nanosleep | sed 'y%./+-%__p_%'`
3742  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3743    echo $ac_n "(cached) $ac_c" 1>&6
3744 @@ -18465,7 +18516,7 @@ else
3745    ac_save_LIBS="$LIBS"
3746  LIBS="-lrt  $LIBS"
3747  cat > conftest.$ac_ext <<EOF
3748 -#line 18469 "configure"
3749 +#line 18520 "configure"
3750  #include "confdefs.h"
3751  /* Override any gcc2 internal prototype to avoid an error.  */
3752  /* We use char because int might match the return type of a gcc2
3753 @@ -18476,7 +18527,7 @@ int main() {
3754  __nanosleep()
3755  ; return 0; }
3756  EOF
3757 -if { (eval echo configure:18480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3758 +if { (eval echo configure:18531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3759    rm -rf conftest*
3760    eval "ac_cv_lib_$ac_lib_var=yes"
3761  else
3762 @@ -18508,11 +18559,11 @@ fi
3763    found=no
3764  else
3765    cat > conftest.$ac_ext <<EOF
3766 -#line 18512 "configure"
3767 +#line 18563 "configure"
3768  #include "confdefs.h"
3769  main() { return (0); }
3770  EOF
3771 -if { (eval echo configure:18516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3772 +if { (eval echo configure:18567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3773  then
3774    found=yes
3775  else
3776 @@ -18556,25 +18607,25 @@ EOF
3777
3778
3779  echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
3780 -echo "configure:18560: checking for getaddrinfo" >&5
3781 +echo "configure:18611: checking for getaddrinfo" >&5
3782  if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
3783    echo $ac_n "(cached) $ac_c" 1>&6
3784  else
3785    cat > conftest.$ac_ext <<EOF
3786 -#line 18565 "configure"
3787 +#line 18616 "configure"
3788  #include "confdefs.h"
3789  #include <netdb.h>
3790  int main() {
3791  struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
3792  ; return 0; }
3793  EOF
3794 -if { (eval echo configure:18572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3795 +if { (eval echo configure:18623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3796    rm -rf conftest*
3797    if test "$cross_compiling" = yes; then
3798    ac_cv_func_getaddrinfo=no
3799  else
3800    cat > conftest.$ac_ext <<EOF
3801 -#line 18578 "configure"
3802 +#line 18629 "configure"
3803  #include "confdefs.h"
3804
3805  #include <netdb.h>
3806 @@ -18614,7 +18665,7 @@ int main(void) {
3807  }
3808
3809  EOF
3810 -if { (eval echo configure:18618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3811 +if { (eval echo configure:18669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3812  then
3813    ac_cv_func_getaddrinfo=yes
3814  else
3815 @@ -18646,12 +18697,12 @@ fi
3816  for ac_func in strlcat strlcpy getopt
3817  do
3818  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3819 -echo "configure:18650: checking for $ac_func" >&5
3820 +echo "configure:18701: checking for $ac_func" >&5
3821  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3822    echo $ac_n "(cached) $ac_c" 1>&6
3823  else
3824    cat > conftest.$ac_ext <<EOF
3825 -#line 18655 "configure"
3826 +#line 18706 "configure"
3827  #include "confdefs.h"
3828  /* System header to define __stub macros and hopefully few prototypes,
3829      which can conflict with char $ac_func(); below.  */
3830 @@ -18674,7 +18725,7 @@ $ac_func();
3831
3832  ; return 0; }
3833  EOF
3834 -if { (eval echo configure:18678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3835 +if { (eval echo configure:18729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3836    rm -rf conftest*
3837    eval "ac_cv_func_$ac_func=yes"
3838  else
3839 @@ -18701,7 +18752,7 @@ done
3840
3841
3842  echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
3843 -echo "configure:18705: checking whether utime accepts a null argument" >&5
3844 +echo "configure:18756: checking whether utime accepts a null argument" >&5
3845  if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
3846    echo $ac_n "(cached) $ac_c" 1>&6
3847  else
3848 @@ -18711,7 +18762,7 @@ if test "$cross_compiling" = yes; then
3849    ac_cv_func_utime_null=no
3850  else
3851    cat > conftest.$ac_ext <<EOF
3852 -#line 18715 "configure"
3853 +#line 18766 "configure"
3854  #include "confdefs.h"
3855  #include <sys/types.h>
3856  #include <sys/stat.h>
3857 @@ -18722,7 +18773,7 @@ exit(!(stat ("conftestdata", &s) == 0 &&
3858  && t.st_mtime - s.st_mtime < 120));
3859  }
3860  EOF
3861 -if { (eval echo configure:18726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3862 +if { (eval echo configure:18777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3863  then
3864    ac_cv_func_utime_null=yes
3865  else
3866 @@ -18748,19 +18799,19 @@ fi
3867  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
3868  # for constant arguments.  Useless!
3869  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
3870 -echo "configure:18752: checking for working alloca.h" >&5
3871 +echo "configure:18803: checking for working alloca.h" >&5
3872  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
3873    echo $ac_n "(cached) $ac_c" 1>&6
3874  else
3875    cat > conftest.$ac_ext <<EOF
3876 -#line 18757 "configure"
3877 +#line 18808 "configure"
3878  #include "confdefs.h"
3879  #include <alloca.h>
3880  int main() {
3881  char *p = alloca(2 * sizeof(int));
3882  ; return 0; }
3883  EOF
3884 -if { (eval echo configure:18764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3885 +if { (eval echo configure:18815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3886    rm -rf conftest*
3887    ac_cv_header_alloca_h=yes
3888  else
3889 @@ -18781,12 +18832,12 @@ EOF
3890  fi
3891
3892  echo $ac_n "checking for alloca""... $ac_c" 1>&6
3893 -echo "configure:18785: checking for alloca" >&5
3894 +echo "configure:18836: checking for alloca" >&5
3895  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
3896    echo $ac_n "(cached) $ac_c" 1>&6
3897  else
3898    cat > conftest.$ac_ext <<EOF
3899 -#line 18790 "configure"
3900 +#line 18841 "configure"
3901  #include "confdefs.h"
3902
3903  #ifdef __GNUC__
3904 @@ -18814,7 +18865,7 @@ int main() {
3905  char *p = (char *) alloca(1);
3906  ; return 0; }
3907  EOF
3908 -if { (eval echo configure:18818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3909 +if { (eval echo configure:18869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3910    rm -rf conftest*
3911    ac_cv_func_alloca_works=yes
3912  else
3913 @@ -18846,12 +18897,12 @@ EOF
3914
3915
3916  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
3917 -echo "configure:18850: checking whether alloca needs Cray hooks" >&5
3918 +echo "configure:18901: checking whether alloca needs Cray hooks" >&5
3919  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
3920    echo $ac_n "(cached) $ac_c" 1>&6
3921  else
3922    cat > conftest.$ac_ext <<EOF
3923 -#line 18855 "configure"
3924 +#line 18906 "configure"
3925  #include "confdefs.h"
3926  #if defined(CRAY) && ! defined(CRAY2)
3927  webecray
3928 @@ -18876,12 +18927,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
3929  if test $ac_cv_os_cray = yes; then
3930  for ac_func in _getb67 GETB67 getb67; do
3931    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3932 -echo "configure:18880: checking for $ac_func" >&5
3933 +echo "configure:18931: checking for $ac_func" >&5
3934  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3935    echo $ac_n "(cached) $ac_c" 1>&6
3936  else
3937    cat > conftest.$ac_ext <<EOF
3938 -#line 18885 "configure"
3939 +#line 18936 "configure"
3940  #include "confdefs.h"
3941  /* System header to define __stub macros and hopefully few prototypes,
3942      which can conflict with char $ac_func(); below.  */
3943 @@ -18904,7 +18955,7 @@ $ac_func();
3944
3945  ; return 0; }
3946  EOF
3947 -if { (eval echo configure:18908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3948 +if { (eval echo configure:18959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3949    rm -rf conftest*
3950    eval "ac_cv_func_$ac_func=yes"
3951  else
3952 @@ -18931,7 +18982,7 @@ done
3953  fi
3954
3955  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
3956 -echo "configure:18935: checking stack direction for C alloca" >&5
3957 +echo "configure:18986: checking stack direction for C alloca" >&5
3958  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
3959    echo $ac_n "(cached) $ac_c" 1>&6
3960  else
3961 @@ -18939,7 +18990,7 @@ else
3962    ac_cv_c_stack_direction=0
3963  else
3964    cat > conftest.$ac_ext <<EOF
3965 -#line 18943 "configure"
3966 +#line 18994 "configure"
3967  #include "confdefs.h"
3968  find_stack_direction ()
3969  {
3970 @@ -18958,7 +19009,7 @@ main ()
3971    exit (find_stack_direction() < 0);
3972  }
3973  EOF
3974 -if { (eval echo configure:18962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3975 +if { (eval echo configure:19013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3976  then
3977    ac_cv_c_stack_direction=1
3978  else
3979 @@ -18981,13 +19032,13 @@ fi
3980
3981
3982    echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
3983 -echo "configure:18985: checking for declared timezone" >&5
3984 +echo "configure:19036: checking for declared timezone" >&5
3985  if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then
3986    echo $ac_n "(cached) $ac_c" 1>&6
3987  else
3988
3989      cat > conftest.$ac_ext <<EOF
3990 -#line 18991 "configure"
3991 +#line 19042 "configure"
3992  #include "confdefs.h"
3993
3994  #include <sys/types.h>
3995 @@ -19002,7 +19053,7 @@ int main() {
3996
3997  ; return 0; }
3998  EOF
3999 -if { (eval echo configure:19006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4000 +if { (eval echo configure:19057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4001    rm -rf conftest*
4002
4003    ac_cv_declared_timezone=yes
4004 @@ -19028,7 +19079,7 @@ EOF
4005
4006
4007  echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6
4008 -echo "configure:19032: checking for type of reentrant time-related functions" >&5
4009 +echo "configure:19083: checking for type of reentrant time-related functions" >&5
4010  if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then
4011    echo $ac_n "(cached) $ac_c" 1>&6
4012  else
4013 @@ -19039,7 +19090,7 @@ if test "$cross_compiling" = yes; then
4014
4015  else
4016    cat > conftest.$ac_ext <<EOF
4017 -#line 19043 "configure"
4018 +#line 19094 "configure"
4019  #include "confdefs.h"
4020
4021  #include <time.h>
4022 @@ -19057,7 +19108,7 @@ return (1);
4023  }
4024
4025  EOF
4026 -if { (eval echo configure:19061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4027 +if { (eval echo configure:19112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4028  then
4029
4030    ac_cv_time_r_type=hpux
4031 @@ -19073,7 +19124,7 @@ else
4032
4033  else
4034    cat > conftest.$ac_ext <<EOF
4035 -#line 19077 "configure"
4036 +#line 19128 "configure"
4037  #include "confdefs.h"
4038
4039  #include <time.h>
4040 @@ -19089,7 +19140,7 @@ main() {
4041  }
4042
4043  EOF
4044 -if { (eval echo configure:19093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4045 +if { (eval echo configure:19144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4046  then
4047
4048      ac_cv_time_r_type=irix
4049 @@ -19127,12 +19178,12 @@ EOF
4050
4051
4052      echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
4053 -echo "configure:19131: checking for readdir_r" >&5
4054 +echo "configure:19182: checking for readdir_r" >&5
4055  if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then
4056    echo $ac_n "(cached) $ac_c" 1>&6
4057  else
4058    cat > conftest.$ac_ext <<EOF
4059 -#line 19136 "configure"
4060 +#line 19187 "configure"
4061  #include "confdefs.h"
4062  /* System header to define __stub macros and hopefully few prototypes,
4063      which can conflict with char readdir_r(); below.  */
4064 @@ -19155,7 +19206,7 @@ readdir_r();
4065
4066  ; return 0; }
4067  EOF
4068 -if { (eval echo configure:19159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4069 +if { (eval echo configure:19210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4070    rm -rf conftest*
4071    eval "ac_cv_func_readdir_r=yes"
4072  else
4073 @@ -19177,7 +19228,7 @@ fi
4074
4075    if test "$ac_cv_func_readdir_r" = "yes"; then
4076    echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6
4077 -echo "configure:19181: checking for type of readdir_r" >&5
4078 +echo "configure:19232: checking for type of readdir_r" >&5
4079  if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then
4080    echo $ac_n "(cached) $ac_c" 1>&6
4081  else
4082 @@ -19188,7 +19239,7 @@ else
4083
4084  else
4085    cat > conftest.$ac_ext <<EOF
4086 -#line 19192 "configure"
4087 +#line 19243 "configure"
4088  #include "confdefs.h"
4089
4090  #define _REENTRANT
4091 @@ -19213,7 +19264,7 @@ main() {
4092  }
4093
4094  EOF
4095 -if { (eval echo configure:19217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4096 +if { (eval echo configure:19268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4097  then
4098
4099        ac_cv_what_readdir_r=POSIX
4100 @@ -19224,7 +19275,7 @@ else
4101    rm -fr conftest*
4102
4103        cat > conftest.$ac_ext <<EOF
4104 -#line 19228 "configure"
4105 +#line 19279 "configure"
4106  #include "confdefs.h"
4107
4108  #define _REENTRANT
4109 @@ -19234,7 +19285,7 @@ int readdir_r(DIR *, struct dirent *);
4110
4111  EOF
4112  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4113 -{ (eval echo configure:19238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4114 +{ (eval echo configure:19289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4115  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4116  if test -z "$ac_err"; then
4117    rm -rf conftest*
4118 @@ -19276,12 +19327,12 @@ EOF
4119
4120
4121  echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
4122 -echo "configure:19280: checking for in_addr_t" >&5
4123 +echo "configure:19331: checking for in_addr_t" >&5
4124  if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then
4125    echo $ac_n "(cached) $ac_c" 1>&6
4126  else
4127    cat > conftest.$ac_ext <<EOF
4128 -#line 19285 "configure"
4129 +#line 19336 "configure"
4130  #include "confdefs.h"
4131  #include <sys/types.h>
4132  #if STDC_HEADERS
4133 @@ -19315,12 +19366,12 @@ fi
4134  for ac_func in crypt_r
4135  do
4136  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
4137 -echo "configure:19319: checking for $ac_func" >&5
4138 +echo "configure:19370: checking for $ac_func" >&5
4139  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
4140    echo $ac_n "(cached) $ac_c" 1>&6
4141  else
4142    cat > conftest.$ac_ext <<EOF
4143 -#line 19324 "configure"
4144 +#line 19375 "configure"
4145  #include "confdefs.h"
4146  /* System header to define __stub macros and hopefully few prototypes,
4147      which can conflict with char $ac_func(); below.  */
4148 @@ -19343,7 +19394,7 @@ $ac_func();
4149
4150  ; return 0; }
4151  EOF
4152 -if { (eval echo configure:19347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4153 +if { (eval echo configure:19398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4154    rm -rf conftest*
4155    eval "ac_cv_func_$ac_func=yes"
4156  else
4157 @@ -19371,14 +19422,14 @@ done
4158  if test "x$php_crypt_r" = "x1"; then
4159
4160    echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6
4161 -echo "configure:19375: checking which data struct is used by crypt_r" >&5
4162 +echo "configure:19426: checking which data struct is used by crypt_r" >&5
4163  if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then
4164    echo $ac_n "(cached) $ac_c" 1>&6
4165  else
4166
4167      php_cv_crypt_r_style=none
4168      cat > conftest.$ac_ext <<EOF
4169 -#line 19382 "configure"
4170 +#line 19433 "configure"
4171  #include "confdefs.h"
4172
4173  #define _REENTRANT 1
4174 @@ -19391,7 +19442,7 @@ crypt_r("passwd", "hash", &buffer);
4175
4176  ; return 0; }
4177  EOF
4178 -if { (eval echo configure:19395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4179 +if { (eval echo configure:19446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4180    rm -rf conftest*
4181    php_cv_crypt_r_style=cryptd
4182  else
4183 @@ -19402,7 +19453,7 @@ rm -f conftest*
4184
4185      if test "$php_cv_crypt_r_style" = "none"; then
4186        cat > conftest.$ac_ext <<EOF
4187 -#line 19406 "configure"
4188 +#line 19457 "configure"
4189  #include "confdefs.h"
4190
4191  #define _REENTRANT 1
4192 @@ -19415,7 +19466,7 @@ crypt_r("passwd", "hash", &buffer);
4193
4194  ; return 0; }
4195  EOF
4196 -if { (eval echo configure:19419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4197 +if { (eval echo configure:19470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4198    rm -rf conftest*
4199    php_cv_crypt_r_style=struct_crypt_data
4200  else
4201 @@ -19427,7 +19478,7 @@ rm -f conftest*
4202
4203      if test "$php_cv_crypt_r_style" = "none"; then
4204        cat > conftest.$ac_ext <<EOF
4205 -#line 19431 "configure"
4206 +#line 19482 "configure"
4207  #include "confdefs.h"
4208
4209  #define _REENTRANT 1
4210 @@ -19441,7 +19492,7 @@ crypt_r("passwd", "hash", &buffer);
4211
4212  ; return 0; }
4213  EOF
4214 -if { (eval echo configure:19445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4215 +if { (eval echo configure:19496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4216    rm -rf conftest*
4217    php_cv_crypt_r_style=struct_crypt_data_gnu_source
4218  else
4219 @@ -19500,7 +19551,7 @@ fi
4220  php_enable_gcov=no
4221
4222  echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6
4223 -echo "configure:19504: checking whether to include gcov symbols" >&5
4224 +echo "configure:19555: checking whether to include gcov symbols" >&5
4225  # Check whether --enable-gcov or --disable-gcov was given.
4226  if test "${enable_gcov+set}" = set; then
4227    enableval="$enable_gcov"
4228 @@ -19539,7 +19590,7 @@ if test "$PHP_GCOV" = "yes"; then
4229    # Extract the first word of "lcov", so it can be a program name with args.
4230  set dummy lcov; ac_word=$2
4231  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4232 -echo "configure:19543: checking for $ac_word" >&5
4233 +echo "configure:19594: checking for $ac_word" >&5
4234  if eval "test \"`echo '$''{'ac_cv_prog_LTP'+set}'`\" = set"; then
4235    echo $ac_n "(cached) $ac_c" 1>&6
4236  else
4237 @@ -19568,7 +19619,7 @@ fi
4238    # Extract the first word of "genhtml", so it can be a program name with args.
4239  set dummy genhtml; ac_word=$2
4240  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4241 -echo "configure:19572: checking for $ac_word" >&5
4242 +echo "configure:19623: checking for $ac_word" >&5
4243  if eval "test \"`echo '$''{'ac_cv_prog_LTP_GENHTML'+set}'`\" = set"; then
4244    echo $ac_n "(cached) $ac_c" 1>&6
4245  else
4246 @@ -19603,7 +19654,7 @@ fi
4247
4248    if test "$LTP"; then
4249      echo $ac_n "checking for ltp version""... $ac_c" 1>&6
4250 -echo "configure:19607: checking for ltp version" >&5
4251 +echo "configure:19658: checking for ltp version" >&5
4252  if eval "test \"`echo '$''{'php_cv_ltp_version'+set}'`\" = set"; then
4253    echo $ac_n "(cached) $ac_c" 1>&6
4254  else
4255 @@ -19660,7 +19711,7 @@ fi
4256  php_enable_debug=no
4257
4258  echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6
4259 -echo "configure:19664: checking whether to include debugging symbols" >&5
4260 +echo "configure:19715: checking whether to include debugging symbols" >&5
4261  # Check whether --enable-debug or --disable-debug was given.
4262  if test "${enable_debug+set}" = set; then
4263    enableval="$enable_debug"
4264 @@ -19708,7 +19759,7 @@ fi
4265  php_with_layout=PHP
4266
4267  echo $ac_n "checking layout of installed files""... $ac_c" 1>&6
4268 -echo "configure:19712: checking layout of installed files" >&5
4269 +echo "configure:19763: checking layout of installed files" >&5
4270  # Check whether --with-layout or --without-layout was given.
4271  if test "${with_layout+set}" = set; then
4272    withval="$with_layout"
4273 @@ -19740,7 +19791,7 @@ esac
4274  php_with_config_file_path=DEFAULT
4275
4276  echo $ac_n "checking path to configuration file""... $ac_c" 1>&6
4277 -echo "configure:19744: checking path to configuration file" >&5
4278 +echo "configure:19795: checking path to configuration file" >&5
4279  # Check whether --with-config-file-path or --without-config-file-path was given.
4280  if test "${with_config_file_path+set}" = set; then
4281    withval="$with_config_file_path"
4282 @@ -19771,7 +19822,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAU
4283  fi
4284
4285  echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6
4286 -echo "configure:19775: checking where to scan for configuration files" >&5
4287 +echo "configure:19826: checking where to scan for configuration files" >&5
4288
4289  php_with_config_file_scan_dir=DEFAULT
4290
4291 @@ -19804,7 +19855,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLA
4292  php_enable_safe_mode=no
4293
4294  echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6
4295 -echo "configure:19808: checking whether to enable safe mode by default" >&5
4296 +echo "configure:19859: checking whether to enable safe mode by default" >&5
4297  # Check whether --enable-safe-mode or --disable-safe-mode was given.
4298  if test "${enable_safe_mode+set}" = set; then
4299    enableval="$enable_safe_mode"
4300 @@ -19836,7 +19887,7 @@ EOF
4301  fi
4302
4303  echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6
4304 -echo "configure:19840: checking for safe mode exec dir" >&5
4305 +echo "configure:19891: checking for safe mode exec dir" >&5
4306
4307  php_with_exec_dir=no
4308
4309 @@ -19877,7 +19928,7 @@ fi
4310  php_enable_sigchild=no
4311
4312  echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6
4313 -echo "configure:19881: checking whether to enable PHP's own SIGCHLD handler" >&5
4314 +echo "configure:19932: checking whether to enable PHP's own SIGCHLD handler" >&5
4315  # Check whether --enable-sigchild or --disable-sigchild was given.
4316  if test "${enable_sigchild+set}" = set; then
4317    enableval="$enable_sigchild"
4318 @@ -19912,7 +19963,7 @@ fi
4319  php_enable_magic_quotes=no
4320
4321  echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6
4322 -echo "configure:19916: checking whether to enable magic quotes by default" >&5
4323 +echo "configure:19967: checking whether to enable magic quotes by default" >&5
4324  # Check whether --enable-magic-quotes or --disable-magic-quotes was given.
4325  if test "${enable_magic_quotes+set}" = set; then
4326    enableval="$enable_magic_quotes"
4327 @@ -19947,7 +19998,7 @@ fi
4328  php_enable_libgcc=no
4329
4330  echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6
4331 -echo "configure:19951: checking whether to explicitly link against libgcc" >&5
4332 +echo "configure:20002: checking whether to explicitly link against libgcc" >&5
4333  # Check whether --enable-libgcc or --disable-libgcc was given.
4334  if test "${enable_libgcc+set}" = set; then
4335    enableval="$enable_libgcc"
4336 @@ -20024,7 +20075,7 @@ fi
4337  php_enable_short_tags=yes
4338
4339  echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6
4340 -echo "configure:20028: checking whether to enable short tags by default" >&5
4341 +echo "configure:20079: checking whether to enable short tags by default" >&5
4342  # Check whether --enable-short-tags or --disable-short-tags was given.
4343  if test "${enable_short_tags+set}" = set; then
4344    enableval="$enable_short_tags"
4345 @@ -20059,7 +20110,7 @@ fi
4346  php_enable_dmalloc=no
4347
4348  echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6
4349 -echo "configure:20063: checking whether to enable dmalloc" >&5
4350 +echo "configure:20114: checking whether to enable dmalloc" >&5
4351  # Check whether --enable-dmalloc or --disable-dmalloc was given.
4352  if test "${enable_dmalloc+set}" = set; then
4353    enableval="$enable_dmalloc"
4354 @@ -20080,7 +20131,7 @@ echo "$ac_t""$ext_output" 1>&6
4355
4356  if test "$PHP_DMALLOC" = "yes"; then
4357    echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6
4358 -echo "configure:20084: checking for dmalloc_error in -ldmalloc" >&5
4359 +echo "configure:20135: checking for dmalloc_error in -ldmalloc" >&5
4360  ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'`
4361  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4362    echo $ac_n "(cached) $ac_c" 1>&6
4363 @@ -20088,7 +20139,7 @@ else
4364    ac_save_LIBS="$LIBS"
4365  LIBS="-ldmalloc  $LIBS"
4366  cat > conftest.$ac_ext <<EOF
4367 -#line 20092 "configure"
4368 +#line 20143 "configure"
4369  #include "confdefs.h"
4370  /* Override any gcc2 internal prototype to avoid an error.  */
4371  /* We use char because int might match the return type of a gcc2
4372 @@ -20099,7 +20150,7 @@ int main() {
4373  dmalloc_error()
4374  ; return 0; }
4375  EOF
4376 -if { (eval echo configure:20103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4377 +if { (eval echo configure:20154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4378    rm -rf conftest*
4379    eval "ac_cv_lib_$ac_lib_var=yes"
4380  else
4381 @@ -20144,7 +20195,7 @@ fi
4382  php_enable_ipv6=yes
4383
4384  echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
4385 -echo "configure:20148: checking whether to enable IPv6 support" >&5
4386 +echo "configure:20199: checking whether to enable IPv6 support" >&5
4387  # Check whether --enable-ipv6 or --disable-ipv6 was given.
4388  if test "${enable_ipv6+set}" = set; then
4389    enableval="$enable_ipv6"
4390 @@ -20171,7 +20222,7 @@ EOF
4391  fi
4392
4393  echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6
4394 -echo "configure:20175: checking how big to make fd sets" >&5
4395 +echo "configure:20226: checking how big to make fd sets" >&5
4396
4397  php_enable_fd_setsize=no
4398
4399 @@ -20239,7 +20290,7 @@ fi
4400
4401
4402  echo $ac_n "checking size of long""... $ac_c" 1>&6
4403 -echo "configure:20243: checking size of long" >&5
4404 +echo "configure:20294: checking size of long" >&5
4405  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
4406    echo $ac_n "(cached) $ac_c" 1>&6
4407  else
4408 @@ -20247,18 +20298,19 @@ else
4409    ac_cv_sizeof_long=8
4410  else
4411    cat > conftest.$ac_ext <<EOF
4412 -#line 20251 "configure"
4413 +#line 20302 "configure"
4414  #include "confdefs.h"
4415  #include <stdio.h>
4416 -int main()
4417 +#include <sys/types.h>
4418 +main()
4419  {
4420    FILE *f=fopen("conftestval", "w");
4421 -  if (!f) return(1);
4422 +  if (!f) exit(1);
4423    fprintf(f, "%d\n", sizeof(long));
4424 -  return(0);
4425 +  exit(0);
4426  }
4427  EOF
4428 -if { (eval echo configure:20262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4429 +if { (eval echo configure:20314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4430  then
4431    ac_cv_sizeof_long=`cat conftestval`
4432  else
4433 @@ -20278,7 +20330,7 @@ EOF
4434
4435
4436  echo $ac_n "checking size of int""... $ac_c" 1>&6
4437 -echo "configure:20282: checking size of int" >&5
4438 +echo "configure:20334: checking size of int" >&5
4439  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
4440    echo $ac_n "(cached) $ac_c" 1>&6
4441  else
4442 @@ -20286,18 +20338,19 @@ else
4443    ac_cv_sizeof_int=4
4444  else
4445    cat > conftest.$ac_ext <<EOF
4446 -#line 20290 "configure"
4447 +#line 20342 "configure"
4448  #include "confdefs.h"
4449  #include <stdio.h>
4450 -int main()
4451 +#include <sys/types.h>
4452 +main()
4453  {
4454    FILE *f=fopen("conftestval", "w");
4455 -  if (!f) return(1);
4456 +  if (!f) exit(1);
4457    fprintf(f, "%d\n", sizeof(int));
4458 -  return(0);
4459 +  exit(0);
4460  }
4461  EOF
4462 -if { (eval echo configure:20301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4463 +if { (eval echo configure:20354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4464  then
4465    ac_cv_sizeof_int=`cat conftestval`
4466  else
4467 @@ -20318,13 +20371,13 @@ EOF
4468
4469
4470  echo $ac_n "checking for int32_t""... $ac_c" 1>&6
4471 -echo "configure:20322: checking for int32_t" >&5
4472 +echo "configure:20375: checking for int32_t" >&5
4473  if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then
4474    echo $ac_n "(cached) $ac_c" 1>&6
4475  else
4476
4477  cat > conftest.$ac_ext <<EOF
4478 -#line 20328 "configure"
4479 +#line 20381 "configure"
4480  #include "confdefs.h"
4481
4482  #if HAVE_SYS_TYPES_H
4483 @@ -20343,7 +20396,7 @@ if (sizeof (int32_t))
4484
4485  ; return 0; }
4486  EOF
4487 -if { (eval echo configure:20347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4488 +if { (eval echo configure:20400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4489    rm -rf conftest*
4490    ac_cv_int_type_int32_t=yes
4491  else
4492 @@ -20366,13 +20419,13 @@ fi
4493
4494
4495  echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
4496 -echo "configure:20370: checking for uint32_t" >&5
4497 +echo "configure:20423: checking for uint32_t" >&5
4498  if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then
4499    echo $ac_n "(cached) $ac_c" 1>&6
4500  else
4501
4502  cat > conftest.$ac_ext <<EOF
4503 -#line 20376 "configure"
4504 +#line 20429 "configure"
4505  #include "confdefs.h"
4506
4507  #if HAVE_SYS_TYPES_H
4508 @@ -20391,7 +20444,7 @@ if (sizeof (uint32_t))
4509
4510  ; return 0; }
4511  EOF
4512 -if { (eval echo configure:20395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4513 +if { (eval echo configure:20448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4514    rm -rf conftest*
4515    ac_cv_int_type_uint32_t=yes
4516  else
4517 @@ -20423,17 +20476,17 @@ stdlib.h
4518  do
4519  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
4520  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
4521 -echo "configure:20427: checking for $ac_hdr" >&5
4522 +echo "configure:20480: checking for $ac_hdr" >&5
4523  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4524    echo $ac_n "(cached) $ac_c" 1>&6
4525  else
4526    cat > conftest.$ac_ext <<EOF
4527 -#line 20432 "configure"
4528 +#line 20485 "configure"
4529  #include "confdefs.h"
4530  #include <$ac_hdr>
4531  EOF
4532  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4533 -{ (eval echo configure:20437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4534 +{ (eval echo configure:20490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4535  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4536  if test -z "$ac_err"; then
4537    rm -rf conftest*
4538 @@ -20463,12 +20516,12 @@ done
4539  for ac_func in strtoll atoll strftime
4540  do
4541  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
4542 -echo "configure:20467: checking for $ac_func" >&5
4543 +echo "configure:20520: checking for $ac_func" >&5
4544  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
4545    echo $ac_n "(cached) $ac_c" 1>&6
4546  else
4547    cat > conftest.$ac_ext <<EOF
4548 -#line 20472 "configure"
4549 +#line 20525 "configure"
4550  #include "confdefs.h"
4551  /* System header to define __stub macros and hopefully few prototypes,
4552      which can conflict with char $ac_func(); below.  */
4553 @@ -20491,7 +20544,7 @@ $ac_func();
4554
4555  ; return 0; }
4556  EOF
4557 -if { (eval echo configure:20495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4558 +if { (eval echo configure:20548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4559    rm -rf conftest*
4560    eval "ac_cv_func_$ac_func=yes"
4561  else
4562 @@ -20953,7 +21006,7 @@ case $PHP_REGEX in
4563  esac
4564
4565  echo $ac_n "checking which regex library to use""... $ac_c" 1>&6
4566 -echo "configure:20957: checking which regex library to use" >&5
4567 +echo "configure:21010: checking which regex library to use" >&5
4568  echo "$ac_t""$REGEX_TYPE" 1>&6
4569
4570  if test "$REGEX_TYPE" = "php"; then
4571 @@ -21330,13 +21383,13 @@ elif test "$REGEX_TYPE" = "system"; then
4572  EOF
4573
4574      echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6
4575 -echo "configure:21334: checking whether field re_magic exists in struct regex_t" >&5
4576 +echo "configure:21387: checking whether field re_magic exists in struct regex_t" >&5
4577  if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then
4578    echo $ac_n "(cached) $ac_c" 1>&6
4579  else
4580
4581    cat > conftest.$ac_ext <<EOF
4582 -#line 21340 "configure"
4583 +#line 21393 "configure"
4584  #include "confdefs.h"
4585  #include <sys/types.h>
4586  #include <regex.h>
4587 @@ -21344,7 +21397,7 @@ int main() {
4588  regex_t rt; rt.re_magic;
4589  ; return 0; }
4590  EOF
4591 -if { (eval echo configure:21348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4592 +if { (eval echo configure:21401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4593    rm -rf conftest*
4594    ac_cv_regex_t_re_magic=yes
4595  else
4596 @@ -21370,7 +21423,7 @@ fi
4597  php_enable_libxml=yes
4598
4599  echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6
4600 -echo "configure:21374: checking whether to enable LIBXML support" >&5
4601 +echo "configure:21427: checking whether to enable LIBXML support" >&5
4602  # Check whether --enable-libxml or --disable-libxml was given.
4603  if test "${enable_libxml+set}" = set; then
4604    enableval="$enable_libxml"
4605 @@ -21415,7 +21468,7 @@ if test -z "$PHP_LIBXML_DIR"; then
4606  php_with_libxml_dir=no
4607
4608  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
4609 -echo "configure:21419: checking libxml2 install dir" >&5
4610 +echo "configure:21472: checking libxml2 install dir" >&5
4611  # Check whether --with-libxml-dir or --without-libxml-dir was given.
4612  if test "${with_libxml_dir+set}" = set; then
4613    withval="$with_libxml_dir"
4614 @@ -21441,7 +21494,7 @@ if test "$PHP_LIBXML" != "no"; then
4615
4616
4617  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
4618 -echo "configure:21445: checking for xml2-config path" >&5
4619 +echo "configure:21498: checking for xml2-config path" >&5
4620  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
4621    echo $ac_n "(cached) $ac_c" 1>&6
4622  else
4623 @@ -21599,7 +21652,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
4624
4625
4626              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
4627 -echo "configure:21603: checking whether libxml build works" >&5
4628 +echo "configure:21656: checking whether libxml build works" >&5
4629  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
4630    echo $ac_n "(cached) $ac_c" 1>&6
4631  else
4632 @@ -21615,7 +21668,7 @@ else
4633
4634  else
4635    cat > conftest.$ac_ext <<EOF
4636 -#line 21619 "configure"
4637 +#line 21672 "configure"
4638  #include "confdefs.h"
4639
4640
4641 @@ -21626,7 +21679,7 @@ else
4642      }
4643
4644  EOF
4645 -if { (eval echo configure:21630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4646 +if { (eval echo configure:21683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4647  then
4648
4649      LIBS=$old_LIBS
4650 @@ -21991,7 +22044,7 @@ fi
4651  php_with_openssl=no
4652
4653  echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6
4654 -echo "configure:21995: checking for OpenSSL support" >&5
4655 +echo "configure:22048: checking for OpenSSL support" >&5
4656  # Check whether --with-openssl or --without-openssl was given.
4657  if test "${with_openssl+set}" = set; then
4658    withval="$with_openssl"
4659 @@ -22035,7 +22088,7 @@ echo "$ac_t""$ext_output" 1>&6
4660  php_with_kerberos=no
4661
4662  echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6
4663 -echo "configure:22039: checking for Kerberos support" >&5
4664 +echo "configure:22092: checking for Kerberos support" >&5
4665  # Check whether --with-kerberos or --without-kerberos was given.
4666  if test "${with_kerberos+set}" = set; then
4667    withval="$with_kerberos"
4668 @@ -22361,7 +22414,7 @@ EOF
4669      # Extract the first word of "krb5-config", so it can be a program name with args.
4670  set dummy krb5-config; ac_word=$2
4671  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4672 -echo "configure:22365: checking for $ac_word" >&5
4673 +echo "configure:22418: checking for $ac_word" >&5
4674  if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
4675    echo $ac_n "(cached) $ac_c" 1>&6
4676  else
4677 @@ -22721,7 +22774,7 @@ fi
4678    fi
4679
4680    echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6
4681 -echo "configure:22725: checking for DSA_get_default_method in -lssl" >&5
4682 +echo "configure:22778: checking for DSA_get_default_method in -lssl" >&5
4683  ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'`
4684  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4685    echo $ac_n "(cached) $ac_c" 1>&6
4686 @@ -22729,7 +22782,7 @@ else
4687    ac_save_LIBS="$LIBS"
4688  LIBS="-lssl  $LIBS"
4689  cat > conftest.$ac_ext <<EOF
4690 -#line 22733 "configure"
4691 +#line 22786 "configure"
4692  #include "confdefs.h"
4693  /* Override any gcc2 internal prototype to avoid an error.  */
4694  /* We use char because int might match the return type of a gcc2
4695 @@ -22740,7 +22793,7 @@ int main() {
4696  DSA_get_default_method()
4697  ; return 0; }
4698  EOF
4699 -if { (eval echo configure:22744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4700 +if { (eval echo configure:22797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4701    rm -rf conftest*
4702    eval "ac_cv_lib_$ac_lib_var=yes"
4703  else
4704 @@ -22782,7 +22835,7 @@ fi
4705      # Extract the first word of "pkg-config", so it can be a program name with args.
4706  set dummy pkg-config; ac_word=$2
4707  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4708 -echo "configure:22786: checking for $ac_word" >&5
4709 +echo "configure:22839: checking for $ac_word" >&5
4710  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4711    echo $ac_n "(cached) $ac_c" 1>&6
4712  else
4713 @@ -22987,9 +23040,9 @@ fi
4714      old_CPPFLAGS=$CPPFLAGS
4715      CPPFLAGS=-I$OPENSSL_INCDIR
4716      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
4717 -echo "configure:22991: checking for OpenSSL version" >&5
4718 +echo "configure:23044: checking for OpenSSL version" >&5
4719      cat > conftest.$ac_ext <<EOF
4720 -#line 22993 "configure"
4721 +#line 23046 "configure"
4722  #include "confdefs.h"
4723
4724  #include <openssl/opensslv.h>
4725 @@ -23144,7 +23197,7 @@ rm -f conftest*
4726    done
4727
4728    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
4729 -echo "configure:23148: checking for CRYPTO_free in -lcrypto" >&5
4730 +echo "configure:23201: checking for CRYPTO_free in -lcrypto" >&5
4731  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
4732  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4733    echo $ac_n "(cached) $ac_c" 1>&6
4734 @@ -23152,7 +23205,7 @@ else
4735    ac_save_LIBS="$LIBS"
4736  LIBS="-lcrypto  $LIBS"
4737  cat > conftest.$ac_ext <<EOF
4738 -#line 23156 "configure"
4739 +#line 23209 "configure"
4740  #include "confdefs.h"
4741  /* Override any gcc2 internal prototype to avoid an error.  */
4742  /* We use char because int might match the return type of a gcc2
4743 @@ -23163,7 +23216,7 @@ int main() {
4744  CRYPTO_free()
4745  ; return 0; }
4746  EOF
4747 -if { (eval echo configure:23167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4748 +if { (eval echo configure:23220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4749    rm -rf conftest*
4750    eval "ac_cv_lib_$ac_lib_var=yes"
4751  else
4752 @@ -23320,7 +23373,7 @@ fi
4753    done
4754
4755    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
4756 -echo "configure:23324: checking for SSL_CTX_set_ssl_version in -lssl" >&5
4757 +echo "configure:23377: checking for SSL_CTX_set_ssl_version in -lssl" >&5
4758  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
4759  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4760    echo $ac_n "(cached) $ac_c" 1>&6
4761 @@ -23328,7 +23381,7 @@ else
4762    ac_save_LIBS="$LIBS"
4763  LIBS="-lssl  $LIBS"
4764  cat > conftest.$ac_ext <<EOF
4765 -#line 23332 "configure"
4766 +#line 23385 "configure"
4767  #include "confdefs.h"
4768  /* Override any gcc2 internal prototype to avoid an error.  */
4769  /* We use char because int might match the return type of a gcc2
4770 @@ -23339,7 +23392,7 @@ int main() {
4771  SSL_CTX_set_ssl_version()
4772  ; return 0; }
4773  EOF
4774 -if { (eval echo configure:23343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4775 +if { (eval echo configure:23396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4776    rm -rf conftest*
4777    eval "ac_cv_lib_$ac_lib_var=yes"
4778  else
4779 @@ -23481,7 +23534,7 @@ ext_output=$PHP_PCRE_REGEX
4780
4781    if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
4782      echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6
4783 -echo "configure:23485: checking for PCRE headers location" >&5
4784 +echo "configure:23538: checking for PCRE headers location" >&5
4785      for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do
4786        test -f $i/pcre.h && PCRE_INCDIR=$i
4787      done
4788 @@ -23492,7 +23545,7 @@ echo "configure:23485: checking for PCRE
4789      echo "$ac_t""$PCRE_INCDIR" 1>&6
4790
4791      echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6
4792 -echo "configure:23496: checking for PCRE library location" >&5
4793 +echo "configure:23549: checking for PCRE library location" >&5
4794      for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
4795        test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
4796      done
4797 @@ -23914,7 +23967,7 @@ EOF
4798
4799    else
4800      echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6
4801 -echo "configure:23918: checking for PCRE library to use" >&5
4802 +echo "configure:23971: checking for PCRE library to use" >&5
4803      echo "$ac_t""bundled" 1>&6
4804      pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \
4805                                  pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \
4806 @@ -24251,7 +24304,7 @@ EOF
4807  php_with_sqlite3=yes
4808
4809  echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6
4810 -echo "configure:24255: checking whether to enable the SQLite3 extension" >&5
4811 +echo "configure:24308: checking whether to enable the SQLite3 extension" >&5
4812  # Check whether --with-sqlite3 or --without-sqlite3 was given.
4813  if test "${with_sqlite3+set}" = set; then
4814    withval="$with_sqlite3"
4815 @@ -24306,7 +24359,7 @@ if test $PHP_SQLITE3 != "no"; then
4816
4817    if test $PHP_SQLITE3 != "yes"; then
4818      echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
4819 -echo "configure:24310: checking for sqlite3 files in default path" >&5
4820 +echo "configure:24363: checking for sqlite3 files in default path" >&5
4821      for i in $PHP_SQLITE3 /usr/local /usr; do
4822        if test -r $i/include/sqlite3.h; then
4823          SQLITE3_DIR=$i
4824 @@ -24321,7 +24374,7 @@ echo "configure:24310: checking for sqli
4825      fi
4826
4827      echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6
4828 -echo "configure:24325: checking for SQLite 3.3.9+" >&5
4829 +echo "configure:24378: checking for SQLite 3.3.9+" >&5
4830
4831    save_old_LDFLAGS=$LDFLAGS
4832    ac_stuff="
4833 @@ -24420,7 +24473,7 @@ echo "configure:24325: checking for SQLi
4834    done
4835
4836    echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6
4837 -echo "configure:24424: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
4838 +echo "configure:24477: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
4839  ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'`
4840  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4841    echo $ac_n "(cached) $ac_c" 1>&6
4842 @@ -24428,7 +24481,7 @@ else
4843    ac_save_LIBS="$LIBS"
4844  LIBS="-lsqlite3  $LIBS"
4845  cat > conftest.$ac_ext <<EOF
4846 -#line 24432 "configure"
4847 +#line 24485 "configure"
4848  #include "confdefs.h"
4849  /* Override any gcc2 internal prototype to avoid an error.  */
4850  /* We use char because int might match the return type of a gcc2
4851 @@ -24439,7 +24492,7 @@ int main() {
4852  sqlite3_prepare_v2()
4853  ; return 0; }
4854  EOF
4855 -if { (eval echo configure:24443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4856 +if { (eval echo configure:24496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4857    rm -rf conftest*
4858    eval "ac_cv_lib_$ac_lib_var=yes"
4859  else
4860 @@ -24699,7 +24752,7 @@ fi
4861    done
4862
4863    echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
4864 -echo "configure:24703: checking for sqlite3_key in -lsqlite3" >&5
4865 +echo "configure:24756: checking for sqlite3_key in -lsqlite3" >&5
4866  ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
4867  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4868    echo $ac_n "(cached) $ac_c" 1>&6
4869 @@ -24707,7 +24760,7 @@ else
4870    ac_save_LIBS="$LIBS"
4871  LIBS="-lsqlite3  $LIBS"
4872  cat > conftest.$ac_ext <<EOF
4873 -#line 24711 "configure"
4874 +#line 24764 "configure"
4875  #include "confdefs.h"
4876  /* Override any gcc2 internal prototype to avoid an error.  */
4877  /* We use char because int might match the return type of a gcc2
4878 @@ -24718,7 +24771,7 @@ int main() {
4879  sqlite3_key()
4880  ; return 0; }
4881  EOF
4882 -if { (eval echo configure:24722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4883 +if { (eval echo configure:24775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4884    rm -rf conftest*
4885    eval "ac_cv_lib_$ac_lib_var=yes"
4886  else
4887 @@ -24850,7 +24903,7 @@ fi
4888    done
4889
4890    echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6
4891 -echo "configure:24854: checking for sqlite3_load_extension in -lsqlite3" >&5
4892 +echo "configure:24907: checking for sqlite3_load_extension in -lsqlite3" >&5
4893  ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'`
4894  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4895    echo $ac_n "(cached) $ac_c" 1>&6
4896 @@ -24858,7 +24911,7 @@ else
4897    ac_save_LIBS="$LIBS"
4898  LIBS="-lsqlite3  $LIBS"
4899  cat > conftest.$ac_ext <<EOF
4900 -#line 24862 "configure"
4901 +#line 24915 "configure"
4902  #include "confdefs.h"
4903  /* Override any gcc2 internal prototype to avoid an error.  */
4904  /* We use char because int might match the return type of a gcc2
4905 @@ -24869,7 +24922,7 @@ int main() {
4906  sqlite3_load_extension()
4907  ; return 0; }
4908  EOF
4909 -if { (eval echo configure:24873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4910 +if { (eval echo configure:24926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4911    rm -rf conftest*
4912    eval "ac_cv_lib_$ac_lib_var=yes"
4913  else
4914 @@ -24906,7 +24959,7 @@ fi
4915
4916    else
4917      echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6
4918 -echo "configure:24910: checking bundled sqlite3 library" >&5
4919 +echo "configure:24963: checking bundled sqlite3 library" >&5
4920      echo "$ac_t""yes" 1>&6
4921
4922      sqlite3_extra_sources="libsqlite/sqlite3.c"
4923 @@ -25262,7 +25315,7 @@ fi
4924  php_with_zlib=no
4925
4926  echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6
4927 -echo "configure:25266: checking for ZLIB support" >&5
4928 +echo "configure:25319: checking for ZLIB support" >&5
4929  # Check whether --with-zlib or --without-zlib was given.
4930  if test "${with_zlib+set}" = set; then
4931    withval="$with_zlib"
4932 @@ -25306,7 +25359,7 @@ echo "$ac_t""$ext_output" 1>&6
4933  php_with_zlib_dir=no
4934
4935  echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6
4936 -echo "configure:25310: checking if the location of ZLIB install directory is defined" >&5
4937 +echo "configure:25363: checking if the location of ZLIB install directory is defined" >&5
4938  # Check whether --with-zlib-dir or --without-zlib-dir was given.
4939  if test "${with_zlib_dir+set}" = set; then
4940    withval="$with_zlib_dir"
4941 @@ -25749,7 +25802,7 @@ EOF
4942    done
4943
4944    echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
4945 -echo "configure:25753: checking for gzgets in -lz" >&5
4946 +echo "configure:25806: checking for gzgets in -lz" >&5
4947  ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'`
4948  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4949    echo $ac_n "(cached) $ac_c" 1>&6
4950 @@ -25757,7 +25810,7 @@ else
4951    ac_save_LIBS="$LIBS"
4952  LIBS="-lz  $LIBS"
4953  cat > conftest.$ac_ext <<EOF
4954 -#line 25761 "configure"
4955 +#line 25814 "configure"
4956  #include "confdefs.h"
4957  /* Override any gcc2 internal prototype to avoid an error.  */
4958  /* We use char because int might match the return type of a gcc2
4959 @@ -25768,7 +25821,7 @@ int main() {
4960  gzgets()
4961  ; return 0; }
4962  EOF
4963 -if { (eval echo configure:25772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4964 +if { (eval echo configure:25825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4965    rm -rf conftest*
4966    eval "ac_cv_lib_$ac_lib_var=yes"
4967  else
4968 @@ -25905,18 +25958,18 @@ fi
4969
4970
4971
4972 -php_enable_bcmath=no
4973 +php_enable_apc=no
4974
4975 -echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
4976 -echo "configure:25912: checking whether to enable bc style precision math functions" >&5
4977 -# Check whether --enable-bcmath or --disable-bcmath was given.
4978 -if test "${enable_bcmath+set}" = set; then
4979 -  enableval="$enable_bcmath"
4980 -  PHP_BCMATH=$enableval
4981 +echo $ac_n "checking whether to enable APC support""... $ac_c" 1>&6
4982 +echo "configure:25965: checking whether to enable APC support" >&5
4983 +# Check whether --enable-apc or --disable-apc was given.
4984 +if test "${enable_apc+set}" = set; then
4985 +  enableval="$enable_apc"
4986 +  PHP_APC=$enableval
4987  else
4988
4989 -  PHP_BCMATH=no
4990 -  test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL
4991 +  PHP_APC=no
4992 +  test "$PHP_ENABLE_ALL" && PHP_APC=$PHP_ENABLE_ALL
4993
4994  fi
4995
4996 @@ -25924,12 +25977,12 @@ fi
4997
4998  ext_output="yes, shared"
4999  ext_shared=yes
5000 -case $PHP_BCMATH in
5001 +case $PHP_APC in
5002  shared,*)
5003 -  PHP_BCMATH=`echo "$PHP_BCMATH"|$SED 's/^shared,//'`
5004 +  PHP_APC=`echo "$PHP_APC"|$SED 's/^shared,//'`
5005    ;;
5006  shared)
5007 -  PHP_BCMATH=yes
5008 +  PHP_APC=yes
5009    ;;
5010  no)
5011    ext_output=no
5012 @@ -25948,396 +26001,481 @@ echo "$ac_t""$ext_output" 1>&6
5013
5014
5015
5016 -if test "$PHP_BCMATH" != "no"; then
5017 +# Check whether --enable-apc-debug or --disable-apc-debug was given.
5018 +if test "${enable_apc_debug+set}" = set; then
5019 +  enableval="$enable_apc_debug"
5020
5021 -  ext_builddir=ext/bcmath
5022 -  ext_srcdir=$abs_srcdir/ext/bcmath
5023 -
5024 -  ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
5025 +  PHP_APC_DEBUG=yes
5026
5027 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
5028 -    PHP_BCMATH_SHARED=no
5029 -
5030 -
5031 -  case ext/bcmath in
5032 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
5033 -  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
5034 -  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
5035 -  esac
5036 -
5037 +else
5038
5039 +  PHP_APC_DEBUG=no
5040
5041 -  b_c_pre=$php_c_pre
5042 -  b_cxx_pre=$php_cxx_pre
5043 -  b_c_meta=$php_c_meta
5044 -  b_cxx_meta=$php_cxx_meta
5045 -  b_c_post=$php_c_post
5046 -  b_cxx_post=$php_cxx_post
5047 -  b_lo=$php_lo
5048 +fi
5049
5050
5051 -  old_IFS=$IFS
5052 -  for ac_src in bcmath.c \
5053 -libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
5054 -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
5055 -libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
5056 -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
5057 +echo $ac_n "checking whether we should enable cache request file info""... $ac_c" 1>&6
5058 +echo "configure:26019: checking whether we should enable cache request file info" >&5
5059 +# Check whether --enable-apc-filehits or --disable-apc-filehits was given.
5060 +if test "${enable_apc_filehits+set}" = set; then
5061 +  enableval="$enable_apc_filehits"
5062
5063 -      IFS=.
5064 -      set $ac_src
5065 -      ac_obj=$1
5066 -      IFS=$old_IFS
5067 -
5068 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
5069 +  PHP_APC_FILEHITS=$enableval
5070 +       echo "$ac_t""$enableval" 1>&6
5071
5072 -      case $ac_src in
5073 -        *.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" ;;
5074 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5075 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5076 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
5077 -      esac
5078 +else
5079 +
5080 +  PHP_APC_FILEHITS=no
5081 +       echo "$ac_t""no" 1>&6
5082
5083 -    cat >>Makefile.objects<<EOF
5084 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
5085 -       $ac_comp
5086 -EOF
5087 -  done
5088 +fi
5089
5090
5091 -    EXT_STATIC="$EXT_STATIC bcmath"
5092 -    if test "$ext_shared" != "nocli"; then
5093 -      EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
5094 -    fi
5095 -  else
5096 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
5097 -      PHP_BCMATH_SHARED=yes
5098 -
5099 -  case ext/bcmath in
5100 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
5101 -  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
5102 -  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
5103 -  esac
5104 +echo $ac_n "checking whether we should use mmap""... $ac_c" 1>&6
5105 +echo "configure:26036: checking whether we should use mmap" >&5
5106 +# Check whether --enable-apc-mmap or --disable-apc-mmap was given.
5107 +if test "${enable_apc_mmap+set}" = set; then
5108 +  enableval="$enable_apc_mmap"
5109
5110 +  PHP_APC_MMAP=$enableval
5111 +  echo "$ac_t""$enableval" 1>&6
5112 +
5113 +else
5114
5115 +  PHP_APC_MMAP=yes
5116 +  echo "$ac_t""yes" 1>&6
5117
5118 -  b_c_pre=$shared_c_pre
5119 -  b_cxx_pre=$shared_cxx_pre
5120 -  b_c_meta=$shared_c_meta
5121 -  b_cxx_meta=$shared_cxx_meta
5122 -  b_c_post=$shared_c_post
5123 -  b_cxx_post=$shared_cxx_post
5124 -  b_lo=$shared_lo
5125 +fi
5126
5127
5128 -  old_IFS=$IFS
5129 -  for ac_src in bcmath.c \
5130 -libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
5131 -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
5132 -libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
5133 -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
5134 +echo $ac_n "checking whether we should use semaphore locking instead of fcntl""... $ac_c" 1>&6
5135 +echo "configure:26053: checking whether we should use semaphore locking instead of fcntl" >&5
5136 +# Check whether --enable-apc-sem or --disable-apc-sem was given.
5137 +if test "${enable_apc_sem+set}" = set; then
5138 +  enableval="$enable_apc_sem"
5139
5140 -      IFS=.
5141 -      set $ac_src
5142 -      ac_obj=$1
5143 -      IFS=$old_IFS
5144 -
5145 -      shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo"
5146 -
5147 -      case $ac_src in
5148 -        *.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" ;;
5149 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5150 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5151 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
5152 -      esac
5153 +  PHP_APC_SEM=$enableval
5154 +  echo "$ac_t""$enableval" 1>&6
5155
5156 -    cat >>Makefile.objects<<EOF
5157 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
5158 -       $ac_comp
5159 -EOF
5160 -  done
5161 +else
5162 +
5163 +  PHP_APC_SEM=no
5164 +  echo "$ac_t""no" 1>&6
5165
5166 -      case $host_alias in
5167 -        *netware*)
5168 -
5169 -  install_modules="install-modules"
5170 +fi
5171
5172 -  case $host_alias in
5173 -    *aix*)
5174 -      suffix=so
5175 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpbcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(PHPBCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpbcmath.so '$ext_builddir'/phpbcmath.so'
5176 -      ;;
5177 -    *netware*)
5178 -      suffix=nlm
5179 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBCMATH, 3)_SHARED_LIBADD)'
5180 -      ;;
5181 -    *)
5182 -      suffix=la
5183 -      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_bcmath) $(PHPBCMATH_SHARED_LIBADD)'
5184 -      ;;
5185 -  esac
5186
5187 -  if test "x" = "xyes"; then
5188 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix"
5189 -  else
5190 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix"
5191 -  fi
5192 +echo $ac_n "checking whether we should use pthread mutex locking""... $ac_c" 1>&6
5193 +echo "configure:26070: checking whether we should use pthread mutex locking" >&5
5194 +# Check whether --enable-apc-pthreadmutex or --disable-apc-pthreadmutex was given.
5195 +if test "${enable_apc_pthreadmutex+set}" = set; then
5196 +  enableval="$enable_apc_pthreadmutex"
5197
5198 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
5199 -
5200 -  cat >>Makefile.objects<<EOF
5201 -\$(phplibdir)/phpbcmath.$suffix: $ext_builddir/phpbcmath.$suffix
5202 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpbcmath.$suffix \$(phplibdir)
5203 +  PHP_APC_PTHREADMUTEX=$enableval
5204 +  echo "$ac_t""$enableval" 1>&6
5205
5206 -$ext_builddir/phpbcmath.$suffix: \$(shared_objects_bcmath) \$(PHPBCMATH_SHARED_DEPENDENCIES)
5207 -       $link_cmd
5208 -
5209 -EOF
5210 +else
5211 +
5212 +  PHP_APC_PTHREADMUTEX=yes
5213 +  echo "$ac_t""yes" 1>&6
5214
5215 -          ;;
5216 -        *)
5217 -
5218 -  install_modules="install-modules"
5219 +fi
5220
5221 -  case $host_alias in
5222 -    *aix*)
5223 -      suffix=so
5224 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/bcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(BCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/bcmath.so '$ext_builddir'/bcmath.so'
5225 -      ;;
5226 -    *netware*)
5227 -      suffix=nlm
5228 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BCMATH, 3)_SHARED_LIBADD)'
5229 -      ;;
5230 -    *)
5231 -      suffix=la
5232 -      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_bcmath) $(BCMATH_SHARED_LIBADD)'
5233 -      ;;
5234 -  esac
5235
5236 -  if test "x" = "xyes"; then
5237 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix"
5238 -  else
5239 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix"
5240 -  fi
5241 +if test "$PHP_APC_PTHREADMUTEX" != "no"; then
5242 +       orig_LIBS="$LIBS"
5243 +       LIBS="$LIBS -lpthread"
5244 +       if test "$cross_compiling" = yes; then
5245
5246 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
5247 +
5248 +
5249 +  case pthread in
5250 +  c|c_r|pthread*) ;;
5251 +  *)
5252 +      LIBS="-lpthread $LIBS"
5253 +   ;;
5254 +  esac
5255
5256 -  cat >>Makefile.objects<<EOF
5257 -\$(phplibdir)/bcmath.$suffix: $ext_builddir/bcmath.$suffix
5258 -       \$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir)
5259
5260 -$ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES)
5261 -       $link_cmd
5262 +
5263 +
5264 +else
5265 +  cat > conftest.$ac_ext <<EOF
5266 +#line 26105 "configure"
5267 +#include "confdefs.h"
5268
5269 +                               #include <sys/types.h>
5270 +                               #include <pthread.h>
5271 +                                main() {
5272 +                               pthread_mutex_t mutex;
5273 +                               pthread_mutexattr_t attr;
5274 +
5275 +                               if(pthread_mutexattr_init(&attr)) {
5276 +                                       puts("Unable to initialize pthread attributes (pthread_mutexattr_init).");
5277 +                                       return -1;
5278 +                               }
5279 +                               if(pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
5280 +                                       puts("Unable to set PTHREAD_PROCESS_SHARED (pthread_mutexattr_setpshared), your system may not support shared mutex's.");
5281 +                                       return -1;
5282 +                               }
5283 +                               if(pthread_mutex_init(&mutex, &attr)) {
5284 +                                       puts("Unable to initialize the mutex (pthread_mutex_init).");
5285 +                                       return -1;
5286 +                               }
5287 +                               if(pthread_mutexattr_destroy(&attr)) {
5288 +                                       puts("Unable to destroy mutex attributes (pthread_mutexattr_destroy).");
5289 +                                       return -1;
5290 +                               }
5291 +                               if(pthread_mutex_destroy(&mutex)) {
5292 +                                       puts("Unable to destroy mutex (pthread_mutex_destroy).");
5293 +                                       return -1;
5294 +                               }
5295 +
5296 +                               puts("pthread mutex's are supported!");
5297 +                               return 0;
5298 +                                }
5299 +
5300  EOF
5301 +if { (eval echo configure:26140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5302 +then
5303 +
5304 +
5305 +  case pthread in
5306 +  c|c_r|pthread*) ;;
5307 +  *)
5308 +      LIBS="-lpthread $LIBS"
5309 +   ;;
5310 +  esac
5311
5312 -          ;;
5313 -      esac
5314 -      cat >> confdefs.h <<EOF
5315 -#define COMPILE_DL_BCMATH 1
5316 -EOF
5317
5318 -    fi
5319 -  fi
5320 +
5321 +else
5322 +  echo "configure: failed program was:" >&5
5323 +  cat conftest.$ac_ext >&5
5324 +  rm -fr conftest*
5325 +                               echo "configure: warning: It doesn't appear that pthread mutex's are supported on your system" 1>&2
5326 +                       PHP_APC_PTHREADMUTEX=no
5327 +
5328 +fi
5329 +rm -fr conftest*
5330 +fi
5331
5332 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
5333 -    PHP_BCMATH_SHARED=no
5334 -    case "$PHP_SAPI" in
5335 -      cgi|embed)
5336 -
5337 -
5338 -  case ext/bcmath in
5339 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
5340 -  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
5341 -  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
5342 -  esac
5343 +       LIBS="$orig_LIBS"
5344 +fi
5345 +
5346 +echo $ac_n "checking whether we should use spin locks""... $ac_c" 1>&6
5347 +echo "configure:26168: checking whether we should use spin locks" >&5
5348 +# Check whether --enable-apc-spinlocks or --disable-apc-spinlocks was given.
5349 +if test "${enable_apc_spinlocks+set}" = set; then
5350 +  enableval="$enable_apc_spinlocks"
5351
5352 +  PHP_APC_SPINLOCKS=$enableval
5353 +  echo "$ac_t""$enableval" 1>&6
5354 +
5355 +else
5356
5357 +  PHP_APC_SPINLOCKS=no
5358 +  echo "$ac_t""no" 1>&6
5359
5360 -  b_c_pre=$php_c_pre
5361 -  b_cxx_pre=$php_cxx_pre
5362 -  b_c_meta=$php_c_meta
5363 -  b_cxx_meta=$php_cxx_meta
5364 -  b_c_post=$php_c_post
5365 -  b_cxx_post=$php_cxx_post
5366 -  b_lo=$php_lo
5367 +fi
5368
5369
5370 -  old_IFS=$IFS
5371 -  for ac_src in bcmath.c \
5372 -libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
5373 -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
5374 -libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
5375 -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
5376 +echo $ac_n "checking whether we should enable memory protection""... $ac_c" 1>&6
5377 +echo "configure:26185: checking whether we should enable memory protection" >&5
5378 +# Check whether --enable-apc-memprotect or --disable-apc-memprotect was given.
5379 +if test "${enable_apc_memprotect+set}" = set; then
5380 +  enableval="$enable_apc_memprotect"
5381
5382 -      IFS=.
5383 -      set $ac_src
5384 -      ac_obj=$1
5385 -      IFS=$old_IFS
5386 -
5387 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
5388 +  PHP_APC_MEMPROTECT=$enableval
5389 +  echo "$ac_t""$enableval" 1>&6
5390
5391 -      case $ac_src in
5392 -        *.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" ;;
5393 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5394 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5395 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
5396 -      esac
5397 +else
5398 +
5399 +  PHP_APC_MEMPROTECT=no
5400 +  echo "$ac_t""no" 1>&6
5401
5402 -    cat >>Makefile.objects<<EOF
5403 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
5404 -       $ac_comp
5405 -EOF
5406 -  done
5407 +fi
5408
5409
5410 -        EXT_STATIC="$EXT_STATIC bcmath"
5411 -        ;;
5412 -      *)
5413 -
5414 -
5415 -  case ext/bcmath in
5416 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
5417 -  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
5418 -  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
5419 -  esac
5420 -
5421 -
5422 +if test "$PHP_APC" != "no"; then
5423 +  test "$PHP_APC_MMAP" != "no" && cat >> confdefs.h <<\EOF
5424 +#define APC_MMAP 1
5425 +EOF
5426
5427 -  b_c_pre=$php_c_pre
5428 -  b_cxx_pre=$php_cxx_pre
5429 -  b_c_meta=$php_c_meta
5430 -  b_cxx_meta=$php_cxx_meta
5431 -  b_c_post=$php_c_post
5432 -  b_cxx_post=$php_cxx_post
5433 -  b_lo=$php_lo
5434 +  test "$PHP_APC_FILEHITS" != "no" && cat >> confdefs.h <<\EOF
5435 +#define APC_FILEHITS 1
5436 +EOF
5437
5438
5439 -  old_IFS=$IFS
5440 -  for ac_src in bcmath.c \
5441 -libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
5442 -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
5443 -libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
5444 -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
5445 -
5446 -      IFS=.
5447 -      set $ac_src
5448 -      ac_obj=$1
5449 -      IFS=$old_IFS
5450 -
5451 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
5452 +       if test "$PHP_APC_DEBUG" != "no"; then
5453 +               cat >> confdefs.h <<\EOF
5454 +#define __DEBUG_APC__ 1
5455 +EOF
5456
5457 -      case $ac_src in
5458 -        *.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" ;;
5459 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5460 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5461 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
5462 -      esac
5463 +       fi
5464
5465 -    cat >>Makefile.objects<<EOF
5466 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
5467 -       $ac_comp
5468 +       if test "$PHP_APC_SEM" != "no"; then
5469 +               cat >> confdefs.h <<\EOF
5470 +#define APC_SEM_LOCKS 1
5471  EOF
5472 -  done
5473
5474 +       elif test "$PHP_APC_SPINLOCKS" != "no"; then
5475 +               cat >> confdefs.h <<\EOF
5476 +#define APC_SPIN_LOCKS 1
5477 +EOF
5478 +
5479 +       elif test "$PHP_APC_PTHREADMUTEX" != "no"; then
5480 +               cat >> confdefs.h <<\EOF
5481 +#define APC_PTHREADMUTEX_LOCKS 1
5482 +EOF
5483
5484 -        ;;
5485 -    esac
5486 -    EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
5487 -  fi
5488 -
5489 -
5490 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
5491 -
5492 +       else
5493 +               cat >> confdefs.h <<\EOF
5494 +#define APC_FCNTL_LOCKS 1
5495 +EOF
5496
5497 +       fi
5498 +
5499 +       if test "$PHP_APC_MEMPROTECT" != "no"; then
5500 +               cat >> confdefs.h <<\EOF
5501 +#define APC_MEMPROTECT 1
5502 +EOF
5503
5504 -  if test "$ext_builddir" = "."; then
5505 -    PHP_PECL_EXTENSION=bcmath
5506 -
5507 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
5508 +       fi
5509
5510 -  fi
5511 +  echo $ac_n "checking for zend_set_lookup_function_hook""... $ac_c" 1>&6
5512 +echo "configure:26248: checking for zend_set_lookup_function_hook" >&5
5513 +if eval "test \"`echo '$''{'php_cv_zend_set_lookup_function_hook'+set}'`\" = set"; then
5514 +  echo $ac_n "(cached) $ac_c" 1>&6
5515 +else
5516 +
5517 +    orig_cflags=$CFLAGS
5518 +    CFLAGS="$INCLUDES $EXTRA_INCLUDES"
5519 +    cat > conftest.$ac_ext <<EOF
5520 +#line 26256 "configure"
5521 +#include "confdefs.h"
5522
5523 +#include "main/php.h"
5524 +#include "Zend/zend_API.h"
5525 +
5526 +int main() {
5527 +#ifndef zend_set_lookup_function_hook
5528 +       (void) zend_set_lookup_function_hook;
5529 +#endif
5530 +; return 0; }
5531 +EOF
5532 +if { (eval echo configure:26268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5533 +  rm -rf conftest*
5534
5535 +      php_cv_zend_set_lookup_function_hook=yes
5536 +
5537 +else
5538 +  echo "configure: failed program was:" >&5
5539 +  cat conftest.$ac_ext >&5
5540 +  rm -rf conftest*
5541
5542 -    BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src"
5543 +      php_cv_zend_set_lookup_function_hook=no
5544 +
5545 +fi
5546 +rm -f conftest*
5547 +    CFLAGS=$orig_cflags
5548
5549 +fi
5550
5551 -  cat >> confdefs.h <<\EOF
5552 -#define HAVE_BCMATH 1
5553 +echo "$ac_t""$php_cv_zend_set_lookup_function_hook" 1>&6
5554 +  if test "$php_cv_zend_set_lookup_function_hook" = "yes"; then
5555 +    cat >> confdefs.h <<\EOF
5556 +#define APC_HAVE_LOOKUP_HOOKS 1
5557  EOF
5558
5559 -fi
5560 +  else
5561 +    cat >> confdefs.h <<\EOF
5562 +#define APC_HAVE_LOOKUP_HOOKS 0
5563 +EOF
5564
5565 +  fi
5566 +
5567 +  for ac_func in sigaction
5568 +do
5569 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5570 +echo "configure:26302: checking for $ac_func" >&5
5571 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5572 +  echo $ac_n "(cached) $ac_c" 1>&6
5573 +else
5574 +  cat > conftest.$ac_ext <<EOF
5575 +#line 26307 "configure"
5576 +#include "confdefs.h"
5577 +/* System header to define __stub macros and hopefully few prototypes,
5578 +    which can conflict with char $ac_func(); below.  */
5579 +#include <assert.h>
5580 +/* Override any gcc2 internal prototype to avoid an error.  */
5581 +/* We use char because int might match the return type of a gcc2
5582 +    builtin and then its argument prototype would still apply.  */
5583 +char $ac_func();
5584
5585 +int main() {
5586
5587 -php_with_bz2=no
5588 +/* The GNU C library defines this for functions which it implements
5589 +    to always fail with ENOSYS.  Some functions are actually named
5590 +    something starting with __ and the normal name is an alias.  */
5591 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
5592 +choke me
5593 +#else
5594 +$ac_func();
5595 +#endif
5596
5597 -echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
5598 -echo "configure:26277: checking for BZip2 support" >&5
5599 -# Check whether --with-bz2 or --without-bz2 was given.
5600 -if test "${with_bz2+set}" = set; then
5601 -  withval="$with_bz2"
5602 -  PHP_BZ2=$withval
5603 +; return 0; }
5604 +EOF
5605 +if { (eval echo configure:26330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5606 +  rm -rf conftest*
5607 +  eval "ac_cv_func_$ac_func=yes"
5608  else
5609 -
5610 -  PHP_BZ2=no
5611 -  test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL
5612 -
5613 +  echo "configure: failed program was:" >&5
5614 +  cat conftest.$ac_ext >&5
5615 +  rm -rf conftest*
5616 +  eval "ac_cv_func_$ac_func=no"
5617 +fi
5618 +rm -f conftest*
5619  fi
5620
5621 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
5622 +  echo "$ac_t""yes" 1>&6
5623 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
5624 +  cat >> confdefs.h <<EOF
5625 +#define $ac_tr_func 1
5626 +EOF
5627 +
5628 +else
5629 +  echo "$ac_t""no" 1>&6
5630 +fi
5631 +done
5632
5633 +  echo $ac_n "checking for union semun""... $ac_c" 1>&6
5634 +echo "configure:26355: checking for union semun" >&5
5635 +if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
5636 +  echo $ac_n "(cached) $ac_c" 1>&6
5637 +else
5638 +
5639 +    cat > conftest.$ac_ext <<EOF
5640 +#line 26361 "configure"
5641 +#include "confdefs.h"
5642
5643 -ext_output="yes, shared"
5644 -ext_shared=yes
5645 -case $PHP_BZ2 in
5646 -shared,*)
5647 -  PHP_BZ2=`echo "$PHP_BZ2"|$SED 's/^shared,//'`
5648 -  ;;
5649 -shared)
5650 -  PHP_BZ2=yes
5651 -  ;;
5652 -no)
5653 -  ext_output=no
5654 -  ext_shared=no
5655 -  ;;
5656 -*)
5657 -  ext_output=yes
5658 -  ext_shared=no
5659 -  ;;
5660 -esac
5661 +#include <sys/types.h>
5662 +#include <sys/ipc.h>
5663 +#include <sys/sem.h>
5664 +
5665 +int main() {
5666 +union semun x; x.val=1
5667 +; return 0; }
5668 +EOF
5669 +if { (eval echo configure:26372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5670 +  rm -rf conftest*
5671 +
5672 +      php_cv_semun=yes
5673 +
5674 +else
5675 +  echo "configure: failed program was:" >&5
5676 +  cat conftest.$ac_ext >&5
5677 +  rm -rf conftest*
5678 +
5679 +      php_cv_semun=no
5680 +
5681 +fi
5682 +rm -f conftest*
5683 +
5684 +fi
5685
5686 +echo "$ac_t""$php_cv_semun" 1>&6
5687 +  if test "$php_cv_semun" = "yes"; then
5688 +    cat >> confdefs.h <<\EOF
5689 +#define HAVE_SEMUN 1
5690 +EOF
5691
5692 +  else
5693 +    cat >> confdefs.h <<\EOF
5694 +#define HAVE_SEMUN 0
5695 +EOF
5696
5697 -echo "$ac_t""$ext_output" 1>&6
5698 +  fi
5699
5700 +  echo $ac_n "checking whether we should enable valgrind support""... $ac_c" 1>&6
5701 +echo "configure:26403: checking whether we should enable valgrind support" >&5
5702 +  # Check whether --enable-valgrind-checks or --disable-valgrind-checks was given.
5703 +if test "${enable_valgrind_checks+set}" = set; then
5704 +  enableval="$enable_valgrind_checks"
5705 +
5706 +    PHP_APC_VALGRIND=$enableval
5707 +    echo "$ac_t""$enableval" 1>&6
5708 +
5709 +else
5710 +
5711 +    PHP_APC_VALGRIND=yes
5712 +    echo "$ac_t""yes" 1>&6
5713 +    ac_safe=`echo "valgrind/memcheck.h" | sed 'y%./+-%__p_%'`
5714 +echo $ac_n "checking for valgrind/memcheck.h""... $ac_c" 1>&6
5715 +echo "configure:26417: checking for valgrind/memcheck.h" >&5
5716 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5717 +  echo $ac_n "(cached) $ac_c" 1>&6
5718 +else
5719 +  cat > conftest.$ac_ext <<EOF
5720 +#line 26422 "configure"
5721 +#include "confdefs.h"
5722 +#include <valgrind/memcheck.h>
5723 +EOF
5724 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5725 +{ (eval echo configure:26427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5726 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
5727 +if test -z "$ac_err"; then
5728 +  rm -rf conftest*
5729 +  eval "ac_cv_header_$ac_safe=yes"
5730 +else
5731 +  echo "$ac_err" >&5
5732 +  echo "configure: failed program was:" >&5
5733 +  cat conftest.$ac_ext >&5
5734 +  rm -rf conftest*
5735 +  eval "ac_cv_header_$ac_safe=no"
5736 +fi
5737 +rm -f conftest*
5738 +fi
5739 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
5740 +  echo "$ac_t""yes" 1>&6
5741 +  cat >> confdefs.h <<\EOF
5742 +#define HAVE_VALGRIND_MEMCHECK_H 1
5743 +EOF
5744
5745 +else
5746 +  echo "$ac_t""no" 1>&6
5747 +fi
5748
5749 +
5750 +fi
5751
5752 -if test "$PHP_BZ2" != "no"; then
5753 -  if test -r $PHP_BZ2/include/bzlib.h; then
5754 -    BZIP_DIR=$PHP_BZ2
5755 -  else
5756 -    echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
5757 -echo "configure:26322: checking for BZip2 in default path" >&5
5758 -    for i in /usr/local /usr; do
5759 -      if test -r $i/include/bzlib.h; then
5760 -        BZIP_DIR=$i
5761 -        echo "$ac_t""found in $i" 1>&6
5762 -        break
5763 -      fi
5764 -    done
5765 -  fi
5766
5767 -  if test -z "$BZIP_DIR"; then
5768 -    echo "$ac_t""not found" 1>&6
5769 -    { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; }
5770 -  fi
5771 +  apc_sources="apc.c php_apc.c \
5772 +               apc_cache.c \
5773 +               apc_compile.c \
5774 +               apc_debug.c \
5775 +               apc_fcntl.c \
5776 +               apc_main.c \
5777 +               apc_mmap.c \
5778 +               apc_sem.c \
5779 +               apc_shm.c \
5780 +               apc_pthreadmutex.c \
5781 +               apc_spin.c \
5782 +               pgsql_s_lock.c \
5783 +               apc_sma.c \
5784 +               apc_stack.c \
5785 +               apc_zend.c \
5786 +               apc_rfc1867.c \
5787 +               apc_signal.c \
5788 +               apc_pool.c \
5789 +               apc_iterator.c \
5790 +               apc_bin.c \
5791 +               apc_string.c "
5792
5793
5794    save_old_LDFLAGS=$LDFLAGS
5795 -  ac_stuff="
5796 -    -L$BZIP_DIR/$PHP_LIBDIR
5797 -  "
5798 +  ac_stuff=""
5799
5800    save_ext_shared=$ext_shared
5801    ext_shared=yes
5802 @@ -26430,27 +26568,27 @@ echo "configure:26322: checking for BZip
5803      esac
5804    done
5805
5806 -  echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
5807 -echo "configure:26435: checking for BZ2_bzerror in -lbz2" >&5
5808 -ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'`
5809 +  echo $ac_n "checking for shm_open in -lrt""... $ac_c" 1>&6
5810 +echo "configure:26573: checking for shm_open in -lrt" >&5
5811 +ac_lib_var=`echo rt'_'shm_open | sed 'y%./+-%__p_%'`
5812  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5813    echo $ac_n "(cached) $ac_c" 1>&6
5814  else
5815    ac_save_LIBS="$LIBS"
5816 -LIBS="-lbz2  $LIBS"
5817 +LIBS="-lrt  $LIBS"
5818  cat > conftest.$ac_ext <<EOF
5819 -#line 26443 "configure"
5820 +#line 26581 "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      builtin and then its argument prototype would still apply.  */
5825 -char BZ2_bzerror();
5826 +char shm_open();
5827
5828  int main() {
5829 -BZ2_bzerror()
5830 +shm_open()
5831  ; return 0; }
5832  EOF
5833 -if { (eval echo configure:26454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5834 +if { (eval echo configure:26592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5835    rm -rf conftest*
5836    eval "ac_cv_lib_$ac_lib_var=yes"
5837  else
5838 @@ -26469,167 +26607,53 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
5839      LDFLAGS=$save_old_LDFLAGS
5840      ext_shared=$save_ext_shared
5841
5842 -
5843 -  if test "$BZIP_DIR/include" != "/usr/include"; then
5844 -
5845 -  if test -z "$BZIP_DIR/include" || echo "$BZIP_DIR/include" | grep '^/' >/dev/null ; then
5846 -    ai_p=$BZIP_DIR/include
5847 -  else
5848 -
5849 -    ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
5850 -
5851 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
5852 -    ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`"
5853 -  fi
5854 -
5855 -
5856 -
5857 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
5858 -
5859 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
5860 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
5861 -    eval "INCLUDEPATH$unique=set"
5862 -
5863 -      if test ""; then
5864 -        INCLUDES="-I$ai_p $INCLUDES"
5865 -      else
5866 -        INCLUDES="$INCLUDES -I$ai_p"
5867 -      fi
5868 -
5869 -  fi
5870 -
5871 -  fi
5872 -
5873 -
5874 -
5875 -  if test "$ext_shared" = "yes"; then
5876 -    BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD"
5877 -    if test -n "$BZIP_DIR/$PHP_LIBDIR"; then
5878 -
5879 -  if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
5880 -
5881 -  if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
5882 -    ai_p=$BZIP_DIR/$PHP_LIBDIR
5883 -  else
5884 -
5885 -    ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
5886 -
5887 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
5888 -    ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
5889 -  fi
5890 -
5891 -
5892 -      if test "$ext_shared" = "yes"; then
5893 -        BZ2_SHARED_LIBADD="-L$ai_p $BZ2_SHARED_LIBADD"
5894 -        test -n "$ld_runpath_switch" && BZ2_SHARED_LIBADD="$ld_runpath_switch$ai_p $BZ2_SHARED_LIBADD"
5895 -      else
5896 -
5897 -
5898 -
5899 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
5900 -
5901 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
5902 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
5903 -    eval "LIBPATH$unique=set"
5904 -
5905 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
5906 -    LDFLAGS="$LDFLAGS -L$ai_p"
5907 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
5908
5909 -  fi
5910 -
5911 -
5912 -      fi
5913 -
5914 -  fi
5915 -
5916 -    fi
5917 -  else
5918 -
5919 -
5920 -  if test -n "$BZIP_DIR/$PHP_LIBDIR"; then
5921 -
5922 -  if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
5923 -
5924 -  if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
5925 -    ai_p=$BZIP_DIR/$PHP_LIBDIR
5926 -  else
5927 -
5928 -    ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
5929 -
5930 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
5931 -    ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
5932 -  fi
5933 -
5934 -
5935 +  case rt in
5936 +  c|c_r|pthread*) ;;
5937 +  *)
5938 +    if test "$ext_shared" = "yes"; then
5939 +        APC_SHARED_LIBADD="-lrt $APC_SHARED_LIBADD"
5940 +    else
5941
5942
5943 -
5944 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
5945 -
5946 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
5947 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
5948 -    eval "LIBPATH$unique=set"
5949 -
5950 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
5951 -    LDFLAGS="$LDFLAGS -L$ai_p"
5952 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
5953 -
5954 -  fi
5955 -
5956 -
5957 -
5958 -  fi
5959 -
5960 -  fi
5961 -
5962 -
5963 -  case bz2 in
5964 +  case rt in
5965    c|c_r|pthread*) ;;
5966    *)
5967 -      LIBS="-lbz2 $LIBS"
5968 +      LIBS="-lrt $LIBS"
5969     ;;
5970    esac
5971
5972
5973 +    fi
5974 +   ;;
5975 +  esac
5976
5977
5978 -  fi
5979 -
5980 -
5981 -    cat >> confdefs.h <<\EOF
5982 -#define HAVE_BZ2 1
5983 -EOF
5984 -
5985 -
5986
5987  else
5988    echo "$ac_t""no" 1>&6
5989
5990      LDFLAGS=$save_old_LDFLAGS
5991      ext_shared=$save_ext_shared
5992 -    unset ac_cv_lib_bz2_BZ2_bzerror
5993 +    unset ac_cv_lib_rt_shm_open
5994
5995 -    { echo "configure: error: bz2 module requires libbz2 >= 1.0.0" 1>&2; exit 1; }
5996 -
5997
5998  fi
5999
6000 -
6001
6002 -  ext_builddir=ext/bz2
6003 -  ext_srcdir=$abs_srcdir/ext/bz2
6004 +  ext_builddir=ext/apc
6005 +  ext_srcdir=$abs_srcdir/ext/apc
6006
6007 -  ac_extra=
6008 +  ac_extra=`echo "\\$(APC_CFLAGS)"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
6009
6010    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
6011 -    PHP_BZ2_SHARED=no
6012 +    PHP_APC_SHARED=no
6013
6014
6015 -  case ext/bz2 in
6016 +  case ext/apc in
6017    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6018 -  /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6019 -  *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6020 +  /*) ac_srcdir=`echo "ext/apc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6021 +  *) ac_srcdir="$abs_srcdir/ext/apc/"; ac_bdir="ext/apc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6022    esac
6023
6024
6025 @@ -26644,7 +26668,7 @@ fi
6026
6027
6028    old_IFS=$IFS
6029 -  for ac_src in bz2.c bz2_filter.c; do
6030 +  for ac_src in $apc_sources; do
6031
6032        IFS=.
6033        set $ac_src
6034 @@ -26667,18 +26691,18 @@ EOF
6035    done
6036
6037
6038 -    EXT_STATIC="$EXT_STATIC bz2"
6039 +    EXT_STATIC="$EXT_STATIC apc"
6040      if test "$ext_shared" != "nocli"; then
6041 -      EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
6042 +      EXT_CLI_STATIC="$EXT_CLI_STATIC apc"
6043      fi
6044    else
6045      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
6046 -      PHP_BZ2_SHARED=yes
6047 +      PHP_APC_SHARED=yes
6048
6049 -  case ext/bz2 in
6050 +  case ext/apc in
6051    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6052 -  /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6053 -  *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6054 +  /*) ac_srcdir=`echo "ext/apc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6055 +  *) ac_srcdir="$abs_srcdir/ext/apc/"; ac_bdir="ext/apc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6056    esac
6057
6058
6059 @@ -26693,14 +26717,14 @@ EOF
6060
6061
6062    old_IFS=$IFS
6063 -  for ac_src in bz2.c bz2_filter.c; do
6064 +  for ac_src in $apc_sources; do
6065
6066        IFS=.
6067        set $ac_src
6068        ac_obj=$1
6069        IFS=$old_IFS
6070
6071 -      shared_objects_bz2="$shared_objects_bz2 $ac_bdir$ac_obj.lo"
6072 +      shared_objects_apc="$shared_objects_apc $ac_bdir$ac_obj.lo"
6073
6074        case $ac_src in
6075          *.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" ;;
6076 @@ -26723,31 +26747,31 @@ EOF
6077    case $host_alias in
6078      *aix*)
6079        suffix=so
6080 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpbz2.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) $(PHPBZ2_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpbz2.so '$ext_builddir'/phpbz2.so'
6081 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpapc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_apc) $(PHPAPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpapc.so '$ext_builddir'/phpapc.so'
6082        ;;
6083      *netware*)
6084        suffix=nlm
6085 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBZ2, 3)_SHARED_LIBADD)'
6086 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_apc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPAPC, 3)_SHARED_LIBADD)'
6087        ;;
6088      *)
6089        suffix=la
6090 -      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_bz2) $(PHPBZ2_SHARED_LIBADD)'
6091 +      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_apc) $(PHPAPC_SHARED_LIBADD)'
6092        ;;
6093    esac
6094
6095    if test "x" = "xyes"; then
6096 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbz2.$suffix"
6097 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpapc.$suffix"
6098    else
6099 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbz2.$suffix"
6100 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpapc.$suffix"
6101    fi
6102
6103 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
6104 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_apc"
6105
6106    cat >>Makefile.objects<<EOF
6107 -\$(phplibdir)/phpbz2.$suffix: $ext_builddir/phpbz2.$suffix
6108 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpbz2.$suffix \$(phplibdir)
6109 +\$(phplibdir)/phpapc.$suffix: $ext_builddir/phpapc.$suffix
6110 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpapc.$suffix \$(phplibdir)
6111
6112 -$ext_builddir/phpbz2.$suffix: \$(shared_objects_bz2) \$(PHPBZ2_SHARED_DEPENDENCIES)
6113 +$ext_builddir/phpapc.$suffix: \$(shared_objects_apc) \$(PHPAPC_SHARED_DEPENDENCIES)
6114         $link_cmd
6115
6116  EOF
6117 @@ -26760,31 +26784,31 @@ EOF
6118    case $host_alias in
6119      *aix*)
6120        suffix=so
6121 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/bz2.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) $(BZ2_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/bz2.so '$ext_builddir'/bz2.so'
6122 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/apc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_apc) $(APC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/apc.so '$ext_builddir'/apc.so'
6123        ;;
6124      *netware*)
6125        suffix=nlm
6126 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BZ2, 3)_SHARED_LIBADD)'
6127 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_apc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(APC, 3)_SHARED_LIBADD)'
6128        ;;
6129      *)
6130        suffix=la
6131 -      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_bz2) $(BZ2_SHARED_LIBADD)'
6132 +      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_apc) $(APC_SHARED_LIBADD)'
6133        ;;
6134    esac
6135
6136    if test "x" = "xyes"; then
6137 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bz2.$suffix"
6138 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/apc.$suffix"
6139    else
6140 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/bz2.$suffix"
6141 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/apc.$suffix"
6142    fi
6143
6144 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
6145 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_apc"
6146
6147    cat >>Makefile.objects<<EOF
6148 -\$(phplibdir)/bz2.$suffix: $ext_builddir/bz2.$suffix
6149 -       \$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir)
6150 +\$(phplibdir)/apc.$suffix: $ext_builddir/apc.$suffix
6151 +       \$(LIBTOOL) --mode=install cp $ext_builddir/apc.$suffix \$(phplibdir)
6152
6153 -$ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES)
6154 +$ext_builddir/apc.$suffix: \$(shared_objects_apc) \$(APC_SHARED_DEPENDENCIES)
6155         $link_cmd
6156
6157  EOF
6158 @@ -26792,22 +26816,22 @@ EOF
6159            ;;
6160        esac
6161        cat >> confdefs.h <<EOF
6162 -#define COMPILE_DL_BZ2 1
6163 +#define COMPILE_DL_APC 1
6164  EOF
6165
6166      fi
6167    fi
6168
6169    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
6170 -    PHP_BZ2_SHARED=no
6171 +    PHP_APC_SHARED=no
6172      case "$PHP_SAPI" in
6173        cgi|embed)
6174
6175
6176 -  case ext/bz2 in
6177 +  case ext/apc in
6178    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6179 -  /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6180 -  *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6181 +  /*) ac_srcdir=`echo "ext/apc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6182 +  *) ac_srcdir="$abs_srcdir/ext/apc/"; ac_bdir="ext/apc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6183    esac
6184
6185
6186 @@ -26822,7 +26846,7 @@ EOF
6187
6188
6189    old_IFS=$IFS
6190 -  for ac_src in bz2.c bz2_filter.c; do
6191 +  for ac_src in $apc_sources; do
6192
6193        IFS=.
6194        set $ac_src
6195 @@ -26845,15 +26869,15 @@ EOF
6196    done
6197
6198
6199 -        EXT_STATIC="$EXT_STATIC bz2"
6200 +        EXT_STATIC="$EXT_STATIC apc"
6201          ;;
6202        *)
6203
6204
6205 -  case ext/bz2 in
6206 +  case ext/apc in
6207    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6208 -  /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6209 -  *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6210 +  /*) ac_srcdir=`echo "ext/apc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6211 +  *) ac_srcdir="$abs_srcdir/ext/apc/"; ac_bdir="ext/apc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6212    esac
6213
6214
6215 @@ -26868,7 +26892,7 @@ EOF
6216
6217
6218    old_IFS=$IFS
6219 -  for ac_src in bz2.c bz2_filter.c; do
6220 +  for ac_src in $apc_sources; do
6221
6222        IFS=.
6223        set $ac_src
6224 @@ -26893,7 +26917,7 @@ EOF
6225
6226          ;;
6227      esac
6228 -    EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
6229 +    EXT_CLI_STATIC="$EXT_CLI_STATIC apc"
6230    fi
6231
6232
6233 @@ -26902,31 +26926,39 @@ EOF
6234
6235
6236    if test "$ext_builddir" = "."; then
6237 -    PHP_PECL_EXTENSION=bz2
6238 +    PHP_PECL_EXTENSION=apc
6239
6240    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
6241
6242    fi
6243
6244
6245 -  PHP_VAR_SUBST="$PHP_VAR_SUBST BZ2_SHARED_LIBADD"
6246 +  PHP_VAR_SUBST="$PHP_VAR_SUBST APC_SHARED_LIBADD"
6247 +
6248 +
6249 +  PHP_VAR_SUBST="$PHP_VAR_SUBST APC_CFLAGS"
6250 +
6251 +  cat >> confdefs.h <<\EOF
6252 +#define HAVE_APC 1
6253 +EOF
6254
6255  fi
6256
6257
6258
6259 -php_enable_calendar=no
6260
6261 -echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
6262 -echo "configure:26922: checking whether to enable calendar conversion support" >&5
6263 -# Check whether --enable-calendar or --disable-calendar was given.
6264 -if test "${enable_calendar+set}" = set; then
6265 -  enableval="$enable_calendar"
6266 -  PHP_CALENDAR=$enableval
6267 +php_enable_bcmath=no
6268 +
6269 +echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
6270 +echo "configure:26954: checking whether to enable bc style precision math functions" >&5
6271 +# Check whether --enable-bcmath or --disable-bcmath was given.
6272 +if test "${enable_bcmath+set}" = set; then
6273 +  enableval="$enable_bcmath"
6274 +  PHP_BCMATH=$enableval
6275  else
6276
6277 -  PHP_CALENDAR=no
6278 -  test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL
6279 +  PHP_BCMATH=no
6280 +  test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL
6281
6282  fi
6283
6284 @@ -26934,12 +26966,12 @@ fi
6285
6286  ext_output="yes, shared"
6287  ext_shared=yes
6288 -case $PHP_CALENDAR in
6289 +case $PHP_BCMATH in
6290  shared,*)
6291 -  PHP_CALENDAR=`echo "$PHP_CALENDAR"|$SED 's/^shared,//'`
6292 +  PHP_BCMATH=`echo "$PHP_BCMATH"|$SED 's/^shared,//'`
6293    ;;
6294  shared)
6295 -  PHP_CALENDAR=yes
6296 +  PHP_BCMATH=yes
6297    ;;
6298  no)
6299    ext_output=no
6300 @@ -26958,25 +26990,21 @@ echo "$ac_t""$ext_output" 1>&6
6301
6302
6303
6304 -if test "$PHP_CALENDAR" = "yes"; then
6305 -  cat >> confdefs.h <<\EOF
6306 -#define HAVE_CALENDAR 1
6307 -EOF
6308 -
6309 +if test "$PHP_BCMATH" != "no"; then
6310
6311 -  ext_builddir=ext/calendar
6312 -  ext_srcdir=$abs_srcdir/ext/calendar
6313 +  ext_builddir=ext/bcmath
6314 +  ext_srcdir=$abs_srcdir/ext/bcmath
6315
6316 -  ac_extra=
6317 +  ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
6318
6319    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
6320 -    PHP_CALENDAR_SHARED=no
6321 +    PHP_BCMATH_SHARED=no
6322
6323
6324 -  case ext/calendar in
6325 +  case ext/bcmath in
6326    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6327 -  /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6328 -  *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6329 +  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6330 +  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6331    esac
6332
6333
6334 @@ -26991,7 +27019,11 @@ EOF
6335
6336
6337    old_IFS=$IFS
6338 -  for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
6339 +  for ac_src in bcmath.c \
6340 +libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
6341 +libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
6342 +libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
6343 +libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
6344
6345        IFS=.
6346        set $ac_src
6347 @@ -27014,18 +27046,18 @@ EOF
6348    done
6349
6350
6351 -    EXT_STATIC="$EXT_STATIC calendar"
6352 +    EXT_STATIC="$EXT_STATIC bcmath"
6353      if test "$ext_shared" != "nocli"; then
6354 -      EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
6355 +      EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
6356      fi
6357    else
6358      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
6359 -      PHP_CALENDAR_SHARED=yes
6360 +      PHP_BCMATH_SHARED=yes
6361
6362 -  case ext/calendar in
6363 +  case ext/bcmath in
6364    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6365 -  /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6366 -  *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6367 +  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6368 +  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6369    esac
6370
6371
6372 @@ -27040,14 +27072,18 @@ EOF
6373
6374
6375    old_IFS=$IFS
6376 -  for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
6377 +  for ac_src in bcmath.c \
6378 +libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
6379 +libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
6380 +libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
6381 +libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
6382
6383        IFS=.
6384        set $ac_src
6385        ac_obj=$1
6386        IFS=$old_IFS
6387
6388 -      shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo"
6389 +      shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo"
6390
6391        case $ac_src in
6392          *.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" ;;
6393 @@ -27070,31 +27106,31 @@ EOF
6394    case $host_alias in
6395      *aix*)
6396        suffix=so
6397 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpcalendar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) $(PHPCALENDAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpcalendar.so '$ext_builddir'/phpcalendar.so'
6398 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpbcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(PHPBCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpbcmath.so '$ext_builddir'/phpbcmath.so'
6399        ;;
6400      *netware*)
6401        suffix=nlm
6402 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCALENDAR, 3)_SHARED_LIBADD)'
6403 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBCMATH, 3)_SHARED_LIBADD)'
6404        ;;
6405      *)
6406        suffix=la
6407 -      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_calendar) $(PHPCALENDAR_SHARED_LIBADD)'
6408 +      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_bcmath) $(PHPBCMATH_SHARED_LIBADD)'
6409        ;;
6410    esac
6411
6412    if test "x" = "xyes"; then
6413 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpcalendar.$suffix"
6414 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix"
6415    else
6416 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcalendar.$suffix"
6417 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix"
6418    fi
6419
6420 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
6421 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
6422
6423    cat >>Makefile.objects<<EOF
6424 -\$(phplibdir)/phpcalendar.$suffix: $ext_builddir/phpcalendar.$suffix
6425 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpcalendar.$suffix \$(phplibdir)
6426 +\$(phplibdir)/phpbcmath.$suffix: $ext_builddir/phpbcmath.$suffix
6427 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpbcmath.$suffix \$(phplibdir)
6428
6429 -$ext_builddir/phpcalendar.$suffix: \$(shared_objects_calendar) \$(PHPCALENDAR_SHARED_DEPENDENCIES)
6430 +$ext_builddir/phpbcmath.$suffix: \$(shared_objects_bcmath) \$(PHPBCMATH_SHARED_DEPENDENCIES)
6431         $link_cmd
6432
6433  EOF
6434 @@ -27107,31 +27143,31 @@ EOF
6435    case $host_alias in
6436      *aix*)
6437        suffix=so
6438 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/calendar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) $(CALENDAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/calendar.so '$ext_builddir'/calendar.so'
6439 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/bcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(BCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/bcmath.so '$ext_builddir'/bcmath.so'
6440        ;;
6441      *netware*)
6442        suffix=nlm
6443 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CALENDAR, 3)_SHARED_LIBADD)'
6444 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BCMATH, 3)_SHARED_LIBADD)'
6445        ;;
6446      *)
6447        suffix=la
6448 -      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_calendar) $(CALENDAR_SHARED_LIBADD)'
6449 +      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_bcmath) $(BCMATH_SHARED_LIBADD)'
6450        ;;
6451    esac
6452
6453    if test "x" = "xyes"; then
6454 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/calendar.$suffix"
6455 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix"
6456    else
6457 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/calendar.$suffix"
6458 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix"
6459    fi
6460
6461 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
6462 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
6463
6464    cat >>Makefile.objects<<EOF
6465 -\$(phplibdir)/calendar.$suffix: $ext_builddir/calendar.$suffix
6466 -       \$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir)
6467 +\$(phplibdir)/bcmath.$suffix: $ext_builddir/bcmath.$suffix
6468 +       \$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir)
6469
6470 -$ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES)
6471 +$ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES)
6472         $link_cmd
6473
6474  EOF
6475 @@ -27139,22 +27175,22 @@ EOF
6476            ;;
6477        esac
6478        cat >> confdefs.h <<EOF
6479 -#define COMPILE_DL_CALENDAR 1
6480 +#define COMPILE_DL_BCMATH 1
6481  EOF
6482
6483      fi
6484    fi
6485
6486    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
6487 -    PHP_CALENDAR_SHARED=no
6488 +    PHP_BCMATH_SHARED=no
6489      case "$PHP_SAPI" in
6490        cgi|embed)
6491
6492
6493 -  case ext/calendar in
6494 +  case ext/bcmath in
6495    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6496 -  /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6497 -  *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6498 +  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6499 +  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6500    esac
6501
6502
6503 @@ -27169,7 +27205,11 @@ EOF
6504
6505
6506    old_IFS=$IFS
6507 -  for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
6508 +  for ac_src in bcmath.c \
6509 +libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
6510 +libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
6511 +libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
6512 +libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
6513
6514        IFS=.
6515        set $ac_src
6516 @@ -27192,15 +27232,15 @@ EOF
6517    done
6518
6519
6520 -        EXT_STATIC="$EXT_STATIC calendar"
6521 +        EXT_STATIC="$EXT_STATIC bcmath"
6522          ;;
6523        *)
6524
6525
6526 -  case ext/calendar in
6527 +  case ext/bcmath in
6528    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6529 -  /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6530 -  *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6531 +  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6532 +  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6533    esac
6534
6535
6536 @@ -27215,7 +27255,11 @@ EOF
6537
6538
6539    old_IFS=$IFS
6540 -  for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
6541 +  for ac_src in bcmath.c \
6542 +libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
6543 +libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
6544 +libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
6545 +libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
6546
6547        IFS=.
6548        set $ac_src
6549 @@ -27240,7 +27284,7 @@ EOF
6550
6551          ;;
6552      esac
6553 -    EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
6554 +    EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
6555    fi
6556
6557
6558 @@ -27249,28 +27293,37 @@ EOF
6559
6560
6561    if test "$ext_builddir" = "."; then
6562 -    PHP_PECL_EXTENSION=calendar
6563 +    PHP_PECL_EXTENSION=bcmath
6564
6565    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
6566
6567    fi
6568
6569 +
6570 +
6571 +    BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src"
6572 +
6573 +
6574 +  cat >> confdefs.h <<\EOF
6575 +#define HAVE_BCMATH 1
6576 +EOF
6577 +
6578  fi
6579
6580
6581
6582 -php_enable_ctype=yes
6583 +php_with_bz2=no
6584
6585 -echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
6586 -echo "configure:27266: checking whether to enable ctype functions" >&5
6587 -# Check whether --enable-ctype or --disable-ctype was given.
6588 -if test "${enable_ctype+set}" = set; then
6589 -  enableval="$enable_ctype"
6590 -  PHP_CTYPE=$enableval
6591 +echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
6592 +echo "configure:27319: checking for BZip2 support" >&5
6593 +# Check whether --with-bz2 or --without-bz2 was given.
6594 +if test "${with_bz2+set}" = set; then
6595 +  withval="$with_bz2"
6596 +  PHP_BZ2=$withval
6597  else
6598
6599 -  PHP_CTYPE=yes
6600 -  test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL
6601 +  PHP_BZ2=no
6602 +  test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL
6603
6604  fi
6605
6606 @@ -27278,12 +27331,12 @@ fi
6607
6608  ext_output="yes, shared"
6609  ext_shared=yes
6610 -case $PHP_CTYPE in
6611 +case $PHP_BZ2 in
6612  shared,*)
6613 -  PHP_CTYPE=`echo "$PHP_CTYPE"|$SED 's/^shared,//'`
6614 +  PHP_BZ2=`echo "$PHP_BZ2"|$SED 's/^shared,//'`
6615    ;;
6616  shared)
6617 -  PHP_CTYPE=yes
6618 +  PHP_BZ2=yes
6619    ;;
6620  no)
6621    ext_output=no
6622 @@ -27302,31 +27355,329 @@ echo "$ac_t""$ext_output" 1>&6
6623
6624
6625
6626 -if test "$PHP_CTYPE" != "no"; then
6627 -  cat >> confdefs.h <<\EOF
6628 -#define HAVE_CTYPE 1
6629 -EOF
6630 -
6631 -
6632 -  ext_builddir=ext/ctype
6633 -  ext_srcdir=$abs_srcdir/ext/ctype
6634 +if test "$PHP_BZ2" != "no"; then
6635 +  if test -r $PHP_BZ2/include/bzlib.h; then
6636 +    BZIP_DIR=$PHP_BZ2
6637 +  else
6638 +    echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
6639 +echo "configure:27364: checking for BZip2 in default path" >&5
6640 +    for i in /usr/local /usr; do
6641 +      if test -r $i/include/bzlib.h; then
6642 +        BZIP_DIR=$i
6643 +        echo "$ac_t""found in $i" 1>&6
6644 +        break
6645 +      fi
6646 +    done
6647 +  fi
6648
6649 -  ac_extra=
6650 +  if test -z "$BZIP_DIR"; then
6651 +    echo "$ac_t""not found" 1>&6
6652 +    { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; }
6653 +  fi
6654
6655 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
6656 -    PHP_CTYPE_SHARED=no
6657 -
6658
6659 -  case ext/ctype in
6660 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6661 -  /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6662 -  *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6663 -  esac
6664 +  save_old_LDFLAGS=$LDFLAGS
6665 +  ac_stuff="
6666 +    -L$BZIP_DIR/$PHP_LIBDIR
6667 +  "
6668 +
6669 +  save_ext_shared=$ext_shared
6670 +  ext_shared=yes
6671
6672 +  for ac_i in $ac_stuff; do
6673 +    case $ac_i in
6674 +    -pthread)
6675 +      if test "$ext_shared" = "yes"; then
6676 +        LDFLAGS="$LDFLAGS -pthread"
6677 +      else
6678 +
6679 +
6680 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
6681
6682 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
6683 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
6684 +    eval "EXTRA_LDFLAGS$unique=set"
6685 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
6686 +  fi
6687
6688 -  b_c_pre=$php_c_pre
6689 -  b_cxx_pre=$php_cxx_pre
6690 +      fi
6691 +    ;;
6692 +    -l*)
6693 +      ac_ii=`echo $ac_i|cut -c 3-`
6694 +
6695 +
6696 +  case $ac_ii in
6697 +  c|c_r|pthread*) ;;
6698 +  *)
6699 +    if test "$ext_shared" = "yes"; then
6700 +        LDFLAGS="$LDFLAGS -l$ac_ii"
6701 +    else
6702 +
6703 +
6704 +  case $ac_ii in
6705 +  c|c_r|pthread*) ;;
6706 +  *)
6707 +      LIBS="$LIBS -l$ac_ii"
6708 +   ;;
6709 +  esac
6710 +
6711 +
6712 +    fi
6713 +   ;;
6714 +  esac
6715 +
6716 +
6717 +    ;;
6718 +    -L*)
6719 +      ac_ii=`echo $ac_i|cut -c 3-`
6720 +
6721 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
6722 +
6723 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
6724 +    ai_p=$ac_ii
6725 +  else
6726 +
6727 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
6728 +
6729 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
6730 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
6731 +  fi
6732 +
6733 +
6734 +      if test "$ext_shared" = "yes"; then
6735 +        LDFLAGS="-L$ai_p $LDFLAGS"
6736 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
6737 +      else
6738 +
6739 +
6740 +
6741 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
6742 +
6743 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
6744 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
6745 +    eval "LIBPATH$unique=set"
6746 +
6747 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
6748 +    LDFLAGS="$LDFLAGS -L$ai_p"
6749 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
6750 +
6751 +  fi
6752 +
6753 +
6754 +      fi
6755 +
6756 +  fi
6757 +
6758 +    ;;
6759 +    esac
6760 +  done
6761 +
6762 +  echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
6763 +echo "configure:27477: checking for BZ2_bzerror in -lbz2" >&5
6764 +ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'`
6765 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6766 +  echo $ac_n "(cached) $ac_c" 1>&6
6767 +else
6768 +  ac_save_LIBS="$LIBS"
6769 +LIBS="-lbz2  $LIBS"
6770 +cat > conftest.$ac_ext <<EOF
6771 +#line 27485 "configure"
6772 +#include "confdefs.h"
6773 +/* Override any gcc2 internal prototype to avoid an error.  */
6774 +/* We use char because int might match the return type of a gcc2
6775 +    builtin and then its argument prototype would still apply.  */
6776 +char BZ2_bzerror();
6777 +
6778 +int main() {
6779 +BZ2_bzerror()
6780 +; return 0; }
6781 +EOF
6782 +if { (eval echo configure:27496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6783 +  rm -rf conftest*
6784 +  eval "ac_cv_lib_$ac_lib_var=yes"
6785 +else
6786 +  echo "configure: failed program was:" >&5
6787 +  cat conftest.$ac_ext >&5
6788 +  rm -rf conftest*
6789 +  eval "ac_cv_lib_$ac_lib_var=no"
6790 +fi
6791 +rm -f conftest*
6792 +LIBS="$ac_save_LIBS"
6793 +
6794 +fi
6795 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
6796 +  echo "$ac_t""yes" 1>&6
6797 +
6798 +    LDFLAGS=$save_old_LDFLAGS
6799 +    ext_shared=$save_ext_shared
6800 +
6801 +
6802 +  if test "$BZIP_DIR/include" != "/usr/include"; then
6803 +
6804 +  if test -z "$BZIP_DIR/include" || echo "$BZIP_DIR/include" | grep '^/' >/dev/null ; then
6805 +    ai_p=$BZIP_DIR/include
6806 +  else
6807 +
6808 +    ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
6809 +
6810 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
6811 +    ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`"
6812 +  fi
6813 +
6814 +
6815 +
6816 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
6817 +
6818 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
6819 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
6820 +    eval "INCLUDEPATH$unique=set"
6821 +
6822 +      if test ""; then
6823 +        INCLUDES="-I$ai_p $INCLUDES"
6824 +      else
6825 +        INCLUDES="$INCLUDES -I$ai_p"
6826 +      fi
6827 +
6828 +  fi
6829 +
6830 +  fi
6831 +
6832 +
6833 +
6834 +  if test "$ext_shared" = "yes"; then
6835 +    BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD"
6836 +    if test -n "$BZIP_DIR/$PHP_LIBDIR"; then
6837 +
6838 +  if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
6839 +
6840 +  if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
6841 +    ai_p=$BZIP_DIR/$PHP_LIBDIR
6842 +  else
6843 +
6844 +    ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
6845 +
6846 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
6847 +    ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
6848 +  fi
6849 +
6850 +
6851 +      if test "$ext_shared" = "yes"; then
6852 +        BZ2_SHARED_LIBADD="-L$ai_p $BZ2_SHARED_LIBADD"
6853 +        test -n "$ld_runpath_switch" && BZ2_SHARED_LIBADD="$ld_runpath_switch$ai_p $BZ2_SHARED_LIBADD"
6854 +      else
6855 +
6856 +
6857 +
6858 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
6859 +
6860 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
6861 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
6862 +    eval "LIBPATH$unique=set"
6863 +
6864 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
6865 +    LDFLAGS="$LDFLAGS -L$ai_p"
6866 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
6867 +
6868 +  fi
6869 +
6870 +
6871 +      fi
6872 +
6873 +  fi
6874 +
6875 +    fi
6876 +  else
6877 +
6878 +
6879 +  if test -n "$BZIP_DIR/$PHP_LIBDIR"; then
6880 +
6881 +  if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
6882 +
6883 +  if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
6884 +    ai_p=$BZIP_DIR/$PHP_LIBDIR
6885 +  else
6886 +
6887 +    ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
6888 +
6889 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
6890 +    ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
6891 +  fi
6892 +
6893 +
6894 +
6895 +
6896 +
6897 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
6898 +
6899 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
6900 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
6901 +    eval "LIBPATH$unique=set"
6902 +
6903 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
6904 +    LDFLAGS="$LDFLAGS -L$ai_p"
6905 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
6906 +
6907 +  fi
6908 +
6909 +
6910 +
6911 +  fi
6912 +
6913 +  fi
6914 +
6915 +
6916 +  case bz2 in
6917 +  c|c_r|pthread*) ;;
6918 +  *)
6919 +      LIBS="-lbz2 $LIBS"
6920 +   ;;
6921 +  esac
6922 +
6923 +
6924 +
6925 +
6926 +  fi
6927 +
6928 +
6929 +    cat >> confdefs.h <<\EOF
6930 +#define HAVE_BZ2 1
6931 +EOF
6932 +
6933 +
6934 +
6935 +else
6936 +  echo "$ac_t""no" 1>&6
6937 +
6938 +    LDFLAGS=$save_old_LDFLAGS
6939 +    ext_shared=$save_ext_shared
6940 +    unset ac_cv_lib_bz2_BZ2_bzerror
6941 +
6942 +    { echo "configure: error: bz2 module requires libbz2 >= 1.0.0" 1>&2; exit 1; }
6943 +
6944 +
6945 +fi
6946 +
6947 +
6948 +
6949 +  ext_builddir=ext/bz2
6950 +  ext_srcdir=$abs_srcdir/ext/bz2
6951 +
6952 +  ac_extra=
6953 +
6954 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
6955 +    PHP_BZ2_SHARED=no
6956 +
6957 +
6958 +  case ext/bz2 in
6959 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6960 +  /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6961 +  *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6962 +  esac
6963 +
6964 +
6965 +
6966 +  b_c_pre=$php_c_pre
6967 +  b_cxx_pre=$php_cxx_pre
6968    b_c_meta=$php_c_meta
6969    b_cxx_meta=$php_cxx_meta
6970    b_c_post=$php_c_post
6971 @@ -27335,7 +27686,7 @@ EOF
6972
6973
6974    old_IFS=$IFS
6975 -  for ac_src in ctype.c; do
6976 +  for ac_src in bz2.c bz2_filter.c; do
6977
6978        IFS=.
6979        set $ac_src
6980 @@ -27358,18 +27709,18 @@ EOF
6981    done
6982
6983
6984 -    EXT_STATIC="$EXT_STATIC ctype"
6985 +    EXT_STATIC="$EXT_STATIC bz2"
6986      if test "$ext_shared" != "nocli"; then
6987 -      EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
6988 +      EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
6989      fi
6990    else
6991      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
6992 -      PHP_CTYPE_SHARED=yes
6993 +      PHP_BZ2_SHARED=yes
6994
6995 -  case ext/ctype in
6996 +  case ext/bz2 in
6997    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6998 -  /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6999 -  *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7000 +  /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7001 +  *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7002    esac
7003
7004
7005 @@ -27384,14 +27735,14 @@ EOF
7006
7007
7008    old_IFS=$IFS
7009 -  for ac_src in ctype.c; do
7010 +  for ac_src in bz2.c bz2_filter.c; do
7011
7012        IFS=.
7013        set $ac_src
7014        ac_obj=$1
7015        IFS=$old_IFS
7016
7017 -      shared_objects_ctype="$shared_objects_ctype $ac_bdir$ac_obj.lo"
7018 +      shared_objects_bz2="$shared_objects_bz2 $ac_bdir$ac_obj.lo"
7019
7020        case $ac_src in
7021          *.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" ;;
7022 @@ -27414,31 +27765,31 @@ EOF
7023    case $host_alias in
7024      *aix*)
7025        suffix=so
7026 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpctype.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) $(PHPCTYPE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpctype.so '$ext_builddir'/phpctype.so'
7027 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpbz2.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) $(PHPBZ2_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpbz2.so '$ext_builddir'/phpbz2.so'
7028        ;;
7029      *netware*)
7030        suffix=nlm
7031 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCTYPE, 3)_SHARED_LIBADD)'
7032 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBZ2, 3)_SHARED_LIBADD)'
7033        ;;
7034      *)
7035        suffix=la
7036 -      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_ctype) $(PHPCTYPE_SHARED_LIBADD)'
7037 +      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_bz2) $(PHPBZ2_SHARED_LIBADD)'
7038        ;;
7039    esac
7040
7041    if test "x" = "xyes"; then
7042 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpctype.$suffix"
7043 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbz2.$suffix"
7044    else
7045 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpctype.$suffix"
7046 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbz2.$suffix"
7047    fi
7048
7049 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
7050 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
7051
7052    cat >>Makefile.objects<<EOF
7053 -\$(phplibdir)/phpctype.$suffix: $ext_builddir/phpctype.$suffix
7054 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpctype.$suffix \$(phplibdir)
7055 +\$(phplibdir)/phpbz2.$suffix: $ext_builddir/phpbz2.$suffix
7056 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpbz2.$suffix \$(phplibdir)
7057
7058 -$ext_builddir/phpctype.$suffix: \$(shared_objects_ctype) \$(PHPCTYPE_SHARED_DEPENDENCIES)
7059 +$ext_builddir/phpbz2.$suffix: \$(shared_objects_bz2) \$(PHPBZ2_SHARED_DEPENDENCIES)
7060         $link_cmd
7061
7062  EOF
7063 @@ -27451,31 +27802,31 @@ EOF
7064    case $host_alias in
7065      *aix*)
7066        suffix=so
7067 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/ctype.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) $(CTYPE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/ctype.so '$ext_builddir'/ctype.so'
7068 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/bz2.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) $(BZ2_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/bz2.so '$ext_builddir'/bz2.so'
7069        ;;
7070      *netware*)
7071        suffix=nlm
7072 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CTYPE, 3)_SHARED_LIBADD)'
7073 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BZ2, 3)_SHARED_LIBADD)'
7074        ;;
7075      *)
7076        suffix=la
7077 -      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_ctype) $(CTYPE_SHARED_LIBADD)'
7078 +      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_bz2) $(BZ2_SHARED_LIBADD)'
7079        ;;
7080    esac
7081
7082    if test "x" = "xyes"; then
7083 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/ctype.$suffix"
7084 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bz2.$suffix"
7085    else
7086 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/ctype.$suffix"
7087 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/bz2.$suffix"
7088    fi
7089
7090 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
7091 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
7092
7093    cat >>Makefile.objects<<EOF
7094 -\$(phplibdir)/ctype.$suffix: $ext_builddir/ctype.$suffix
7095 -       \$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir)
7096 +\$(phplibdir)/bz2.$suffix: $ext_builddir/bz2.$suffix
7097 +       \$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir)
7098
7099 -$ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES)
7100 +$ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES)
7101         $link_cmd
7102
7103  EOF
7104 @@ -27483,22 +27834,22 @@ EOF
7105            ;;
7106        esac
7107        cat >> confdefs.h <<EOF
7108 -#define COMPILE_DL_CTYPE 1
7109 +#define COMPILE_DL_BZ2 1
7110  EOF
7111
7112      fi
7113    fi
7114
7115    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
7116 -    PHP_CTYPE_SHARED=no
7117 +    PHP_BZ2_SHARED=no
7118      case "$PHP_SAPI" in
7119        cgi|embed)
7120
7121
7122 -  case ext/ctype in
7123 +  case ext/bz2 in
7124    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7125 -  /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7126 -  *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7127 +  /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7128 +  *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7129    esac
7130
7131
7132 @@ -27513,7 +27864,7 @@ EOF
7133
7134
7135    old_IFS=$IFS
7136 -  for ac_src in ctype.c; do
7137 +  for ac_src in bz2.c bz2_filter.c; do
7138
7139        IFS=.
7140        set $ac_src
7141 @@ -27536,15 +27887,15 @@ EOF
7142    done
7143
7144
7145 -        EXT_STATIC="$EXT_STATIC ctype"
7146 +        EXT_STATIC="$EXT_STATIC bz2"
7147          ;;
7148        *)
7149
7150
7151 -  case ext/ctype in
7152 +  case ext/bz2 in
7153    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7154 -  /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7155 -  *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7156 +  /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7157 +  *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7158    esac
7159
7160
7161 @@ -27559,7 +27910,7 @@ EOF
7162
7163
7164    old_IFS=$IFS
7165 -  for ac_src in ctype.c; do
7166 +  for ac_src in bz2.c bz2_filter.c; do
7167
7168        IFS=.
7169        set $ac_src
7170 @@ -27584,7 +27935,7 @@ EOF
7171
7172          ;;
7173      esac
7174 -    EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
7175 +    EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
7176    fi
7177
7178
7179 @@ -27593,28 +27944,31 @@ EOF
7180
7181
7182    if test "$ext_builddir" = "."; then
7183 -    PHP_PECL_EXTENSION=ctype
7184 +    PHP_PECL_EXTENSION=bz2
7185
7186    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
7187
7188    fi
7189
7190 +
7191 +  PHP_VAR_SUBST="$PHP_VAR_SUBST BZ2_SHARED_LIBADD"
7192 +
7193  fi
7194
7195
7196
7197 -php_with_curl=no
7198 +php_enable_calendar=no
7199
7200 -echo $ac_n "checking for cURL support""... $ac_c" 1>&6
7201 -echo "configure:27610: checking for cURL support" >&5
7202 -# Check whether --with-curl or --without-curl was given.
7203 -if test "${with_curl+set}" = set; then
7204 -  withval="$with_curl"
7205 -  PHP_CURL=$withval
7206 +echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
7207 +echo "configure:27964: checking whether to enable calendar conversion support" >&5
7208 +# Check whether --enable-calendar or --disable-calendar was given.
7209 +if test "${enable_calendar+set}" = set; then
7210 +  enableval="$enable_calendar"
7211 +  PHP_CALENDAR=$enableval
7212  else
7213
7214 -  PHP_CURL=no
7215 -  test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL
7216 +  PHP_CALENDAR=no
7217 +  test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL
7218
7219  fi
7220
7221 @@ -27622,12 +27976,12 @@ fi
7222
7223  ext_output="yes, shared"
7224  ext_shared=yes
7225 -case $PHP_CURL in
7226 +case $PHP_CALENDAR in
7227  shared,*)
7228 -  PHP_CURL=`echo "$PHP_CURL"|$SED 's/^shared,//'`
7229 +  PHP_CALENDAR=`echo "$PHP_CALENDAR"|$SED 's/^shared,//'`
7230    ;;
7231  shared)
7232 -  PHP_CURL=yes
7233 +  PHP_CALENDAR=yes
7234    ;;
7235  no)
7236    ext_output=no
7237 @@ -27646,572 +28000,796 @@ echo "$ac_t""$ext_output" 1>&6
7238
7239
7240
7241 +if test "$PHP_CALENDAR" = "yes"; then
7242 +  cat >> confdefs.h <<\EOF
7243 +#define HAVE_CALENDAR 1
7244 +EOF
7245 +
7246 +
7247 +  ext_builddir=ext/calendar
7248 +  ext_srcdir=$abs_srcdir/ext/calendar
7249
7250 -php_with_curlwrappers=no
7251 +  ac_extra=
7252
7253 -echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6
7254 -echo "configure:27654: checking if we should use cURL for url streams" >&5
7255 -# Check whether --with-curlwrappers or --without-curlwrappers was given.
7256 -if test "${with_curlwrappers+set}" = set; then
7257 -  withval="$with_curlwrappers"
7258 -  PHP_CURLWRAPPERS=$withval
7259 -else
7260 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
7261 +    PHP_CALENDAR_SHARED=no
7262 +
7263 +
7264 +  case ext/calendar in
7265 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7266 +  /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7267 +  *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7268 +  esac
7269
7270 -  PHP_CURLWRAPPERS=no
7271
7272
7273 -fi
7274 +  b_c_pre=$php_c_pre
7275 +  b_cxx_pre=$php_cxx_pre
7276 +  b_c_meta=$php_c_meta
7277 +  b_cxx_meta=$php_cxx_meta
7278 +  b_c_post=$php_c_post
7279 +  b_cxx_post=$php_cxx_post
7280 +  b_lo=$php_lo
7281
7282
7283 -ext_output=$PHP_CURLWRAPPERS
7284 -echo "$ac_t""$ext_output" 1>&6
7285 +  old_IFS=$IFS
7286 +  for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
7287 +
7288 +      IFS=.
7289 +      set $ac_src
7290 +      ac_obj=$1
7291 +      IFS=$old_IFS
7292 +
7293 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
7294
7295 +      case $ac_src in
7296 +        *.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" ;;
7297 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7298 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7299 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
7300 +      esac
7301
7302 +    cat >>Makefile.objects<<EOF
7303 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
7304 +       $ac_comp
7305 +EOF
7306 +  done
7307
7308
7309 -if test "$PHP_CURL" != "no"; then
7310 -  if test -r $PHP_CURL/include/curl/easy.h; then
7311 -    CURL_DIR=$PHP_CURL
7312 +    EXT_STATIC="$EXT_STATIC calendar"
7313 +    if test "$ext_shared" != "nocli"; then
7314 +      EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
7315 +    fi
7316    else
7317 -    echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6
7318 -echo "configure:27678: checking for cURL in default path" >&5
7319 -    for i in /usr/local /usr; do
7320 -      if test -r $i/include/curl/easy.h; then
7321 -        CURL_DIR=$i
7322 -        echo "$ac_t""found in $i" 1>&6
7323 -        break
7324 -      fi
7325 -    done
7326 -  fi
7327 -
7328 -  if test -z "$CURL_DIR"; then
7329 -    echo "$ac_t""not found" 1>&6
7330 -    { echo "configure: error: Please reinstall the libcurl distribution -
7331 -    easy.h should be in <curl-dir>/include/curl/" 1>&2; exit 1; }
7332 -  fi
7333 -
7334 -  CURL_CONFIG="curl-config"
7335 -  echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6
7336 -echo "configure:27696: checking for cURL 7.10.5 or greater" >&5
7337 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
7338 +      PHP_CALENDAR_SHARED=yes
7339 +
7340 +  case ext/calendar in
7341 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7342 +  /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7343 +  *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7344 +  esac
7345 +
7346 +
7347
7348 -  if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
7349 -    CURL_CONFIG=${CURL_DIR}/bin/curl-config
7350 -  else
7351 -    if ${CURL_DIR}/curl-config --libs > /dev/null 2>&1; then
7352 -      CURL_CONFIG=${CURL_DIR}/curl-config
7353 -    fi
7354 -  fi
7355 +  b_c_pre=$shared_c_pre
7356 +  b_cxx_pre=$shared_cxx_pre
7357 +  b_c_meta=$shared_c_meta
7358 +  b_cxx_meta=$shared_cxx_meta
7359 +  b_c_post=$shared_c_post
7360 +  b_cxx_post=$shared_cxx_post
7361 +  b_lo=$shared_lo
7362
7363 -  curl_version_full=`$CURL_CONFIG --version`
7364 -  curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
7365 -  if test "$curl_version" -ge 7010005; then
7366 -    echo "$ac_t""$curl_version_full" 1>&6
7367 -    CURL_LIBS=`$CURL_CONFIG --libs`
7368 -  else
7369 -    { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; }
7370 -  fi
7371
7372 +  old_IFS=$IFS
7373 +  for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
7374
7375 -  if test "$CURL_DIR/include" != "/usr/include"; then
7376 -
7377 -  if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then
7378 -    ai_p=$CURL_DIR/include
7379 -  else
7380 -
7381 -    ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
7382 -
7383 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
7384 -    ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`"
7385 -  fi
7386 +      IFS=.
7387 +      set $ac_src
7388 +      ac_obj=$1
7389 +      IFS=$old_IFS
7390 +
7391 +      shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo"
7392
7393 -
7394 -
7395 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
7396 -
7397 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
7398 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
7399 -    eval "INCLUDEPATH$unique=set"
7400 -
7401 -      if test ""; then
7402 -        INCLUDES="-I$ai_p $INCLUDES"
7403 -      else
7404 -        INCLUDES="$INCLUDES -I$ai_p"
7405 -      fi
7406 -
7407 -  fi
7408 +      case $ac_src in
7409 +        *.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" ;;
7410 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7411 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7412 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
7413 +      esac
7414
7415 -  fi
7416 +    cat >>Makefile.objects<<EOF
7417 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
7418 +       $ac_comp
7419 +EOF
7420 +  done
7421
7422 -
7423 -  for ac_i in $CURL_LIBS; do
7424 -    case $ac_i in
7425 -    -pthread)
7426 -      if test "$ext_shared" = "yes"; then
7427 -        CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -pthread"
7428 -      else
7429 -
7430 -
7431 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
7432 -
7433 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
7434 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
7435 -    eval "EXTRA_LDFLAGS$unique=set"
7436 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
7437 -  fi
7438 +      case $host_alias in
7439 +        *netware*)
7440 +
7441 +  install_modules="install-modules"
7442
7443 -      fi
7444 -    ;;
7445 -    -l*)
7446 -      ac_ii=`echo $ac_i|cut -c 3-`
7447 -
7448 -
7449 -  case $ac_ii in
7450 -  c|c_r|pthread*) ;;
7451 -  *)
7452 -    if test "$ext_shared" = "yes"; then
7453 -        CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii"
7454 -    else
7455 -
7456 -
7457 -  case $ac_ii in
7458 -  c|c_r|pthread*) ;;
7459 -  *)
7460 -      LIBS="$LIBS -l$ac_ii"
7461 -   ;;
7462 +  case $host_alias in
7463 +    *aix*)
7464 +      suffix=so
7465 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpcalendar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) $(PHPCALENDAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpcalendar.so '$ext_builddir'/phpcalendar.so'
7466 +      ;;
7467 +    *netware*)
7468 +      suffix=nlm
7469 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCALENDAR, 3)_SHARED_LIBADD)'
7470 +      ;;
7471 +    *)
7472 +      suffix=la
7473 +      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_calendar) $(PHPCALENDAR_SHARED_LIBADD)'
7474 +      ;;
7475    esac
7476
7477 +  if test "x" = "xyes"; then
7478 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpcalendar.$suffix"
7479 +  else
7480 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcalendar.$suffix"
7481 +  fi
7482 +
7483 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
7484
7485 -    fi
7486 -   ;;
7487 -  esac
7488 +  cat >>Makefile.objects<<EOF
7489 +\$(phplibdir)/phpcalendar.$suffix: $ext_builddir/phpcalendar.$suffix
7490 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpcalendar.$suffix \$(phplibdir)
7491
7492 +$ext_builddir/phpcalendar.$suffix: \$(shared_objects_calendar) \$(PHPCALENDAR_SHARED_DEPENDENCIES)
7493 +       $link_cmd
7494
7495 -    ;;
7496 -    -L*)
7497 -      ac_ii=`echo $ac_i|cut -c 3-`
7498 -
7499 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
7500 -
7501 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
7502 -    ai_p=$ac_ii
7503 +EOF
7504 +
7505 +          ;;
7506 +        *)
7507 +
7508 +  install_modules="install-modules"
7509 +
7510 +  case $host_alias in
7511 +    *aix*)
7512 +      suffix=so
7513 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/calendar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) $(CALENDAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/calendar.so '$ext_builddir'/calendar.so'
7514 +      ;;
7515 +    *netware*)
7516 +      suffix=nlm
7517 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CALENDAR, 3)_SHARED_LIBADD)'
7518 +      ;;
7519 +    *)
7520 +      suffix=la
7521 +      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_calendar) $(CALENDAR_SHARED_LIBADD)'
7522 +      ;;
7523 +  esac
7524 +
7525 +  if test "x" = "xyes"; then
7526 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/calendar.$suffix"
7527    else
7528 -
7529 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
7530 -
7531 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
7532 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
7533 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/calendar.$suffix"
7534    fi
7535 +
7536 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
7537
7538 -
7539 -      if test "$ext_shared" = "yes"; then
7540 -        CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
7541 -        test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD"
7542 -      else
7543 +  cat >>Makefile.objects<<EOF
7544 +\$(phplibdir)/calendar.$suffix: $ext_builddir/calendar.$suffix
7545 +       \$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir)
7546 +
7547 +$ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES)
7548 +       $link_cmd
7549 +
7550 +EOF
7551 +
7552 +          ;;
7553 +      esac
7554 +      cat >> confdefs.h <<EOF
7555 +#define COMPILE_DL_CALENDAR 1
7556 +EOF
7557 +
7558 +    fi
7559 +  fi
7560 +
7561 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
7562 +    PHP_CALENDAR_SHARED=no
7563 +    case "$PHP_SAPI" in
7564 +      cgi|embed)
7565
7566
7567 +  case ext/calendar in
7568 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7569 +  /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7570 +  *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7571 +  esac
7572
7573 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
7574 -
7575 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
7576 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
7577 -    eval "LIBPATH$unique=set"
7578 -
7579 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
7580 -    LDFLAGS="$LDFLAGS -L$ai_p"
7581 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
7582
7583 -  fi
7584
7585 +  b_c_pre=$php_c_pre
7586 +  b_cxx_pre=$php_cxx_pre
7587 +  b_c_meta=$php_c_meta
7588 +  b_cxx_meta=$php_cxx_meta
7589 +  b_c_post=$php_c_post
7590 +  b_cxx_post=$php_cxx_post
7591 +  b_lo=$php_lo
7592
7593 -      fi
7594 -
7595 -  fi
7596 -
7597 -    ;;
7598 -    esac
7599 -  done
7600
7601 +  old_IFS=$IFS
7602 +  for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
7603
7604 -
7605 -  if test "$ext_shared" = "yes"; then
7606 -    CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD"
7607 -    if test -n "$CURL_DIR/$PHP_LIBDIR"; then
7608 +      IFS=.
7609 +      set $ac_src
7610 +      ac_obj=$1
7611 +      IFS=$old_IFS
7612
7613 -  if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
7614 -
7615 -  if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
7616 -    ai_p=$CURL_DIR/$PHP_LIBDIR
7617 -  else
7618 -
7619 -    ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
7620 -
7621 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
7622 -    ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
7623 -  fi
7624 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
7625
7626 -
7627 -      if test "$ext_shared" = "yes"; then
7628 -        CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
7629 -        test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD"
7630 -      else
7631 +      case $ac_src in
7632 +        *.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" ;;
7633 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7634 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7635 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
7636 +      esac
7637 +
7638 +    cat >>Makefile.objects<<EOF
7639 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
7640 +       $ac_comp
7641 +EOF
7642 +  done
7643 +
7644 +
7645 +        EXT_STATIC="$EXT_STATIC calendar"
7646 +        ;;
7647 +      *)
7648
7649
7650 +  case ext/calendar in
7651 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7652 +  /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7653 +  *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7654 +  esac
7655
7656 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
7657
7658 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
7659 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
7660 -    eval "LIBPATH$unique=set"
7661 -
7662 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
7663 -    LDFLAGS="$LDFLAGS -L$ai_p"
7664 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
7665 +
7666 +  b_c_pre=$php_c_pre
7667 +  b_cxx_pre=$php_cxx_pre
7668 +  b_c_meta=$php_c_meta
7669 +  b_cxx_meta=$php_cxx_meta
7670 +  b_c_post=$php_c_post
7671 +  b_cxx_post=$php_cxx_post
7672 +  b_lo=$php_lo
7673 +
7674 +
7675 +  old_IFS=$IFS
7676 +  for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
7677
7678 -  fi
7679 +      IFS=.
7680 +      set $ac_src
7681 +      ac_obj=$1
7682 +      IFS=$old_IFS
7683 +
7684 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
7685
7686 +      case $ac_src in
7687 +        *.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" ;;
7688 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7689 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7690 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
7691 +      esac
7692
7693 -      fi
7694 -
7695 -  fi
7696 +    cat >>Makefile.objects<<EOF
7697 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
7698 +       $ac_comp
7699 +EOF
7700 +  done
7701
7702 -    fi
7703 -  else
7704 -
7705
7706 -  if test -n "$CURL_DIR/$PHP_LIBDIR"; then
7707 -
7708 -  if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
7709 -
7710 -  if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
7711 -    ai_p=$CURL_DIR/$PHP_LIBDIR
7712 -  else
7713 -
7714 -    ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
7715 -
7716 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
7717 -    ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
7718 +        ;;
7719 +    esac
7720 +    EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
7721    fi
7722 -
7723 -
7724 -
7725 -
7726
7727 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
7728
7729 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
7730 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
7731 -    eval "LIBPATH$unique=set"
7732 -
7733 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
7734 -    LDFLAGS="$LDFLAGS -L$ai_p"
7735 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
7736 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
7737
7738 -  fi
7739
7740
7741 +  if test "$ext_builddir" = "."; then
7742 +    PHP_PECL_EXTENSION=calendar
7743
7744 -  fi
7745 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
7746
7747    fi
7748 -
7749 -
7750 -  case curl in
7751 -  c|c_r|pthread*) ;;
7752 -  *)
7753 -      LIBS="-lcurl $LIBS"
7754 -   ;;
7755 -  esac
7756 -
7757
7758 +fi
7759
7760
7761 -  fi
7762
7763 +php_enable_ctype=yes
7764
7765 +echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
7766 +echo "configure:28308: checking whether to enable ctype functions" >&5
7767 +# Check whether --enable-ctype or --disable-ctype was given.
7768 +if test "${enable_ctype+set}" = set; then
7769 +  enableval="$enable_ctype"
7770 +  PHP_CTYPE=$enableval
7771 +else
7772
7773 -  echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
7774 -echo "configure:27934: checking for SSL support in libcurl" >&5
7775 -  CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
7776 -  if test "$CURL_SSL" = "SSL"; then
7777 -    echo "$ac_t""yes" 1>&6
7778 -    cat >> confdefs.h <<\EOF
7779 -#define HAVE_CURL_SSL 1
7780 -EOF
7781 +  PHP_CTYPE=yes
7782 +  test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL
7783
7784 -
7785 -    save_CFLAGS="$CFLAGS"
7786 -    CFLAGS="`$CURL_CONFIG --cflags`"
7787 -
7788 -    echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
7789 -echo "configure:27947: checking how to run the C preprocessor" >&5
7790 -# On Suns, sometimes $CPP names a directory.
7791 -if test -n "$CPP" && test -d "$CPP"; then
7792 -  CPP=
7793 -fi
7794 -if test -z "$CPP"; then
7795 -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
7796 -  echo $ac_n "(cached) $ac_c" 1>&6
7797 -else
7798 -    # This must be in double quotes, not single quotes, because CPP may get
7799 -  # substituted into the Makefile and "${CC-cc}" will confuse make.
7800 -  CPP="${CC-cc} -E"
7801 -  # On the NeXT, cc -E runs the code through the compiler's parser,
7802 -  # not just through cpp.
7803 -  cat > conftest.$ac_ext <<EOF
7804 -#line 27962 "configure"
7805 -#include "confdefs.h"
7806 -#include <assert.h>
7807 -Syntax Error
7808 -EOF
7809 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7810 -{ (eval echo configure:27968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7811 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7812 -if test -z "$ac_err"; then
7813 -  :
7814 -else
7815 -  echo "$ac_err" >&5
7816 -  echo "configure: failed program was:" >&5
7817 -  cat conftest.$ac_ext >&5
7818 -  rm -rf conftest*
7819 -  CPP="${CC-cc} -E -traditional-cpp"
7820 -  cat > conftest.$ac_ext <<EOF
7821 -#line 27979 "configure"
7822 -#include "confdefs.h"
7823 -#include <assert.h>
7824 -Syntax Error
7825 -EOF
7826 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7827 -{ (eval echo configure:27985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7828 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7829 -if test -z "$ac_err"; then
7830 -  :
7831 -else
7832 -  echo "$ac_err" >&5
7833 -  echo "configure: failed program was:" >&5
7834 -  cat conftest.$ac_ext >&5
7835 -  rm -rf conftest*
7836 -  CPP="${CC-cc} -nologo -E"
7837 -  cat > conftest.$ac_ext <<EOF
7838 -#line 27996 "configure"
7839 -#include "confdefs.h"
7840 -#include <assert.h>
7841 -Syntax Error
7842 -EOF
7843 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7844 -{ (eval echo configure:28002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7845 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7846 -if test -z "$ac_err"; then
7847 -  :
7848 -else
7849 -  echo "$ac_err" >&5
7850 -  echo "configure: failed program was:" >&5
7851 -  cat conftest.$ac_ext >&5
7852 -  rm -rf conftest*
7853 -  CPP=/lib/cpp
7854 -fi
7855 -rm -f conftest*
7856 -fi
7857 -rm -f conftest*
7858 -fi
7859 -rm -f conftest*
7860 -  ac_cv_prog_CPP="$CPP"
7861 -fi
7862 -  CPP="$ac_cv_prog_CPP"
7863 -else
7864 -  ac_cv_prog_CPP="$CPP"
7865  fi
7866 -echo "$ac_t""$CPP" 1>&6
7867
7868 -    echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
7869 -echo "configure:28027: checking for openssl support in libcurl" >&5
7870 -    if test "$cross_compiling" = yes; then
7871 -
7872 -      echo "$ac_t""no" 1>&6
7873 -
7874 -else
7875 -  cat > conftest.$ac_ext <<EOF
7876 -#line 28034 "configure"
7877 -#include "confdefs.h"
7878
7879 -#include <curl/curl.h>
7880
7881 -int main(int argc, char *argv[])
7882 -{
7883 -  curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
7884 +ext_output="yes, shared"
7885 +ext_shared=yes
7886 +case $PHP_CTYPE in
7887 +shared,*)
7888 +  PHP_CTYPE=`echo "$PHP_CTYPE"|$SED 's/^shared,//'`
7889 +  ;;
7890 +shared)
7891 +  PHP_CTYPE=yes
7892 +  ;;
7893 +no)
7894 +  ext_output=no
7895 +  ext_shared=no
7896 +  ;;
7897 +*)
7898 +  ext_output=yes
7899 +  ext_shared=no
7900 +  ;;
7901 +esac
7902
7903 -  if (data && data->ssl_version && *data->ssl_version) {
7904 -    const char *ptr = data->ssl_version;
7905
7906 -    while(*ptr == ' ') ++ptr;
7907 -    return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
7908 -  }
7909 -  return 1;
7910 -}
7911 -
7912 +
7913 +echo "$ac_t""$ext_output" 1>&6
7914 +
7915 +
7916 +
7917 +
7918 +if test "$PHP_CTYPE" != "no"; then
7919 +  cat >> confdefs.h <<\EOF
7920 +#define HAVE_CTYPE 1
7921  EOF
7922 -if { (eval echo configure:28053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7923 -then
7924 +
7925
7926 -      echo "$ac_t""yes" 1>&6
7927 -      for ac_hdr in openssl/crypto.h
7928 -do
7929 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
7930 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
7931 -echo "configure:28061: checking for $ac_hdr" >&5
7932 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
7933 -  echo $ac_n "(cached) $ac_c" 1>&6
7934 -else
7935 -  cat > conftest.$ac_ext <<EOF
7936 -#line 28066 "configure"
7937 -#include "confdefs.h"
7938 -#include <$ac_hdr>
7939 -EOF
7940 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7941 -{ (eval echo configure:28071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7942 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7943 -if test -z "$ac_err"; then
7944 -  rm -rf conftest*
7945 -  eval "ac_cv_header_$ac_safe=yes"
7946 -else
7947 -  echo "$ac_err" >&5
7948 -  echo "configure: failed program was:" >&5
7949 -  cat conftest.$ac_ext >&5
7950 -  rm -rf conftest*
7951 -  eval "ac_cv_header_$ac_safe=no"
7952 -fi
7953 -rm -f conftest*
7954 -fi
7955 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
7956 -  echo "$ac_t""yes" 1>&6
7957 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
7958 -  cat >> confdefs.h <<EOF
7959 -#define $ac_tr_hdr 1
7960 -EOF
7961 -
7962 -        cat >> confdefs.h <<\EOF
7963 -#define HAVE_CURL_OPENSSL 1
7964 -EOF
7965 +  ext_builddir=ext/ctype
7966 +  ext_srcdir=$abs_srcdir/ext/ctype
7967
7968 -
7969 -else
7970 -  echo "$ac_t""no" 1>&6
7971 -fi
7972 -done
7973 +  ac_extra=
7974
7975 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
7976 +    PHP_CTYPE_SHARED=no
7977
7978 -else
7979 -  echo "configure: failed program was:" >&5
7980 -  cat conftest.$ac_ext >&5
7981 -  rm -fr conftest*
7982 -
7983 -      echo "$ac_t""no" 1>&6
7984 -
7985 -fi
7986 -rm -fr conftest*
7987 -fi
7988 +
7989 +  case ext/ctype in
7990 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7991 +  /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7992 +  *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7993 +  esac
7994 +
7995 +
7996
7997 -
7998 -    echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
7999 -echo "configure:28116: checking for gnutls support in libcurl" >&5
8000 -    if test "$cross_compiling" = yes; then
8001 +  b_c_pre=$php_c_pre
8002 +  b_cxx_pre=$php_cxx_pre
8003 +  b_c_meta=$php_c_meta
8004 +  b_cxx_meta=$php_cxx_meta
8005 +  b_c_post=$php_c_post
8006 +  b_cxx_post=$php_cxx_post
8007 +  b_lo=$php_lo
8008 +
8009 +
8010 +  old_IFS=$IFS
8011 +  for ac_src in ctype.c; do
8012
8013 -      echo "$ac_t""no" 1>&6
8014 -
8015 -else
8016 -  cat > conftest.$ac_ext <<EOF
8017 -#line 28123 "configure"
8018 -#include "confdefs.h"
8019 +      IFS=.
8020 +      set $ac_src
8021 +      ac_obj=$1
8022 +      IFS=$old_IFS
8023 +
8024 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
8025
8026 -#include <curl/curl.h>
8027 +      case $ac_src in
8028 +        *.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" ;;
8029 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8030 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8031 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
8032 +      esac
8033
8034 -int main(int argc, char *argv[])
8035 -{
8036 -  curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
8037 +    cat >>Makefile.objects<<EOF
8038 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
8039 +       $ac_comp
8040 +EOF
8041 +  done
8042 +
8043 +
8044 +    EXT_STATIC="$EXT_STATIC ctype"
8045 +    if test "$ext_shared" != "nocli"; then
8046 +      EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
8047 +    fi
8048 +  else
8049 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
8050 +      PHP_CTYPE_SHARED=yes
8051 +
8052 +  case ext/ctype in
8053 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
8054 +  /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
8055 +  *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
8056 +  esac
8057 +
8058
8059 -  if (data && data->ssl_version && *data->ssl_version) {
8060 -    const char *ptr = data->ssl_version;
8061
8062 -    while(*ptr == ' ') ++ptr;
8063 -    return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
8064 -  }
8065 -  return 1;
8066 -}
8067 +  b_c_pre=$shared_c_pre
8068 +  b_cxx_pre=$shared_cxx_pre
8069 +  b_c_meta=$shared_c_meta
8070 +  b_cxx_meta=$shared_cxx_meta
8071 +  b_c_post=$shared_c_post
8072 +  b_cxx_post=$shared_cxx_post
8073 +  b_lo=$shared_lo
8074 +
8075 +
8076 +  old_IFS=$IFS
8077 +  for ac_src in ctype.c; do
8078 +
8079 +      IFS=.
8080 +      set $ac_src
8081 +      ac_obj=$1
8082 +      IFS=$old_IFS
8083 +
8084 +      shared_objects_ctype="$shared_objects_ctype $ac_bdir$ac_obj.lo"
8085 +
8086 +      case $ac_src in
8087 +        *.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" ;;
8088 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8089 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8090 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
8091 +      esac
8092
8093 +    cat >>Makefile.objects<<EOF
8094 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
8095 +       $ac_comp
8096  EOF
8097 -if { (eval echo configure:28142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8098 -then
8099 +  done
8100 +
8101 +      case $host_alias in
8102 +        *netware*)
8103 +
8104 +  install_modules="install-modules"
8105 +
8106 +  case $host_alias in
8107 +    *aix*)
8108 +      suffix=so
8109 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpctype.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) $(PHPCTYPE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpctype.so '$ext_builddir'/phpctype.so'
8110 +      ;;
8111 +    *netware*)
8112 +      suffix=nlm
8113 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCTYPE, 3)_SHARED_LIBADD)'
8114 +      ;;
8115 +    *)
8116 +      suffix=la
8117 +      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_ctype) $(PHPCTYPE_SHARED_LIBADD)'
8118 +      ;;
8119 +  esac
8120 +
8121 +  if test "x" = "xyes"; then
8122 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpctype.$suffix"
8123 +  else
8124 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpctype.$suffix"
8125 +  fi
8126
8127 -      echo "$ac_t""yes" 1>&6
8128 -      ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
8129 -echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
8130 -echo "configure:28148: checking for gcrypt.h" >&5
8131 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8132 -  echo $ac_n "(cached) $ac_c" 1>&6
8133 -else
8134 -  cat > conftest.$ac_ext <<EOF
8135 -#line 28153 "configure"
8136 -#include "confdefs.h"
8137 -#include <gcrypt.h>
8138 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
8139 +
8140 +  cat >>Makefile.objects<<EOF
8141 +\$(phplibdir)/phpctype.$suffix: $ext_builddir/phpctype.$suffix
8142 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpctype.$suffix \$(phplibdir)
8143 +
8144 +$ext_builddir/phpctype.$suffix: \$(shared_objects_ctype) \$(PHPCTYPE_SHARED_DEPENDENCIES)
8145 +       $link_cmd
8146 +
8147  EOF
8148 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8149 -{ (eval echo configure:28158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8150 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8151 -if test -z "$ac_err"; then
8152 -  rm -rf conftest*
8153 -  eval "ac_cv_header_$ac_safe=yes"
8154 -else
8155 -  echo "$ac_err" >&5
8156 -  echo "configure: failed program was:" >&5
8157 -  cat conftest.$ac_ext >&5
8158 -  rm -rf conftest*
8159 -  eval "ac_cv_header_$ac_safe=no"
8160 -fi
8161 -rm -f conftest*
8162 -fi
8163 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
8164 -  echo "$ac_t""yes" 1>&6
8165 +
8166 +          ;;
8167 +        *)
8168 +
8169 +  install_modules="install-modules"
8170 +
8171 +  case $host_alias in
8172 +    *aix*)
8173 +      suffix=so
8174 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/ctype.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) $(CTYPE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/ctype.so '$ext_builddir'/ctype.so'
8175 +      ;;
8176 +    *netware*)
8177 +      suffix=nlm
8178 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CTYPE, 3)_SHARED_LIBADD)'
8179 +      ;;
8180 +    *)
8181 +      suffix=la
8182 +      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_ctype) $(CTYPE_SHARED_LIBADD)'
8183 +      ;;
8184 +  esac
8185 +
8186 +  if test "x" = "xyes"; then
8187 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/ctype.$suffix"
8188 +  else
8189 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/ctype.$suffix"
8190 +  fi
8191
8192 -        cat >> confdefs.h <<\EOF
8193 -#define HAVE_CURL_GNUTLS 1
8194 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
8195 +
8196 +  cat >>Makefile.objects<<EOF
8197 +\$(phplibdir)/ctype.$suffix: $ext_builddir/ctype.$suffix
8198 +       \$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir)
8199 +
8200 +$ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES)
8201 +       $link_cmd
8202 +
8203 +EOF
8204 +
8205 +          ;;
8206 +      esac
8207 +      cat >> confdefs.h <<EOF
8208 +#define COMPILE_DL_CTYPE 1
8209  EOF
8210
8211 +    fi
8212 +  fi
8213 +
8214 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
8215 +    PHP_CTYPE_SHARED=no
8216 +    case "$PHP_SAPI" in
8217 +      cgi|embed)
8218 +
8219 +
8220 +  case ext/ctype in
8221 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
8222 +  /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
8223 +  *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
8224 +  esac
8225 +
8226 +
8227 +
8228 +  b_c_pre=$php_c_pre
8229 +  b_cxx_pre=$php_cxx_pre
8230 +  b_c_meta=$php_c_meta
8231 +  b_cxx_meta=$php_cxx_meta
8232 +  b_c_post=$php_c_post
8233 +  b_cxx_post=$php_cxx_post
8234 +  b_lo=$php_lo
8235 +
8236 +
8237 +  old_IFS=$IFS
8238 +  for ac_src in ctype.c; do
8239 +
8240 +      IFS=.
8241 +      set $ac_src
8242 +      ac_obj=$1
8243 +      IFS=$old_IFS
8244
8245 -else
8246 -  echo "$ac_t""no" 1>&6
8247 -fi
8248 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
8249 +
8250 +      case $ac_src in
8251 +        *.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" ;;
8252 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8253 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8254 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
8255 +      esac
8256 +
8257 +    cat >>Makefile.objects<<EOF
8258 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
8259 +       $ac_comp
8260 +EOF
8261 +  done
8262 +
8263 +
8264 +        EXT_STATIC="$EXT_STATIC ctype"
8265 +        ;;
8266 +      *)
8267 +
8268 +
8269 +  case ext/ctype in
8270 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
8271 +  /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
8272 +  *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
8273 +  esac
8274 +
8275 +
8276 +
8277 +  b_c_pre=$php_c_pre
8278 +  b_cxx_pre=$php_cxx_pre
8279 +  b_c_meta=$php_c_meta
8280 +  b_cxx_meta=$php_cxx_meta
8281 +  b_c_post=$php_c_post
8282 +  b_cxx_post=$php_cxx_post
8283 +  b_lo=$php_lo
8284 +
8285 +
8286 +  old_IFS=$IFS
8287 +  for ac_src in ctype.c; do
8288 +
8289 +      IFS=.
8290 +      set $ac_src
8291 +      ac_obj=$1
8292 +      IFS=$old_IFS
8293 +
8294 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
8295 +
8296 +      case $ac_src in
8297 +        *.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" ;;
8298 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8299 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8300 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
8301 +      esac
8302 +
8303 +    cat >>Makefile.objects<<EOF
8304 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
8305 +       $ac_comp
8306 +EOF
8307 +  done
8308 +
8309 +
8310 +        ;;
8311 +    esac
8312 +    EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
8313 +  fi
8314 +
8315 +
8316 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
8317 +
8318 +
8319
8320 +  if test "$ext_builddir" = "."; then
8321 +    PHP_PECL_EXTENSION=ctype
8322
8323 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
8324 +
8325 +  fi
8326 +
8327 +fi
8328 +
8329 +
8330 +
8331 +php_with_curl=no
8332 +
8333 +echo $ac_n "checking for cURL support""... $ac_c" 1>&6
8334 +echo "configure:28652: checking for cURL support" >&5
8335 +# Check whether --with-curl or --without-curl was given.
8336 +if test "${with_curl+set}" = set; then
8337 +  withval="$with_curl"
8338 +  PHP_CURL=$withval
8339  else
8340 -  echo "configure: failed program was:" >&5
8341 -  cat conftest.$ac_ext >&5
8342 -  rm -fr conftest*
8343
8344 -      echo "$ac_t""no" 1>&6
8345 -
8346 +  PHP_CURL=no
8347 +  test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL
8348 +
8349  fi
8350 -rm -fr conftest*
8351 +
8352 +
8353 +
8354 +ext_output="yes, shared"
8355 +ext_shared=yes
8356 +case $PHP_CURL in
8357 +shared,*)
8358 +  PHP_CURL=`echo "$PHP_CURL"|$SED 's/^shared,//'`
8359 +  ;;
8360 +shared)
8361 +  PHP_CURL=yes
8362 +  ;;
8363 +no)
8364 +  ext_output=no
8365 +  ext_shared=no
8366 +  ;;
8367 +*)
8368 +  ext_output=yes
8369 +  ext_shared=no
8370 +  ;;
8371 +esac
8372 +
8373 +
8374 +
8375 +echo "$ac_t""$ext_output" 1>&6
8376 +
8377 +
8378 +
8379 +
8380 +
8381 +php_with_curlwrappers=no
8382 +
8383 +echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6
8384 +echo "configure:28696: checking if we should use cURL for url streams" >&5
8385 +# Check whether --with-curlwrappers or --without-curlwrappers was given.
8386 +if test "${with_curlwrappers+set}" = set; then
8387 +  withval="$with_curlwrappers"
8388 +  PHP_CURLWRAPPERS=$withval
8389 +else
8390 +
8391 +  PHP_CURLWRAPPERS=no
8392 +
8393 +
8394  fi
8395
8396 -
8397 -    CFLAGS="$save_CFLAGS"
8398 +
8399 +ext_output=$PHP_CURLWRAPPERS
8400 +echo "$ac_t""$ext_output" 1>&6
8401 +
8402 +
8403 +
8404 +
8405 +if test "$PHP_CURL" != "no"; then
8406 +  if test -r $PHP_CURL/include/curl/easy.h; then
8407 +    CURL_DIR=$PHP_CURL
8408    else
8409 -    echo "$ac_t""no" 1>&6
8410 +    echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6
8411 +echo "configure:28720: checking for cURL in default path" >&5
8412 +    for i in /usr/local /usr; do
8413 +      if test -r $i/include/curl/easy.h; then
8414 +        CURL_DIR=$i
8415 +        echo "$ac_t""found in $i" 1>&6
8416 +        break
8417 +      fi
8418 +    done
8419 +  fi
8420 +
8421 +  if test -z "$CURL_DIR"; then
8422 +    echo "$ac_t""not found" 1>&6
8423 +    { echo "configure: error: Please reinstall the libcurl distribution -
8424 +    easy.h should be in <curl-dir>/include/curl/" 1>&2; exit 1; }
8425 +  fi
8426 +
8427 +  CURL_CONFIG="curl-config"
8428 +  echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6
8429 +echo "configure:28738: checking for cURL 7.10.5 or greater" >&5
8430 +
8431 +  if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
8432 +    CURL_CONFIG=${CURL_DIR}/bin/curl-config
8433 +  else
8434 +    if ${CURL_DIR}/curl-config --libs > /dev/null 2>&1; then
8435 +      CURL_CONFIG=${CURL_DIR}/curl-config
8436 +    fi
8437 +  fi
8438 +
8439 +  curl_version_full=`$CURL_CONFIG --version`
8440 +  curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
8441 +  if test "$curl_version" -ge 7010005; then
8442 +    echo "$ac_t""$curl_version_full" 1>&6
8443 +    CURL_LIBS=`$CURL_CONFIG --libs`
8444 +  else
8445 +    { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; }
8446    fi
8447
8448
8449 -  save_old_LDFLAGS=$LDFLAGS
8450 -  ac_stuff="
8451 -    $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
8452 -  "
8453 +  if test "$CURL_DIR/include" != "/usr/include"; then
8454 +
8455 +  if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then
8456 +    ai_p=$CURL_DIR/include
8457 +  else
8458 +
8459 +    ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
8460 +
8461 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
8462 +    ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`"
8463 +  fi
8464 +
8465 +
8466
8467 -  save_ext_shared=$ext_shared
8468 -  ext_shared=yes
8469 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
8470
8471 -  for ac_i in $ac_stuff; do
8472 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
8473 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
8474 +    eval "INCLUDEPATH$unique=set"
8475 +
8476 +      if test ""; then
8477 +        INCLUDES="-I$ai_p $INCLUDES"
8478 +      else
8479 +        INCLUDES="$INCLUDES -I$ai_p"
8480 +      fi
8481 +
8482 +  fi
8483 +
8484 +  fi
8485 +
8486 +
8487 +  for ac_i in $CURL_LIBS; do
8488      case $ac_i in
8489      -pthread)
8490        if test "$ext_shared" = "yes"; then
8491 -        LDFLAGS="$LDFLAGS -pthread"
8492 +        CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -pthread"
8493        else
8494
8495
8496 @@ -28233,7 +28811,7 @@ fi
8497    c|c_r|pthread*) ;;
8498    *)
8499      if test "$ext_shared" = "yes"; then
8500 -        LDFLAGS="$LDFLAGS -l$ac_ii"
8501 +        CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii"
8502      else
8503
8504
8505 @@ -28268,8 +28846,8 @@ fi
8506
8507
8508        if test "$ext_shared" = "yes"; then
8509 -        LDFLAGS="-L$ai_p $LDFLAGS"
8510 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
8511 +        CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
8512 +        test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD"
8513        else
8514
8515
8516 @@ -28295,39 +28873,503 @@ fi
8517      esac
8518    done
8519
8520 -  echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
8521 -echo "configure:28300: checking for curl_easy_perform in -lcurl" >&5
8522 -ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'`
8523 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
8524 -  echo $ac_n "(cached) $ac_c" 1>&6
8525 -else
8526 -  ac_save_LIBS="$LIBS"
8527 -LIBS="-lcurl  $LIBS"
8528 -cat > conftest.$ac_ext <<EOF
8529 -#line 28308 "configure"
8530 -#include "confdefs.h"
8531 -/* Override any gcc2 internal prototype to avoid an error.  */
8532 -/* We use char because int might match the return type of a gcc2
8533 -    builtin and then its argument prototype would still apply.  */
8534 -char curl_easy_perform();
8535 -
8536 -int main() {
8537 -curl_easy_perform()
8538 -; return 0; }
8539 -EOF
8540 -if { (eval echo configure:28319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8541 -  rm -rf conftest*
8542 -  eval "ac_cv_lib_$ac_lib_var=yes"
8543 -else
8544 -  echo "configure: failed program was:" >&5
8545 -  cat conftest.$ac_ext >&5
8546 -  rm -rf conftest*
8547 -  eval "ac_cv_lib_$ac_lib_var=no"
8548 -fi
8549 -rm -f conftest*
8550 -LIBS="$ac_save_LIBS"
8551 +
8552
8553 -fi
8554 +  if test "$ext_shared" = "yes"; then
8555 +    CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD"
8556 +    if test -n "$CURL_DIR/$PHP_LIBDIR"; then
8557 +
8558 +  if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
8559 +
8560 +  if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
8561 +    ai_p=$CURL_DIR/$PHP_LIBDIR
8562 +  else
8563 +
8564 +    ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
8565 +
8566 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
8567 +    ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
8568 +  fi
8569 +
8570 +
8571 +      if test "$ext_shared" = "yes"; then
8572 +        CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
8573 +        test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD"
8574 +      else
8575 +
8576 +
8577 +
8578 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
8579 +
8580 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
8581 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
8582 +    eval "LIBPATH$unique=set"
8583 +
8584 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
8585 +    LDFLAGS="$LDFLAGS -L$ai_p"
8586 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
8587 +
8588 +  fi
8589 +
8590 +
8591 +      fi
8592 +
8593 +  fi
8594 +
8595 +    fi
8596 +  else
8597 +
8598 +
8599 +  if test -n "$CURL_DIR/$PHP_LIBDIR"; then
8600 +
8601 +  if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
8602 +
8603 +  if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
8604 +    ai_p=$CURL_DIR/$PHP_LIBDIR
8605 +  else
8606 +
8607 +    ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
8608 +
8609 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
8610 +    ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
8611 +  fi
8612 +
8613 +
8614 +
8615 +
8616 +
8617 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
8618 +
8619 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
8620 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
8621 +    eval "LIBPATH$unique=set"
8622 +
8623 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
8624 +    LDFLAGS="$LDFLAGS -L$ai_p"
8625 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
8626 +
8627 +  fi
8628 +
8629 +
8630 +
8631 +  fi
8632 +
8633 +  fi
8634 +
8635 +
8636 +  case curl in
8637 +  c|c_r|pthread*) ;;
8638 +  *)
8639 +      LIBS="-lcurl $LIBS"
8640 +   ;;
8641 +  esac
8642 +
8643 +
8644 +
8645 +
8646 +  fi
8647 +
8648 +
8649 +
8650 +  echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
8651 +echo "configure:28976: checking for SSL support in libcurl" >&5
8652 +  CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
8653 +  if test "$CURL_SSL" = "SSL"; then
8654 +    echo "$ac_t""yes" 1>&6
8655 +    cat >> confdefs.h <<\EOF
8656 +#define HAVE_CURL_SSL 1
8657 +EOF
8658 +
8659 +
8660 +    save_CFLAGS="$CFLAGS"
8661 +    CFLAGS="`$CURL_CONFIG --cflags`"
8662 +
8663 +    echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
8664 +echo "configure:28989: checking how to run the C preprocessor" >&5
8665 +# On Suns, sometimes $CPP names a directory.
8666 +if test -n "$CPP" && test -d "$CPP"; then
8667 +  CPP=
8668 +fi
8669 +if test -z "$CPP"; then
8670 +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
8671 +  echo $ac_n "(cached) $ac_c" 1>&6
8672 +else
8673 +    # This must be in double quotes, not single quotes, because CPP may get
8674 +  # substituted into the Makefile and "${CC-cc}" will confuse make.
8675 +  CPP="${CC-cc} -E"
8676 +  # On the NeXT, cc -E runs the code through the compiler's parser,
8677 +  # not just through cpp.
8678 +  cat > conftest.$ac_ext <<EOF
8679 +#line 29004 "configure"
8680 +#include "confdefs.h"
8681 +#include <assert.h>
8682 +Syntax Error
8683 +EOF
8684 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8685 +{ (eval echo configure:29010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8686 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8687 +if test -z "$ac_err"; then
8688 +  :
8689 +else
8690 +  echo "$ac_err" >&5
8691 +  echo "configure: failed program was:" >&5
8692 +  cat conftest.$ac_ext >&5
8693 +  rm -rf conftest*
8694 +  CPP="${CC-cc} -E -traditional-cpp"
8695 +  cat > conftest.$ac_ext <<EOF
8696 +#line 29021 "configure"
8697 +#include "confdefs.h"
8698 +#include <assert.h>
8699 +Syntax Error
8700 +EOF
8701 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8702 +{ (eval echo configure:29027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8703 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8704 +if test -z "$ac_err"; then
8705 +  :
8706 +else
8707 +  echo "$ac_err" >&5
8708 +  echo "configure: failed program was:" >&5
8709 +  cat conftest.$ac_ext >&5
8710 +  rm -rf conftest*
8711 +  CPP="${CC-cc} -nologo -E"
8712 +  cat > conftest.$ac_ext <<EOF
8713 +#line 29038 "configure"
8714 +#include "confdefs.h"
8715 +#include <assert.h>
8716 +Syntax Error
8717 +EOF
8718 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8719 +{ (eval echo configure:29044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8720 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8721 +if test -z "$ac_err"; then
8722 +  :
8723 +else
8724 +  echo "$ac_err" >&5
8725 +  echo "configure: failed program was:" >&5
8726 +  cat conftest.$ac_ext >&5
8727 +  rm -rf conftest*
8728 +  CPP=/lib/cpp
8729 +fi
8730 +rm -f conftest*
8731 +fi
8732 +rm -f conftest*
8733 +fi
8734 +rm -f conftest*
8735 +  ac_cv_prog_CPP="$CPP"
8736 +fi
8737 +  CPP="$ac_cv_prog_CPP"
8738 +else
8739 +  ac_cv_prog_CPP="$CPP"
8740 +fi
8741 +echo "$ac_t""$CPP" 1>&6
8742 +
8743 +    echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
8744 +echo "configure:29069: checking for openssl support in libcurl" >&5
8745 +    if test "$cross_compiling" = yes; then
8746 +
8747 +      echo "$ac_t""no" 1>&6
8748 +
8749 +else
8750 +  cat > conftest.$ac_ext <<EOF
8751 +#line 29076 "configure"
8752 +#include "confdefs.h"
8753 +
8754 +#include <curl/curl.h>
8755 +
8756 +int main(int argc, char *argv[])
8757 +{
8758 +  curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
8759 +
8760 +  if (data && data->ssl_version && *data->ssl_version) {
8761 +    const char *ptr = data->ssl_version;
8762 +
8763 +    while(*ptr == ' ') ++ptr;
8764 +    return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
8765 +  }
8766 +  return 1;
8767 +}
8768 +
8769 +EOF
8770 +if { (eval echo configure:29095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8771 +then
8772 +
8773 +      echo "$ac_t""yes" 1>&6
8774 +      for ac_hdr in openssl/crypto.h
8775 +do
8776 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
8777 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
8778 +echo "configure:29103: checking for $ac_hdr" >&5
8779 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8780 +  echo $ac_n "(cached) $ac_c" 1>&6
8781 +else
8782 +  cat > conftest.$ac_ext <<EOF
8783 +#line 29108 "configure"
8784 +#include "confdefs.h"
8785 +#include <$ac_hdr>
8786 +EOF
8787 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8788 +{ (eval echo configure:29113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8789 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8790 +if test -z "$ac_err"; then
8791 +  rm -rf conftest*
8792 +  eval "ac_cv_header_$ac_safe=yes"
8793 +else
8794 +  echo "$ac_err" >&5
8795 +  echo "configure: failed program was:" >&5
8796 +  cat conftest.$ac_ext >&5
8797 +  rm -rf conftest*
8798 +  eval "ac_cv_header_$ac_safe=no"
8799 +fi
8800 +rm -f conftest*
8801 +fi
8802 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
8803 +  echo "$ac_t""yes" 1>&6
8804 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
8805 +  cat >> confdefs.h <<EOF
8806 +#define $ac_tr_hdr 1
8807 +EOF
8808 +
8809 +        cat >> confdefs.h <<\EOF
8810 +#define HAVE_CURL_OPENSSL 1
8811 +EOF
8812 +
8813 +
8814 +else
8815 +  echo "$ac_t""no" 1>&6
8816 +fi
8817 +done
8818 +
8819 +
8820 +else
8821 +  echo "configure: failed program was:" >&5
8822 +  cat conftest.$ac_ext >&5
8823 +  rm -fr conftest*
8824 +
8825 +      echo "$ac_t""no" 1>&6
8826 +
8827 +fi
8828 +rm -fr conftest*
8829 +fi
8830 +
8831 +
8832 +    echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
8833 +echo "configure:29158: checking for gnutls support in libcurl" >&5
8834 +    if test "$cross_compiling" = yes; then
8835 +
8836 +      echo "$ac_t""no" 1>&6
8837 +
8838 +else
8839 +  cat > conftest.$ac_ext <<EOF
8840 +#line 29165 "configure"
8841 +#include "confdefs.h"
8842 +
8843 +#include <curl/curl.h>
8844 +
8845 +int main(int argc, char *argv[])
8846 +{
8847 +  curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
8848 +
8849 +  if (data && data->ssl_version && *data->ssl_version) {
8850 +    const char *ptr = data->ssl_version;
8851 +
8852 +    while(*ptr == ' ') ++ptr;
8853 +    return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
8854 +  }
8855 +  return 1;
8856 +}
8857 +
8858 +EOF
8859 +if { (eval echo configure:29184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8860 +then
8861 +
8862 +      echo "$ac_t""yes" 1>&6
8863 +      ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
8864 +echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
8865 +echo "configure:29190: checking for gcrypt.h" >&5
8866 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8867 +  echo $ac_n "(cached) $ac_c" 1>&6
8868 +else
8869 +  cat > conftest.$ac_ext <<EOF
8870 +#line 29195 "configure"
8871 +#include "confdefs.h"
8872 +#include <gcrypt.h>
8873 +EOF
8874 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8875 +{ (eval echo configure:29200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8876 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8877 +if test -z "$ac_err"; then
8878 +  rm -rf conftest*
8879 +  eval "ac_cv_header_$ac_safe=yes"
8880 +else
8881 +  echo "$ac_err" >&5
8882 +  echo "configure: failed program was:" >&5
8883 +  cat conftest.$ac_ext >&5
8884 +  rm -rf conftest*
8885 +  eval "ac_cv_header_$ac_safe=no"
8886 +fi
8887 +rm -f conftest*
8888 +fi
8889 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
8890 +  echo "$ac_t""yes" 1>&6
8891 +
8892 +        cat >> confdefs.h <<\EOF
8893 +#define HAVE_CURL_GNUTLS 1
8894 +EOF
8895 +
8896 +
8897 +else
8898 +  echo "$ac_t""no" 1>&6
8899 +fi
8900 +
8901 +
8902 +else
8903 +  echo "configure: failed program was:" >&5
8904 +  cat conftest.$ac_ext >&5
8905 +  rm -fr conftest*
8906 +
8907 +      echo "$ac_t""no" 1>&6
8908 +
8909 +fi
8910 +rm -fr conftest*
8911 +fi
8912 +
8913 +
8914 +    CFLAGS="$save_CFLAGS"
8915 +  else
8916 +    echo "$ac_t""no" 1>&6
8917 +  fi
8918 +
8919 +
8920 +  save_old_LDFLAGS=$LDFLAGS
8921 +  ac_stuff="
8922 +    $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
8923 +  "
8924 +
8925 +  save_ext_shared=$ext_shared
8926 +  ext_shared=yes
8927 +
8928 +  for ac_i in $ac_stuff; do
8929 +    case $ac_i in
8930 +    -pthread)
8931 +      if test "$ext_shared" = "yes"; then
8932 +        LDFLAGS="$LDFLAGS -pthread"
8933 +      else
8934 +
8935 +
8936 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
8937 +
8938 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
8939 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
8940 +    eval "EXTRA_LDFLAGS$unique=set"
8941 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
8942 +  fi
8943 +
8944 +      fi
8945 +    ;;
8946 +    -l*)
8947 +      ac_ii=`echo $ac_i|cut -c 3-`
8948 +
8949 +
8950 +  case $ac_ii in
8951 +  c|c_r|pthread*) ;;
8952 +  *)
8953 +    if test "$ext_shared" = "yes"; then
8954 +        LDFLAGS="$LDFLAGS -l$ac_ii"
8955 +    else
8956 +
8957 +
8958 +  case $ac_ii in
8959 +  c|c_r|pthread*) ;;
8960 +  *)
8961 +      LIBS="$LIBS -l$ac_ii"
8962 +   ;;
8963 +  esac
8964 +
8965 +
8966 +    fi
8967 +   ;;
8968 +  esac
8969 +
8970 +
8971 +    ;;
8972 +    -L*)
8973 +      ac_ii=`echo $ac_i|cut -c 3-`
8974 +
8975 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
8976 +
8977 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
8978 +    ai_p=$ac_ii
8979 +  else
8980 +
8981 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
8982 +
8983 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
8984 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
8985 +  fi
8986 +
8987 +
8988 +      if test "$ext_shared" = "yes"; then
8989 +        LDFLAGS="-L$ai_p $LDFLAGS"
8990 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
8991 +      else
8992 +
8993 +
8994 +
8995 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
8996 +
8997 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
8998 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
8999 +    eval "LIBPATH$unique=set"
9000 +
9001 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
9002 +    LDFLAGS="$LDFLAGS -L$ai_p"
9003 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
9004 +
9005 +  fi
9006 +
9007 +
9008 +      fi
9009 +
9010 +  fi
9011 +
9012 +    ;;
9013 +    esac
9014 +  done
9015 +
9016 +  echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
9017 +echo "configure:29342: checking for curl_easy_perform in -lcurl" >&5
9018 +ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'`
9019 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9020 +  echo $ac_n "(cached) $ac_c" 1>&6
9021 +else
9022 +  ac_save_LIBS="$LIBS"
9023 +LIBS="-lcurl  $LIBS"
9024 +cat > conftest.$ac_ext <<EOF
9025 +#line 29350 "configure"
9026 +#include "confdefs.h"
9027 +/* Override any gcc2 internal prototype to avoid an error.  */
9028 +/* We use char because int might match the return type of a gcc2
9029 +    builtin and then its argument prototype would still apply.  */
9030 +char curl_easy_perform();
9031 +
9032 +int main() {
9033 +curl_easy_perform()
9034 +; return 0; }
9035 +EOF
9036 +if { (eval echo configure:29361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9037 +  rm -rf conftest*
9038 +  eval "ac_cv_lib_$ac_lib_var=yes"
9039 +else
9040 +  echo "configure: failed program was:" >&5
9041 +  cat conftest.$ac_ext >&5
9042 +  rm -rf conftest*
9043 +  eval "ac_cv_lib_$ac_lib_var=no"
9044 +fi
9045 +rm -f conftest*
9046 +LIBS="$ac_save_LIBS"
9047 +
9048 +fi
9049  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
9050    echo "$ac_t""yes" 1>&6
9051
9052 @@ -28451,7 +29493,7 @@ fi
9053    done
9054
9055    echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6
9056 -echo "configure:28455: checking for curl_version_info in -lcurl" >&5
9057 +echo "configure:29497: checking for curl_version_info in -lcurl" >&5
9058  ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'`
9059  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9060    echo $ac_n "(cached) $ac_c" 1>&6
9061 @@ -28459,7 +29501,7 @@ else
9062    ac_save_LIBS="$LIBS"
9063  LIBS="-lcurl  $LIBS"
9064  cat > conftest.$ac_ext <<EOF
9065 -#line 28463 "configure"
9066 +#line 29505 "configure"
9067  #include "confdefs.h"
9068  /* Override any gcc2 internal prototype to avoid an error.  */
9069  /* We use char because int might match the return type of a gcc2
9070 @@ -28470,7 +29512,7 @@ int main() {
9071  curl_version_info()
9072  ; return 0; }
9073  EOF
9074 -if { (eval echo configure:28474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9075 +if { (eval echo configure:29516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9076    rm -rf conftest*
9077    eval "ac_cv_lib_$ac_lib_var=yes"
9078  else
9079 @@ -28604,7 +29646,7 @@ fi
9080    done
9081
9082    echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6
9083 -echo "configure:28608: checking for curl_easy_strerror in -lcurl" >&5
9084 +echo "configure:29650: checking for curl_easy_strerror in -lcurl" >&5
9085  ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'`
9086  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9087    echo $ac_n "(cached) $ac_c" 1>&6
9088 @@ -28612,7 +29654,7 @@ else
9089    ac_save_LIBS="$LIBS"
9090  LIBS="-lcurl  $LIBS"
9091  cat > conftest.$ac_ext <<EOF
9092 -#line 28616 "configure"
9093 +#line 29658 "configure"
9094  #include "confdefs.h"
9095  /* Override any gcc2 internal prototype to avoid an error.  */
9096  /* We use char because int might match the return type of a gcc2
9097 @@ -28623,7 +29665,7 @@ int main() {
9098  curl_easy_strerror()
9099  ; return 0; }
9100  EOF
9101 -if { (eval echo configure:28627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9102 +if { (eval echo configure:29669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9103    rm -rf conftest*
9104    eval "ac_cv_lib_$ac_lib_var=yes"
9105  else
9106 @@ -28757,7 +29799,7 @@ fi
9107    done
9108
9109    echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6
9110 -echo "configure:28761: checking for curl_multi_strerror in -lcurl" >&5
9111 +echo "configure:29803: checking for curl_multi_strerror in -lcurl" >&5
9112  ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'`
9113  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9114    echo $ac_n "(cached) $ac_c" 1>&6
9115 @@ -28765,7 +29807,7 @@ else
9116    ac_save_LIBS="$LIBS"
9117  LIBS="-lcurl  $LIBS"
9118  cat > conftest.$ac_ext <<EOF
9119 -#line 28769 "configure"
9120 +#line 29811 "configure"
9121  #include "confdefs.h"
9122  /* Override any gcc2 internal prototype to avoid an error.  */
9123  /* We use char because int might match the return type of a gcc2
9124 @@ -28776,7 +29818,7 @@ int main() {
9125  curl_multi_strerror()
9126  ; return 0; }
9127  EOF
9128 -if { (eval echo configure:28780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9129 +if { (eval echo configure:29822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9130    rm -rf conftest*
9131    eval "ac_cv_lib_$ac_lib_var=yes"
9132  else
9133 @@ -29462,7 +30504,7 @@ if test "$PHP_QDBM" != "no"; then
9134    done
9135
9136    echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6
9137 -echo "configure:29466: checking for dpopen in -l$LIB" >&5
9138 +echo "configure:30508: checking for dpopen in -l$LIB" >&5
9139  ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'`
9140  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9141    echo $ac_n "(cached) $ac_c" 1>&6
9142 @@ -29470,7 +30512,7 @@ else
9143    ac_save_LIBS="$LIBS"
9144  LIBS="-l$LIB  $LIBS"
9145  cat > conftest.$ac_ext <<EOF
9146 -#line 29474 "configure"
9147 +#line 30516 "configure"
9148  #include "confdefs.h"
9149  /* Override any gcc2 internal prototype to avoid an error.  */
9150  /* We use char because int might match the return type of a gcc2
9151 @@ -29481,7 +30523,7 @@ int main() {
9152  dpopen()
9153  ; return 0; }
9154  EOF
9155 -if { (eval echo configure:29485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9156 +if { (eval echo configure:30527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9157    rm -rf conftest*
9158    eval "ac_cv_lib_$ac_lib_var=yes"
9159  else
9160 @@ -29650,7 +30692,7 @@ fi
9161      THIS_FULL_NAME="$THIS_NAME"
9162    fi
9163    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9164 -echo "configure:29654: checking for $THIS_FULL_NAME support" >&5
9165 +echo "configure:30696: checking for $THIS_FULL_NAME support" >&5
9166    if test -n ""; then
9167      { echo "configure: error: " 1>&2; exit 1; }
9168    fi
9169 @@ -29678,7 +30720,7 @@ if test "$PHP_GDBM" != "no"; then
9170      THIS_FULL_NAME="$THIS_NAME"
9171    fi
9172    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9173 -echo "configure:29682: checking for $THIS_FULL_NAME support" >&5
9174 +echo "configure:30724: checking for $THIS_FULL_NAME support" >&5
9175    if test -n "You cannot combine --with-gdbm with --with-qdbm"; then
9176      { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; }
9177    fi
9178 @@ -29797,7 +30839,7 @@ echo "configure:29682: checking for $THI
9179    done
9180
9181    echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
9182 -echo "configure:29801: checking for gdbm_open in -lgdbm" >&5
9183 +echo "configure:30843: checking for gdbm_open in -lgdbm" >&5
9184  ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
9185  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9186    echo $ac_n "(cached) $ac_c" 1>&6
9187 @@ -29805,7 +30847,7 @@ else
9188    ac_save_LIBS="$LIBS"
9189  LIBS="-lgdbm  $LIBS"
9190  cat > conftest.$ac_ext <<EOF
9191 -#line 29809 "configure"
9192 +#line 30851 "configure"
9193  #include "confdefs.h"
9194  /* Override any gcc2 internal prototype to avoid an error.  */
9195  /* We use char because int might match the return type of a gcc2
9196 @@ -29816,7 +30858,7 @@ int main() {
9197  gdbm_open()
9198  ; return 0; }
9199  EOF
9200 -if { (eval echo configure:29820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9201 +if { (eval echo configure:30862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9202    rm -rf conftest*
9203    eval "ac_cv_lib_$ac_lib_var=yes"
9204  else
9205 @@ -29981,7 +31023,7 @@ fi
9206      THIS_FULL_NAME="$THIS_NAME"
9207    fi
9208    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9209 -echo "configure:29985: checking for $THIS_FULL_NAME support" >&5
9210 +echo "configure:31027: checking for $THIS_FULL_NAME support" >&5
9211    if test -n ""; then
9212      { echo "configure: error: " 1>&2; exit 1; }
9213    fi
9214 @@ -30110,7 +31152,7 @@ if test "$PHP_NDBM" != "no"; then
9215    done
9216
9217    echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
9218 -echo "configure:30114: checking for dbm_open in -l$LIB" >&5
9219 +echo "configure:31156: checking for dbm_open in -l$LIB" >&5
9220  ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'`
9221  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9222    echo $ac_n "(cached) $ac_c" 1>&6
9223 @@ -30118,7 +31160,7 @@ else
9224    ac_save_LIBS="$LIBS"
9225  LIBS="-l$LIB  $LIBS"
9226  cat > conftest.$ac_ext <<EOF
9227 -#line 30122 "configure"
9228 +#line 31164 "configure"
9229  #include "confdefs.h"
9230  /* Override any gcc2 internal prototype to avoid an error.  */
9231  /* We use char because int might match the return type of a gcc2
9232 @@ -30129,7 +31171,7 @@ int main() {
9233  dbm_open()
9234  ; return 0; }
9235  EOF
9236 -if { (eval echo configure:30133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9237 +if { (eval echo configure:31175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9238    rm -rf conftest*
9239    eval "ac_cv_lib_$ac_lib_var=yes"
9240  else
9241 @@ -30298,7 +31340,7 @@ fi
9242      THIS_FULL_NAME="$THIS_NAME"
9243    fi
9244    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9245 -echo "configure:30302: checking for $THIS_FULL_NAME support" >&5
9246 +echo "configure:31344: checking for $THIS_FULL_NAME support" >&5
9247    if test -n ""; then
9248      { echo "configure: error: " 1>&2; exit 1; }
9249    fi
9250 @@ -30382,7 +31424,7 @@ if test "$PHP_DB4" != "no"; then
9251    LIBS="-l$LIB $LIBS"
9252
9253          cat > conftest.$ac_ext <<EOF
9254 -#line 30386 "configure"
9255 +#line 31428 "configure"
9256  #include "confdefs.h"
9257
9258  #include "$THIS_INCLUDE"
9259 @@ -30393,11 +31435,11 @@ int main() {
9260
9261  ; return 0; }
9262  EOF
9263 -if { (eval echo configure:30397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9264 +if { (eval echo configure:31439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9265    rm -rf conftest*
9266
9267            cat > conftest.$ac_ext <<EOF
9268 -#line 30401 "configure"
9269 +#line 31443 "configure"
9270  #include "confdefs.h"
9271
9272  #include "$THIS_INCLUDE"
9273 @@ -30434,14 +31476,14 @@ rm -f conftest*
9274    done
9275    if test -z "$THIS_LIBS"; then
9276      echo $ac_n "checking for DB4 major version""... $ac_c" 1>&6
9277 -echo "configure:30438: checking for DB4 major version" >&5
9278 +echo "configure:31480: checking for DB4 major version" >&5
9279      { echo "configure: error: Header contains different version" 1>&2; exit 1; }
9280    fi
9281    if test "4" = "4"; then
9282      echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
9283 -echo "configure:30443: checking for DB4 minor version and patch level" >&5
9284 +echo "configure:31485: checking for DB4 minor version and patch level" >&5
9285      cat > conftest.$ac_ext <<EOF
9286 -#line 30445 "configure"
9287 +#line 31487 "configure"
9288  #include "confdefs.h"
9289
9290  #include "$THIS_INCLUDE"
9291 @@ -30467,9 +31509,9 @@ rm -f conftest*
9292    fi
9293    if test "$ext_shared" = "yes"; then
9294      echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
9295 -echo "configure:30471: checking if dba can be used as shared extension" >&5
9296 +echo "configure:31513: checking if dba can be used as shared extension" >&5
9297      cat > conftest.$ac_ext <<EOF
9298 -#line 30473 "configure"
9299 +#line 31515 "configure"
9300  #include "confdefs.h"
9301
9302  #include "$THIS_INCLUDE"
9303 @@ -30626,7 +31668,7 @@ fi
9304      THIS_FULL_NAME="$THIS_NAME"
9305    fi
9306    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9307 -echo "configure:30630: checking for $THIS_FULL_NAME support" >&5
9308 +echo "configure:31672: checking for $THIS_FULL_NAME support" >&5
9309    if test -n ""; then
9310      { echo "configure: error: " 1>&2; exit 1; }
9311    fi
9312 @@ -30654,7 +31696,7 @@ if test "$PHP_DB3" != "no"; then
9313      THIS_FULL_NAME="$THIS_NAME"
9314    fi
9315    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9316 -echo "configure:30658: checking for $THIS_FULL_NAME support" >&5
9317 +echo "configure:31700: checking for $THIS_FULL_NAME support" >&5
9318    if test -n "You cannot combine --with-db3 with --with-db4"; then
9319      { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; }
9320    fi
9321 @@ -30705,7 +31747,7 @@ echo "configure:30658: checking for $THI
9322    LIBS="-l$LIB $LIBS"
9323
9324          cat > conftest.$ac_ext <<EOF
9325 -#line 30709 "configure"
9326 +#line 31751 "configure"
9327  #include "confdefs.h"
9328
9329  #include "$THIS_INCLUDE"
9330 @@ -30716,11 +31758,11 @@ int main() {
9331
9332  ; return 0; }
9333  EOF
9334 -if { (eval echo configure:30720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9335 +if { (eval echo configure:31762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9336    rm -rf conftest*
9337
9338            cat > conftest.$ac_ext <<EOF
9339 -#line 30724 "configure"
9340 +#line 31766 "configure"
9341  #include "confdefs.h"
9342
9343  #include "$THIS_INCLUDE"
9344 @@ -30757,14 +31799,14 @@ rm -f conftest*
9345    done
9346    if test -z "$THIS_LIBS"; then
9347      echo $ac_n "checking for DB3 major version""... $ac_c" 1>&6
9348 -echo "configure:30761: checking for DB3 major version" >&5
9349 +echo "configure:31803: checking for DB3 major version" >&5
9350      { echo "configure: error: Header contains different version" 1>&2; exit 1; }
9351    fi
9352    if test "3" = "4"; then
9353      echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
9354 -echo "configure:30766: checking for DB4 minor version and patch level" >&5
9355 +echo "configure:31808: checking for DB4 minor version and patch level" >&5
9356      cat > conftest.$ac_ext <<EOF
9357 -#line 30768 "configure"
9358 +#line 31810 "configure"
9359  #include "confdefs.h"
9360
9361  #include "$THIS_INCLUDE"
9362 @@ -30790,9 +31832,9 @@ rm -f conftest*
9363    fi
9364    if test "$ext_shared" = "yes"; then
9365      echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
9366 -echo "configure:30794: checking if dba can be used as shared extension" >&5
9367 +echo "configure:31836: checking if dba can be used as shared extension" >&5
9368      cat > conftest.$ac_ext <<EOF
9369 -#line 30796 "configure"
9370 +#line 31838 "configure"
9371  #include "confdefs.h"
9372
9373  #include "$THIS_INCLUDE"
9374 @@ -30949,7 +31991,7 @@ fi
9375      THIS_FULL_NAME="$THIS_NAME"
9376    fi
9377    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9378 -echo "configure:30953: checking for $THIS_FULL_NAME support" >&5
9379 +echo "configure:31995: checking for $THIS_FULL_NAME support" >&5
9380    if test -n ""; then
9381      { echo "configure: error: " 1>&2; exit 1; }
9382    fi
9383 @@ -30977,7 +32019,7 @@ if test "$PHP_DB2" != "no"; then
9384      THIS_FULL_NAME="$THIS_NAME"
9385    fi
9386    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9387 -echo "configure:30981: checking for $THIS_FULL_NAME support" >&5
9388 +echo "configure:32023: checking for $THIS_FULL_NAME support" >&5
9389    if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
9390      { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; }
9391    fi
9392 @@ -31028,7 +32070,7 @@ echo "configure:30981: checking for $THI
9393    LIBS="-l$LIB $LIBS"
9394
9395          cat > conftest.$ac_ext <<EOF
9396 -#line 31032 "configure"
9397 +#line 32074 "configure"
9398  #include "confdefs.h"
9399
9400  #include "$THIS_INCLUDE"
9401 @@ -31039,11 +32081,11 @@ int main() {
9402
9403  ; return 0; }
9404  EOF
9405 -if { (eval echo configure:31043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9406 +if { (eval echo configure:32085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9407    rm -rf conftest*
9408
9409            cat > conftest.$ac_ext <<EOF
9410 -#line 31047 "configure"
9411 +#line 32089 "configure"
9412  #include "confdefs.h"
9413
9414  #include "$THIS_INCLUDE"
9415 @@ -31080,14 +32122,14 @@ rm -f conftest*
9416    done
9417    if test -z "$THIS_LIBS"; then
9418      echo $ac_n "checking for DB2 major version""... $ac_c" 1>&6
9419 -echo "configure:31084: checking for DB2 major version" >&5
9420 +echo "configure:32126: checking for DB2 major version" >&5
9421      { echo "configure: error: Header contains different version" 1>&2; exit 1; }
9422    fi
9423    if test "2" = "4"; then
9424      echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
9425 -echo "configure:31089: checking for DB4 minor version and patch level" >&5
9426 +echo "configure:32131: checking for DB4 minor version and patch level" >&5
9427      cat > conftest.$ac_ext <<EOF
9428 -#line 31091 "configure"
9429 +#line 32133 "configure"
9430  #include "confdefs.h"
9431
9432  #include "$THIS_INCLUDE"
9433 @@ -31113,9 +32155,9 @@ rm -f conftest*
9434    fi
9435    if test "$ext_shared" = "yes"; then
9436      echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
9437 -echo "configure:31117: checking if dba can be used as shared extension" >&5
9438 +echo "configure:32159: checking if dba can be used as shared extension" >&5
9439      cat > conftest.$ac_ext <<EOF
9440 -#line 31119 "configure"
9441 +#line 32161 "configure"
9442  #include "confdefs.h"
9443
9444  #include "$THIS_INCLUDE"
9445 @@ -31272,7 +32314,7 @@ fi
9446      THIS_FULL_NAME="$THIS_NAME"
9447    fi
9448    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9449 -echo "configure:31276: checking for $THIS_FULL_NAME support" >&5
9450 +echo "configure:32318: checking for $THIS_FULL_NAME support" >&5
9451    if test -n ""; then
9452      { echo "configure: error: " 1>&2; exit 1; }
9453    fi
9454 @@ -31292,7 +32334,7 @@ if test "$PHP_DB1" != "no"; then
9455    unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
9456
9457    echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6
9458 -echo "configure:31296: checking for DB1 in library" >&5
9459 +echo "configure:32338: checking for DB1 in library" >&5
9460    if test "$HAVE_DB4" = "1"; then
9461      THIS_VERSION=4
9462      THIS_LIBS=$DB4_LIBS
9463 @@ -31340,7 +32382,7 @@ EOF
9464    fi
9465    echo "$ac_t""$THIS_LIBS" 1>&6
9466    echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6
9467 -echo "configure:31344: checking for DB1 in header" >&5
9468 +echo "configure:32386: checking for DB1 in header" >&5
9469    echo "$ac_t""$THIS_INCLUDE" 1>&6
9470    if test -n "$THIS_INCLUDE"; then
9471
9472 @@ -31350,7 +32392,7 @@ echo "configure:31344: checking for DB1
9473    LIBS="-l$THIS_LIBS $LIBS"
9474
9475        cat > conftest.$ac_ext <<EOF
9476 -#line 31354 "configure"
9477 +#line 32396 "configure"
9478  #include "confdefs.h"
9479
9480  #include "$THIS_INCLUDE"
9481 @@ -31361,7 +32403,7 @@ int main() {
9482
9483  ; return 0; }
9484  EOF
9485 -if { (eval echo configure:31365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9486 +if { (eval echo configure:32407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9487    rm -rf conftest*
9488
9489          cat >> confdefs.h <<EOF
9490 @@ -31511,7 +32553,7 @@ fi
9491      THIS_FULL_NAME="$THIS_NAME"
9492    fi
9493    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9494 -echo "configure:31515: checking for $THIS_FULL_NAME support" >&5
9495 +echo "configure:32557: checking for $THIS_FULL_NAME support" >&5
9496    if test -n ""; then
9497      { echo "configure: error: " 1>&2; exit 1; }
9498    fi
9499 @@ -31539,7 +32581,7 @@ if test "$PHP_DBM" != "no"; then
9500      THIS_FULL_NAME="$THIS_NAME"
9501    fi
9502    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9503 -echo "configure:31543: checking for $THIS_FULL_NAME support" >&5
9504 +echo "configure:32585: checking for $THIS_FULL_NAME support" >&5
9505    if test -n "You cannot combine --with-dbm with --with-qdbm"; then
9506      { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; }
9507    fi
9508 @@ -31663,7 +32705,7 @@ echo "configure:31543: checking for $THI
9509    done
9510
9511    echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
9512 -echo "configure:31667: checking for dbminit in -l$LIB" >&5
9513 +echo "configure:32709: checking for dbminit in -l$LIB" >&5
9514  ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'`
9515  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9516    echo $ac_n "(cached) $ac_c" 1>&6
9517 @@ -31671,7 +32713,7 @@ else
9518    ac_save_LIBS="$LIBS"
9519  LIBS="-l$LIB  $LIBS"
9520  cat > conftest.$ac_ext <<EOF
9521 -#line 31675 "configure"
9522 +#line 32717 "configure"
9523  #include "confdefs.h"
9524  /* Override any gcc2 internal prototype to avoid an error.  */
9525  /* We use char because int might match the return type of a gcc2
9526 @@ -31682,7 +32724,7 @@ int main() {
9527  dbminit()
9528  ; return 0; }
9529  EOF
9530 -if { (eval echo configure:31686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9531 +if { (eval echo configure:32728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9532    rm -rf conftest*
9533    eval "ac_cv_lib_$ac_lib_var=yes"
9534  else
9535 @@ -31702,7 +32744,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
9536      ext_shared=$save_ext_shared
9537
9538          echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6
9539 -echo "configure:31706: checking for DBM using GDBM" >&5
9540 +echo "configure:32748: checking for DBM using GDBM" >&5
9541          cat >> confdefs.h <<EOF
9542  #define DBM_INCLUDE_FILE "$THIS_INCLUDE"
9543  EOF
9544 @@ -31866,7 +32908,7 @@ fi
9545      THIS_FULL_NAME="$THIS_NAME"
9546    fi
9547    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9548 -echo "configure:31870: checking for $THIS_FULL_NAME support" >&5
9549 +echo "configure:32912: checking for $THIS_FULL_NAME support" >&5
9550    if test -n ""; then
9551      { echo "configure: error: " 1>&2; exit 1; }
9552    fi
9553 @@ -32078,7 +33120,7 @@ elif test "$PHP_CDB" != "no"; then
9554    done
9555
9556    echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6
9557 -echo "configure:32082: checking for cdb_read in -l$LIB" >&5
9558 +echo "configure:33124: checking for cdb_read in -l$LIB" >&5
9559  ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'`
9560  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9561    echo $ac_n "(cached) $ac_c" 1>&6
9562 @@ -32086,7 +33128,7 @@ else
9563    ac_save_LIBS="$LIBS"
9564  LIBS="-l$LIB  $LIBS"
9565  cat > conftest.$ac_ext <<EOF
9566 -#line 32090 "configure"
9567 +#line 33132 "configure"
9568  #include "confdefs.h"
9569  /* Override any gcc2 internal prototype to avoid an error.  */
9570  /* We use char because int might match the return type of a gcc2
9571 @@ -32097,7 +33139,7 @@ int main() {
9572  cdb_read()
9573  ; return 0; }
9574  EOF
9575 -if { (eval echo configure:32101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9576 +if { (eval echo configure:33143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9577    rm -rf conftest*
9578    eval "ac_cv_lib_$ac_lib_var=yes"
9579  else
9580 @@ -32266,7 +33308,7 @@ fi
9581      THIS_FULL_NAME="$THIS_NAME"
9582    fi
9583    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9584 -echo "configure:32270: checking for $THIS_FULL_NAME support" >&5
9585 +echo "configure:33312: checking for $THIS_FULL_NAME support" >&5
9586    if test -n ""; then
9587      { echo "configure: error: " 1>&2; exit 1; }
9588    fi
9589 @@ -32297,7 +33339,7 @@ fi
9590      THIS_FULL_NAME="$THIS_NAME"
9591    fi
9592    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9593 -echo "configure:32301: checking for $THIS_FULL_NAME support" >&5
9594 +echo "configure:33343: checking for $THIS_FULL_NAME support" >&5
9595    if test -n ""; then
9596      { echo "configure: error: " 1>&2; exit 1; }
9597    fi
9598 @@ -32328,7 +33370,7 @@ fi
9599      THIS_FULL_NAME="$THIS_NAME"
9600    fi
9601    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9602 -echo "configure:32332: checking for $THIS_FULL_NAME support" >&5
9603 +echo "configure:33374: checking for $THIS_FULL_NAME support" >&5
9604    if test -n ""; then
9605      { echo "configure: error: " 1>&2; exit 1; }
9606    fi
9607 @@ -32343,7 +33385,7 @@ echo "configure:32332: checking for $THI
9608
9609
9610  echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
9611 -echo "configure:32347: checking whether to enable DBA interface" >&5
9612 +echo "configure:33389: checking whether to enable DBA interface" >&5
9613  if test "$HAVE_DBA" = "1"; then
9614    if test "$ext_shared" = "yes"; then
9615      echo "$ac_t""yes, shared" 1>&6
9616 @@ -32670,18 +33712,18 @@ fi
9617
9618
9619
9620 -php_enable_dom=yes
9621 +php_enable_dio=no
9622
9623 -echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6
9624 -echo "configure:32677: checking whether to enable DOM support" >&5
9625 -# Check whether --enable-dom or --disable-dom was given.
9626 -if test "${enable_dom+set}" = set; then
9627 -  enableval="$enable_dom"
9628 -  PHP_DOM=$enableval
9629 +echo $ac_n "checking whether to enable direct I/O support""... $ac_c" 1>&6
9630 +echo "configure:33719: checking whether to enable direct I/O support" >&5
9631 +# Check whether --enable-dio or --disable-dio was given.
9632 +if test "${enable_dio+set}" = set; then
9633 +  enableval="$enable_dio"
9634 +  PHP_DIO=$enableval
9635  else
9636
9637 -  PHP_DOM=yes
9638 -  test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL
9639 +  PHP_DIO=no
9640 +  test "$PHP_ENABLE_ALL" && PHP_DIO=$PHP_ENABLE_ALL
9641
9642  fi
9643
9644 @@ -32689,12 +33731,12 @@ fi
9645
9646  ext_output="yes, shared"
9647  ext_shared=yes
9648 -case $PHP_DOM in
9649 +case $PHP_DIO in
9650  shared,*)
9651 -  PHP_DOM=`echo "$PHP_DOM"|$SED 's/^shared,//'`
9652 +  PHP_DIO=`echo "$PHP_DIO"|$SED 's/^shared,//'`
9653    ;;
9654  shared)
9655 -  PHP_DOM=yes
9656 +  PHP_DIO=yes
9657    ;;
9658  no)
9659    ext_output=no
9660 @@ -32713,27 +33755,367 @@ echo "$ac_t""$ext_output" 1>&6
9661
9662
9663
9664 -if test -z "$PHP_LIBXML_DIR"; then
9665 +if test "$PHP_DIO" != "no"; then
9666
9667 -php_with_libxml_dir=no
9668 +  ext_builddir=ext/dio
9669 +  ext_srcdir=$abs_srcdir/ext/dio
9670
9671 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
9672 -echo "configure:32722: checking libxml2 install dir" >&5
9673 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
9674 -if test "${with_libxml_dir+set}" = set; then
9675 -  withval="$with_libxml_dir"
9676 -  PHP_LIBXML_DIR=$withval
9677 -else
9678 +  ac_extra=
9679 +
9680 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
9681 +    PHP_DIO_SHARED=no
9682 +
9683 +
9684 +  case ext/dio in
9685 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
9686 +  /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
9687 +  *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
9688 +  esac
9689
9690 -  PHP_LIBXML_DIR=no
9691
9692
9693 -fi
9694 -
9695 -
9696 -ext_output=$PHP_LIBXML_DIR
9697 -echo "$ac_t""$ext_output" 1>&6
9698 -
9699 +  b_c_pre=$php_c_pre
9700 +  b_cxx_pre=$php_cxx_pre
9701 +  b_c_meta=$php_c_meta
9702 +  b_cxx_meta=$php_cxx_meta
9703 +  b_c_post=$php_c_post
9704 +  b_cxx_post=$php_cxx_post
9705 +  b_lo=$php_lo
9706 +
9707 +
9708 +  old_IFS=$IFS
9709 +  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
9710 +
9711 +      IFS=.
9712 +      set $ac_src
9713 +      ac_obj=$1
9714 +      IFS=$old_IFS
9715 +
9716 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
9717 +
9718 +      case $ac_src in
9719 +        *.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" ;;
9720 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9721 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9722 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
9723 +      esac
9724 +
9725 +    cat >>Makefile.objects<<EOF
9726 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
9727 +       $ac_comp
9728 +EOF
9729 +  done
9730 +
9731 +
9732 +    EXT_STATIC="$EXT_STATIC dio"
9733 +    if test "$ext_shared" != "nocli"; then
9734 +      EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
9735 +    fi
9736 +  else
9737 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
9738 +      PHP_DIO_SHARED=yes
9739 +
9740 +  case ext/dio in
9741 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
9742 +  /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
9743 +  *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
9744 +  esac
9745 +
9746 +
9747 +
9748 +  b_c_pre=$shared_c_pre
9749 +  b_cxx_pre=$shared_cxx_pre
9750 +  b_c_meta=$shared_c_meta
9751 +  b_cxx_meta=$shared_cxx_meta
9752 +  b_c_post=$shared_c_post
9753 +  b_cxx_post=$shared_cxx_post
9754 +  b_lo=$shared_lo
9755 +
9756 +
9757 +  old_IFS=$IFS
9758 +  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
9759 +
9760 +      IFS=.
9761 +      set $ac_src
9762 +      ac_obj=$1
9763 +      IFS=$old_IFS
9764 +
9765 +      shared_objects_dio="$shared_objects_dio $ac_bdir$ac_obj.lo"
9766 +
9767 +      case $ac_src in
9768 +        *.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" ;;
9769 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9770 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9771 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
9772 +      esac
9773 +
9774 +    cat >>Makefile.objects<<EOF
9775 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
9776 +       $ac_comp
9777 +EOF
9778 +  done
9779 +
9780 +      case $host_alias in
9781 +        *netware*)
9782 +
9783 +  install_modules="install-modules"
9784 +
9785 +  case $host_alias in
9786 +    *aix*)
9787 +      suffix=so
9788 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpdio.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) $(PHPDIO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpdio.so '$ext_builddir'/phpdio.so'
9789 +      ;;
9790 +    *netware*)
9791 +      suffix=nlm
9792 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDIO, 3)_SHARED_LIBADD)'
9793 +      ;;
9794 +    *)
9795 +      suffix=la
9796 +      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_dio) $(PHPDIO_SHARED_LIBADD)'
9797 +      ;;
9798 +  esac
9799 +
9800 +  if test "x" = "xyes"; then
9801 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpdio.$suffix"
9802 +  else
9803 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdio.$suffix"
9804 +  fi
9805 +
9806 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
9807 +
9808 +  cat >>Makefile.objects<<EOF
9809 +\$(phplibdir)/phpdio.$suffix: $ext_builddir/phpdio.$suffix
9810 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpdio.$suffix \$(phplibdir)
9811 +
9812 +$ext_builddir/phpdio.$suffix: \$(shared_objects_dio) \$(PHPDIO_SHARED_DEPENDENCIES)
9813 +       $link_cmd
9814 +
9815 +EOF
9816 +
9817 +          ;;
9818 +        *)
9819 +
9820 +  install_modules="install-modules"
9821 +
9822 +  case $host_alias in
9823 +    *aix*)
9824 +      suffix=so
9825 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/dio.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) $(DIO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/dio.so '$ext_builddir'/dio.so'
9826 +      ;;
9827 +    *netware*)
9828 +      suffix=nlm
9829 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DIO, 3)_SHARED_LIBADD)'
9830 +      ;;
9831 +    *)
9832 +      suffix=la
9833 +      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_dio) $(DIO_SHARED_LIBADD)'
9834 +      ;;
9835 +  esac
9836 +
9837 +  if test "x" = "xyes"; then
9838 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/dio.$suffix"
9839 +  else
9840 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/dio.$suffix"
9841 +  fi
9842 +
9843 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
9844 +
9845 +  cat >>Makefile.objects<<EOF
9846 +\$(phplibdir)/dio.$suffix: $ext_builddir/dio.$suffix
9847 +       \$(LIBTOOL) --mode=install cp $ext_builddir/dio.$suffix \$(phplibdir)
9848 +
9849 +$ext_builddir/dio.$suffix: \$(shared_objects_dio) \$(DIO_SHARED_DEPENDENCIES)
9850 +       $link_cmd
9851 +
9852 +EOF
9853 +
9854 +          ;;
9855 +      esac
9856 +      cat >> confdefs.h <<EOF
9857 +#define COMPILE_DL_DIO 1
9858 +EOF
9859 +
9860 +    fi
9861 +  fi
9862 +
9863 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
9864 +    PHP_DIO_SHARED=no
9865 +    case "$PHP_SAPI" in
9866 +      cgi|embed)
9867 +
9868 +
9869 +  case ext/dio in
9870 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
9871 +  /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
9872 +  *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
9873 +  esac
9874 +
9875 +
9876 +
9877 +  b_c_pre=$php_c_pre
9878 +  b_cxx_pre=$php_cxx_pre
9879 +  b_c_meta=$php_c_meta
9880 +  b_cxx_meta=$php_cxx_meta
9881 +  b_c_post=$php_c_post
9882 +  b_cxx_post=$php_cxx_post
9883 +  b_lo=$php_lo
9884 +
9885 +
9886 +  old_IFS=$IFS
9887 +  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
9888 +
9889 +      IFS=.
9890 +      set $ac_src
9891 +      ac_obj=$1
9892 +      IFS=$old_IFS
9893 +
9894 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
9895 +
9896 +      case $ac_src in
9897 +        *.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" ;;
9898 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9899 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9900 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
9901 +      esac
9902 +
9903 +    cat >>Makefile.objects<<EOF
9904 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
9905 +       $ac_comp
9906 +EOF
9907 +  done
9908 +
9909 +
9910 +        EXT_STATIC="$EXT_STATIC dio"
9911 +        ;;
9912 +      *)
9913 +
9914 +
9915 +  case ext/dio in
9916 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
9917 +  /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
9918 +  *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
9919 +  esac
9920 +
9921 +
9922 +
9923 +  b_c_pre=$php_c_pre
9924 +  b_cxx_pre=$php_cxx_pre
9925 +  b_c_meta=$php_c_meta
9926 +  b_cxx_meta=$php_cxx_meta
9927 +  b_c_post=$php_c_post
9928 +  b_cxx_post=$php_cxx_post
9929 +  b_lo=$php_lo
9930 +
9931 +
9932 +  old_IFS=$IFS
9933 +  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
9934 +
9935 +      IFS=.
9936 +      set $ac_src
9937 +      ac_obj=$1
9938 +      IFS=$old_IFS
9939 +
9940 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
9941 +
9942 +      case $ac_src in
9943 +        *.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" ;;
9944 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9945 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9946 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
9947 +      esac
9948 +
9949 +    cat >>Makefile.objects<<EOF
9950 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
9951 +       $ac_comp
9952 +EOF
9953 +  done
9954 +
9955 +
9956 +        ;;
9957 +    esac
9958 +    EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
9959 +  fi
9960 +
9961 +
9962 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
9963 +
9964 +
9965 +
9966 +  if test "$ext_builddir" = "."; then
9967 +    PHP_PECL_EXTENSION=dio
9968 +
9969 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
9970 +
9971 +  fi
9972 +
9973 +fi
9974 +
9975 +
9976 +
9977 +php_enable_dom=yes
9978 +
9979 +echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6
9980 +echo "configure:34059: checking whether to enable DOM support" >&5
9981 +# Check whether --enable-dom or --disable-dom was given.
9982 +if test "${enable_dom+set}" = set; then
9983 +  enableval="$enable_dom"
9984 +  PHP_DOM=$enableval
9985 +else
9986 +
9987 +  PHP_DOM=yes
9988 +  test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL
9989 +
9990 +fi
9991 +
9992 +
9993 +
9994 +ext_output="yes, shared"
9995 +ext_shared=yes
9996 +case $PHP_DOM in
9997 +shared,*)
9998 +  PHP_DOM=`echo "$PHP_DOM"|$SED 's/^shared,//'`
9999 +  ;;
10000 +shared)
10001 +  PHP_DOM=yes
10002 +  ;;
10003 +no)
10004 +  ext_output=no
10005 +  ext_shared=no
10006 +  ;;
10007 +*)
10008 +  ext_output=yes
10009 +  ext_shared=no
10010 +  ;;
10011 +esac
10012 +
10013 +
10014 +
10015 +echo "$ac_t""$ext_output" 1>&6
10016 +
10017 +
10018 +
10019 +
10020 +if test -z "$PHP_LIBXML_DIR"; then
10021 +
10022 +php_with_libxml_dir=no
10023 +
10024 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
10025 +echo "configure:34104: checking libxml2 install dir" >&5
10026 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
10027 +if test "${with_libxml_dir+set}" = set; then
10028 +  withval="$with_libxml_dir"
10029 +  PHP_LIBXML_DIR=$withval
10030 +else
10031 +
10032 +  PHP_LIBXML_DIR=no
10033 +
10034 +
10035 +fi
10036 +
10037 +
10038 +ext_output=$PHP_LIBXML_DIR
10039 +echo "$ac_t""$ext_output" 1>&6
10040 +
10041
10042
10043  fi
10044 @@ -32746,7 +34128,7 @@ if test "$PHP_DOM" != "no"; then
10045
10046
10047  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
10048 -echo "configure:32750: checking for xml2-config path" >&5
10049 +echo "configure:34132: checking for xml2-config path" >&5
10050  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
10051    echo $ac_n "(cached) $ac_c" 1>&6
10052  else
10053 @@ -32904,7 +34286,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
10054
10055
10056              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
10057 -echo "configure:32908: checking whether libxml build works" >&5
10058 +echo "configure:34290: checking whether libxml build works" >&5
10059  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
10060    echo $ac_n "(cached) $ac_c" 1>&6
10061  else
10062 @@ -32920,7 +34302,7 @@ else
10063
10064  else
10065    cat > conftest.$ac_ext <<EOF
10066 -#line 32924 "configure"
10067 +#line 34306 "configure"
10068  #include "confdefs.h"
10069
10070
10071 @@ -32931,7 +34313,7 @@ else
10072      }
10073
10074  EOF
10075 -if { (eval echo configure:32935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10076 +if { (eval echo configure:34317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10077  then
10078
10079      LIBS=$old_LIBS
10080 @@ -33354,7 +34736,7 @@ fi
10081  php_with_enchant=no
10082
10083  echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6
10084 -echo "configure:33358: checking for ENCHANT support" >&5
10085 +echo "configure:34740: checking for ENCHANT support" >&5
10086  # Check whether --with-enchant or --without-enchant was given.
10087  if test "${with_enchant+set}" = set; then
10088    withval="$with_enchant"
10089 @@ -33939,7 +35321,7 @@ EOF
10090    done
10091
10092    echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6
10093 -echo "configure:33943: checking for enchant_broker_set_param in -lenchant" >&5
10094 +echo "configure:35325: checking for enchant_broker_set_param in -lenchant" >&5
10095  ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'`
10096  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10097    echo $ac_n "(cached) $ac_c" 1>&6
10098 @@ -33947,7 +35329,7 @@ else
10099    ac_save_LIBS="$LIBS"
10100  LIBS="-lenchant  $LIBS"
10101  cat > conftest.$ac_ext <<EOF
10102 -#line 33951 "configure"
10103 +#line 35333 "configure"
10104  #include "confdefs.h"
10105  /* Override any gcc2 internal prototype to avoid an error.  */
10106  /* We use char because int might match the return type of a gcc2
10107 @@ -33958,7 +35340,7 @@ int main() {
10108  enchant_broker_set_param()
10109  ; return 0; }
10110  EOF
10111 -if { (eval echo configure:33962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10112 +if { (eval echo configure:35344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10113    rm -rf conftest*
10114    eval "ac_cv_lib_$ac_lib_var=yes"
10115  else
10116 @@ -34005,7 +35387,7 @@ fi
10117  php_enable_exif=no
10118
10119  echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6
10120 -echo "configure:34009: checking whether to enable EXIF (metadata from images) support" >&5
10121 +echo "configure:35391: checking whether to enable EXIF (metadata from images) support" >&5
10122  # Check whether --enable-exif or --disable-exif was given.
10123  if test "${enable_exif+set}" = set; then
10124    enableval="$enable_exif"
10125 @@ -34349,7 +35731,7 @@ fi
10126  php_enable_fileinfo=yes
10127
10128  echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6
10129 -echo "configure:34353: checking for fileinfo support" >&5
10130 +echo "configure:35735: checking for fileinfo support" >&5
10131  # Check whether --enable-fileinfo or --disable-fileinfo was given.
10132  if test "${enable_fileinfo+set}" = set; then
10133    enableval="$enable_fileinfo"
10134 @@ -34699,12 +36081,12 @@ EOF
10135    for ac_func in utimes strndup
10136  do
10137  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
10138 -echo "configure:34703: checking for $ac_func" >&5
10139 +echo "configure:36085: checking for $ac_func" >&5
10140  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
10141    echo $ac_n "(cached) $ac_c" 1>&6
10142  else
10143    cat > conftest.$ac_ext <<EOF
10144 -#line 34708 "configure"
10145 +#line 36090 "configure"
10146  #include "confdefs.h"
10147  /* System header to define __stub macros and hopefully few prototypes,
10148      which can conflict with char $ac_func(); below.  */
10149 @@ -34727,7 +36109,7 @@ $ac_func();
10150
10151  ; return 0; }
10152  EOF
10153 -if { (eval echo configure:34731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10154 +if { (eval echo configure:36113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10155    rm -rf conftest*
10156    eval "ac_cv_func_$ac_func=yes"
10157  else
10158 @@ -34765,7 +36147,7 @@ fi
10159  php_enable_filter=yes
10160
10161  echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6
10162 -echo "configure:34769: checking whether to enable input filter support" >&5
10163 +echo "configure:36151: checking whether to enable input filter support" >&5
10164  # Check whether --enable-filter or --disable-filter was given.
10165  if test "${enable_filter+set}" = set; then
10166    enableval="$enable_filter"
10167 @@ -34809,7 +36191,7 @@ echo "$ac_t""$ext_output" 1>&6
10168  php_with_pcre_dir=no
10169
10170  echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
10171 -echo "configure:34813: checking pcre install prefix" >&5
10172 +echo "configure:36195: checking pcre install prefix" >&5
10173  # Check whether --with-pcre-dir or --without-pcre-dir was given.
10174  if test "${with_pcre_dir+set}" = set; then
10175    withval="$with_pcre_dir"
10176 @@ -34836,7 +36218,7 @@ if test "$PHP_FILTER" != "no"; then
10177          old_CPPFLAGS=$CPPFLAGS
10178      CPPFLAGS=$INCLUDES
10179      cat > conftest.$ac_ext <<EOF
10180 -#line 34840 "configure"
10181 +#line 36222 "configure"
10182  #include "confdefs.h"
10183
10184  #include <main/php_config.h>
10185 @@ -34855,7 +36237,7 @@ else
10186    rm -rf conftest*
10187
10188        cat > conftest.$ac_ext <<EOF
10189 -#line 34859 "configure"
10190 +#line 36241 "configure"
10191  #include "confdefs.h"
10192
10193  #include <main/php_config.h>
10194 @@ -35225,7 +36607,7 @@ fi
10195  php_enable_ftp=no
10196
10197  echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6
10198 -echo "configure:35229: checking whether to enable FTP support" >&5
10199 +echo "configure:36611: checking whether to enable FTP support" >&5
10200  # Check whether --enable-ftp or --disable-ftp was given.
10201  if test "${enable_ftp+set}" = set; then
10202    enableval="$enable_ftp"
10203 @@ -35269,7 +36651,7 @@ echo "$ac_t""$ext_output" 1>&6
10204  php_with_openssl_dir=no
10205
10206  echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6
10207 -echo "configure:35273: checking OpenSSL dir for FTP" >&5
10208 +echo "configure:36655: checking OpenSSL dir for FTP" >&5
10209  # Check whether --with-openssl-dir or --without-openssl-dir was given.
10210  if test "${with_openssl_dir+set}" = set; then
10211    withval="$with_openssl_dir"
10212 @@ -35607,7 +36989,7 @@ EOF
10213      # Extract the first word of "pkg-config", so it can be a program name with args.
10214  set dummy pkg-config; ac_word=$2
10215  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
10216 -echo "configure:35611: checking for $ac_word" >&5
10217 +echo "configure:36993: checking for $ac_word" >&5
10218  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
10219    echo $ac_n "(cached) $ac_c" 1>&6
10220  else
10221 @@ -35812,9 +37194,9 @@ fi
10222      old_CPPFLAGS=$CPPFLAGS
10223      CPPFLAGS=-I$OPENSSL_INCDIR
10224      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
10225 -echo "configure:35816: checking for OpenSSL version" >&5
10226 +echo "configure:37198: checking for OpenSSL version" >&5
10227      cat > conftest.$ac_ext <<EOF
10228 -#line 35818 "configure"
10229 +#line 37200 "configure"
10230  #include "confdefs.h"
10231
10232  #include <openssl/opensslv.h>
10233 @@ -35969,7 +37351,7 @@ rm -f conftest*
10234    done
10235
10236    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
10237 -echo "configure:35973: checking for CRYPTO_free in -lcrypto" >&5
10238 +echo "configure:37355: checking for CRYPTO_free in -lcrypto" >&5
10239  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
10240  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10241    echo $ac_n "(cached) $ac_c" 1>&6
10242 @@ -35977,7 +37359,7 @@ else
10243    ac_save_LIBS="$LIBS"
10244  LIBS="-lcrypto  $LIBS"
10245  cat > conftest.$ac_ext <<EOF
10246 -#line 35981 "configure"
10247 +#line 37363 "configure"
10248  #include "confdefs.h"
10249  /* Override any gcc2 internal prototype to avoid an error.  */
10250  /* We use char because int might match the return type of a gcc2
10251 @@ -35988,7 +37370,7 @@ int main() {
10252  CRYPTO_free()
10253  ; return 0; }
10254  EOF
10255 -if { (eval echo configure:35992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10256 +if { (eval echo configure:37374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10257    rm -rf conftest*
10258    eval "ac_cv_lib_$ac_lib_var=yes"
10259  else
10260 @@ -36145,7 +37527,7 @@ fi
10261    done
10262
10263    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
10264 -echo "configure:36149: checking for SSL_CTX_set_ssl_version in -lssl" >&5
10265 +echo "configure:37531: checking for SSL_CTX_set_ssl_version in -lssl" >&5
10266  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
10267  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10268    echo $ac_n "(cached) $ac_c" 1>&6
10269 @@ -36153,7 +37535,7 @@ else
10270    ac_save_LIBS="$LIBS"
10271  LIBS="-lssl  $LIBS"
10272  cat > conftest.$ac_ext <<EOF
10273 -#line 36157 "configure"
10274 +#line 37539 "configure"
10275  #include "confdefs.h"
10276  /* Override any gcc2 internal prototype to avoid an error.  */
10277  /* We use char because int might match the return type of a gcc2
10278 @@ -36164,7 +37546,7 @@ int main() {
10279  SSL_CTX_set_ssl_version()
10280  ; return 0; }
10281  EOF
10282 -if { (eval echo configure:36168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10283 +if { (eval echo configure:37550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10284    rm -rf conftest*
10285    eval "ac_cv_lib_$ac_lib_var=yes"
10286  else
10287 @@ -36283,7 +37665,7 @@ fi
10288  php_with_gd=no
10289
10290  echo $ac_n "checking for GD support""... $ac_c" 1>&6
10291 -echo "configure:36287: checking for GD support" >&5
10292 +echo "configure:37669: checking for GD support" >&5
10293  # Check whether --with-gd or --without-gd was given.
10294  if test "${with_gd+set}" = set; then
10295    withval="$with_gd"
10296 @@ -36328,7 +37710,7 @@ if test -z "$PHP_JPEG_DIR"; then
10297  php_with_jpeg_dir=no
10298
10299  echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
10300 -echo "configure:36332: checking for the location of libjpeg" >&5
10301 +echo "configure:37714: checking for the location of libjpeg" >&5
10302  # Check whether --with-jpeg-dir or --without-jpeg-dir was given.
10303  if test "${with_jpeg_dir+set}" = set; then
10304    withval="$with_jpeg_dir"
10305 @@ -36353,7 +37735,7 @@ if test -z "$PHP_PNG_DIR"; then
10306  php_with_png_dir=no
10307
10308  echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
10309 -echo "configure:36357: checking for the location of libpng" >&5
10310 +echo "configure:37739: checking for the location of libpng" >&5
10311  # Check whether --with-png-dir or --without-png-dir was given.
10312  if test "${with_png_dir+set}" = set; then
10313    withval="$with_png_dir"
10314 @@ -36378,7 +37760,7 @@ if test -z "$PHP_ZLIB_DIR"; then
10315  php_with_zlib_dir=no
10316
10317  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
10318 -echo "configure:36382: checking for the location of libz" >&5
10319 +echo "configure:37764: checking for the location of libz" >&5
10320  # Check whether --with-zlib-dir or --without-zlib-dir was given.
10321  if test "${with_zlib_dir+set}" = set; then
10322    withval="$with_zlib_dir"
10323 @@ -36402,7 +37784,7 @@ fi
10324  php_with_xpm_dir=no
10325
10326  echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6
10327 -echo "configure:36406: checking for the location of libXpm" >&5
10328 +echo "configure:37788: checking for the location of libXpm" >&5
10329  # Check whether --with-xpm-dir or --without-xpm-dir was given.
10330  if test "${with_xpm_dir+set}" = set; then
10331    withval="$with_xpm_dir"
10332 @@ -36425,7 +37807,7 @@ echo "$ac_t""$ext_output" 1>&6
10333  php_with_freetype_dir=no
10334
10335  echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6
10336 -echo "configure:36429: checking for FreeType 2" >&5
10337 +echo "configure:37811: checking for FreeType 2" >&5
10338  # Check whether --with-freetype-dir or --without-freetype-dir was given.
10339  if test "${with_freetype_dir+set}" = set; then
10340    withval="$with_freetype_dir"
10341 @@ -36448,7 +37830,7 @@ echo "$ac_t""$ext_output" 1>&6
10342  php_with_t1lib=no
10343
10344  echo $ac_n "checking for T1lib support""... $ac_c" 1>&6
10345 -echo "configure:36452: checking for T1lib support" >&5
10346 +echo "configure:37834: checking for T1lib support" >&5
10347  # Check whether --with-t1lib or --without-t1lib was given.
10348  if test "${with_t1lib+set}" = set; then
10349    withval="$with_t1lib"
10350 @@ -36471,7 +37853,7 @@ echo "$ac_t""$ext_output" 1>&6
10351  php_enable_gd_native_ttf=no
10352
10353  echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6
10354 -echo "configure:36475: checking whether to enable truetype string function in GD" >&5
10355 +echo "configure:37857: checking whether to enable truetype string function in GD" >&5
10356  # Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given.
10357  if test "${enable_gd_native_ttf+set}" = set; then
10358    enableval="$enable_gd_native_ttf"
10359 @@ -36494,7 +37876,7 @@ echo "$ac_t""$ext_output" 1>&6
10360  php_enable_gd_jis_conv=no
10361
10362  echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6
10363 -echo "configure:36498: checking whether to enable JIS-mapped Japanese font support in GD" >&5
10364 +echo "configure:37880: checking whether to enable JIS-mapped Japanese font support in GD" >&5
10365  # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given.
10366  if test "${enable_gd_jis_conv+set}" = set; then
10367    enableval="$enable_gd_jis_conv"
10368 @@ -36546,12 +37928,12 @@ if test "$PHP_GD" = "yes"; then
10369    for ac_func in fabsf floorf
10370  do
10371  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
10372 -echo "configure:36550: checking for $ac_func" >&5
10373 +echo "configure:37932: checking for $ac_func" >&5
10374  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
10375    echo $ac_n "(cached) $ac_c" 1>&6
10376  else
10377    cat > conftest.$ac_ext <<EOF
10378 -#line 36555 "configure"
10379 +#line 37937 "configure"
10380  #include "confdefs.h"
10381  /* System header to define __stub macros and hopefully few prototypes,
10382      which can conflict with char $ac_func(); below.  */
10383 @@ -36574,7 +37956,7 @@ $ac_func();
10384
10385  ; return 0; }
10386  EOF
10387 -if { (eval echo configure:36578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10388 +if { (eval echo configure:37960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10389    rm -rf conftest*
10390    eval "ac_cv_func_$ac_func=yes"
10391  else
10392 @@ -36746,7 +38128,7 @@ EOF
10393    done
10394
10395    echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
10396 -echo "configure:36750: checking for jpeg_read_header in -ljpeg" >&5
10397 +echo "configure:38132: checking for jpeg_read_header in -ljpeg" >&5
10398  ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
10399  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10400    echo $ac_n "(cached) $ac_c" 1>&6
10401 @@ -36754,7 +38136,7 @@ else
10402    ac_save_LIBS="$LIBS"
10403  LIBS="-ljpeg  $LIBS"
10404  cat > conftest.$ac_ext <<EOF
10405 -#line 36758 "configure"
10406 +#line 38140 "configure"
10407  #include "confdefs.h"
10408  /* Override any gcc2 internal prototype to avoid an error.  */
10409  /* We use char because int might match the return type of a gcc2
10410 @@ -36765,7 +38147,7 @@ int main() {
10411  jpeg_read_header()
10412  ; return 0; }
10413  EOF
10414 -if { (eval echo configure:36769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10415 +if { (eval echo configure:38151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10416    rm -rf conftest*
10417    eval "ac_cv_lib_$ac_lib_var=yes"
10418  else
10419 @@ -37047,7 +38429,7 @@ fi
10420    done
10421
10422    echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
10423 -echo "configure:37051: checking for png_write_image in -lpng" >&5
10424 +echo "configure:38433: checking for png_write_image in -lpng" >&5
10425  ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
10426  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10427    echo $ac_n "(cached) $ac_c" 1>&6
10428 @@ -37055,7 +38437,7 @@ else
10429    ac_save_LIBS="$LIBS"
10430  LIBS="-lpng  $LIBS"
10431  cat > conftest.$ac_ext <<EOF
10432 -#line 37059 "configure"
10433 +#line 38441 "configure"
10434  #include "confdefs.h"
10435  /* Override any gcc2 internal prototype to avoid an error.  */
10436  /* We use char because int might match the return type of a gcc2
10437 @@ -37066,7 +38448,7 @@ int main() {
10438  png_write_image()
10439  ; return 0; }
10440  EOF
10441 -if { (eval echo configure:37070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10442 +if { (eval echo configure:38452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10443    rm -rf conftest*
10444    eval "ac_cv_lib_$ac_lib_var=yes"
10445  else
10446 @@ -37446,7 +38828,7 @@ fi
10447    done
10448
10449    echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
10450 -echo "configure:37450: checking for XpmFreeXpmImage in -lXpm" >&5
10451 +echo "configure:38832: checking for XpmFreeXpmImage in -lXpm" >&5
10452  ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
10453  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10454    echo $ac_n "(cached) $ac_c" 1>&6
10455 @@ -37454,7 +38836,7 @@ else
10456    ac_save_LIBS="$LIBS"
10457  LIBS="-lXpm  $LIBS"
10458  cat > conftest.$ac_ext <<EOF
10459 -#line 37458 "configure"
10460 +#line 38840 "configure"
10461  #include "confdefs.h"
10462  /* Override any gcc2 internal prototype to avoid an error.  */
10463  /* We use char because int might match the return type of a gcc2
10464 @@ -37465,7 +38847,7 @@ int main() {
10465  XpmFreeXpmImage()
10466  ; return 0; }
10467  EOF
10468 -if { (eval echo configure:37469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10469 +if { (eval echo configure:38851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10470    rm -rf conftest*
10471    eval "ac_cv_lib_$ac_lib_var=yes"
10472  else
10473 @@ -37840,7 +39222,7 @@ fi
10474    done
10475
10476    echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
10477 -echo "configure:37844: checking for FT_New_Face in -lfreetype" >&5
10478 +echo "configure:39226: checking for FT_New_Face in -lfreetype" >&5
10479  ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
10480  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10481    echo $ac_n "(cached) $ac_c" 1>&6
10482 @@ -37848,7 +39230,7 @@ else
10483    ac_save_LIBS="$LIBS"
10484  LIBS="-lfreetype  $LIBS"
10485  cat > conftest.$ac_ext <<EOF
10486 -#line 37852 "configure"
10487 +#line 39234 "configure"
10488  #include "confdefs.h"
10489  /* Override any gcc2 internal prototype to avoid an error.  */
10490  /* We use char because int might match the return type of a gcc2
10491 @@ -37859,7 +39241,7 @@ int main() {
10492  FT_New_Face()
10493  ; return 0; }
10494  EOF
10495 -if { (eval echo configure:37863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10496 +if { (eval echo configure:39245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10497    rm -rf conftest*
10498    eval "ac_cv_lib_$ac_lib_var=yes"
10499  else
10500 @@ -38176,7 +39558,7 @@ fi
10501    done
10502
10503    echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
10504 -echo "configure:38180: checking for T1_StrError in -lt1" >&5
10505 +echo "configure:39562: checking for T1_StrError in -lt1" >&5
10506  ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
10507  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10508    echo $ac_n "(cached) $ac_c" 1>&6
10509 @@ -38184,7 +39566,7 @@ else
10510    ac_save_LIBS="$LIBS"
10511  LIBS="-lt1  $LIBS"
10512  cat > conftest.$ac_ext <<EOF
10513 -#line 38188 "configure"
10514 +#line 39570 "configure"
10515  #include "confdefs.h"
10516  /* Override any gcc2 internal prototype to avoid an error.  */
10517  /* We use char because int might match the return type of a gcc2
10518 @@ -38195,7 +39577,7 @@ int main() {
10519  T1_StrError()
10520  ; return 0; }
10521  EOF
10522 -if { (eval echo configure:38199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10523 +if { (eval echo configure:39581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10524    rm -rf conftest*
10525    eval "ac_cv_lib_$ac_lib_var=yes"
10526  else
10527 @@ -38638,7 +40020,7 @@ EOF
10528    done
10529
10530    echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
10531 -echo "configure:38642: checking for jpeg_read_header in -ljpeg" >&5
10532 +echo "configure:40024: checking for jpeg_read_header in -ljpeg" >&5
10533  ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
10534  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10535    echo $ac_n "(cached) $ac_c" 1>&6
10536 @@ -38646,7 +40028,7 @@ else
10537    ac_save_LIBS="$LIBS"
10538  LIBS="-ljpeg  $LIBS"
10539  cat > conftest.$ac_ext <<EOF
10540 -#line 38650 "configure"
10541 +#line 40032 "configure"
10542  #include "confdefs.h"
10543  /* Override any gcc2 internal prototype to avoid an error.  */
10544  /* We use char because int might match the return type of a gcc2
10545 @@ -38657,7 +40039,7 @@ int main() {
10546  jpeg_read_header()
10547  ; return 0; }
10548  EOF
10549 -if { (eval echo configure:38661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10550 +if { (eval echo configure:40043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10551    rm -rf conftest*
10552    eval "ac_cv_lib_$ac_lib_var=yes"
10553  else
10554 @@ -38939,7 +40321,7 @@ fi
10555    done
10556
10557    echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
10558 -echo "configure:38943: checking for png_write_image in -lpng" >&5
10559 +echo "configure:40325: checking for png_write_image in -lpng" >&5
10560  ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
10561  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10562    echo $ac_n "(cached) $ac_c" 1>&6
10563 @@ -38947,7 +40329,7 @@ else
10564    ac_save_LIBS="$LIBS"
10565  LIBS="-lpng  $LIBS"
10566  cat > conftest.$ac_ext <<EOF
10567 -#line 38951 "configure"
10568 +#line 40333 "configure"
10569  #include "confdefs.h"
10570  /* Override any gcc2 internal prototype to avoid an error.  */
10571  /* We use char because int might match the return type of a gcc2
10572 @@ -38958,7 +40340,7 @@ int main() {
10573  png_write_image()
10574  ; return 0; }
10575  EOF
10576 -if { (eval echo configure:38962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10577 +if { (eval echo configure:40344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10578    rm -rf conftest*
10579    eval "ac_cv_lib_$ac_lib_var=yes"
10580  else
10581 @@ -39338,7 +40720,7 @@ fi
10582    done
10583
10584    echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
10585 -echo "configure:39342: checking for XpmFreeXpmImage in -lXpm" >&5
10586 +echo "configure:40724: checking for XpmFreeXpmImage in -lXpm" >&5
10587  ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
10588  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10589    echo $ac_n "(cached) $ac_c" 1>&6
10590 @@ -39346,7 +40728,7 @@ else
10591    ac_save_LIBS="$LIBS"
10592  LIBS="-lXpm  $LIBS"
10593  cat > conftest.$ac_ext <<EOF
10594 -#line 39350 "configure"
10595 +#line 40732 "configure"
10596  #include "confdefs.h"
10597  /* Override any gcc2 internal prototype to avoid an error.  */
10598  /* We use char because int might match the return type of a gcc2
10599 @@ -39357,7 +40739,7 @@ int main() {
10600  XpmFreeXpmImage()
10601  ; return 0; }
10602  EOF
10603 -if { (eval echo configure:39361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10604 +if { (eval echo configure:40743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10605    rm -rf conftest*
10606    eval "ac_cv_lib_$ac_lib_var=yes"
10607  else
10608 @@ -39732,7 +41114,7 @@ fi
10609    done
10610
10611    echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
10612 -echo "configure:39736: checking for FT_New_Face in -lfreetype" >&5
10613 +echo "configure:41118: checking for FT_New_Face in -lfreetype" >&5
10614  ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
10615  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10616    echo $ac_n "(cached) $ac_c" 1>&6
10617 @@ -39740,7 +41122,7 @@ else
10618    ac_save_LIBS="$LIBS"
10619  LIBS="-lfreetype  $LIBS"
10620  cat > conftest.$ac_ext <<EOF
10621 -#line 39744 "configure"
10622 +#line 41126 "configure"
10623  #include "confdefs.h"
10624  /* Override any gcc2 internal prototype to avoid an error.  */
10625  /* We use char because int might match the return type of a gcc2
10626 @@ -39751,7 +41133,7 @@ int main() {
10627  FT_New_Face()
10628  ; return 0; }
10629  EOF
10630 -if { (eval echo configure:39755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10631 +if { (eval echo configure:41137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10632    rm -rf conftest*
10633    eval "ac_cv_lib_$ac_lib_var=yes"
10634  else
10635 @@ -40068,7 +41450,7 @@ fi
10636    done
10637
10638    echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
10639 -echo "configure:40072: checking for T1_StrError in -lt1" >&5
10640 +echo "configure:41454: checking for T1_StrError in -lt1" >&5
10641  ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
10642  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10643    echo $ac_n "(cached) $ac_c" 1>&6
10644 @@ -40076,7 +41458,7 @@ else
10645    ac_save_LIBS="$LIBS"
10646  LIBS="-lt1  $LIBS"
10647  cat > conftest.$ac_ext <<EOF
10648 -#line 40080 "configure"
10649 +#line 41462 "configure"
10650  #include "confdefs.h"
10651  /* Override any gcc2 internal prototype to avoid an error.  */
10652  /* We use char because int might match the return type of a gcc2
10653 @@ -40087,7 +41469,7 @@ int main() {
10654  T1_StrError()
10655  ; return 0; }
10656  EOF
10657 -if { (eval echo configure:40091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10658 +if { (eval echo configure:41473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10659    rm -rf conftest*
10660    eval "ac_cv_lib_$ac_lib_var=yes"
10661  else
10662 @@ -40462,7 +41844,7 @@ EOF
10663    done
10664
10665    echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
10666 -echo "configure:40466: checking for gdImageString16 in -lgd" >&5
10667 +echo "configure:41848: checking for gdImageString16 in -lgd" >&5
10668  ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
10669  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10670    echo $ac_n "(cached) $ac_c" 1>&6
10671 @@ -40470,7 +41852,7 @@ else
10672    ac_save_LIBS="$LIBS"
10673  LIBS="-lgd  $LIBS"
10674  cat > conftest.$ac_ext <<EOF
10675 -#line 40474 "configure"
10676 +#line 41856 "configure"
10677  #include "confdefs.h"
10678  /* Override any gcc2 internal prototype to avoid an error.  */
10679  /* We use char because int might match the return type of a gcc2
10680 @@ -40481,7 +41863,7 @@ int main() {
10681  gdImageString16()
10682  ; return 0; }
10683  EOF
10684 -if { (eval echo configure:40485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10685 +if { (eval echo configure:41867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10686    rm -rf conftest*
10687    eval "ac_cv_lib_$ac_lib_var=yes"
10688  else
10689 @@ -40610,7 +41992,7 @@ fi
10690    done
10691
10692    echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6
10693 -echo "configure:40614: checking for gdImagePaletteCopy in -lgd" >&5
10694 +echo "configure:41996: checking for gdImagePaletteCopy in -lgd" >&5
10695  ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'`
10696  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10697    echo $ac_n "(cached) $ac_c" 1>&6
10698 @@ -40618,7 +42000,7 @@ else
10699    ac_save_LIBS="$LIBS"
10700  LIBS="-lgd  $LIBS"
10701  cat > conftest.$ac_ext <<EOF
10702 -#line 40622 "configure"
10703 +#line 42004 "configure"
10704  #include "confdefs.h"
10705  /* Override any gcc2 internal prototype to avoid an error.  */
10706  /* We use char because int might match the return type of a gcc2
10707 @@ -40629,7 +42011,7 @@ int main() {
10708  gdImagePaletteCopy()
10709  ; return 0; }
10710  EOF
10711 -if { (eval echo configure:40633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10712 +if { (eval echo configure:42015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10713    rm -rf conftest*
10714    eval "ac_cv_lib_$ac_lib_var=yes"
10715  else
10716 @@ -40758,7 +42140,7 @@ fi
10717    done
10718
10719    echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
10720 -echo "configure:40762: checking for gdImageCreateFromPng in -lgd" >&5
10721 +echo "configure:42144: checking for gdImageCreateFromPng in -lgd" >&5
10722  ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
10723  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10724    echo $ac_n "(cached) $ac_c" 1>&6
10725 @@ -40766,7 +42148,7 @@ else
10726    ac_save_LIBS="$LIBS"
10727  LIBS="-lgd  $LIBS"
10728  cat > conftest.$ac_ext <<EOF
10729 -#line 40770 "configure"
10730 +#line 42152 "configure"
10731  #include "confdefs.h"
10732  /* Override any gcc2 internal prototype to avoid an error.  */
10733  /* We use char because int might match the return type of a gcc2
10734 @@ -40777,7 +42159,7 @@ int main() {
10735  gdImageCreateFromPng()
10736  ; return 0; }
10737  EOF
10738 -if { (eval echo configure:40781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10739 +if { (eval echo configure:42163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10740    rm -rf conftest*
10741    eval "ac_cv_lib_$ac_lib_var=yes"
10742  else
10743 @@ -40906,7 +42288,7 @@ fi
10744    done
10745
10746    echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
10747 -echo "configure:40910: checking for gdImageCreateFromGif in -lgd" >&5
10748 +echo "configure:42292: checking for gdImageCreateFromGif in -lgd" >&5
10749  ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
10750  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10751    echo $ac_n "(cached) $ac_c" 1>&6
10752 @@ -40914,7 +42296,7 @@ else
10753    ac_save_LIBS="$LIBS"
10754  LIBS="-lgd  $LIBS"
10755  cat > conftest.$ac_ext <<EOF
10756 -#line 40918 "configure"
10757 +#line 42300 "configure"
10758  #include "confdefs.h"
10759  /* Override any gcc2 internal prototype to avoid an error.  */
10760  /* We use char because int might match the return type of a gcc2
10761 @@ -40925,7 +42307,7 @@ int main() {
10762  gdImageCreateFromGif()
10763  ; return 0; }
10764  EOF
10765 -if { (eval echo configure:40929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10766 +if { (eval echo configure:42311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10767    rm -rf conftest*
10768    eval "ac_cv_lib_$ac_lib_var=yes"
10769  else
10770 @@ -41054,7 +42436,7 @@ fi
10771    done
10772
10773    echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
10774 -echo "configure:41058: checking for gdImageGif in -lgd" >&5
10775 +echo "configure:42440: checking for gdImageGif in -lgd" >&5
10776  ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'`
10777  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10778    echo $ac_n "(cached) $ac_c" 1>&6
10779 @@ -41062,7 +42444,7 @@ else
10780    ac_save_LIBS="$LIBS"
10781  LIBS="-lgd  $LIBS"
10782  cat > conftest.$ac_ext <<EOF
10783 -#line 41066 "configure"
10784 +#line 42448 "configure"
10785  #include "confdefs.h"
10786  /* Override any gcc2 internal prototype to avoid an error.  */
10787  /* We use char because int might match the return type of a gcc2
10788 @@ -41073,7 +42455,7 @@ int main() {
10789  gdImageGif()
10790  ; return 0; }
10791  EOF
10792 -if { (eval echo configure:41077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10793 +if { (eval echo configure:42459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10794    rm -rf conftest*
10795    eval "ac_cv_lib_$ac_lib_var=yes"
10796  else
10797 @@ -41202,7 +42584,7 @@ fi
10798    done
10799
10800    echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6
10801 -echo "configure:41206: checking for gdImageWBMP in -lgd" >&5
10802 +echo "configure:42588: checking for gdImageWBMP in -lgd" >&5
10803  ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'`
10804  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10805    echo $ac_n "(cached) $ac_c" 1>&6
10806 @@ -41210,7 +42592,7 @@ else
10807    ac_save_LIBS="$LIBS"
10808  LIBS="-lgd  $LIBS"
10809  cat > conftest.$ac_ext <<EOF
10810 -#line 41214 "configure"
10811 +#line 42596 "configure"
10812  #include "confdefs.h"
10813  /* Override any gcc2 internal prototype to avoid an error.  */
10814  /* We use char because int might match the return type of a gcc2
10815 @@ -41221,7 +42603,7 @@ int main() {
10816  gdImageWBMP()
10817  ; return 0; }
10818  EOF
10819 -if { (eval echo configure:41225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10820 +if { (eval echo configure:42607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10821    rm -rf conftest*
10822    eval "ac_cv_lib_$ac_lib_var=yes"
10823  else
10824 @@ -41350,7 +42732,7 @@ fi
10825    done
10826
10827    echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
10828 -echo "configure:41354: checking for gdImageCreateFromJpeg in -lgd" >&5
10829 +echo "configure:42736: checking for gdImageCreateFromJpeg in -lgd" >&5
10830  ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
10831  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10832    echo $ac_n "(cached) $ac_c" 1>&6
10833 @@ -41358,7 +42740,7 @@ else
10834    ac_save_LIBS="$LIBS"
10835  LIBS="-lgd  $LIBS"
10836  cat > conftest.$ac_ext <<EOF
10837 -#line 41362 "configure"
10838 +#line 42744 "configure"
10839  #include "confdefs.h"
10840  /* Override any gcc2 internal prototype to avoid an error.  */
10841  /* We use char because int might match the return type of a gcc2
10842 @@ -41369,7 +42751,7 @@ int main() {
10843  gdImageCreateFromJpeg()
10844  ; return 0; }
10845  EOF
10846 -if { (eval echo configure:41373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10847 +if { (eval echo configure:42755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10848    rm -rf conftest*
10849    eval "ac_cv_lib_$ac_lib_var=yes"
10850  else
10851 @@ -41498,7 +42880,7 @@ fi
10852    done
10853
10854    echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6
10855 -echo "configure:41502: checking for gdImageCreateFromXpm in -lgd" >&5
10856 +echo "configure:42884: checking for gdImageCreateFromXpm in -lgd" >&5
10857  ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'`
10858  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10859    echo $ac_n "(cached) $ac_c" 1>&6
10860 @@ -41506,7 +42888,7 @@ else
10861    ac_save_LIBS="$LIBS"
10862  LIBS="-lgd  $LIBS"
10863  cat > conftest.$ac_ext <<EOF
10864 -#line 41510 "configure"
10865 +#line 42892 "configure"
10866  #include "confdefs.h"
10867  /* Override any gcc2 internal prototype to avoid an error.  */
10868  /* We use char because int might match the return type of a gcc2
10869 @@ -41517,7 +42899,7 @@ int main() {
10870  gdImageCreateFromXpm()
10871  ; return 0; }
10872  EOF
10873 -if { (eval echo configure:41521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10874 +if { (eval echo configure:42903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10875    rm -rf conftest*
10876    eval "ac_cv_lib_$ac_lib_var=yes"
10877  else
10878 @@ -41646,7 +43028,7 @@ fi
10879    done
10880
10881    echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6
10882 -echo "configure:41650: checking for gdImageCreateFromGd2 in -lgd" >&5
10883 +echo "configure:43032: checking for gdImageCreateFromGd2 in -lgd" >&5
10884  ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'`
10885  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10886    echo $ac_n "(cached) $ac_c" 1>&6
10887 @@ -41654,7 +43036,7 @@ else
10888    ac_save_LIBS="$LIBS"
10889  LIBS="-lgd  $LIBS"
10890  cat > conftest.$ac_ext <<EOF
10891 -#line 41658 "configure"
10892 +#line 43040 "configure"
10893  #include "confdefs.h"
10894  /* Override any gcc2 internal prototype to avoid an error.  */
10895  /* We use char because int might match the return type of a gcc2
10896 @@ -41665,7 +43047,7 @@ int main() {
10897  gdImageCreateFromGd2()
10898  ; return 0; }
10899  EOF
10900 -if { (eval echo configure:41669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10901 +if { (eval echo configure:43051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10902    rm -rf conftest*
10903    eval "ac_cv_lib_$ac_lib_var=yes"
10904  else
10905 @@ -41794,7 +43176,7 @@ fi
10906    done
10907
10908    echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6
10909 -echo "configure:41798: checking for gdImageCreateTrueColor in -lgd" >&5
10910 +echo "configure:43180: checking for gdImageCreateTrueColor in -lgd" >&5
10911  ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'`
10912  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10913    echo $ac_n "(cached) $ac_c" 1>&6
10914 @@ -41802,7 +43184,7 @@ else
10915    ac_save_LIBS="$LIBS"
10916  LIBS="-lgd  $LIBS"
10917  cat > conftest.$ac_ext <<EOF
10918 -#line 41806 "configure"
10919 +#line 43188 "configure"
10920  #include "confdefs.h"
10921  /* Override any gcc2 internal prototype to avoid an error.  */
10922  /* We use char because int might match the return type of a gcc2
10923 @@ -41813,7 +43195,7 @@ int main() {
10924  gdImageCreateTrueColor()
10925  ; return 0; }
10926  EOF
10927 -if { (eval echo configure:41817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10928 +if { (eval echo configure:43199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10929    rm -rf conftest*
10930    eval "ac_cv_lib_$ac_lib_var=yes"
10931  else
10932 @@ -41942,7 +43324,7 @@ fi
10933    done
10934
10935    echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6
10936 -echo "configure:41946: checking for gdImageSetTile in -lgd" >&5
10937 +echo "configure:43328: checking for gdImageSetTile in -lgd" >&5
10938  ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'`
10939  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10940    echo $ac_n "(cached) $ac_c" 1>&6
10941 @@ -41950,7 +43332,7 @@ else
10942    ac_save_LIBS="$LIBS"
10943  LIBS="-lgd  $LIBS"
10944  cat > conftest.$ac_ext <<EOF
10945 -#line 41954 "configure"
10946 +#line 43336 "configure"
10947  #include "confdefs.h"
10948  /* Override any gcc2 internal prototype to avoid an error.  */
10949  /* We use char because int might match the return type of a gcc2
10950 @@ -41961,7 +43343,7 @@ int main() {
10951  gdImageSetTile()
10952  ; return 0; }
10953  EOF
10954 -if { (eval echo configure:41965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10955 +if { (eval echo configure:43347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10956    rm -rf conftest*
10957    eval "ac_cv_lib_$ac_lib_var=yes"
10958  else
10959 @@ -42090,7 +43472,7 @@ fi
10960    done
10961
10962    echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6
10963 -echo "configure:42094: checking for gdImageEllipse in -lgd" >&5
10964 +echo "configure:43476: checking for gdImageEllipse in -lgd" >&5
10965  ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'`
10966  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10967    echo $ac_n "(cached) $ac_c" 1>&6
10968 @@ -42098,7 +43480,7 @@ else
10969    ac_save_LIBS="$LIBS"
10970  LIBS="-lgd  $LIBS"
10971  cat > conftest.$ac_ext <<EOF
10972 -#line 42102 "configure"
10973 +#line 43484 "configure"
10974  #include "confdefs.h"
10975  /* Override any gcc2 internal prototype to avoid an error.  */
10976  /* We use char because int might match the return type of a gcc2
10977 @@ -42109,7 +43491,7 @@ int main() {
10978  gdImageEllipse()
10979  ; return 0; }
10980  EOF
10981 -if { (eval echo configure:42113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10982 +if { (eval echo configure:43495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10983    rm -rf conftest*
10984    eval "ac_cv_lib_$ac_lib_var=yes"
10985  else
10986 @@ -42238,7 +43620,7 @@ fi
10987    done
10988
10989    echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6
10990 -echo "configure:42242: checking for gdImageSetBrush in -lgd" >&5
10991 +echo "configure:43624: checking for gdImageSetBrush in -lgd" >&5
10992  ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'`
10993  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10994    echo $ac_n "(cached) $ac_c" 1>&6
10995 @@ -42246,7 +43628,7 @@ else
10996    ac_save_LIBS="$LIBS"
10997  LIBS="-lgd  $LIBS"
10998  cat > conftest.$ac_ext <<EOF
10999 -#line 42250 "configure"
11000 +#line 43632 "configure"
11001  #include "confdefs.h"
11002  /* Override any gcc2 internal prototype to avoid an error.  */
11003  /* We use char because int might match the return type of a gcc2
11004 @@ -42257,7 +43639,7 @@ int main() {
11005  gdImageSetBrush()
11006  ; return 0; }
11007  EOF
11008 -if { (eval echo configure:42261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11009 +if { (eval echo configure:43643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11010    rm -rf conftest*
11011    eval "ac_cv_lib_$ac_lib_var=yes"
11012  else
11013 @@ -42386,7 +43768,7 @@ fi
11014    done
11015
11016    echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6
11017 -echo "configure:42390: checking for gdImageStringTTF in -lgd" >&5
11018 +echo "configure:43772: checking for gdImageStringTTF in -lgd" >&5
11019  ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'`
11020  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11021    echo $ac_n "(cached) $ac_c" 1>&6
11022 @@ -42394,7 +43776,7 @@ else
11023    ac_save_LIBS="$LIBS"
11024  LIBS="-lgd  $LIBS"
11025  cat > conftest.$ac_ext <<EOF
11026 -#line 42398 "configure"
11027 +#line 43780 "configure"
11028  #include "confdefs.h"
11029  /* Override any gcc2 internal prototype to avoid an error.  */
11030  /* We use char because int might match the return type of a gcc2
11031 @@ -42405,7 +43787,7 @@ int main() {
11032  gdImageStringTTF()
11033  ; return 0; }
11034  EOF
11035 -if { (eval echo configure:42409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11036 +if { (eval echo configure:43791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11037    rm -rf conftest*
11038    eval "ac_cv_lib_$ac_lib_var=yes"
11039  else
11040 @@ -42534,7 +43916,7 @@ fi
11041    done
11042
11043    echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6
11044 -echo "configure:42538: checking for gdImageStringFT in -lgd" >&5
11045 +echo "configure:43920: checking for gdImageStringFT in -lgd" >&5
11046  ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'`
11047  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11048    echo $ac_n "(cached) $ac_c" 1>&6
11049 @@ -42542,7 +43924,7 @@ else
11050    ac_save_LIBS="$LIBS"
11051  LIBS="-lgd  $LIBS"
11052  cat > conftest.$ac_ext <<EOF
11053 -#line 42546 "configure"
11054 +#line 43928 "configure"
11055  #include "confdefs.h"
11056  /* Override any gcc2 internal prototype to avoid an error.  */
11057  /* We use char because int might match the return type of a gcc2
11058 @@ -42553,7 +43935,7 @@ int main() {
11059  gdImageStringFT()
11060  ; return 0; }
11061  EOF
11062 -if { (eval echo configure:42557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11063 +if { (eval echo configure:43939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11064    rm -rf conftest*
11065    eval "ac_cv_lib_$ac_lib_var=yes"
11066  else
11067 @@ -42682,7 +44064,7 @@ fi
11068    done
11069
11070    echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6
11071 -echo "configure:42686: checking for gdImageStringFTEx in -lgd" >&5
11072 +echo "configure:44068: checking for gdImageStringFTEx in -lgd" >&5
11073  ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'`
11074  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11075    echo $ac_n "(cached) $ac_c" 1>&6
11076 @@ -42690,7 +44072,7 @@ else
11077    ac_save_LIBS="$LIBS"
11078  LIBS="-lgd  $LIBS"
11079  cat > conftest.$ac_ext <<EOF
11080 -#line 42694 "configure"
11081 +#line 44076 "configure"
11082  #include "confdefs.h"
11083  /* Override any gcc2 internal prototype to avoid an error.  */
11084  /* We use char because int might match the return type of a gcc2
11085 @@ -42701,7 +44083,7 @@ int main() {
11086  gdImageStringFTEx()
11087  ; return 0; }
11088  EOF
11089 -if { (eval echo configure:42705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11090 +if { (eval echo configure:44087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11091    rm -rf conftest*
11092    eval "ac_cv_lib_$ac_lib_var=yes"
11093  else
11094 @@ -42830,7 +44212,7 @@ fi
11095    done
11096
11097    echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6
11098 -echo "configure:42834: checking for gdImageColorClosestHWB in -lgd" >&5
11099 +echo "configure:44216: checking for gdImageColorClosestHWB in -lgd" >&5
11100  ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'`
11101  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11102    echo $ac_n "(cached) $ac_c" 1>&6
11103 @@ -42838,7 +44220,7 @@ else
11104    ac_save_LIBS="$LIBS"
11105  LIBS="-lgd  $LIBS"
11106  cat > conftest.$ac_ext <<EOF
11107 -#line 42842 "configure"
11108 +#line 44224 "configure"
11109  #include "confdefs.h"
11110  /* Override any gcc2 internal prototype to avoid an error.  */
11111  /* We use char because int might match the return type of a gcc2
11112 @@ -42849,7 +44231,7 @@ int main() {
11113  gdImageColorClosestHWB()
11114  ; return 0; }
11115  EOF
11116 -if { (eval echo configure:42853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11117 +if { (eval echo configure:44235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11118    rm -rf conftest*
11119    eval "ac_cv_lib_$ac_lib_var=yes"
11120  else
11121 @@ -42978,7 +44360,7 @@ fi
11122    done
11123
11124    echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
11125 -echo "configure:42982: checking for gdImageColorResolve in -lgd" >&5
11126 +echo "configure:44364: checking for gdImageColorResolve in -lgd" >&5
11127  ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
11128  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11129    echo $ac_n "(cached) $ac_c" 1>&6
11130 @@ -42986,7 +44368,7 @@ else
11131    ac_save_LIBS="$LIBS"
11132  LIBS="-lgd  $LIBS"
11133  cat > conftest.$ac_ext <<EOF
11134 -#line 42990 "configure"
11135 +#line 44372 "configure"
11136  #include "confdefs.h"
11137  /* Override any gcc2 internal prototype to avoid an error.  */
11138  /* We use char because int might match the return type of a gcc2
11139 @@ -42997,7 +44379,7 @@ int main() {
11140  gdImageColorResolve()
11141  ; return 0; }
11142  EOF
11143 -if { (eval echo configure:43001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11144 +if { (eval echo configure:44383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11145    rm -rf conftest*
11146    eval "ac_cv_lib_$ac_lib_var=yes"
11147  else
11148 @@ -43126,7 +44508,7 @@ fi
11149    done
11150
11151    echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6
11152 -echo "configure:43130: checking for gdImageGifCtx in -lgd" >&5
11153 +echo "configure:44512: checking for gdImageGifCtx in -lgd" >&5
11154  ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'`
11155  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11156    echo $ac_n "(cached) $ac_c" 1>&6
11157 @@ -43134,7 +44516,7 @@ else
11158    ac_save_LIBS="$LIBS"
11159  LIBS="-lgd  $LIBS"
11160  cat > conftest.$ac_ext <<EOF
11161 -#line 43138 "configure"
11162 +#line 44520 "configure"
11163  #include "confdefs.h"
11164  /* Override any gcc2 internal prototype to avoid an error.  */
11165  /* We use char because int might match the return type of a gcc2
11166 @@ -43145,7 +44527,7 @@ int main() {
11167  gdImageGifCtx()
11168  ; return 0; }
11169  EOF
11170 -if { (eval echo configure:43149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11171 +if { (eval echo configure:44531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11172    rm -rf conftest*
11173    eval "ac_cv_lib_$ac_lib_var=yes"
11174  else
11175 @@ -43274,7 +44656,7 @@ fi
11176    done
11177
11178    echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
11179 -echo "configure:43278: checking for gdCacheCreate in -lgd" >&5
11180 +echo "configure:44660: checking for gdCacheCreate in -lgd" >&5
11181  ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
11182  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11183    echo $ac_n "(cached) $ac_c" 1>&6
11184 @@ -43282,7 +44664,7 @@ else
11185    ac_save_LIBS="$LIBS"
11186  LIBS="-lgd  $LIBS"
11187  cat > conftest.$ac_ext <<EOF
11188 -#line 43286 "configure"
11189 +#line 44668 "configure"
11190  #include "confdefs.h"
11191  /* Override any gcc2 internal prototype to avoid an error.  */
11192  /* We use char because int might match the return type of a gcc2
11193 @@ -43293,7 +44675,7 @@ int main() {
11194  gdCacheCreate()
11195  ; return 0; }
11196  EOF
11197 -if { (eval echo configure:43297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11198 +if { (eval echo configure:44679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11199    rm -rf conftest*
11200    eval "ac_cv_lib_$ac_lib_var=yes"
11201  else
11202 @@ -43422,7 +44804,7 @@ fi
11203    done
11204
11205    echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6
11206 -echo "configure:43426: checking for gdFontCacheShutdown in -lgd" >&5
11207 +echo "configure:44808: checking for gdFontCacheShutdown in -lgd" >&5
11208  ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'`
11209  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11210    echo $ac_n "(cached) $ac_c" 1>&6
11211 @@ -43430,7 +44812,7 @@ else
11212    ac_save_LIBS="$LIBS"
11213  LIBS="-lgd  $LIBS"
11214  cat > conftest.$ac_ext <<EOF
11215 -#line 43434 "configure"
11216 +#line 44816 "configure"
11217  #include "confdefs.h"
11218  /* Override any gcc2 internal prototype to avoid an error.  */
11219  /* We use char because int might match the return type of a gcc2
11220 @@ -43441,7 +44823,7 @@ int main() {
11221  gdFontCacheShutdown()
11222  ; return 0; }
11223  EOF
11224 -if { (eval echo configure:43445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11225 +if { (eval echo configure:44827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11226    rm -rf conftest*
11227    eval "ac_cv_lib_$ac_lib_var=yes"
11228  else
11229 @@ -43570,7 +44952,7 @@ fi
11230    done
11231
11232    echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6
11233 -echo "configure:43574: checking for gdFreeFontCache in -lgd" >&5
11234 +echo "configure:44956: checking for gdFreeFontCache in -lgd" >&5
11235  ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'`
11236  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11237    echo $ac_n "(cached) $ac_c" 1>&6
11238 @@ -43578,7 +44960,7 @@ else
11239    ac_save_LIBS="$LIBS"
11240  LIBS="-lgd  $LIBS"
11241  cat > conftest.$ac_ext <<EOF
11242 -#line 43582 "configure"
11243 +#line 44964 "configure"
11244  #include "confdefs.h"
11245  /* Override any gcc2 internal prototype to avoid an error.  */
11246  /* We use char because int might match the return type of a gcc2
11247 @@ -43589,7 +44971,7 @@ int main() {
11248  gdFreeFontCache()
11249  ; return 0; }
11250  EOF
11251 -if { (eval echo configure:43593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11252 +if { (eval echo configure:44975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11253    rm -rf conftest*
11254    eval "ac_cv_lib_$ac_lib_var=yes"
11255  else
11256 @@ -43718,7 +45100,7 @@ fi
11257    done
11258
11259    echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6
11260 -echo "configure:43722: checking for gdFontCacheMutexSetup in -lgd" >&5
11261 +echo "configure:45104: checking for gdFontCacheMutexSetup in -lgd" >&5
11262  ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'`
11263  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11264    echo $ac_n "(cached) $ac_c" 1>&6
11265 @@ -43726,7 +45108,7 @@ else
11266    ac_save_LIBS="$LIBS"
11267  LIBS="-lgd  $LIBS"
11268  cat > conftest.$ac_ext <<EOF
11269 -#line 43730 "configure"
11270 +#line 45112 "configure"
11271  #include "confdefs.h"
11272  /* Override any gcc2 internal prototype to avoid an error.  */
11273  /* We use char because int might match the return type of a gcc2
11274 @@ -43737,7 +45119,7 @@ int main() {
11275  gdFontCacheMutexSetup()
11276  ; return 0; }
11277  EOF
11278 -if { (eval echo configure:43741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11279 +if { (eval echo configure:45123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11280    rm -rf conftest*
11281    eval "ac_cv_lib_$ac_lib_var=yes"
11282  else
11283 @@ -43866,7 +45248,7 @@ fi
11284    done
11285
11286    echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6
11287 -echo "configure:43870: checking for gdNewDynamicCtxEx in -lgd" >&5
11288 +echo "configure:45252: checking for gdNewDynamicCtxEx in -lgd" >&5
11289  ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'`
11290  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11291    echo $ac_n "(cached) $ac_c" 1>&6
11292 @@ -43874,7 +45256,7 @@ else
11293    ac_save_LIBS="$LIBS"
11294  LIBS="-lgd  $LIBS"
11295  cat > conftest.$ac_ext <<EOF
11296 -#line 43878 "configure"
11297 +#line 45260 "configure"
11298  #include "confdefs.h"
11299  /* Override any gcc2 internal prototype to avoid an error.  */
11300  /* We use char because int might match the return type of a gcc2
11301 @@ -43885,7 +45267,7 @@ int main() {
11302  gdNewDynamicCtxEx()
11303  ; return 0; }
11304  EOF
11305 -if { (eval echo configure:43889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11306 +if { (eval echo configure:45271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11307    rm -rf conftest*
11308    eval "ac_cv_lib_$ac_lib_var=yes"
11309  else
11310 @@ -43940,7 +45322,7 @@ fi
11311          old_CPPFLAGS=$CPPFLAGS
11312    CPPFLAGS=-I$GD_INCLUDE
11313    cat > conftest.$ac_ext <<EOF
11314 -#line 43944 "configure"
11315 +#line 45326 "configure"
11316  #include "confdefs.h"
11317
11318  #include <gd.h>
11319 @@ -43954,7 +45336,7 @@ ctx->gd_free = 1;
11320
11321  ; return 0; }
11322  EOF
11323 -if { (eval echo configure:43958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
11324 +if { (eval echo configure:45340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
11325    rm -rf conftest*
11326
11327      cat >> confdefs.h <<\EOF
11328 @@ -44285,7 +45667,7 @@ EOF
11329
11330  else
11331    cat > conftest.$ac_ext <<EOF
11332 -#line 44289 "configure"
11333 +#line 45671 "configure"
11334  #include "confdefs.h"
11335
11336      char foobar () {}
11337 @@ -44296,7 +45678,7 @@ else
11338      }
11339
11340  EOF
11341 -if { (eval echo configure:44300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11342 +if { (eval echo configure:45682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11343  then
11344
11345      LIBS=$old_LIBS
11346 @@ -44447,7 +45829,7 @@ fi
11347    done
11348
11349    echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
11350 -echo "configure:44451: checking for gdImageCreate in -lgd" >&5
11351 +echo "configure:45833: checking for gdImageCreate in -lgd" >&5
11352  ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
11353  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11354    echo $ac_n "(cached) $ac_c" 1>&6
11355 @@ -44455,7 +45837,7 @@ else
11356    ac_save_LIBS="$LIBS"
11357  LIBS="-lgd  $LIBS"
11358  cat > conftest.$ac_ext <<EOF
11359 -#line 44459 "configure"
11360 +#line 45841 "configure"
11361  #include "confdefs.h"
11362  /* Override any gcc2 internal prototype to avoid an error.  */
11363  /* We use char because int might match the return type of a gcc2
11364 @@ -44466,7 +45848,7 @@ int main() {
11365  gdImageCreate()
11366  ; return 0; }
11367  EOF
11368 -if { (eval echo configure:44470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11369 +if { (eval echo configure:45852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11370    rm -rf conftest*
11371    eval "ac_cv_lib_$ac_lib_var=yes"
11372  else
11373 @@ -44531,7 +45913,7 @@ fi
11374  php_with_gettext=no
11375
11376  echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6
11377 -echo "configure:44535: checking for GNU gettext support" >&5
11378 +echo "configure:45917: checking for GNU gettext support" >&5
11379  # Check whether --with-gettext or --without-gettext was given.
11380  if test "${with_gettext+set}" = set; then
11381    withval="$with_gettext"
11382 @@ -44586,7 +45968,7 @@ if test "$PHP_GETTEXT" != "no"; then
11383    O_LDFLAGS=$LDFLAGS
11384    LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
11385    echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
11386 -echo "configure:44590: checking for bindtextdomain in -lintl" >&5
11387 +echo "configure:45972: checking for bindtextdomain in -lintl" >&5
11388  ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
11389  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11390    echo $ac_n "(cached) $ac_c" 1>&6
11391 @@ -44594,7 +45976,7 @@ else
11392    ac_save_LIBS="$LIBS"
11393  LIBS="-lintl  $LIBS"
11394  cat > conftest.$ac_ext <<EOF
11395 -#line 44598 "configure"
11396 +#line 45980 "configure"
11397  #include "confdefs.h"
11398  /* Override any gcc2 internal prototype to avoid an error.  */
11399  /* We use char because int might match the return type of a gcc2
11400 @@ -44605,7 +45987,7 @@ int main() {
11401  bindtextdomain()
11402  ; return 0; }
11403  EOF
11404 -if { (eval echo configure:44609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11405 +if { (eval echo configure:45991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11406    rm -rf conftest*
11407    eval "ac_cv_lib_$ac_lib_var=yes"
11408  else
11409 @@ -44627,7 +46009,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
11410  else
11411    echo "$ac_t""no" 1>&6
11412  echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
11413 -echo "configure:44631: checking for bindtextdomain in -lc" >&5
11414 +echo "configure:46013: checking for bindtextdomain in -lc" >&5
11415  ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'`
11416  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11417    echo $ac_n "(cached) $ac_c" 1>&6
11418 @@ -44635,7 +46017,7 @@ else
11419    ac_save_LIBS="$LIBS"
11420  LIBS="-lc  $LIBS"
11421  cat > conftest.$ac_ext <<EOF
11422 -#line 44639 "configure"
11423 +#line 46021 "configure"
11424  #include "confdefs.h"
11425  /* Override any gcc2 internal prototype to avoid an error.  */
11426  /* We use char because int might match the return type of a gcc2
11427 @@ -44646,7 +46028,7 @@ int main() {
11428  bindtextdomain()
11429  ; return 0; }
11430  EOF
11431 -if { (eval echo configure:44650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11432 +if { (eval echo configure:46032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11433    rm -rf conftest*
11434    eval "ac_cv_lib_$ac_lib_var=yes"
11435  else
11436 @@ -45110,7 +46492,7 @@ EOF
11437
11438
11439    echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
11440 -echo "configure:45114: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11441 +echo "configure:46496: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11442  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'`
11443  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11444    echo $ac_n "(cached) $ac_c" 1>&6
11445 @@ -45118,7 +46500,7 @@ else
11446    ac_save_LIBS="$LIBS"
11447  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
11448  cat > conftest.$ac_ext <<EOF
11449 -#line 45122 "configure"
11450 +#line 46504 "configure"
11451  #include "confdefs.h"
11452  /* Override any gcc2 internal prototype to avoid an error.  */
11453  /* We use char because int might match the return type of a gcc2
11454 @@ -45129,7 +46511,7 @@ int main() {
11455  ngettext()
11456  ; return 0; }
11457  EOF
11458 -if { (eval echo configure:45133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11459 +if { (eval echo configure:46515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11460    rm -rf conftest*
11461    eval "ac_cv_lib_$ac_lib_var=yes"
11462  else
11463 @@ -45153,7 +46535,7 @@ else
11464  fi
11465
11466    echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
11467 -echo "configure:45157: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11468 +echo "configure:46539: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11469  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'`
11470  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11471    echo $ac_n "(cached) $ac_c" 1>&6
11472 @@ -45161,7 +46543,7 @@ else
11473    ac_save_LIBS="$LIBS"
11474  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
11475  cat > conftest.$ac_ext <<EOF
11476 -#line 45165 "configure"
11477 +#line 46547 "configure"
11478  #include "confdefs.h"
11479  /* Override any gcc2 internal prototype to avoid an error.  */
11480  /* We use char because int might match the return type of a gcc2
11481 @@ -45172,7 +46554,7 @@ int main() {
11482  dngettext()
11483  ; return 0; }
11484  EOF
11485 -if { (eval echo configure:45176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11486 +if { (eval echo configure:46558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11487    rm -rf conftest*
11488    eval "ac_cv_lib_$ac_lib_var=yes"
11489  else
11490 @@ -45196,7 +46578,7 @@ else
11491  fi
11492
11493    echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
11494 -echo "configure:45200: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11495 +echo "configure:46582: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11496  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'`
11497  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11498    echo $ac_n "(cached) $ac_c" 1>&6
11499 @@ -45204,7 +46586,7 @@ else
11500    ac_save_LIBS="$LIBS"
11501  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
11502  cat > conftest.$ac_ext <<EOF
11503 -#line 45208 "configure"
11504 +#line 46590 "configure"
11505  #include "confdefs.h"
11506  /* Override any gcc2 internal prototype to avoid an error.  */
11507  /* We use char because int might match the return type of a gcc2
11508 @@ -45215,7 +46597,7 @@ int main() {
11509  dcngettext()
11510  ; return 0; }
11511  EOF
11512 -if { (eval echo configure:45219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11513 +if { (eval echo configure:46601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11514    rm -rf conftest*
11515    eval "ac_cv_lib_$ac_lib_var=yes"
11516  else
11517 @@ -45239,7 +46621,7 @@ else
11518  fi
11519
11520    echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
11521 -echo "configure:45243: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
11522 +echo "configure:46625: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
11523  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'`
11524  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11525    echo $ac_n "(cached) $ac_c" 1>&6
11526 @@ -45247,7 +46629,7 @@ else
11527    ac_save_LIBS="$LIBS"
11528  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
11529  cat > conftest.$ac_ext <<EOF
11530 -#line 45251 "configure"
11531 +#line 46633 "configure"
11532  #include "confdefs.h"
11533  /* Override any gcc2 internal prototype to avoid an error.  */
11534  /* We use char because int might match the return type of a gcc2
11535 @@ -45258,7 +46640,7 @@ int main() {
11536  bind_textdomain_codeset()
11537  ; return 0; }
11538  EOF
11539 -if { (eval echo configure:45262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11540 +if { (eval echo configure:46644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11541    rm -rf conftest*
11542    eval "ac_cv_lib_$ac_lib_var=yes"
11543  else
11544 @@ -45289,7 +46671,7 @@ fi
11545  php_with_gmp=no
11546
11547  echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6
11548 -echo "configure:45293: checking for GNU MP support" >&5
11549 +echo "configure:46675: checking for GNU MP support" >&5
11550  # Check whether --with-gmp or --without-gmp was given.
11551  if test "${with_gmp+set}" = set; then
11552    withval="$with_gmp"
11553 @@ -45437,7 +46819,7 @@ if test "$PHP_GMP" != "no"; then
11554    done
11555
11556    echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
11557 -echo "configure:45441: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
11558 +echo "configure:46823: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
11559  ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
11560  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11561    echo $ac_n "(cached) $ac_c" 1>&6
11562 @@ -45445,7 +46827,7 @@ else
11563    ac_save_LIBS="$LIBS"
11564  LIBS="-lgmp  $LIBS"
11565  cat > conftest.$ac_ext <<EOF
11566 -#line 45449 "configure"
11567 +#line 46831 "configure"
11568  #include "confdefs.h"
11569  /* Override any gcc2 internal prototype to avoid an error.  */
11570  /* We use char because int might match the return type of a gcc2
11571 @@ -45456,7 +46838,7 @@ int main() {
11572  __gmp_randinit_lc_2exp_size()
11573  ; return 0; }
11574  EOF
11575 -if { (eval echo configure:45460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11576 +if { (eval echo configure:46842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11577    rm -rf conftest*
11578    eval "ac_cv_lib_$ac_lib_var=yes"
11579  else
11580 @@ -45581,7 +46963,7 @@ else
11581    done
11582
11583    echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
11584 -echo "configure:45585: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
11585 +echo "configure:46967: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
11586  ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
11587  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11588    echo $ac_n "(cached) $ac_c" 1>&6
11589 @@ -45589,7 +46971,7 @@ else
11590    ac_save_LIBS="$LIBS"
11591  LIBS="-lgmp  $LIBS"
11592  cat > conftest.$ac_ext <<EOF
11593 -#line 45593 "configure"
11594 +#line 46975 "configure"
11595  #include "confdefs.h"
11596  /* Override any gcc2 internal prototype to avoid an error.  */
11597  /* We use char because int might match the return type of a gcc2
11598 @@ -45600,7 +46982,7 @@ int main() {
11599  gmp_randinit_lc_2exp_size()
11600  ; return 0; }
11601  EOF
11602 -if { (eval echo configure:45604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11603 +if { (eval echo configure:46986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11604    rm -rf conftest*
11605    eval "ac_cv_lib_$ac_lib_var=yes"
11606  else
11607 @@ -46072,7 +47454,7 @@ fi
11608  php_with_mhash=no
11609
11610  echo $ac_n "checking for mhash support""... $ac_c" 1>&6
11611 -echo "configure:46076: checking for mhash support" >&5
11612 +echo "configure:47458: checking for mhash support" >&5
11613  # Check whether --with-mhash or --without-mhash was given.
11614  if test "${with_mhash+set}" = set; then
11615    withval="$with_mhash"
11616 @@ -46116,7 +47498,7 @@ echo "$ac_t""$ext_output" 1>&6
11617  php_enable_hash=yes
11618
11619  echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6
11620 -echo "configure:46120: checking whether to enable hash support" >&5
11621 +echo "configure:47502: checking whether to enable hash support" >&5
11622  # Check whether --enable-hash or --disable-hash was given.
11623  if test "${enable_hash+set}" = set; then
11624    enableval="$enable_hash"
11625 @@ -46174,7 +47556,7 @@ EOF
11626
11627
11628    echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
11629 -echo "configure:46178: checking whether byte ordering is bigendian" >&5
11630 +echo "configure:47560: checking whether byte ordering is bigendian" >&5
11631  if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
11632    echo $ac_n "(cached) $ac_c" 1>&6
11633  else
11634 @@ -46184,7 +47566,7 @@ else
11635    ac_cv_c_bigendian_php=unknown
11636  else
11637    cat > conftest.$ac_ext <<EOF
11638 -#line 46188 "configure"
11639 +#line 47570 "configure"
11640  #include "confdefs.h"
11641
11642  int main(void)
11643 @@ -46200,7 +47582,7 @@ int main(void)
11644  }
11645
11646  EOF
11647 -if { (eval echo configure:46204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11648 +if { (eval echo configure:47586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11649  then
11650    ac_cv_c_bigendian_php=yes
11651  else
11652 @@ -46225,7 +47607,7 @@ EOF
11653
11654
11655    echo $ac_n "checking size of short""... $ac_c" 1>&6
11656 -echo "configure:46229: checking size of short" >&5
11657 +echo "configure:47611: checking size of short" >&5
11658  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
11659    echo $ac_n "(cached) $ac_c" 1>&6
11660  else
11661 @@ -46233,18 +47615,19 @@ else
11662    ac_cv_sizeof_short=2
11663  else
11664    cat > conftest.$ac_ext <<EOF
11665 -#line 46237 "configure"
11666 +#line 47619 "configure"
11667  #include "confdefs.h"
11668  #include <stdio.h>
11669 -int main()
11670 +#include <sys/types.h>
11671 +main()
11672  {
11673    FILE *f=fopen("conftestval", "w");
11674 -  if (!f) return(1);
11675 +  if (!f) exit(1);
11676    fprintf(f, "%d\n", sizeof(short));
11677 -  return(0);
11678 +  exit(0);
11679  }
11680  EOF
11681 -if { (eval echo configure:46248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11682 +if { (eval echo configure:47631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11683  then
11684    ac_cv_sizeof_short=`cat conftestval`
11685  else
11686 @@ -46264,7 +47647,7 @@ EOF
11687
11688
11689    echo $ac_n "checking size of int""... $ac_c" 1>&6
11690 -echo "configure:46268: checking size of int" >&5
11691 +echo "configure:47651: checking size of int" >&5
11692  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
11693    echo $ac_n "(cached) $ac_c" 1>&6
11694  else
11695 @@ -46272,18 +47655,19 @@ else
11696    ac_cv_sizeof_int=4
11697  else
11698    cat > conftest.$ac_ext <<EOF
11699 -#line 46276 "configure"
11700 +#line 47659 "configure"
11701  #include "confdefs.h"
11702  #include <stdio.h>
11703 -int main()
11704 +#include <sys/types.h>
11705 +main()
11706  {
11707    FILE *f=fopen("conftestval", "w");
11708 -  if (!f) return(1);
11709 +  if (!f) exit(1);
11710    fprintf(f, "%d\n", sizeof(int));
11711 -  return(0);
11712 +  exit(0);
11713  }
11714  EOF
11715 -if { (eval echo configure:46287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11716 +if { (eval echo configure:47671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11717  then
11718    ac_cv_sizeof_int=`cat conftestval`
11719  else
11720 @@ -46303,7 +47687,7 @@ EOF
11721
11722
11723    echo $ac_n "checking size of long""... $ac_c" 1>&6
11724 -echo "configure:46307: checking size of long" >&5
11725 +echo "configure:47691: checking size of long" >&5
11726  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
11727    echo $ac_n "(cached) $ac_c" 1>&6
11728  else
11729 @@ -46311,18 +47695,19 @@ else
11730    ac_cv_sizeof_long=4
11731  else
11732    cat > conftest.$ac_ext <<EOF
11733 -#line 46315 "configure"
11734 +#line 47699 "configure"
11735  #include "confdefs.h"
11736  #include <stdio.h>
11737 -int main()
11738 +#include <sys/types.h>
11739 +main()
11740  {
11741    FILE *f=fopen("conftestval", "w");
11742 -  if (!f) return(1);
11743 +  if (!f) exit(1);
11744    fprintf(f, "%d\n", sizeof(long));
11745 -  return(0);
11746 +  exit(0);
11747  }
11748  EOF
11749 -if { (eval echo configure:46326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11750 +if { (eval echo configure:47711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11751  then
11752    ac_cv_sizeof_long=`cat conftestval`
11753  else
11754 @@ -46342,7 +47727,7 @@ EOF
11755
11756
11757    echo $ac_n "checking size of long long""... $ac_c" 1>&6
11758 -echo "configure:46346: checking size of long long" >&5
11759 +echo "configure:47731: checking size of long long" >&5
11760  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
11761    echo $ac_n "(cached) $ac_c" 1>&6
11762  else
11763 @@ -46350,18 +47735,19 @@ else
11764    ac_cv_sizeof_long_long=8
11765  else
11766    cat > conftest.$ac_ext <<EOF
11767 -#line 46354 "configure"
11768 +#line 47739 "configure"
11769  #include "confdefs.h"
11770  #include <stdio.h>
11771 -int main()
11772 +#include <sys/types.h>
11773 +main()
11774  {
11775    FILE *f=fopen("conftestval", "w");
11776 -  if (!f) return(1);
11777 +  if (!f) exit(1);
11778    fprintf(f, "%d\n", sizeof(long long));
11779 -  return(0);
11780 +  exit(0);
11781  }
11782  EOF
11783 -if { (eval echo configure:46365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11784 +if { (eval echo configure:47751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11785  then
11786    ac_cv_sizeof_long_long=`cat conftestval`
11787  else
11788 @@ -46707,10 +48093,13 @@ fi
11789
11790
11791
11792 +
11793 +
11794 +
11795  php_with_iconv=yes
11796
11797  echo $ac_n "checking for iconv support""... $ac_c" 1>&6
11798 -echo "configure:46714: checking for iconv support" >&5
11799 +echo "configure:48103: checking for iconv support" >&5
11800  # Check whether --with-iconv or --without-iconv was given.
11801  if test "${with_iconv+set}" = set; then
11802    withval="$with_iconv"
11803 @@ -46771,12 +48160,12 @@ if test "$PHP_ICONV" != "no"; then
11804
11805          if test "$PHP_ICONV" = "yes"; then
11806      echo $ac_n "checking for iconv""... $ac_c" 1>&6
11807 -echo "configure:46775: checking for iconv" >&5
11808 +echo "configure:48164: checking for iconv" >&5
11809  if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
11810    echo $ac_n "(cached) $ac_c" 1>&6
11811  else
11812    cat > conftest.$ac_ext <<EOF
11813 -#line 46780 "configure"
11814 +#line 48169 "configure"
11815  #include "confdefs.h"
11816  /* System header to define __stub macros and hopefully few prototypes,
11817      which can conflict with char iconv(); below.  */
11818 @@ -46799,7 +48188,7 @@ iconv();
11819
11820  ; return 0; }
11821  EOF
11822 -if { (eval echo configure:46803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11823 +if { (eval echo configure:48192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11824    rm -rf conftest*
11825    eval "ac_cv_func_iconv=yes"
11826  else
11827 @@ -46820,12 +48209,12 @@ else
11828    echo "$ac_t""no" 1>&6
11829
11830        echo $ac_n "checking for libiconv""... $ac_c" 1>&6
11831 -echo "configure:46824: checking for libiconv" >&5
11832 +echo "configure:48213: checking for libiconv" >&5
11833  if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
11834    echo $ac_n "(cached) $ac_c" 1>&6
11835  else
11836    cat > conftest.$ac_ext <<EOF
11837 -#line 46829 "configure"
11838 +#line 48218 "configure"
11839  #include "confdefs.h"
11840  /* System header to define __stub macros and hopefully few prototypes,
11841      which can conflict with char libiconv(); below.  */
11842 @@ -46848,7 +48237,7 @@ libiconv();
11843
11844  ; return 0; }
11845  EOF
11846 -if { (eval echo configure:46852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11847 +if { (eval echo configure:48241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11848    rm -rf conftest*
11849    eval "ac_cv_func_libiconv=yes"
11850  else
11851 @@ -47004,7 +48393,7 @@ EOF
11852    done
11853
11854    echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
11855 -echo "configure:47008: checking for libiconv in -l$iconv_lib_name" >&5
11856 +echo "configure:48397: checking for libiconv in -l$iconv_lib_name" >&5
11857  ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
11858  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11859    echo $ac_n "(cached) $ac_c" 1>&6
11860 @@ -47012,7 +48401,7 @@ else
11861    ac_save_LIBS="$LIBS"
11862  LIBS="-l$iconv_lib_name  $LIBS"
11863  cat > conftest.$ac_ext <<EOF
11864 -#line 47016 "configure"
11865 +#line 48405 "configure"
11866  #include "confdefs.h"
11867  /* Override any gcc2 internal prototype to avoid an error.  */
11868  /* We use char because int might match the return type of a gcc2
11869 @@ -47023,7 +48412,7 @@ int main() {
11870  libiconv()
11871  ; return 0; }
11872  EOF
11873 -if { (eval echo configure:47027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11874 +if { (eval echo configure:48416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11875    rm -rf conftest*
11876    eval "ac_cv_lib_$ac_lib_var=yes"
11877  else
11878 @@ -47164,7 +48553,7 @@ else
11879    done
11880
11881    echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
11882 -echo "configure:47168: checking for iconv in -l$iconv_lib_name" >&5
11883 +echo "configure:48557: checking for iconv in -l$iconv_lib_name" >&5
11884  ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
11885  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11886    echo $ac_n "(cached) $ac_c" 1>&6
11887 @@ -47172,7 +48561,7 @@ else
11888    ac_save_LIBS="$LIBS"
11889  LIBS="-l$iconv_lib_name  $LIBS"
11890  cat > conftest.$ac_ext <<EOF
11891 -#line 47176 "configure"
11892 +#line 48565 "configure"
11893  #include "confdefs.h"
11894  /* Override any gcc2 internal prototype to avoid an error.  */
11895  /* We use char because int might match the return type of a gcc2
11896 @@ -47183,7 +48572,7 @@ int main() {
11897  iconv()
11898  ; return 0; }
11899  EOF
11900 -if { (eval echo configure:47187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11901 +if { (eval echo configure:48576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11902    rm -rf conftest*
11903    eval "ac_cv_lib_$ac_lib_var=yes"
11904  else
11905 @@ -47394,16 +48783,16 @@ else
11906      fi
11907
11908      echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6
11909 -echo "configure:47398: checking if iconv is glibc's" >&5
11910 +echo "configure:48787: checking if iconv is glibc's" >&5
11911      cat > conftest.$ac_ext <<EOF
11912 -#line 47400 "configure"
11913 +#line 48789 "configure"
11914  #include "confdefs.h"
11915  #include <gnu/libc-version.h>
11916  int main() {
11917  gnu_get_libc_version();
11918  ; return 0; }
11919  EOF
11920 -if { (eval echo configure:47407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11921 +if { (eval echo configure:48796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11922    rm -rf conftest*
11923
11924        echo "$ac_t""yes" 1>&6
11925 @@ -47421,7 +48810,7 @@ rm -f conftest*
11926
11927      if test -z "$iconv_impl_name"; then
11928        echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6
11929 -echo "configure:47425: checking if using GNU libiconv" >&5
11930 +echo "configure:48814: checking if using GNU libiconv" >&5
11931        php_iconv_old_ld="$LDFLAGS"
11932        LDFLAGS="-liconv $LDFLAGS"
11933        if test "$cross_compiling" = yes; then
11934 @@ -47431,7 +48820,7 @@ echo "configure:47425: checking if using
11935
11936  else
11937    cat > conftest.$ac_ext <<EOF
11938 -#line 47435 "configure"
11939 +#line 48824 "configure"
11940  #include "confdefs.h"
11941
11942  #include <$PHP_ICONV_H_PATH>
11943 @@ -47441,7 +48830,7 @@ int main() {
11944  }
11945
11946  EOF
11947 -if { (eval echo configure:47445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11948 +if { (eval echo configure:48834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11949  then
11950
11951          echo "$ac_t""yes" 1>&6
11952 @@ -47463,16 +48852,16 @@ fi
11953
11954      if test -z "$iconv_impl_name"; then
11955        echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6
11956 -echo "configure:47467: checking if iconv is Konstantin Chuguev's" >&5
11957 +echo "configure:48856: checking if iconv is Konstantin Chuguev's" >&5
11958        cat > conftest.$ac_ext <<EOF
11959 -#line 47469 "configure"
11960 +#line 48858 "configure"
11961  #include "confdefs.h"
11962  #include <iconv.h>
11963  int main() {
11964  iconv_ccs_init(NULL, NULL);
11965  ; return 0; }
11966  EOF
11967 -if { (eval echo configure:47476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11968 +if { (eval echo configure:48865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11969    rm -rf conftest*
11970
11971          echo "$ac_t""yes" 1>&6
11972 @@ -47491,18 +48880,18 @@ rm -f conftest*
11973
11974      if test -z "$iconv_impl_name"; then
11975        echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6
11976 -echo "configure:47495: checking if using IBM iconv" >&5
11977 +echo "configure:48884: checking if using IBM iconv" >&5
11978        php_iconv_old_ld="$LDFLAGS"
11979        LDFLAGS="-liconv $LDFLAGS"
11980        cat > conftest.$ac_ext <<EOF
11981 -#line 47499 "configure"
11982 +#line 48888 "configure"
11983  #include "confdefs.h"
11984  #include <iconv.h>
11985  int main() {
11986  cstoccsid("");
11987  ; return 0; }
11988  EOF
11989 -if { (eval echo configure:47506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11990 +if { (eval echo configure:48895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11991    rm -rf conftest*
11992
11993          echo "$ac_t""yes" 1>&6
11994 @@ -47688,7 +49077,7 @@ EOF
11995      esac
11996
11997      echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
11998 -echo "configure:47692: checking if iconv supports errno" >&5
11999 +echo "configure:49081: checking if iconv supports errno" >&5
12000      if test "$cross_compiling" = yes; then
12001
12002        echo "$ac_t""no" 1>&6
12003 @@ -47702,7 +49091,7 @@ EOF
12004
12005  else
12006    cat > conftest.$ac_ext <<EOF
12007 -#line 47706 "configure"
12008 +#line 49095 "configure"
12009  #include "confdefs.h"
12010
12011  #include <$PHP_ICONV_H_PATH>
12012 @@ -47723,7 +49112,7 @@ int main() {
12013  }
12014
12015  EOF
12016 -if { (eval echo configure:47727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12017 +if { (eval echo configure:49116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12018  then
12019
12020        echo "$ac_t""yes" 1>&6
12021 @@ -47755,9 +49144,9 @@ fi
12022
12023
12024      echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6
12025 -echo "configure:47759: checking if your cpp allows macro usage in include lines" >&5
12026 +echo "configure:49148: checking if your cpp allows macro usage in include lines" >&5
12027      cat > conftest.$ac_ext <<EOF
12028 -#line 47761 "configure"
12029 +#line 49150 "configure"
12030  #include "confdefs.h"
12031
12032  #define FOO <$PHP_ICONV_H_PATH>
12033 @@ -47767,7 +49156,7 @@ int main() {
12034
12035  ; return 0; }
12036  EOF
12037 -if { (eval echo configure:47771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12038 +if { (eval echo configure:49160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12039    rm -rf conftest*
12040
12041        echo "$ac_t""yes" 1>&6
12042 @@ -48123,7 +49512,7 @@ fi
12043  php_with_imap=no
12044
12045  echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
12046 -echo "configure:48127: checking for IMAP support" >&5
12047 +echo "configure:49516: checking for IMAP support" >&5
12048  # Check whether --with-imap or --without-imap was given.
12049  if test "${with_imap+set}" = set; then
12050    withval="$with_imap"
12051 @@ -48167,7 +49556,7 @@ echo "$ac_t""$ext_output" 1>&6
12052  php_with_kerberos=no
12053
12054  echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
12055 -echo "configure:48171: checking for IMAP Kerberos support" >&5
12056 +echo "configure:49560: checking for IMAP Kerberos support" >&5
12057  # Check whether --with-kerberos or --without-kerberos was given.
12058  if test "${with_kerberos+set}" = set; then
12059    withval="$with_kerberos"
12060 @@ -48190,7 +49579,7 @@ echo "$ac_t""$ext_output" 1>&6
12061  php_with_imap_ssl=no
12062
12063  echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
12064 -echo "configure:48194: checking for IMAP SSL support" >&5
12065 +echo "configure:49583: checking for IMAP SSL support" >&5
12066  # Check whether --with-imap-ssl or --without-imap-ssl was given.
12067  if test "${with_imap_ssl+set}" = set; then
12068    withval="$with_imap_ssl"
12069 @@ -48594,7 +49983,7 @@ EOF
12070      done
12071
12072          cat > conftest.$ac_ext <<EOF
12073 -#line 48598 "configure"
12074 +#line 49987 "configure"
12075  #include "confdefs.h"
12076  #include <$IMAP_INC_DIR/mail.h>
12077  EOF
12078 @@ -48614,12 +50003,12 @@ rm -f conftest*
12079          old_CFLAGS=$CFLAGS
12080      CFLAGS="-I$IMAP_INC_DIR"
12081      echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6
12082 -echo "configure:48618: checking for utf8_mime2text signature" >&5
12083 +echo "configure:50007: checking for utf8_mime2text signature" >&5
12084  if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then
12085    echo $ac_n "(cached) $ac_c" 1>&6
12086  else
12087    cat > conftest.$ac_ext <<EOF
12088 -#line 48623 "configure"
12089 +#line 50012 "configure"
12090  #include "confdefs.h"
12091
12092  #include <stdio.h>
12093 @@ -48632,7 +50021,7 @@ int main() {
12094
12095  ; return 0; }
12096  EOF
12097 -if { (eval echo configure:48636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12098 +if { (eval echo configure:50025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12099    rm -rf conftest*
12100
12101          ac_cv_utf8_mime2text=old
12102 @@ -48661,12 +50050,12 @@ EOF
12103      old_CFLAGS=$CFLAGS
12104      CFLAGS="-I$IMAP_INC_DIR"
12105      echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6
12106 -echo "configure:48665: checking for U8T_DECOMPOSE" >&5
12107 +echo "configure:50054: checking for U8T_DECOMPOSE" >&5
12108  if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then
12109    echo $ac_n "(cached) $ac_c" 1>&6
12110  else
12111    cat > conftest.$ac_ext <<EOF
12112 -#line 48670 "configure"
12113 +#line 50059 "configure"
12114  #include "confdefs.h"
12115
12116  #include <c-client.h>
12117 @@ -48677,7 +50066,7 @@ int main() {
12118
12119  ; return 0; }
12120  EOF
12121 -if { (eval echo configure:48681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12122 +if { (eval echo configure:50070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12123    rm -rf conftest*
12124
12125           ac_cv_u8t_decompose=yes
12126 @@ -48707,7 +50096,7 @@ echo "$ac_t""$ac_cv_u8t_canonical" 1>&6
12127          old_CPPFLAGS=$CPPFLAGS
12128      CPPFLAGS=-I$IMAP_INC_DIR
12129      cat > conftest.$ac_ext <<EOF
12130 -#line 48711 "configure"
12131 +#line 50100 "configure"
12132  #include "confdefs.h"
12133
12134  #include "imap4r1.h"
12135 @@ -48826,7 +50215,7 @@ rm -f conftest*
12136    done
12137
12138    echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
12139 -echo "configure:48830: checking for pam_start in -lpam" >&5
12140 +echo "configure:50219: checking for pam_start in -lpam" >&5
12141  ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
12142  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12143    echo $ac_n "(cached) $ac_c" 1>&6
12144 @@ -48834,7 +50223,7 @@ else
12145    ac_save_LIBS="$LIBS"
12146  LIBS="-lpam  $LIBS"
12147  cat > conftest.$ac_ext <<EOF
12148 -#line 48838 "configure"
12149 +#line 50227 "configure"
12150  #include "confdefs.h"
12151  /* Override any gcc2 internal prototype to avoid an error.  */
12152  /* We use char because int might match the return type of a gcc2
12153 @@ -48845,7 +50234,7 @@ int main() {
12154  pam_start()
12155  ; return 0; }
12156  EOF
12157 -if { (eval echo configure:48849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12158 +if { (eval echo configure:50238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12159    rm -rf conftest*
12160    eval "ac_cv_lib_$ac_lib_var=yes"
12161  else
12162 @@ -49000,7 +50389,7 @@ fi
12163    done
12164
12165    echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
12166 -echo "configure:49004: checking for crypt in -lcrypt" >&5
12167 +echo "configure:50393: checking for crypt in -lcrypt" >&5
12168  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
12169  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12170    echo $ac_n "(cached) $ac_c" 1>&6
12171 @@ -49008,7 +50397,7 @@ else
12172    ac_save_LIBS="$LIBS"
12173  LIBS="-lcrypt  $LIBS"
12174  cat > conftest.$ac_ext <<EOF
12175 -#line 49012 "configure"
12176 +#line 50401 "configure"
12177  #include "confdefs.h"
12178  /* Override any gcc2 internal prototype to avoid an error.  */
12179  /* We use char because int might match the return type of a gcc2
12180 @@ -49019,7 +50408,7 @@ int main() {
12181  crypt()
12182  ; return 0; }
12183  EOF
12184 -if { (eval echo configure:49023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12185 +if { (eval echo configure:50412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12186    rm -rf conftest*
12187    eval "ac_cv_lib_$ac_lib_var=yes"
12188  else
12189 @@ -49223,7 +50612,7 @@ fi
12190      # Extract the first word of "krb5-config", so it can be a program name with args.
12191  set dummy krb5-config; ac_word=$2
12192  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12193 -echo "configure:49227: checking for $ac_word" >&5
12194 +echo "configure:50616: checking for $ac_word" >&5
12195  if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
12196    echo $ac_n "(cached) $ac_c" 1>&6
12197  else
12198 @@ -49592,7 +50981,7 @@ else
12199
12200    else
12201      cat > conftest.$ac_ext <<EOF
12202 -#line 49596 "configure"
12203 +#line 50985 "configure"
12204  #include "confdefs.h"
12205  #include <$IMAP_INC_DIR/linkage.h>
12206  EOF
12207 @@ -49633,7 +51022,7 @@ rm -f conftest*
12208      # Extract the first word of "pkg-config", so it can be a program name with args.
12209  set dummy pkg-config; ac_word=$2
12210  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12211 -echo "configure:49637: checking for $ac_word" >&5
12212 +echo "configure:51026: checking for $ac_word" >&5
12213  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
12214    echo $ac_n "(cached) $ac_c" 1>&6
12215  else
12216 @@ -49838,9 +51227,9 @@ fi
12217      old_CPPFLAGS=$CPPFLAGS
12218      CPPFLAGS=-I$OPENSSL_INCDIR
12219      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
12220 -echo "configure:49842: checking for OpenSSL version" >&5
12221 +echo "configure:51231: checking for OpenSSL version" >&5
12222      cat > conftest.$ac_ext <<EOF
12223 -#line 49844 "configure"
12224 +#line 51233 "configure"
12225  #include "confdefs.h"
12226
12227  #include <openssl/opensslv.h>
12228 @@ -49995,7 +51384,7 @@ rm -f conftest*
12229    done
12230
12231    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
12232 -echo "configure:49999: checking for CRYPTO_free in -lcrypto" >&5
12233 +echo "configure:51388: checking for CRYPTO_free in -lcrypto" >&5
12234  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
12235  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12236    echo $ac_n "(cached) $ac_c" 1>&6
12237 @@ -50003,7 +51392,7 @@ else
12238    ac_save_LIBS="$LIBS"
12239  LIBS="-lcrypto  $LIBS"
12240  cat > conftest.$ac_ext <<EOF
12241 -#line 50007 "configure"
12242 +#line 51396 "configure"
12243  #include "confdefs.h"
12244  /* Override any gcc2 internal prototype to avoid an error.  */
12245  /* We use char because int might match the return type of a gcc2
12246 @@ -50014,7 +51403,7 @@ int main() {
12247  CRYPTO_free()
12248  ; return 0; }
12249  EOF
12250 -if { (eval echo configure:50018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12251 +if { (eval echo configure:51407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12252    rm -rf conftest*
12253    eval "ac_cv_lib_$ac_lib_var=yes"
12254  else
12255 @@ -50171,7 +51560,7 @@ fi
12256    done
12257
12258    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
12259 -echo "configure:50175: checking for SSL_CTX_set_ssl_version in -lssl" >&5
12260 +echo "configure:51564: checking for SSL_CTX_set_ssl_version in -lssl" >&5
12261  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
12262  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12263    echo $ac_n "(cached) $ac_c" 1>&6
12264 @@ -50179,7 +51568,7 @@ else
12265    ac_save_LIBS="$LIBS"
12266  LIBS="-lssl  $LIBS"
12267  cat > conftest.$ac_ext <<EOF
12268 -#line 50183 "configure"
12269 +#line 51572 "configure"
12270  #include "confdefs.h"
12271  /* Override any gcc2 internal prototype to avoid an error.  */
12272  /* We use char because int might match the return type of a gcc2
12273 @@ -50190,7 +51579,7 @@ int main() {
12274  SSL_CTX_set_ssl_version()
12275  ; return 0; }
12276  EOF
12277 -if { (eval echo configure:50194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12278 +if { (eval echo configure:51583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12279    rm -rf conftest*
12280    eval "ac_cv_lib_$ac_lib_var=yes"
12281  else
12282 @@ -50309,7 +51698,7 @@ else
12283
12284    elif test -f "$IMAP_INC_DIR/linkage.c"; then
12285      cat > conftest.$ac_ext <<EOF
12286 -#line 50313 "configure"
12287 +#line 51702 "configure"
12288  #include "confdefs.h"
12289  #include <$IMAP_INC_DIR/linkage.c>
12290  EOF
12291 @@ -50340,7 +51729,7 @@ rm -f conftest*
12292
12293  else
12294    cat > conftest.$ac_ext <<EOF
12295 -#line 50344 "configure"
12296 +#line 51733 "configure"
12297  #include "confdefs.h"
12298
12299
12300 @@ -50373,7 +51762,7 @@ else
12301      }
12302
12303  EOF
12304 -if { (eval echo configure:50377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12305 +if { (eval echo configure:51766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12306  then
12307
12308      LIBS=$old_LIBS
12309 @@ -50409,7 +51798,7 @@ fi
12310
12311  else
12312    cat > conftest.$ac_ext <<EOF
12313 -#line 50413 "configure"
12314 +#line 51802 "configure"
12315  #include "confdefs.h"
12316
12317
12318 @@ -50442,7 +51831,7 @@ else
12319      }
12320
12321  EOF
12322 -if { (eval echo configure:50446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12323 +if { (eval echo configure:51835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12324  then
12325
12326      LIBS=$old_LIBS
12327 @@ -50469,7 +51858,7 @@ fi
12328
12329
12330      echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6
12331 -echo "configure:50473: checking whether rfc822_output_address_list function present" >&5
12332 +echo "configure:51862: checking whether rfc822_output_address_list function present" >&5
12333
12334    old_LIBS=$LIBS
12335    LIBS="
12336 @@ -50481,7 +51870,7 @@ echo "configure:50473: checking whether
12337
12338  else
12339    cat > conftest.$ac_ext <<EOF
12340 -#line 50485 "configure"
12341 +#line 51874 "configure"
12342  #include "confdefs.h"
12343
12344
12345 @@ -50517,7 +51906,7 @@ else
12346      }
12347
12348  EOF
12349 -if { (eval echo configure:50521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12350 +if { (eval echo configure:51910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12351  then
12352
12353      LIBS=$old_LIBS
12354 @@ -50546,7 +51935,7 @@ fi
12355
12356
12357      echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6
12358 -echo "configure:50550: checking whether build with IMAP works" >&5
12359 +echo "configure:51939: checking whether build with IMAP works" >&5
12360
12361
12362    old_LIBS=$LIBS
12363 @@ -50557,7 +51946,7 @@ echo "configure:50550: checking whether
12364
12365  else
12366    cat > conftest.$ac_ext <<EOF
12367 -#line 50561 "configure"
12368 +#line 51950 "configure"
12369  #include "confdefs.h"
12370
12371
12372 @@ -50590,7 +51979,7 @@ else
12373      }
12374
12375  EOF
12376 -if { (eval echo configure:50594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12377 +if { (eval echo configure:51983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12378  then
12379
12380      LIBS=$old_LIBS
12381 @@ -50622,7 +52011,7 @@ fi
12382  php_with_interbase=no
12383
12384  echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
12385 -echo "configure:50626: checking for InterBase support" >&5
12386 +echo "configure:52015: checking for InterBase support" >&5
12387  # Check whether --with-interbase or --without-interbase was given.
12388  if test "${with_interbase+set}" = set; then
12389    withval="$with_interbase"
12390 @@ -50769,7 +52158,7 @@ if test "$PHP_INTERBASE" != "no"; then
12391    done
12392
12393    echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
12394 -echo "configure:50773: checking for isc_detach_database in -lfbclient" >&5
12395 +echo "configure:52162: checking for isc_detach_database in -lfbclient" >&5
12396  ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
12397  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12398    echo $ac_n "(cached) $ac_c" 1>&6
12399 @@ -50777,7 +52166,7 @@ else
12400    ac_save_LIBS="$LIBS"
12401  LIBS="-lfbclient  $LIBS"
12402  cat > conftest.$ac_ext <<EOF
12403 -#line 50781 "configure"
12404 +#line 52170 "configure"
12405  #include "confdefs.h"
12406  /* Override any gcc2 internal prototype to avoid an error.  */
12407  /* We use char because int might match the return type of a gcc2
12408 @@ -50788,7 +52177,7 @@ int main() {
12409  isc_detach_database()
12410  ; return 0; }
12411  EOF
12412 -if { (eval echo configure:50792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12413 +if { (eval echo configure:52181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12414    rm -rf conftest*
12415    eval "ac_cv_lib_$ac_lib_var=yes"
12416  else
12417 @@ -50915,7 +52304,7 @@ else
12418    done
12419
12420    echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
12421 -echo "configure:50919: checking for isc_detach_database in -lgds" >&5
12422 +echo "configure:52308: checking for isc_detach_database in -lgds" >&5
12423  ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
12424  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12425    echo $ac_n "(cached) $ac_c" 1>&6
12426 @@ -50923,7 +52312,7 @@ else
12427    ac_save_LIBS="$LIBS"
12428  LIBS="-lgds  $LIBS"
12429  cat > conftest.$ac_ext <<EOF
12430 -#line 50927 "configure"
12431 +#line 52316 "configure"
12432  #include "confdefs.h"
12433  /* Override any gcc2 internal prototype to avoid an error.  */
12434  /* We use char because int might match the return type of a gcc2
12435 @@ -50934,7 +52323,7 @@ int main() {
12436  isc_detach_database()
12437  ; return 0; }
12438  EOF
12439 -if { (eval echo configure:50938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12440 +if { (eval echo configure:52327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12441    rm -rf conftest*
12442    eval "ac_cv_lib_$ac_lib_var=yes"
12443  else
12444 @@ -51061,7 +52450,7 @@ else
12445    done
12446
12447    echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
12448 -echo "configure:51065: checking for isc_detach_database in -lib_util" >&5
12449 +echo "configure:52454: checking for isc_detach_database in -lib_util" >&5
12450  ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
12451  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12452    echo $ac_n "(cached) $ac_c" 1>&6
12453 @@ -51069,7 +52458,7 @@ else
12454    ac_save_LIBS="$LIBS"
12455  LIBS="-lib_util  $LIBS"
12456  cat > conftest.$ac_ext <<EOF
12457 -#line 51073 "configure"
12458 +#line 52462 "configure"
12459  #include "confdefs.h"
12460  /* Override any gcc2 internal prototype to avoid an error.  */
12461  /* We use char because int might match the return type of a gcc2
12462 @@ -51080,7 +52469,7 @@ int main() {
12463  isc_detach_database()
12464  ; return 0; }
12465  EOF
12466 -if { (eval echo configure:51084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12467 +if { (eval echo configure:52473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12468    rm -rf conftest*
12469    eval "ac_cv_lib_$ac_lib_var=yes"
12470  else
12471 @@ -51557,7 +52946,7 @@ fi
12472  php_enable_intl=no
12473
12474  echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6
12475 -echo "configure:51561: checking whether to enable internationalization support" >&5
12476 +echo "configure:52950: checking whether to enable internationalization support" >&5
12477  # Check whether --enable-intl or --disable-intl was given.
12478  if test "${enable_intl+set}" = set; then
12479    enableval="$enable_intl"
12480 @@ -51629,7 +53018,7 @@ ext_output=$PHP_ICU_DIR
12481          # Extract the first word of "icu-config", so it can be a program name with args.
12482  set dummy icu-config; ac_word=$2
12483  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12484 -echo "configure:51633: checking for $ac_word" >&5
12485 +echo "configure:53022: checking for $ac_word" >&5
12486  if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then
12487    echo $ac_n "(cached) $ac_c" 1>&6
12488  else
12489 @@ -51667,7 +53056,7 @@ fi
12490    fi
12491
12492    echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6
12493 -echo "configure:51671: checking for location of ICU headers and libraries" >&5
12494 +echo "configure:53060: checking for location of ICU headers and libraries" >&5
12495
12496      icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
12497    if test "$?" != "0" || test -z "$icu_install_prefix"; then
12498 @@ -51677,7 +53066,7 @@ echo "configure:51671: checking for loca
12499      echo "$ac_t""$icu_install_prefix" 1>&6
12500
12501          echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6
12502 -echo "configure:51681: checking for ICU 3.4 or greater" >&5
12503 +echo "configure:53070: checking for ICU 3.4 or greater" >&5
12504      icu_version_full=`$ICU_CONFIG --version`
12505      ac_IFS=$IFS
12506      IFS="."
12507 @@ -51834,7 +53223,7 @@ do
12508  # Extract the first word of "$ac_prog", so it can be a program name with args.
12509  set dummy $ac_prog; ac_word=$2
12510  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12511 -echo "configure:51838: checking for $ac_word" >&5
12512 +echo "configure:53227: checking for $ac_word" >&5
12513  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
12514    echo $ac_n "(cached) $ac_c" 1>&6
12515  else
12516 @@ -51866,7 +53255,7 @@ test -n "$CXX" || CXX="gcc"
12517
12518
12519  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
12520 -echo "configure:51870: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
12521 +echo "configure:53259: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
12522
12523  ac_ext=C
12524  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
12525 @@ -51877,12 +53266,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
12526
12527  cat > conftest.$ac_ext << EOF
12528
12529 -#line 51881 "configure"
12530 +#line 53270 "configure"
12531  #include "confdefs.h"
12532
12533  int main(){return(0);}
12534  EOF
12535 -if { (eval echo configure:51886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12536 +if { (eval echo configure:53275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12537    ac_cv_prog_cxx_works=yes
12538    # If we can't run a trivial program, we are probably using a cross compiler.
12539    if (./conftest; exit) 2>/dev/null; then
12540 @@ -51908,12 +53297,12 @@ if test $ac_cv_prog_cxx_works = no; then
12541    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
12542  fi
12543  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
12544 -echo "configure:51912: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
12545 +echo "configure:53301: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
12546  echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
12547  cross_compiling=$ac_cv_prog_cxx_cross
12548
12549  echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
12550 -echo "configure:51917: checking whether we are using GNU C++" >&5
12551 +echo "configure:53306: checking whether we are using GNU C++" >&5
12552  if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
12553    echo $ac_n "(cached) $ac_c" 1>&6
12554  else
12555 @@ -51922,7 +53311,7 @@ else
12556    yes;
12557  #endif
12558  EOF
12559 -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:51926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
12560 +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:53315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
12561    ac_cv_prog_gxx=yes
12562  else
12563    ac_cv_prog_gxx=no
12564 @@ -51941,7 +53330,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
12565  ac_save_CXXFLAGS="$CXXFLAGS"
12566  CXXFLAGS=
12567  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
12568 -echo "configure:51945: checking whether ${CXX-g++} accepts -g" >&5
12569 +echo "configure:53334: checking whether ${CXX-g++} accepts -g" >&5
12570  if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
12571    echo $ac_n "(cached) $ac_c" 1>&6
12572  else
12573 @@ -51972,59 +53361,8 @@ else
12574    fi
12575  fi
12576
12577 -for ac_declaration in \
12578 -   ''\
12579 -   '#include <stdlib.h>' \
12580 -   'extern "C" void std::exit (int) throw (); using std::exit;' \
12581 -   'extern "C" void std::exit (int); using std::exit;' \
12582 -   'extern "C" void exit (int) throw ();' \
12583 -   'extern "C" void exit (int);' \
12584 -   'void exit (int);'
12585 -do
12586 -  cat > conftest.$ac_ext <<EOF
12587 -#line 51986 "configure"
12588 -#include "confdefs.h"
12589 -#include <stdlib.h>
12590 -$ac_declaration
12591 -int main() {
12592 -exit (42);
12593 -; return 0; }
12594 -EOF
12595 -if { (eval echo configure:51994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12596 -  :
12597 -else
12598 -  echo "configure: failed program was:" >&5
12599 -  cat conftest.$ac_ext >&5
12600 -  rm -rf conftest*
12601 -  continue
12602 -fi
12603 -rm -f conftest*
12604 -  cat > conftest.$ac_ext <<EOF
12605 -#line 52004 "configure"
12606 -#include "confdefs.h"
12607 -$ac_declaration
12608 -int main() {
12609 -exit (42);
12610 -; return 0; }
12611 -EOF
12612 -if { (eval echo configure:52011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12613 -  rm -rf conftest*
12614 -  break
12615 -else
12616 -  echo "configure: failed program was:" >&5
12617 -  cat conftest.$ac_ext >&5
12618 -fi
12619 -rm -f conftest*
12620 -done
12621 -if test -n "$ac_declaration"; then
12622 -  echo '#ifdef __cplusplus' >>confdefs.h
12623 -  echo $ac_declaration      >>confdefs.h
12624 -  echo '#endif'             >>confdefs.h
12625 -fi
12626 -
12627 -
12628      echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
12629 -echo "configure:52028: checking how to run the C++ preprocessor" >&5
12630 +echo "configure:53366: checking how to run the C++ preprocessor" >&5
12631  if test -z "$CXXCPP"; then
12632  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
12633    echo $ac_n "(cached) $ac_c" 1>&6
12634 @@ -52037,12 +53375,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee
12635  cross_compiling=$ac_cv_prog_cxx_cross
12636    CXXCPP="${CXX-g++} -E"
12637    cat > conftest.$ac_ext <<EOF
12638 -#line 52041 "configure"
12639 +#line 53379 "configure"
12640  #include "confdefs.h"
12641  #include <stdlib.h>
12642  EOF
12643  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
12644 -{ (eval echo configure:52046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12645 +{ (eval echo configure:53384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12646  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
12647  if test -z "$ac_err"; then
12648    :
12649 @@ -52600,7 +53938,7 @@ fi
12650  php_enable_json=yes
12651
12652  echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6
12653 -echo "configure:52604: checking whether to enable JavaScript Object Serialization support" >&5
12654 +echo "configure:53942: checking whether to enable JavaScript Object Serialization support" >&5
12655  # Check whether --enable-json or --disable-json was given.
12656  if test "${enable_json+set}" = set; then
12657    enableval="$enable_json"
12658 @@ -52646,12 +53984,12 @@ if test "$PHP_JSON" != "no"; then
12659  EOF
12660
12661    echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
12662 -echo "configure:52650: checking for ANSI C header files" >&5
12663 +echo "configure:53988: checking for ANSI C header files" >&5
12664  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
12665    echo $ac_n "(cached) $ac_c" 1>&6
12666  else
12667    cat > conftest.$ac_ext <<EOF
12668 -#line 52655 "configure"
12669 +#line 53993 "configure"
12670  #include "confdefs.h"
12671  #include <stdlib.h>
12672  #include <stdarg.h>
12673 @@ -52659,7 +53997,7 @@ else
12674  #include <float.h>
12675  EOF
12676  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
12677 -{ (eval echo configure:52663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12678 +{ (eval echo configure:54001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12679  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
12680  if test -z "$ac_err"; then
12681    rm -rf conftest*
12682 @@ -52676,7 +54014,7 @@ rm -f conftest*
12683  if test $ac_cv_header_stdc = yes; then
12684    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
12685  cat > conftest.$ac_ext <<EOF
12686 -#line 52680 "configure"
12687 +#line 54018 "configure"
12688  #include "confdefs.h"
12689  #include <string.h>
12690  EOF
12691 @@ -52694,7 +54032,7 @@ fi
12692  if test $ac_cv_header_stdc = yes; then
12693    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
12694  cat > conftest.$ac_ext <<EOF
12695 -#line 52698 "configure"
12696 +#line 54036 "configure"
12697  #include "confdefs.h"
12698  #include <stdlib.h>
12699  EOF
12700 @@ -52715,7 +54053,7 @@ if test "$cross_compiling" = yes; then
12701    :
12702  else
12703    cat > conftest.$ac_ext <<EOF
12704 -#line 52719 "configure"
12705 +#line 54057 "configure"
12706  #include "confdefs.h"
12707  #include <ctype.h>
12708  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
12709 @@ -52726,7 +54064,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
12710  exit (0); }
12711
12712  EOF
12713 -if { (eval echo configure:52730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12714 +if { (eval echo configure:54068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12715  then
12716    :
12717  else
12718 @@ -53076,7 +54414,7 @@ fi
12719  php_with_ldap=no
12720
12721  echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
12722 -echo "configure:53080: checking for LDAP support" >&5
12723 +echo "configure:54418: checking for LDAP support" >&5
12724  # Check whether --with-ldap or --without-ldap was given.
12725  if test "${with_ldap+set}" = set; then
12726    withval="$with_ldap"
12727 @@ -53120,7 +54458,7 @@ echo "$ac_t""$ext_output" 1>&6
12728  php_with_ldap_sasl=no
12729
12730  echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6
12731 -echo "configure:53124: checking for LDAP Cyrus SASL support" >&5
12732 +echo "configure:54462: checking for LDAP Cyrus SASL support" >&5
12733  # Check whether --with-ldap-sasl or --without-ldap-sasl was given.
12734  if test "${with_ldap_sasl+set}" = set; then
12735    withval="$with_ldap_sasl"
12736 @@ -55462,19 +56800,19 @@ EOF
12737    LIBS="$LIBS $LDAP_SHARED_LIBADD"
12738
12739      echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6
12740 -echo "configure:55466: checking for 3 arg ldap_set_rebind_proc" >&5
12741 +echo "configure:56804: checking for 3 arg ldap_set_rebind_proc" >&5
12742  if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then
12743    echo $ac_n "(cached) $ac_c" 1>&6
12744  else
12745    cat > conftest.$ac_ext <<EOF
12746 -#line 55471 "configure"
12747 +#line 56809 "configure"
12748  #include "confdefs.h"
12749  #include <ldap.h>
12750  int main() {
12751  ldap_set_rebind_proc(0,0,0)
12752  ; return 0; }
12753  EOF
12754 -if { (eval echo configure:55478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12755 +if { (eval echo configure:56816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12756    rm -rf conftest*
12757    ac_cv_3arg_setrebindproc=yes
12758  else
12759 @@ -55497,12 +56835,12 @@ EOF
12760        for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s
12761  do
12762  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
12763 -echo "configure:55501: checking for $ac_func" >&5
12764 +echo "configure:56839: checking for $ac_func" >&5
12765  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
12766    echo $ac_n "(cached) $ac_c" 1>&6
12767  else
12768    cat > conftest.$ac_ext <<EOF
12769 -#line 55506 "configure"
12770 +#line 56844 "configure"
12771  #include "confdefs.h"
12772  /* System header to define __stub macros and hopefully few prototypes,
12773      which can conflict with char $ac_func(); below.  */
12774 @@ -55525,7 +56863,7 @@ $ac_func();
12775
12776  ; return 0; }
12777  EOF
12778 -if { (eval echo configure:55529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12779 +if { (eval echo configure:56867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12780    rm -rf conftest*
12781    eval "ac_cv_func_$ac_func=yes"
12782  else
12783 @@ -55687,7 +57025,7 @@ EOF
12784    done
12785
12786    echo $ac_n "checking for sasl_version in -lldap""... $ac_c" 1>&6
12787 -echo "configure:55691: checking for sasl_version in -lldap" >&5
12788 +echo "configure:57029: checking for sasl_version in -lldap" >&5
12789  ac_lib_var=`echo ldap'_'sasl_version | sed 'y%./+-%__p_%'`
12790  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12791    echo $ac_n "(cached) $ac_c" 1>&6
12792 @@ -55695,7 +57033,7 @@ else
12793    ac_save_LIBS="$LIBS"
12794  LIBS="-lldap  $LIBS"
12795  cat > conftest.$ac_ext <<EOF
12796 -#line 55699 "configure"
12797 +#line 57037 "configure"
12798  #include "confdefs.h"
12799  /* Override any gcc2 internal prototype to avoid an error.  */
12800  /* We use char because int might match the return type of a gcc2
12801 @@ -55706,7 +57044,7 @@ int main() {
12802  sasl_version()
12803  ; return 0; }
12804  EOF
12805 -if { (eval echo configure:55710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12806 +if { (eval echo configure:57048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12807    rm -rf conftest*
12808    eval "ac_cv_lib_$ac_lib_var=yes"
12809  else
12810 @@ -55875,12 +57213,12 @@ fi
12811    fi
12812
12813          echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
12814 -echo "configure:55879: checking for ldap_bind_s" >&5
12815 +echo "configure:57217: checking for ldap_bind_s" >&5
12816  if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then
12817    echo $ac_n "(cached) $ac_c" 1>&6
12818  else
12819    cat > conftest.$ac_ext <<EOF
12820 -#line 55884 "configure"
12821 +#line 57222 "configure"
12822  #include "confdefs.h"
12823  /* System header to define __stub macros and hopefully few prototypes,
12824      which can conflict with char ldap_bind_s(); below.  */
12825 @@ -55903,7 +57241,7 @@ ldap_bind_s();
12826
12827  ; return 0; }
12828  EOF
12829 -if { (eval echo configure:55907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12830 +if { (eval echo configure:57245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12831    rm -rf conftest*
12832    eval "ac_cv_func_ldap_bind_s=yes"
12833  else
12834 @@ -55932,39 +57270,18 @@ fi
12835
12836
12837
12838 +php_with_libevent=no
12839
12840 -
12841 -
12842 -
12843 -
12844 -
12845 -
12846 -
12847 -
12848 -
12849 -
12850 -
12851 -
12852 -
12853 -
12854 -
12855 -
12856 -
12857 -
12858 -
12859 -
12860 -php_enable_mbstring=no
12861 -
12862 -echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
12863 -echo "configure:55960: checking whether to enable multibyte string support" >&5
12864 -# Check whether --enable-mbstring or --disable-mbstring was given.
12865 -if test "${enable_mbstring+set}" = set; then
12866 -  enableval="$enable_mbstring"
12867 -  PHP_MBSTRING=$enableval
12868 +echo $ac_n "checking for libevent support""... $ac_c" 1>&6
12869 +echo "configure:57277: checking for libevent support" >&5
12870 +# Check whether --with-libevent or --without-libevent was given.
12871 +if test "${with_libevent+set}" = set; then
12872 +  withval="$with_libevent"
12873 +  PHP_LIBEVENT=$withval
12874  else
12875
12876 -  PHP_MBSTRING=no
12877 -  test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL
12878 +  PHP_LIBEVENT=no
12879 +  test "$PHP_ENABLE_ALL" && PHP_LIBEVENT=$PHP_ENABLE_ALL
12880
12881  fi
12882
12883 @@ -55972,12 +57289,12 @@ fi
12884
12885  ext_output="yes, shared"
12886  ext_shared=yes
12887 -case $PHP_MBSTRING in
12888 +case $PHP_LIBEVENT in
12889  shared,*)
12890 -  PHP_MBSTRING=`echo "$PHP_MBSTRING"|$SED 's/^shared,//'`
12891 +  PHP_LIBEVENT=`echo "$PHP_LIBEVENT"|$SED 's/^shared,//'`
12892    ;;
12893  shared)
12894 -  PHP_MBSTRING=yes
12895 +  PHP_LIBEVENT=yes
12896    ;;
12897  no)
12898    ext_output=no
12899 @@ -55996,2004 +57313,1529 @@ echo "$ac_t""$ext_output" 1>&6
12900
12901
12902
12903 +if test "$PHP_LIBEVENT" != "no"; then
12904 +  SEARCH_PATH="/usr /usr/local"
12905 +  SEARCH_FOR="/include/event.h"
12906 +
12907 +  if test "$PHP_LIBEVENT" = "yes"; then
12908 +    echo $ac_n "checking for libevent headers in default path""... $ac_c" 1>&6
12909 +echo "configure:57323: checking for libevent headers in default path" >&5
12910 +    for i in $SEARCH_PATH ; do
12911 +      if test -r $i/$SEARCH_FOR; then
12912 +        LIBEVENT_DIR=$i
12913 +        echo "$ac_t""found in $i" 1>&6
12914 +      fi
12915 +    done
12916 +  else
12917 +    echo $ac_n "checking for libevent headers in $PHP_LIBEVENT""... $ac_c" 1>&6
12918 +echo "configure:57332: checking for libevent headers in $PHP_LIBEVENT" >&5
12919 +    if test -r $PHP_LIBEVENT/$SEARCH_FOR; then
12920 +      LIBEVENT_DIR=$PHP_LIBEVENT
12921 +      echo "$ac_t""found" 1>&6
12922 +    fi
12923 +  fi
12924
12925 -php_enable_mbregex=yes
12926 +  if test -z "$LIBEVENT_DIR"; then
12927 +    echo "$ac_t""not found" 1>&6
12928 +    { echo "configure: error: Cannot find libevent headers" 1>&2; exit 1; }
12929 +  fi
12930
12931 -echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
12932 -echo "configure:56004: checking whether to enable multibyte regex support" >&5
12933 -# Check whether --enable-mbregex or --disable-mbregex was given.
12934 -if test "${enable_mbregex+set}" = set; then
12935 -  enableval="$enable_mbregex"
12936 -  PHP_MBREGEX=$enableval
12937 -else
12938 -
12939 -  PHP_MBREGEX=yes
12940
12941 +  if test "$LIBEVENT_DIR/include" != "/usr/include"; then
12942 +
12943 +  if test -z "$LIBEVENT_DIR/include" || echo "$LIBEVENT_DIR/include" | grep '^/' >/dev/null ; then
12944 +    ai_p=$LIBEVENT_DIR/include
12945 +  else
12946 +
12947 +    ep_dir="`echo $LIBEVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
12948 +
12949 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
12950 +    ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/include\"`"
12951 +  fi
12952
12953 -fi
12954 -
12955 -
12956 -ext_output=$PHP_MBREGEX
12957 -echo "$ac_t""$ext_output" 1>&6
12958 -
12959 -
12960 -
12961 -
12962 -
12963 -php_enable_mbregex_backtrack=yes
12964 -
12965 -echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6
12966 -echo "configure:56027: checking whether to check multibyte regex backtrack" >&5
12967 -# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given.
12968 -if test "${enable_mbregex_backtrack+set}" = set; then
12969 -  enableval="$enable_mbregex_backtrack"
12970 -  PHP_MBREGEX_BACKTRACK=$enableval
12971 -else
12972 +
12973
12974 -  PHP_MBREGEX_BACKTRACK=yes
12975 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
12976
12977 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
12978 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
12979 +    eval "INCLUDEPATH$unique=set"
12980 +
12981 +      if test ""; then
12982 +        INCLUDES="-I$ai_p $INCLUDES"
12983 +      else
12984 +        INCLUDES="$INCLUDES -I$ai_p"
12985 +      fi
12986 +
12987 +  fi
12988
12989 -fi
12990 -
12991 -
12992 -ext_output=$PHP_MBREGEX_BACKTRACK
12993 -echo "$ac_t""$ext_output" 1>&6
12994 -
12995 -
12996 +  fi
12997
12998
12999 +  LIBNAME=event
13000 +  LIBSYMBOL=event_base_new
13001
13002 -php_with_libmbfl=no
13003 +  if test "x$PHP_LIBDIR" = "x"; then
13004 +    PHP_LIBDIR=lib
13005 +  fi
13006
13007 -echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
13008 -echo "configure:56050: checking for external libmbfl" >&5
13009 -# Check whether --with-libmbfl or --without-libmbfl was given.
13010 -if test "${with_libmbfl+set}" = set; then
13011 -  withval="$with_libmbfl"
13012 -  PHP_LIBMBFL=$withval
13013 -else
13014
13015 -  PHP_LIBMBFL=no
13016 +  save_old_LDFLAGS=$LDFLAGS
13017 +  ac_stuff="
13018 +    -L$LIBEVENT_DIR/$PHP_LIBDIR
13019 +  "
13020
13021 +  save_ext_shared=$ext_shared
13022 +  ext_shared=yes
13023 +
13024 +  for ac_i in $ac_stuff; do
13025 +    case $ac_i in
13026 +    -pthread)
13027 +      if test "$ext_shared" = "yes"; then
13028 +        LDFLAGS="$LDFLAGS -pthread"
13029 +      else
13030 +
13031 +
13032 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
13033 +
13034 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
13035 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
13036 +    eval "EXTRA_LDFLAGS$unique=set"
13037 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
13038 +  fi
13039
13040 -fi
13041 -
13042 -
13043 -ext_output=$PHP_LIBMBFL
13044 -echo "$ac_t""$ext_output" 1>&6
13045 -
13046 -
13047 -
13048 -
13049 -
13050 -php_with_onig=no
13051 -
13052 -echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6
13053 -echo "configure:56073: checking for external oniguruma" >&5
13054 -# Check whether --with-onig or --without-onig was given.
13055 -if test "${with_onig+set}" = set; then
13056 -  withval="$with_onig"
13057 -  PHP_ONIG=$withval
13058 -else
13059 +      fi
13060 +    ;;
13061 +    -l*)
13062 +      ac_ii=`echo $ac_i|cut -c 3-`
13063 +
13064
13065 -  PHP_ONIG=no
13066 +  case $ac_ii in
13067 +  c|c_r|pthread*) ;;
13068 +  *)
13069 +    if test "$ext_shared" = "yes"; then
13070 +        LDFLAGS="$LDFLAGS -l$ac_ii"
13071 +    else
13072 +
13073
13074 +  case $ac_ii in
13075 +  c|c_r|pthread*) ;;
13076 +  *)
13077 +      LIBS="$LIBS -l$ac_ii"
13078 +   ;;
13079 +  esac
13080
13081 -fi
13082
13083 +    fi
13084 +   ;;
13085 +  esac
13086
13087 -ext_output=$PHP_ONIG
13088 -echo "$ac_t""$ext_output" 1>&6
13089
13090 -
13091 -
13092 -
13093 -if test "$PHP_MBSTRING" != "no"; then
13094 -  cat >> confdefs.h <<\EOF
13095 -#define HAVE_MBSTRING 1
13096 -EOF
13097 -
13098 -
13099 -
13100 -  PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c"
13101 -
13102 -
13103 -  if test "$PHP_MBREGEX" != "no"; then
13104 +    ;;
13105 +    -L*)
13106 +      ac_ii=`echo $ac_i|cut -c 3-`
13107 +
13108 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
13109
13110 -  if test "$PHP_MBREGEX" = "yes"; then
13111 -    if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then
13112 -                        if test "$PHP_MBREGEX_BACKTRACK" != "no"; then
13113 -        cat >> confdefs.h <<\EOF
13114 -#define USE_COMBINATION_EXPLOSION_CHECK 1
13115 -EOF
13116 -
13117 -      fi
13118 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
13119 +    ai_p=$ac_ii
13120 +  else
13121 +
13122 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
13123 +
13124 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
13125 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
13126 +  fi
13127
13128 -      echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
13129 -echo "configure:56114: checking for variable length prototypes and stdarg.h" >&5
13130 -if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then
13131 -  echo $ac_n "(cached) $ac_c" 1>&6
13132 -else
13133 +
13134 +      if test "$ext_shared" = "yes"; then
13135 +        LDFLAGS="-L$ai_p $LDFLAGS"
13136 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
13137 +      else
13138 +
13139
13140 -        if test "$cross_compiling" = yes; then
13141
13142 -                    case $host_alias in
13143 -          *netware*)
13144 -          php_cv_mbstring_stdarg=yes
13145 -          ;;
13146 -          *)
13147 -          php_cv_mbstring_stdarg=no
13148 -          ;;
13149 -          esac
13150 -
13151 -else
13152 -  cat > conftest.$ac_ext <<EOF
13153 -#line 56132 "configure"
13154 -#include "confdefs.h"
13155 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
13156 +
13157 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
13158 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
13159 +    eval "LIBPATH$unique=set"
13160 +
13161 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
13162 +    LDFLAGS="$LDFLAGS -L$ai_p"
13163 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
13164 +
13165 +  fi
13166
13167 -#include <stdarg.h>
13168 -int foo(int x, ...) {
13169 -       va_list va;
13170 -       va_start(va, x);
13171 -       va_arg(va, int);
13172 -       va_arg(va, char *);
13173 -       va_arg(va, double);
13174 -       return 0;
13175 -}
13176 -int main() { return foo(10, "", 3.14); }
13177 -
13178 -EOF
13179 -if { (eval echo configure:56147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13180 -then
13181 -  php_cv_mbstring_stdarg=yes
13182 -else
13183 -  echo "configure: failed program was:" >&5
13184 -  cat conftest.$ac_ext >&5
13185 -  rm -fr conftest*
13186 -  php_cv_mbstring_stdarg=no
13187 -fi
13188 -rm -fr conftest*
13189 -fi
13190
13191 -
13192 -fi
13193 +      fi
13194 +
13195 +  fi
13196
13197 -echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6
13198 +    ;;
13199 +    esac
13200 +  done
13201
13202 -      for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h
13203 -do
13204 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
13205 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
13206 -echo "configure:56168: checking for $ac_hdr" >&5
13207 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
13208 +  echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
13209 +echo "configure:57481: checking for $LIBSYMBOL in -l$LIBNAME" >&5
13210 +ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
13211 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13212    echo $ac_n "(cached) $ac_c" 1>&6
13213  else
13214 -  cat > conftest.$ac_ext <<EOF
13215 -#line 56173 "configure"
13216 +  ac_save_LIBS="$LIBS"
13217 +LIBS="-l$LIBNAME  $LIBS"
13218 +cat > conftest.$ac_ext <<EOF
13219 +#line 57489 "configure"
13220  #include "confdefs.h"
13221 -#include <$ac_hdr>
13222 +/* Override any gcc2 internal prototype to avoid an error.  */
13223 +/* We use char because int might match the return type of a gcc2
13224 +    builtin and then its argument prototype would still apply.  */
13225 +char $LIBSYMBOL();
13226 +
13227 +int main() {
13228 +$LIBSYMBOL()
13229 +; return 0; }
13230  EOF
13231 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
13232 -{ (eval echo configure:56178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13233 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
13234 -if test -z "$ac_err"; then
13235 +if { (eval echo configure:57500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13236    rm -rf conftest*
13237 -  eval "ac_cv_header_$ac_safe=yes"
13238 +  eval "ac_cv_lib_$ac_lib_var=yes"
13239  else
13240 -  echo "$ac_err" >&5
13241    echo "configure: failed program was:" >&5
13242    cat conftest.$ac_ext >&5
13243    rm -rf conftest*
13244 -  eval "ac_cv_header_$ac_safe=no"
13245 +  eval "ac_cv_lib_$ac_lib_var=no"
13246  fi
13247  rm -f conftest*
13248 -fi
13249 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
13250 -  echo "$ac_t""yes" 1>&6
13251 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
13252 -  cat >> confdefs.h <<EOF
13253 -#define $ac_tr_hdr 1
13254 -EOF
13255 -
13256 -else
13257 -  echo "$ac_t""no" 1>&6
13258 -fi
13259 -done
13260 +LIBS="$ac_save_LIBS"
13261
13262 -      echo $ac_n "checking size of int""... $ac_c" 1>&6
13263 -echo "configure:56205: checking size of int" >&5
13264 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
13265 -  echo $ac_n "(cached) $ac_c" 1>&6
13266 -else
13267 -  if test "$cross_compiling" = yes; then
13268 -  ac_cv_sizeof_int=4
13269 -else
13270 -  cat > conftest.$ac_ext <<EOF
13271 -#line 56213 "configure"
13272 -#include "confdefs.h"
13273 -#include <stdio.h>
13274 -int main()
13275 -{
13276 -  FILE *f=fopen("conftestval", "w");
13277 -  if (!f) return(1);
13278 -  fprintf(f, "%d\n", sizeof(int));
13279 -  return(0);
13280 -}
13281 -EOF
13282 -if { (eval echo configure:56224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13283 -then
13284 -  ac_cv_sizeof_int=`cat conftestval`
13285 -else
13286 -  echo "configure: failed program was:" >&5
13287 -  cat conftest.$ac_ext >&5
13288 -  rm -fr conftest*
13289 -  ac_cv_sizeof_int=0
13290 -fi
13291 -rm -fr conftest*
13292  fi
13293 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
13294 +  echo "$ac_t""yes" 1>&6
13295 +
13296 +    LDFLAGS=$save_old_LDFLAGS
13297 +    ext_shared=$save_ext_shared
13298 +
13299 +
13300
13301 -fi
13302 -echo "$ac_t""$ac_cv_sizeof_int" 1>&6
13303 -cat >> confdefs.h <<EOF
13304 -#define SIZEOF_INT $ac_cv_sizeof_int
13305 -EOF
13306 +  if test "$ext_shared" = "yes"; then
13307 +    LIBEVENT_SHARED_LIBADD="-l$LIBNAME $LIBEVENT_SHARED_LIBADD"
13308 +    if test -n "$LIBEVENT_DIR/$PHP_LIBDIR"; then
13309 +
13310 +  if test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
13311 +
13312 +  if test -z "$LIBEVENT_DIR/$PHP_LIBDIR" || echo "$LIBEVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
13313 +    ai_p=$LIBEVENT_DIR/$PHP_LIBDIR
13314 +  else
13315 +
13316 +    ep_dir="`echo $LIBEVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
13317 +
13318 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
13319 +    ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/$PHP_LIBDIR\"`"
13320 +  fi
13321
13322 +
13323 +      if test "$ext_shared" = "yes"; then
13324 +        LIBEVENT_SHARED_LIBADD="-L$ai_p $LIBEVENT_SHARED_LIBADD"
13325 +        test -n "$ld_runpath_switch" && LIBEVENT_SHARED_LIBADD="$ld_runpath_switch$ai_p $LIBEVENT_SHARED_LIBADD"
13326 +      else
13327 +
13328 +
13329 +
13330 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
13331 +
13332 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
13333 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
13334 +    eval "LIBPATH$unique=set"
13335 +
13336 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
13337 +    LDFLAGS="$LDFLAGS -L$ai_p"
13338 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
13339 +
13340 +  fi
13341
13342 -      echo $ac_n "checking size of short""... $ac_c" 1>&6
13343 -echo "configure:56244: checking size of short" >&5
13344 -if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
13345 -  echo $ac_n "(cached) $ac_c" 1>&6
13346 -else
13347 -  if test "$cross_compiling" = yes; then
13348 -  ac_cv_sizeof_short=2
13349 -else
13350 -  cat > conftest.$ac_ext <<EOF
13351 -#line 56252 "configure"
13352 -#include "confdefs.h"
13353 -#include <stdio.h>
13354 -int main()
13355 -{
13356 -  FILE *f=fopen("conftestval", "w");
13357 -  if (!f) return(1);
13358 -  fprintf(f, "%d\n", sizeof(short));
13359 -  return(0);
13360 -}
13361 -EOF
13362 -if { (eval echo configure:56263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13363 -then
13364 -  ac_cv_sizeof_short=`cat conftestval`
13365 -else
13366 -  echo "configure: failed program was:" >&5
13367 -  cat conftest.$ac_ext >&5
13368 -  rm -fr conftest*
13369 -  ac_cv_sizeof_short=0
13370 -fi
13371 -rm -fr conftest*
13372 -fi
13373
13374 -fi
13375 -echo "$ac_t""$ac_cv_sizeof_short" 1>&6
13376 -cat >> confdefs.h <<EOF
13377 -#define SIZEOF_SHORT $ac_cv_sizeof_short
13378 -EOF
13379 +      fi
13380 +
13381 +  fi
13382
13383 +    fi
13384 +  else
13385 +
13386
13387 -      echo $ac_n "checking size of long""... $ac_c" 1>&6
13388 -echo "configure:56283: checking size of long" >&5
13389 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
13390 -  echo $ac_n "(cached) $ac_c" 1>&6
13391 -else
13392 -  if test "$cross_compiling" = yes; then
13393 -  ac_cv_sizeof_long=4
13394 -else
13395 -  cat > conftest.$ac_ext <<EOF
13396 -#line 56291 "configure"
13397 -#include "confdefs.h"
13398 -#include <stdio.h>
13399 -int main()
13400 -{
13401 -  FILE *f=fopen("conftestval", "w");
13402 -  if (!f) return(1);
13403 -  fprintf(f, "%d\n", sizeof(long));
13404 -  return(0);
13405 -}
13406 -EOF
13407 -if { (eval echo configure:56302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13408 -then
13409 -  ac_cv_sizeof_long=`cat conftestval`
13410 -else
13411 -  echo "configure: failed program was:" >&5
13412 -  cat conftest.$ac_ext >&5
13413 -  rm -fr conftest*
13414 -  ac_cv_sizeof_long=0
13415 -fi
13416 -rm -fr conftest*
13417 -fi
13418 +  if test -n "$LIBEVENT_DIR/$PHP_LIBDIR"; then
13419 +
13420 +  if test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
13421 +
13422 +  if test -z "$LIBEVENT_DIR/$PHP_LIBDIR" || echo "$LIBEVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
13423 +    ai_p=$LIBEVENT_DIR/$PHP_LIBDIR
13424 +  else
13425 +
13426 +    ep_dir="`echo $LIBEVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
13427 +
13428 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
13429 +    ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/$PHP_LIBDIR\"`"
13430 +  fi
13431
13432 -fi
13433 -echo "$ac_t""$ac_cv_sizeof_long" 1>&6
13434 -cat >> confdefs.h <<EOF
13435 -#define SIZEOF_LONG $ac_cv_sizeof_long
13436 -EOF
13437 +
13438 +
13439 +
13440 +
13441 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
13442 +
13443 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
13444 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
13445 +    eval "LIBPATH$unique=set"
13446 +
13447 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
13448 +    LDFLAGS="$LDFLAGS -L$ai_p"
13449 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
13450 +
13451 +  fi
13452
13453
13454 -      echo $ac_n "checking for working const""... $ac_c" 1>&6
13455 -echo "configure:56322: checking for working const" >&5
13456 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
13457 -  echo $ac_n "(cached) $ac_c" 1>&6
13458 -else
13459 -  cat > conftest.$ac_ext <<EOF
13460 -#line 56327 "configure"
13461 -#include "confdefs.h"
13462 +
13463 +  fi
13464
13465 -int main() {
13466 +  fi
13467 +
13468 +
13469 +  case $LIBNAME in
13470 +  c|c_r|pthread*) ;;
13471 +  *)
13472 +      LIBS="-l$LIBNAME $LIBS"
13473 +   ;;
13474 +  esac
13475
13476 -/* Ultrix mips cc rejects this.  */
13477 -typedef int charset[2]; const charset x;
13478 -/* SunOS 4.1.1 cc rejects this.  */
13479 -char const *const *ccp;
13480 -char **p;
13481 -/* NEC SVR4.0.2 mips cc rejects this.  */
13482 -struct point {int x, y;};
13483 -static struct point const zero = {0,0};
13484 -/* AIX XL C 1.02.0.0 rejects this.
13485 -   It does not let you subtract one const X* pointer from another in an arm
13486 -   of an if-expression whose if-part is not a constant expression */
13487 -const char *g = "string";
13488 -ccp = &g + (g ? g-g : 0);
13489 -/* HPUX 7.0 cc rejects these. */
13490 -++ccp;
13491 -p = (char**) ccp;
13492 -ccp = (char const *const *) p;
13493 -{ /* SCO 3.2v4 cc rejects this.  */
13494 -  char *t;
13495 -  char const *s = 0 ? (char *) 0 : (char const *) 0;
13496
13497 -  *t++ = 0;
13498 -}
13499 -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
13500 -  int x[] = {25, 17};
13501 -  const int *foo = &x[0];
13502 -  ++foo;
13503 -}
13504 -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
13505 -  typedef const int *iptr;
13506 -  iptr p = 0;
13507 -  ++p;
13508 -}
13509 -{ /* AIX XL C 1.02.0.0 rejects this saying
13510 -     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
13511 -  struct s { int j; const int *ap[3]; };
13512 -  struct s *b; b->j = 5;
13513 -}
13514 -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
13515 -  const int foo = 10;
13516 -}
13517
13518 -; return 0; }
13519 -EOF
13520 -if { (eval echo configure:56376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13521 -  rm -rf conftest*
13522 -  ac_cv_c_const=yes
13523 -else
13524 -  echo "configure: failed program was:" >&5
13525 -  cat conftest.$ac_ext >&5
13526 -  rm -rf conftest*
13527 -  ac_cv_c_const=no
13528 -fi
13529 -rm -f conftest*
13530 -fi
13531
13532 -echo "$ac_t""$ac_cv_c_const" 1>&6
13533 -if test $ac_cv_c_const = no; then
13534 -  cat >> confdefs.h <<\EOF
13535 -#define const
13536 -EOF
13537 +  fi
13538
13539 -fi
13540
13541 -      echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
13542 -echo "configure:56397: checking whether time.h and sys/time.h may both be included" >&5
13543 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
13544 -  echo $ac_n "(cached) $ac_c" 1>&6
13545 -else
13546 -  cat > conftest.$ac_ext <<EOF
13547 -#line 56402 "configure"
13548 -#include "confdefs.h"
13549 -#include <sys/types.h>
13550 -#include <sys/time.h>
13551 -#include <time.h>
13552 -int main() {
13553 -struct tm *tp;
13554 -; return 0; }
13555 -EOF
13556 -if { (eval echo configure:56411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13557 -  rm -rf conftest*
13558 -  ac_cv_header_time=yes
13559 +
13560 +
13561  else
13562 -  echo "configure: failed program was:" >&5
13563 -  cat conftest.$ac_ext >&5
13564 -  rm -rf conftest*
13565 -  ac_cv_header_time=no
13566 -fi
13567 -rm -f conftest*
13568 -fi
13569 -
13570 -echo "$ac_t""$ac_cv_header_time" 1>&6
13571 -if test $ac_cv_header_time = yes; then
13572 -  cat >> confdefs.h <<\EOF
13573 -#define TIME_WITH_SYS_TIME 1
13574 -EOF
13575 +  echo "$ac_t""no" 1>&6
13576
13577 -fi
13578 -
13579 -      # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
13580 -# for constant arguments.  Useless!
13581 -echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
13582 -echo "configure:56434: checking for working alloca.h" >&5
13583 -if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
13584 -  echo $ac_n "(cached) $ac_c" 1>&6
13585 -else
13586 -  cat > conftest.$ac_ext <<EOF
13587 -#line 56439 "configure"
13588 -#include "confdefs.h"
13589 -#include <alloca.h>
13590 -int main() {
13591 -char *p = alloca(2 * sizeof(int));
13592 -; return 0; }
13593 -EOF
13594 -if { (eval echo configure:56446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13595 -  rm -rf conftest*
13596 -  ac_cv_header_alloca_h=yes
13597 -else
13598 -  echo "configure: failed program was:" >&5
13599 -  cat conftest.$ac_ext >&5
13600 -  rm -rf conftest*
13601 -  ac_cv_header_alloca_h=no
13602 -fi
13603 -rm -f conftest*
13604 +    LDFLAGS=$save_old_LDFLAGS
13605 +    ext_shared=$save_ext_shared
13606 +    unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
13607 +
13608 +    { echo "configure: error: wrong libevent version {1.4.+ is required} or lib not found" 1>&2; exit 1; }
13609 +
13610 +
13611  fi
13612
13613 -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
13614 -if test $ac_cv_header_alloca_h = yes; then
13615 -  cat >> confdefs.h <<\EOF
13616 -#define HAVE_ALLOCA_H 1
13617 -EOF
13618
13619 -fi
13620 +
13621 +  am_i_shared=$PHP_LIBEVENT_SHARED
13622 +  is_it_shared=$PHP_SOCKETS_SHARED
13623 +  is_it_enabled=$PHP_SOCKETS
13624 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
13625 +    { echo "configure: error:
13626 +You've configured extension libevent to build statically, but it
13627 +depends on extension sockets, which you've configured to build shared.
13628 +You either need to build libevent shared or build sockets statically for the
13629 +build to be successful.
13630 +" 1>&2; exit 1; }
13631 +  fi
13632 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
13633 +    { echo "configure: error:
13634 +You've configured extension libevent, which depends on extension sockets,
13635 +but you've either not enabled sockets, or have disabled it.
13636 +" 1>&2; exit 1; }
13637 +  fi
13638 +
13639 +
13640 +  PHP_VAR_SUBST="$PHP_VAR_SUBST LIBEVENT_SHARED_LIBADD"
13641
13642 -echo $ac_n "checking for alloca""... $ac_c" 1>&6
13643 -echo "configure:56467: checking for alloca" >&5
13644 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
13645 -  echo $ac_n "(cached) $ac_c" 1>&6
13646 -else
13647 -  cat > conftest.$ac_ext <<EOF
13648 -#line 56472 "configure"
13649 -#include "confdefs.h"
13650 +
13651 +  ext_builddir=ext/libevent
13652 +  ext_srcdir=$abs_srcdir/ext/libevent
13653
13654 -#ifdef __GNUC__
13655 -# define alloca __builtin_alloca
13656 -#else
13657 -# ifdef _MSC_VER
13658 -#  include <malloc.h>
13659 -#  define alloca _alloca
13660 -# else
13661 -#  if HAVE_ALLOCA_H
13662 -#   include <alloca.h>
13663 -#  else
13664 -#   ifdef _AIX
13665 - #pragma alloca
13666 -#   else
13667 -#    ifndef alloca /* predefined by HP cc +Olibcalls */
13668 -char *alloca ();
13669 -#    endif
13670 -#   endif
13671 -#  endif
13672 -# endif
13673 -#endif
13674 +  ac_extra=
13675
13676 -int main() {
13677 -char *p = (char *) alloca(1);
13678 -; return 0; }
13679 -EOF
13680 -if { (eval echo configure:56500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13681 -  rm -rf conftest*
13682 -  ac_cv_func_alloca_works=yes
13683 -else
13684 -  echo "configure: failed program was:" >&5
13685 -  cat conftest.$ac_ext >&5
13686 -  rm -rf conftest*
13687 -  ac_cv_func_alloca_works=no
13688 -fi
13689 -rm -f conftest*
13690 -fi
13691 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
13692 +    PHP_LIBEVENT_SHARED=no
13693 +
13694 +
13695 +  case ext/libevent in
13696 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
13697 +  /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
13698 +  *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
13699 +  esac
13700 +
13701 +
13702
13703 -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
13704 -if test $ac_cv_func_alloca_works = yes; then
13705 -  cat >> confdefs.h <<\EOF
13706 -#define HAVE_ALLOCA 1
13707 -EOF
13708 +  b_c_pre=$php_c_pre
13709 +  b_cxx_pre=$php_cxx_pre
13710 +  b_c_meta=$php_c_meta
13711 +  b_cxx_meta=$php_cxx_meta
13712 +  b_c_post=$php_c_post
13713 +  b_cxx_post=$php_cxx_post
13714 +  b_lo=$php_lo
13715
13716 -fi
13717 -
13718 -if test $ac_cv_func_alloca_works = no; then
13719 -  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
13720 -  # that cause trouble.  Some versions do not even contain alloca or
13721 -  # contain a buggy version.  If you still want to use their alloca,
13722 -  # use ar to extract alloca.o from them instead of compiling alloca.c.
13723 -  ALLOCA=alloca.${ac_objext}
13724 -  cat >> confdefs.h <<\EOF
13725 -#define C_ALLOCA 1
13726 -EOF
13727
13728 +  old_IFS=$IFS
13729 +  for ac_src in libevent.c; do
13730 +
13731 +      IFS=.
13732 +      set $ac_src
13733 +      ac_obj=$1
13734 +      IFS=$old_IFS
13735 +
13736 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
13737
13738 -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
13739 -echo "configure:56532: checking whether alloca needs Cray hooks" >&5
13740 -if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
13741 -  echo $ac_n "(cached) $ac_c" 1>&6
13742 -else
13743 -  cat > conftest.$ac_ext <<EOF
13744 -#line 56537 "configure"
13745 -#include "confdefs.h"
13746 -#if defined(CRAY) && ! defined(CRAY2)
13747 -webecray
13748 -#else
13749 -wenotbecray
13750 -#endif
13751 +      case $ac_src in
13752 +        *.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" ;;
13753 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13754 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13755 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
13756 +      esac
13757
13758 +    cat >>Makefile.objects<<EOF
13759 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
13760 +       $ac_comp
13761  EOF
13762 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
13763 -  egrep "webecray" >/dev/null 2>&1; then
13764 -  rm -rf conftest*
13765 -  ac_cv_os_cray=yes
13766 -else
13767 -  rm -rf conftest*
13768 -  ac_cv_os_cray=no
13769 -fi
13770 -rm -f conftest*
13771 +  done
13772
13773 -fi
13774
13775 -echo "$ac_t""$ac_cv_os_cray" 1>&6
13776 -if test $ac_cv_os_cray = yes; then
13777 -for ac_func in _getb67 GETB67 getb67; do
13778 -  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
13779 -echo "configure:56562: checking for $ac_func" >&5
13780 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
13781 -  echo $ac_n "(cached) $ac_c" 1>&6
13782 -else
13783 -  cat > conftest.$ac_ext <<EOF
13784 -#line 56567 "configure"
13785 -#include "confdefs.h"
13786 -/* System header to define __stub macros and hopefully few prototypes,
13787 -    which can conflict with char $ac_func(); below.  */
13788 -#include <assert.h>
13789 -/* Override any gcc2 internal prototype to avoid an error.  */
13790 -/* We use char because int might match the return type of a gcc2
13791 -    builtin and then its argument prototype would still apply.  */
13792 -char $ac_func();
13793 +    EXT_STATIC="$EXT_STATIC libevent"
13794 +    if test "$ext_shared" != "nocli"; then
13795 +      EXT_CLI_STATIC="$EXT_CLI_STATIC libevent"
13796 +    fi
13797 +  else
13798 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
13799 +      PHP_LIBEVENT_SHARED=yes
13800 +
13801 +  case ext/libevent in
13802 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
13803 +  /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
13804 +  *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
13805 +  esac
13806 +
13807 +
13808
13809 -int main() {
13810 +  b_c_pre=$shared_c_pre
13811 +  b_cxx_pre=$shared_cxx_pre
13812 +  b_c_meta=$shared_c_meta
13813 +  b_cxx_meta=$shared_cxx_meta
13814 +  b_c_post=$shared_c_post
13815 +  b_cxx_post=$shared_cxx_post
13816 +  b_lo=$shared_lo
13817
13818 -/* The GNU C library defines this for functions which it implements
13819 -    to always fail with ENOSYS.  Some functions are actually named
13820 -    something starting with __ and the normal name is an alias.  */
13821 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
13822 -choke me
13823 -#else
13824 -$ac_func();
13825 -#endif
13826
13827 -; return 0; }
13828 -EOF
13829 -if { (eval echo configure:56590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13830 -  rm -rf conftest*
13831 -  eval "ac_cv_func_$ac_func=yes"
13832 -else
13833 -  echo "configure: failed program was:" >&5
13834 -  cat conftest.$ac_ext >&5
13835 -  rm -rf conftest*
13836 -  eval "ac_cv_func_$ac_func=no"
13837 -fi
13838 -rm -f conftest*
13839 -fi
13840 +  old_IFS=$IFS
13841 +  for ac_src in libevent.c; do
13842 +
13843 +      IFS=.
13844 +      set $ac_src
13845 +      ac_obj=$1
13846 +      IFS=$old_IFS
13847 +
13848 +      shared_objects_libevent="$shared_objects_libevent $ac_bdir$ac_obj.lo"
13849
13850 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
13851 -  echo "$ac_t""yes" 1>&6
13852 -  cat >> confdefs.h <<EOF
13853 -#define CRAY_STACKSEG_END $ac_func
13854 +      case $ac_src in
13855 +        *.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" ;;
13856 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13857 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13858 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
13859 +      esac
13860 +
13861 +    cat >>Makefile.objects<<EOF
13862 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
13863 +       $ac_comp
13864  EOF
13865 +  done
13866
13867 -  break
13868 -else
13869 -  echo "$ac_t""no" 1>&6
13870 -fi
13871 +      case $host_alias in
13872 +        *netware*)
13873 +
13874 +  install_modules="install-modules"
13875
13876 -done
13877 -fi
13878 +  case $host_alias in
13879 +    *aix*)
13880 +      suffix=so
13881 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phplibevent.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libevent) $(PHPLIBEVENT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phplibevent.so '$ext_builddir'/phplibevent.so'
13882 +      ;;
13883 +    *netware*)
13884 +      suffix=nlm
13885 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libevent) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPLIBEVENT, 3)_SHARED_LIBADD)'
13886 +      ;;
13887 +    *)
13888 +      suffix=la
13889 +      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_libevent) $(PHPLIBEVENT_SHARED_LIBADD)'
13890 +      ;;
13891 +  esac
13892
13893 -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
13894 -echo "configure:56617: checking stack direction for C alloca" >&5
13895 -if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
13896 -  echo $ac_n "(cached) $ac_c" 1>&6
13897 -else
13898 -  if test "$cross_compiling" = yes; then
13899 -  ac_cv_c_stack_direction=0
13900 -else
13901 -  cat > conftest.$ac_ext <<EOF
13902 -#line 56625 "configure"
13903 -#include "confdefs.h"
13904 -find_stack_direction ()
13905 -{
13906 -  static char *addr = 0;
13907 -  auto char dummy;
13908 -  if (addr == 0)
13909 -    {
13910 -      addr = &dummy;
13911 -      return find_stack_direction ();
13912 -    }
13913 +  if test "x" = "xyes"; then
13914 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phplibevent.$suffix"
13915    else
13916 -    return (&dummy > addr) ? 1 : -1;
13917 -}
13918 -main ()
13919 -{
13920 -  exit (find_stack_direction() < 0);
13921 -}
13922 -EOF
13923 -if { (eval echo configure:56644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13924 -then
13925 -  ac_cv_c_stack_direction=1
13926 -else
13927 -  echo "configure: failed program was:" >&5
13928 -  cat conftest.$ac_ext >&5
13929 -  rm -fr conftest*
13930 -  ac_cv_c_stack_direction=-1
13931 -fi
13932 -rm -fr conftest*
13933 -fi
13934 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phplibevent.$suffix"
13935 +  fi
13936 +
13937 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libevent"
13938
13939 -fi
13940 +  cat >>Makefile.objects<<EOF
13941 +\$(phplibdir)/phplibevent.$suffix: $ext_builddir/phplibevent.$suffix
13942 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phplibevent.$suffix \$(phplibdir)
13943 +
13944 +$ext_builddir/phplibevent.$suffix: \$(shared_objects_libevent) \$(PHPLIBEVENT_SHARED_DEPENDENCIES)
13945 +       $link_cmd
13946
13947 -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
13948 -cat >> confdefs.h <<EOF
13949 -#define STACK_DIRECTION $ac_cv_c_stack_direction
13950  EOF
13951
13952 -fi
13953 +          ;;
13954 +        *)
13955 +
13956 +  install_modules="install-modules"
13957
13958 -      echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
13959 -echo "configure:56666: checking for 8-bit clean memcmp" >&5
13960 -if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
13961 -  echo $ac_n "(cached) $ac_c" 1>&6
13962 -else
13963 -  if test "$cross_compiling" = yes; then
13964 -  ac_cv_func_memcmp_clean=no
13965 -else
13966 -  cat > conftest.$ac_ext <<EOF
13967 -#line 56674 "configure"
13968 -#include "confdefs.h"
13969 +  case $host_alias in
13970 +    *aix*)
13971 +      suffix=so
13972 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/libevent.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libevent) $(LIBEVENT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/libevent.so '$ext_builddir'/libevent.so'
13973 +      ;;
13974 +    *netware*)
13975 +      suffix=nlm
13976 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libevent) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(LIBEVENT, 3)_SHARED_LIBADD)'
13977 +      ;;
13978 +    *)
13979 +      suffix=la
13980 +      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_libevent) $(LIBEVENT_SHARED_LIBADD)'
13981 +      ;;
13982 +  esac
13983
13984 -main()
13985 -{
13986 -  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
13987 -  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
13988 -}
13989 +  if test "x" = "xyes"; then
13990 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/libevent.$suffix"
13991 +  else
13992 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/libevent.$suffix"
13993 +  fi
13994 +
13995 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libevent"
13996
13997 -EOF
13998 -if { (eval echo configure:56684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13999 -then
14000 -  ac_cv_func_memcmp_clean=yes
14001 -else
14002 -  echo "configure: failed program was:" >&5
14003 -  cat conftest.$ac_ext >&5
14004 -  rm -fr conftest*
14005 -  ac_cv_func_memcmp_clean=no
14006 -fi
14007 -rm -fr conftest*
14008 -fi
14009 +  cat >>Makefile.objects<<EOF
14010 +\$(phplibdir)/libevent.$suffix: $ext_builddir/libevent.$suffix
14011 +       \$(LIBTOOL) --mode=install cp $ext_builddir/libevent.$suffix \$(phplibdir)
14012
14013 -fi
14014 +$ext_builddir/libevent.$suffix: \$(shared_objects_libevent) \$(LIBEVENT_SHARED_DEPENDENCIES)
14015 +       $link_cmd
14016
14017 -echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
14018 -test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
14019 +EOF
14020
14021 -      ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'`
14022 -echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6
14023 -echo "configure:56703: checking for stdarg.h" >&5
14024 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14025 -  echo $ac_n "(cached) $ac_c" 1>&6
14026 -else
14027 -  cat > conftest.$ac_ext <<EOF
14028 -#line 56708 "configure"
14029 -#include "confdefs.h"
14030 -#include <stdarg.h>
14031 +          ;;
14032 +      esac
14033 +      cat >> confdefs.h <<EOF
14034 +#define COMPILE_DL_LIBEVENT 1
14035  EOF
14036 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14037 -{ (eval echo configure:56713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14038 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
14039 -if test -z "$ac_err"; then
14040 -  rm -rf conftest*
14041 -  eval "ac_cv_header_$ac_safe=yes"
14042 -else
14043 -  echo "$ac_err" >&5
14044 -  echo "configure: failed program was:" >&5
14045 -  cat conftest.$ac_ext >&5
14046 -  rm -rf conftest*
14047 -  eval "ac_cv_header_$ac_safe=no"
14048 -fi
14049 -rm -f conftest*
14050 -fi
14051 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14052 -  echo "$ac_t""yes" 1>&6
14053 +
14054 +    fi
14055 +  fi
14056 +
14057 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
14058 +    PHP_LIBEVENT_SHARED=no
14059 +    case "$PHP_SAPI" in
14060 +      cgi|embed)
14061 +
14062
14063 -        cat >> confdefs.h <<\EOF
14064 -#define HAVE_STDARG_PROTOTYPES 1
14065 -EOF
14066 +  case ext/libevent in
14067 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
14068 +  /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
14069 +  *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
14070 +  esac
14071 +
14072 +
14073 +
14074 +  b_c_pre=$php_c_pre
14075 +  b_cxx_pre=$php_cxx_pre
14076 +  b_c_meta=$php_c_meta
14077 +  b_cxx_meta=$php_cxx_meta
14078 +  b_c_post=$php_c_post
14079 +  b_cxx_post=$php_cxx_post
14080 +  b_lo=$php_lo
14081
14082 +
14083 +  old_IFS=$IFS
14084 +  for ac_src in libevent.c; do
14085 +
14086 +      IFS=.
14087 +      set $ac_src
14088 +      ac_obj=$1
14089 +      IFS=$old_IFS
14090
14091 -else
14092 -  echo "$ac_t""no" 1>&6
14093 -fi
14094 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
14095
14096 -      cat >> confdefs.h <<\EOF
14097 -#define PHP_ONIG_BUNDLED 1
14098 -EOF
14099 +      case $ac_src in
14100 +        *.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" ;;
14101 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
14102 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
14103 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
14104 +      esac
14105
14106 -      cat >> confdefs.h <<\EOF
14107 -#define HAVE_ONIG 1
14108 +    cat >>Makefile.objects<<EOF
14109 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
14110 +       $ac_comp
14111  EOF
14112 -
14113 -
14114 -  PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY"
14115 +  done
14116
14117 -
14118 -  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma"
14119
14120 -
14121 -  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma/enc"
14122 +        EXT_STATIC="$EXT_STATIC libevent"
14123 +        ;;
14124 +      *)
14125 +
14126 +
14127 +  case ext/libevent in
14128 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
14129 +  /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
14130 +  *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
14131 +  esac
14132 +
14133 +
14134
14135 -
14136 -  PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES oniguruma"
14137 +  b_c_pre=$php_c_pre
14138 +  b_cxx_pre=$php_cxx_pre
14139 +  b_c_meta=$php_c_meta
14140 +  b_cxx_meta=$php_cxx_meta
14141 +  b_c_post=$php_c_post
14142 +  b_cxx_post=$php_cxx_post
14143 +  b_lo=$php_lo
14144
14145 -
14146 -  PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS oniguruma/config.h"
14147
14148 +  old_IFS=$IFS
14149 +  for ac_src in libevent.c; do
14150 +
14151 +      IFS=.
14152 +      set $ac_src
14153 +      ac_obj=$1
14154 +      IFS=$old_IFS
14155
14156 -  PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES
14157 -        oniguruma/regcomp.c
14158 -        oniguruma/regerror.c
14159 -        oniguruma/regexec.c
14160 -        oniguruma/reggnu.c
14161 -        oniguruma/regparse.c
14162 -        oniguruma/regenc.c
14163 -        oniguruma/regext.c
14164 -        oniguruma/regsyntax.c
14165 -        oniguruma/regtrav.c
14166 -        oniguruma/regversion.c
14167 -        oniguruma/st.c
14168 -        oniguruma/enc/unicode.c
14169 -        oniguruma/enc/ascii.c
14170 -        oniguruma/enc/utf8.c
14171 -        oniguruma/enc/euc_jp.c
14172 -        oniguruma/enc/euc_tw.c
14173 -        oniguruma/enc/euc_kr.c
14174 -        oniguruma/enc/sjis.c
14175 -        oniguruma/enc/iso8859_1.c
14176 -        oniguruma/enc/iso8859_2.c
14177 -        oniguruma/enc/iso8859_3.c
14178 -        oniguruma/enc/iso8859_4.c
14179 -        oniguruma/enc/iso8859_5.c
14180 -        oniguruma/enc/iso8859_6.c
14181 -        oniguruma/enc/iso8859_7.c
14182 -        oniguruma/enc/iso8859_8.c
14183 -        oniguruma/enc/iso8859_9.c
14184 -        oniguruma/enc/iso8859_10.c
14185 -        oniguruma/enc/iso8859_11.c
14186 -        oniguruma/enc/iso8859_13.c
14187 -        oniguruma/enc/iso8859_14.c
14188 -        oniguruma/enc/iso8859_15.c
14189 -        oniguruma/enc/iso8859_16.c
14190 -        oniguruma/enc/koi8.c
14191 -        oniguruma/enc/koi8_r.c
14192 -        oniguruma/enc/big5.c
14193 -        oniguruma/enc/utf16_be.c
14194 -        oniguruma/enc/utf16_le.c
14195 -        oniguruma/enc/utf32_be.c
14196 -        oniguruma/enc/utf32_le.c
14197 -      "
14198 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
14199
14200 -
14201 -  PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS oniguruma/oniguruma.h"
14202 +      case $ac_src in
14203 +        *.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" ;;
14204 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
14205 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
14206 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
14207 +      esac
14208
14209 -    else
14210 -                        if test ! -f "$PHP_ONIG/include/oniguruma.h"; then
14211 -        { echo "configure: error: oniguruma.h not found in $PHP_ONIG/include" 1>&2; exit 1; }
14212 -      fi
14213 -
14214 -  if test "$PHP_ONIG/include" != "/usr/include"; then
14215 -
14216 -  if test -z "$PHP_ONIG/include" || echo "$PHP_ONIG/include" | grep '^/' >/dev/null ; then
14217 -    ai_p=$PHP_ONIG/include
14218 -  else
14219 -
14220 -    ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`"
14221 -
14222 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
14223 -    ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`"
14224 -  fi
14225 +    cat >>Makefile.objects<<EOF
14226 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
14227 +       $ac_comp
14228 +EOF
14229 +  done
14230
14231 -
14232 +
14233 +        ;;
14234 +    esac
14235 +    EXT_CLI_STATIC="$EXT_CLI_STATIC libevent"
14236 +  fi
14237
14238 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
14239
14240 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
14241 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
14242 -    eval "INCLUDEPATH$unique=set"
14243 -
14244 -      if test ""; then
14245 -        INCLUDES="-I$ai_p $INCLUDES"
14246 -      else
14247 -        INCLUDES="$INCLUDES -I$ai_p"
14248 -      fi
14249 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
14250 +
14251 +
14252 +
14253 +  if test "$ext_builddir" = "."; then
14254 +    PHP_PECL_EXTENSION=libevent
14255
14256 -  fi
14257 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
14258
14259    fi
14260
14261 +fi
14262
14263 -
14264 -  save_old_LDFLAGS=$LDFLAGS
14265 -  ac_stuff="
14266 -        -L$PHP_ONIG/$PHP_LIBDIR
14267 -      "
14268 -
14269 -  save_ext_shared=$ext_shared
14270 -  ext_shared=yes
14271 -
14272 -  for ac_i in $ac_stuff; do
14273 -    case $ac_i in
14274 -    -pthread)
14275 -      if test "$ext_shared" = "yes"; then
14276 -        LDFLAGS="$LDFLAGS -pthread"
14277 -      else
14278 -
14279 -
14280 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
14281 -
14282 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
14283 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
14284 -    eval "EXTRA_LDFLAGS$unique=set"
14285 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
14286 -  fi
14287
14288 -      fi
14289 -    ;;
14290 -    -l*)
14291 -      ac_ii=`echo $ac_i|cut -c 3-`
14292 -
14293 -
14294 -  case $ac_ii in
14295 -  c|c_r|pthread*) ;;
14296 -  *)
14297 -    if test "$ext_shared" = "yes"; then
14298 -        LDFLAGS="$LDFLAGS -l$ac_ii"
14299 -    else
14300 -
14301 -
14302 -  case $ac_ii in
14303 -  c|c_r|pthread*) ;;
14304 -  *)
14305 -      LIBS="$LIBS -l$ac_ii"
14306 -   ;;
14307 -  esac
14308
14309
14310 -    fi
14311 -   ;;
14312 -  esac
14313
14314
14315 -    ;;
14316 -    -L*)
14317 -      ac_ii=`echo $ac_i|cut -c 3-`
14318 -
14319 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
14320 -
14321 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
14322 -    ai_p=$ac_ii
14323 -  else
14324 -
14325 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
14326 -
14327 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
14328 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
14329 -  fi
14330
14331 -
14332 -      if test "$ext_shared" = "yes"; then
14333 -        LDFLAGS="-L$ai_p $LDFLAGS"
14334 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
14335 -      else
14336 -
14337 -
14338 -
14339 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
14340 -
14341 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
14342 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
14343 -    eval "LIBPATH$unique=set"
14344 -
14345 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
14346 -    LDFLAGS="$LDFLAGS -L$ai_p"
14347 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
14348 -
14349 -  fi
14350
14351
14352 -      fi
14353 -
14354 -  fi
14355
14356 -    ;;
14357 -    esac
14358 -  done
14359
14360 -  echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6
14361 -echo "configure:56943: checking for onig_init in -lonig" >&5
14362 -ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'`
14363 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
14364 -  echo $ac_n "(cached) $ac_c" 1>&6
14365 -else
14366 -  ac_save_LIBS="$LIBS"
14367 -LIBS="-lonig  $LIBS"
14368 -cat > conftest.$ac_ext <<EOF
14369 -#line 56951 "configure"
14370 -#include "confdefs.h"
14371 -/* Override any gcc2 internal prototype to avoid an error.  */
14372 -/* We use char because int might match the return type of a gcc2
14373 -    builtin and then its argument prototype would still apply.  */
14374 -char onig_init();
14375
14376 -int main() {
14377 -onig_init()
14378 -; return 0; }
14379 -EOF
14380 -if { (eval echo configure:56962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14381 -  rm -rf conftest*
14382 -  eval "ac_cv_lib_$ac_lib_var=yes"
14383 -else
14384 -  echo "configure: failed program was:" >&5
14385 -  cat conftest.$ac_ext >&5
14386 -  rm -rf conftest*
14387 -  eval "ac_cv_lib_$ac_lib_var=no"
14388 -fi
14389 -rm -f conftest*
14390 -LIBS="$ac_save_LIBS"
14391
14392 -fi
14393 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
14394 -  echo "$ac_t""yes" 1>&6
14395 -
14396 -    LDFLAGS=$save_old_LDFLAGS
14397 -    ext_shared=$save_ext_shared
14398 -
14399 -
14400
14401 -  if test "$ext_shared" = "yes"; then
14402 -    MBSTRING_SHARED_LIBADD="-lonig $MBSTRING_SHARED_LIBADD"
14403 -    if test -n "$PHP_ONIG/$PHP_LIBDIR"; then
14404 -
14405 -  if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then
14406 -
14407 -  if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
14408 -    ai_p=$PHP_ONIG/$PHP_LIBDIR
14409 -  else
14410 -
14411 -    ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
14412 -
14413 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
14414 -    ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`"
14415 -  fi
14416
14417 -
14418 -      if test "$ext_shared" = "yes"; then
14419 -        MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD"
14420 -        test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_SHARED_LIBADD"
14421 -      else
14422 -
14423 -
14424 -
14425 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
14426 -
14427 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
14428 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
14429 -    eval "LIBPATH$unique=set"
14430 -
14431 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
14432 -    LDFLAGS="$LDFLAGS -L$ai_p"
14433 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
14434 -
14435 -  fi
14436
14437
14438 -      fi
14439 -
14440 -  fi
14441
14442 -    fi
14443 -  else
14444 -
14445
14446 -  if test -n "$PHP_ONIG/$PHP_LIBDIR"; then
14447 -
14448 -  if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then
14449 -
14450 -  if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
14451 -    ai_p=$PHP_ONIG/$PHP_LIBDIR
14452 -  else
14453 -
14454 -    ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
14455 -
14456 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
14457 -    ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`"
14458 -  fi
14459
14460 -
14461 -
14462 -
14463 -
14464 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
14465 -
14466 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
14467 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
14468 -    eval "LIBPATH$unique=set"
14469 -
14470 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
14471 -    LDFLAGS="$LDFLAGS -L$ai_p"
14472 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
14473 -
14474 -  fi
14475
14476
14477 -
14478 -  fi
14479
14480 -  fi
14481 -
14482 +
14483 +php_enable_mbstring=no
14484 +
14485 +echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
14486 +echo "configure:57973: checking whether to enable multibyte string support" >&5
14487 +# Check whether --enable-mbstring or --disable-mbstring was given.
14488 +if test "${enable_mbstring+set}" = set; then
14489 +  enableval="$enable_mbstring"
14490 +  PHP_MBSTRING=$enableval
14491 +else
14492
14493 -  case onig in
14494 -  c|c_r|pthread*) ;;
14495 -  *)
14496 -      LIBS="-lonig $LIBS"
14497 -   ;;
14498 -  esac
14499 +  PHP_MBSTRING=no
14500 +  test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL
14501
14502 +fi
14503
14504
14505
14506 -  fi
14507 +ext_output="yes, shared"
14508 +ext_shared=yes
14509 +case $PHP_MBSTRING in
14510 +shared,*)
14511 +  PHP_MBSTRING=`echo "$PHP_MBSTRING"|$SED 's/^shared,//'`
14512 +  ;;
14513 +shared)
14514 +  PHP_MBSTRING=yes
14515 +  ;;
14516 +no)
14517 +  ext_output=no
14518 +  ext_shared=no
14519 +  ;;
14520 +*)
14521 +  ext_output=yes
14522 +  ext_shared=no
14523 +  ;;
14524 +esac
14525
14526
14527 -        cat >> confdefs.h <<\EOF
14528 -#define HAVE_ONIG 1
14529 -EOF
14530 -
14531 -
14532 -
14533 -else
14534 -  echo "$ac_t""no" 1>&6
14535
14536 -    LDFLAGS=$save_old_LDFLAGS
14537 -    ext_shared=$save_ext_shared
14538 -    unset ac_cv_lib_onig_onig_init
14539 -
14540 -        { echo "configure: error: Problem with oniguruma. Please check config.log for more information." 1>&2; exit 1; }
14541 -
14542 -
14543 -fi
14544 +echo "$ac_t""$ext_output" 1>&6
14545
14546
14547 -      save_old_LDFLAGS=$LDFLAGS
14548 -
14549 -  for ac_i in $MBSTRING_SHARED_LIBADD; do
14550 -    case $ac_i in
14551 -    -pthread)
14552 -      if test "$ext_shared" = "yes"; then
14553 -        LDFLAGS="$LDFLAGS -pthread"
14554 -      else
14555 -
14556 -
14557 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
14558 -
14559 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
14560 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
14561 -    eval "EXTRA_LDFLAGS$unique=set"
14562 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
14563 -  fi
14564
14565 -      fi
14566 -    ;;
14567 -    -l*)
14568 -      ac_ii=`echo $ac_i|cut -c 3-`
14569 -
14570 +
14571 +
14572 +php_enable_mbregex=yes
14573 +
14574 +echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
14575 +echo "configure:58017: checking whether to enable multibyte regex support" >&5
14576 +# Check whether --enable-mbregex or --disable-mbregex was given.
14577 +if test "${enable_mbregex+set}" = set; then
14578 +  enableval="$enable_mbregex"
14579 +  PHP_MBREGEX=$enableval
14580 +else
14581
14582 -  case $ac_ii in
14583 -  c|c_r|pthread*) ;;
14584 -  *)
14585 -    if test "$ext_shared" = "yes"; then
14586 -        LDFLAGS="$LDFLAGS -l$ac_ii"
14587 -    else
14588 -
14589 +  PHP_MBREGEX=yes
14590
14591 -  case $ac_ii in
14592 -  c|c_r|pthread*) ;;
14593 -  *)
14594 -      LIBS="$LIBS -l$ac_ii"
14595 -   ;;
14596 -  esac
14597
14598 +fi
14599
14600 -    fi
14601 -   ;;
14602 -  esac
14603
14604 +ext_output=$PHP_MBREGEX
14605 +echo "$ac_t""$ext_output" 1>&6
14606
14607 -    ;;
14608 -    -L*)
14609 -      ac_ii=`echo $ac_i|cut -c 3-`
14610 -
14611 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
14612 -
14613 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
14614 -    ai_p=$ac_ii
14615 -  else
14616 -
14617 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
14618 -
14619 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
14620 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
14621 -  fi
14622
14623 -
14624 -      if test "$ext_shared" = "yes"; then
14625 -        LDFLAGS="-L$ai_p $LDFLAGS"
14626 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
14627 -      else
14628 -
14629 -
14630 -
14631 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
14632 +
14633 +
14634 +
14635 +php_enable_mbregex_backtrack=yes
14636 +
14637 +echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6
14638 +echo "configure:58040: checking whether to check multibyte regex backtrack" >&5
14639 +# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given.
14640 +if test "${enable_mbregex_backtrack+set}" = set; then
14641 +  enableval="$enable_mbregex_backtrack"
14642 +  PHP_MBREGEX_BACKTRACK=$enableval
14643 +else
14644
14645 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
14646 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
14647 -    eval "LIBPATH$unique=set"
14648 -
14649 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
14650 -    LDFLAGS="$LDFLAGS -L$ai_p"
14651 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
14652 +  PHP_MBREGEX_BACKTRACK=yes
14653
14654 -  fi
14655
14656 +fi
14657
14658 -      fi
14659 -
14660 -  fi
14661
14662 -    ;;
14663 -    esac
14664 -  done
14665 +ext_output=$PHP_MBREGEX_BACKTRACK
14666 +echo "$ac_t""$ext_output" 1>&6
14667
14668 -      echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6
14669 -echo "configure:57188: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
14670 -      cat > conftest.$ac_ext <<EOF
14671 -#line 57190 "configure"
14672 -#include "confdefs.h"
14673
14674 -#include <oniguruma.h>
14675 -
14676 -int main() {
14677
14678 -return (int)(ONIG_ENCODING_KOI8 + 1);
14679 -
14680 -; return 0; }
14681 -EOF
14682 -if { (eval echo configure:57201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14683 -  rm -rf conftest*
14684 -
14685 -        echo "$ac_t""no" 1>&6
14686 -
14687 +
14688 +
14689 +php_with_libmbfl=no
14690 +
14691 +echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
14692 +echo "configure:58063: checking for external libmbfl" >&5
14693 +# Check whether --with-libmbfl or --without-libmbfl was given.
14694 +if test "${with_libmbfl+set}" = set; then
14695 +  withval="$with_libmbfl"
14696 +  PHP_LIBMBFL=$withval
14697  else
14698 -  echo "configure: failed program was:" >&5
14699 -  cat conftest.$ac_ext >&5
14700 -  rm -rf conftest*
14701
14702 -        echo "$ac_t""yes" 1>&6
14703 -        cat >> confdefs.h <<\EOF
14704 -#define PHP_ONIG_BAD_KOI8_ENTRY 1
14705 -EOF
14706 +  PHP_LIBMBFL=no
14707 +
14708
14709 -
14710  fi
14711 -rm -f conftest*
14712 -      LDFLAGS=$save_old_LDFLAGS
14713 -    fi
14714 -
14715 -
14716 -  PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DONIG_ESCAPE_UCHAR_COLLISION=1"
14717
14718 -
14719 -  PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DUChar=OnigUChar"
14720
14721 +ext_output=$PHP_LIBMBFL
14722 +echo "$ac_t""$ext_output" 1>&6
14723
14724 -    cat >> confdefs.h <<\EOF
14725 -#define HAVE_MBREGEX 1
14726 -EOF
14727
14728
14729 -
14730 -  PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES php_mbregex.c"
14731
14732 -
14733 -  PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS php_mbregex.h php_onig_compat.h"
14734
14735 -  fi
14736 +php_with_onig=no
14737
14738 -  fi
14739 +echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6
14740 +echo "configure:58086: checking for external oniguruma" >&5
14741 +# Check whether --with-onig or --without-onig was given.
14742 +if test "${with_onig+set}" = set; then
14743 +  withval="$with_onig"
14744 +  PHP_ONIG=$withval
14745 +else
14746 +
14747 +  PHP_ONIG=no
14748
14749 -
14750 -    if test "$PHP_LIBMBFL" = "yes" || test "$PHP_LIBMBFL" = "no"; then
14751 -
14752 -  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl"
14753
14754 -
14755 -  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/mbfl"
14756 +fi
14757
14758 -
14759 -  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/filters"
14760
14761 -
14762 -  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/nls"
14763 +ext_output=$PHP_ONIG
14764 +echo "$ac_t""$ext_output" 1>&6
14765
14766 -
14767 -  PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl"
14768
14769 -
14770 -  PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl/mbfl"
14771
14772 -
14773 -  PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS libmbfl/config.h"
14774
14775 +if test "$PHP_MBSTRING" != "no"; then
14776 +  cat >> confdefs.h <<\EOF
14777 +#define HAVE_MBSTRING 1
14778 +EOF
14779
14780 -
14781 -  PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES
14782 -     libmbfl/filters/html_entities.c
14783 -     libmbfl/filters/mbfilter_7bit.c
14784 -     libmbfl/filters/mbfilter_ascii.c
14785 -     libmbfl/filters/mbfilter_base64.c
14786 -     libmbfl/filters/mbfilter_big5.c
14787 -     libmbfl/filters/mbfilter_byte2.c
14788 -     libmbfl/filters/mbfilter_byte4.c
14789 -     libmbfl/filters/mbfilter_cp1251.c
14790 -     libmbfl/filters/mbfilter_cp1252.c
14791 -     libmbfl/filters/mbfilter_cp1254.c
14792 -     libmbfl/filters/mbfilter_cp5022x.c
14793 -     libmbfl/filters/mbfilter_cp51932.c
14794 -     libmbfl/filters/mbfilter_cp850.c
14795 -     libmbfl/filters/mbfilter_cp866.c
14796 -     libmbfl/filters/mbfilter_cp932.c
14797 -     libmbfl/filters/mbfilter_cp936.c
14798 -     libmbfl/filters/mbfilter_euc_cn.c
14799 -     libmbfl/filters/mbfilter_euc_jp.c
14800 -     libmbfl/filters/mbfilter_euc_jp_win.c
14801 -     libmbfl/filters/mbfilter_euc_kr.c
14802 -     libmbfl/filters/mbfilter_euc_tw.c
14803 -     libmbfl/filters/mbfilter_htmlent.c
14804 -     libmbfl/filters/mbfilter_hz.c
14805 -     libmbfl/filters/mbfilter_iso2022_jp_ms.c
14806 -     libmbfl/filters/mbfilter_iso2022_kr.c
14807 -     libmbfl/filters/mbfilter_iso8859_1.c
14808 -     libmbfl/filters/mbfilter_iso8859_10.c
14809 -     libmbfl/filters/mbfilter_iso8859_13.c
14810 -     libmbfl/filters/mbfilter_iso8859_14.c
14811 -     libmbfl/filters/mbfilter_iso8859_15.c
14812 -     libmbfl/filters/mbfilter_iso8859_16.c
14813 -     libmbfl/filters/mbfilter_iso8859_2.c
14814 -     libmbfl/filters/mbfilter_iso8859_3.c
14815 -     libmbfl/filters/mbfilter_iso8859_4.c
14816 -     libmbfl/filters/mbfilter_iso8859_5.c
14817 -     libmbfl/filters/mbfilter_iso8859_6.c
14818 -     libmbfl/filters/mbfilter_iso8859_7.c
14819 -     libmbfl/filters/mbfilter_iso8859_8.c
14820 -     libmbfl/filters/mbfilter_iso8859_9.c
14821 -     libmbfl/filters/mbfilter_jis.c
14822 -     libmbfl/filters/mbfilter_koi8r.c
14823 -     libmbfl/filters/mbfilter_armscii8.c
14824 -     libmbfl/filters/mbfilter_qprint.c
14825 -     libmbfl/filters/mbfilter_sjis.c
14826 -     libmbfl/filters/mbfilter_sjis_open.c
14827 -     libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c
14828 -     libmbfl/filters/mbfilter_ucs2.c
14829 -     libmbfl/filters/mbfilter_ucs4.c
14830 -     libmbfl/filters/mbfilter_uhc.c
14831 -     libmbfl/filters/mbfilter_utf16.c
14832 -     libmbfl/filters/mbfilter_utf32.c
14833 -     libmbfl/filters/mbfilter_utf7.c
14834 -     libmbfl/filters/mbfilter_utf7imap.c
14835 -     libmbfl/filters/mbfilter_utf8.c
14836 -     libmbfl/filters/mbfilter_uuencode.c
14837 -     libmbfl/filters/mbfilter_koi8u.c
14838 -     libmbfl/mbfl/mbfilter.c
14839 -     libmbfl/mbfl/mbfilter_8bit.c
14840 -     libmbfl/mbfl/mbfilter_pass.c
14841 -     libmbfl/mbfl/mbfilter_wchar.c
14842 -     libmbfl/mbfl/mbfl_convert.c
14843 -     libmbfl/mbfl/mbfl_encoding.c
14844 -     libmbfl/mbfl/mbfl_filter_output.c
14845 -     libmbfl/mbfl/mbfl_ident.c
14846 -     libmbfl/mbfl/mbfl_language.c
14847 -     libmbfl/mbfl/mbfl_memory_device.c
14848 -     libmbfl/mbfl/mbfl_string.c
14849 -     libmbfl/mbfl/mbfl_allocators.c
14850 -     libmbfl/nls/nls_de.c
14851 -     libmbfl/nls/nls_en.c
14852 -     libmbfl/nls/nls_ja.c
14853 -     libmbfl/nls/nls_kr.c
14854 -     libmbfl/nls/nls_neutral.c
14855 -     libmbfl/nls/nls_ru.c
14856 -     libmbfl/nls/nls_uni.c
14857 -     libmbfl/nls/nls_zh.c
14858 -     libmbfl/nls/nls_hy.c
14859 -     libmbfl/nls/nls_tr.c
14860 -     libmbfl/nls/nls_ua.c
14861 -    "
14862
14863 -
14864 -  PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DHAVE_CONFIG_H"
14865 +
14866 +  PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c"
14867
14868 +
14869 +  if test "$PHP_MBREGEX" != "no"; then
14870
14871 -  PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h"
14872 +  if test "$PHP_MBREGEX" = "yes"; then
14873 +    if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then
14874 +                        if test "$PHP_MBREGEX_BACKTRACK" != "no"; then
14875 +        cat >> confdefs.h <<\EOF
14876 +#define USE_COMBINATION_EXPLOSION_CHECK 1
14877 +EOF
14878
14879 -  else
14880 -                for inc in include include/mbfl-1.0 include/mbfl; do
14881 -      if test -f "$PHP_LIBMBFL/$inc/mbfilter.h"; then
14882 -        PHP_LIBMBFL_INCLUDE="$inc"
14883 -        break
14884        fi
14885 -    done
14886 -
14887 -    if test -z "$PHP_LIBMBFL_INCLUDE"; then
14888 -      { echo "configure: error: mbfilter.h not found. Please reinstall libmbfl library." 1>&2; exit 1; }
14889 -    else
14890 -
14891 -  if test "$PHP_LIBMBFL_INCLUDE" != "/usr/include"; then
14892 -
14893 -  if test -z "$PHP_LIBMBFL_INCLUDE" || echo "$PHP_LIBMBFL_INCLUDE" | grep '^/' >/dev/null ; then
14894 -    ai_p=$PHP_LIBMBFL_INCLUDE
14895 -  else
14896 -
14897 -    ep_dir="`echo $PHP_LIBMBFL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
14898 -
14899 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
14900 -    ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL_INCLUDE\"`"
14901 -  fi
14902
14903 -
14904 +      echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
14905 +echo "configure:58127: checking for variable length prototypes and stdarg.h" >&5
14906 +if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then
14907 +  echo $ac_n "(cached) $ac_c" 1>&6
14908 +else
14909
14910 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
14911 +        if test "$cross_compiling" = yes; then
14912
14913 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
14914 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
14915 -    eval "INCLUDEPATH$unique=set"
14916 -
14917 -      if test ""; then
14918 -        INCLUDES="-I$ai_p $INCLUDES"
14919 -      else
14920 -        INCLUDES="$INCLUDES -I$ai_p"
14921 -      fi
14922 -
14923 -  fi
14924 -
14925 -  fi
14926 -
14927 -    fi
14928 -
14929 -
14930 -  save_old_LDFLAGS=$LDFLAGS
14931 -  ac_stuff="
14932 -      -L$PHP_LIBMBFL/$PHP_LIBDIR
14933 -    "
14934 -
14935 -  save_ext_shared=$ext_shared
14936 -  ext_shared=yes
14937 -
14938 -  for ac_i in $ac_stuff; do
14939 -    case $ac_i in
14940 -    -pthread)
14941 -      if test "$ext_shared" = "yes"; then
14942 -        LDFLAGS="$LDFLAGS -pthread"
14943 -      else
14944 +                    case $host_alias in
14945 +          *netware*)
14946 +          php_cv_mbstring_stdarg=yes
14947 +          ;;
14948 +          *)
14949 +          php_cv_mbstring_stdarg=no
14950 +          ;;
14951 +          esac
14952
14953 -
14954 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
14955 -
14956 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
14957 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
14958 -    eval "EXTRA_LDFLAGS$unique=set"
14959 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
14960 -  fi
14961 -
14962 -      fi
14963 -    ;;
14964 -    -l*)
14965 -      ac_ii=`echo $ac_i|cut -c 3-`
14966 -
14967 -
14968 -  case $ac_ii in
14969 -  c|c_r|pthread*) ;;
14970 -  *)
14971 -    if test "$ext_shared" = "yes"; then
14972 -        LDFLAGS="$LDFLAGS -l$ac_ii"
14973 -    else
14974 -
14975 -
14976 -  case $ac_ii in
14977 -  c|c_r|pthread*) ;;
14978 -  *)
14979 -      LIBS="$LIBS -l$ac_ii"
14980 -   ;;
14981 -  esac
14982 -
14983 -
14984 -    fi
14985 -   ;;
14986 -  esac
14987 -
14988 -
14989 -    ;;
14990 -    -L*)
14991 -      ac_ii=`echo $ac_i|cut -c 3-`
14992 -
14993 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
14994 -
14995 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
14996 -    ai_p=$ac_ii
14997 -  else
14998 -
14999 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
15000 -
15001 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
15002 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
15003 -  fi
15004 +else
15005 +  cat > conftest.$ac_ext <<EOF
15006 +#line 58145 "configure"
15007 +#include "confdefs.h"
15008
15009 -
15010 -      if test "$ext_shared" = "yes"; then
15011 -        LDFLAGS="-L$ai_p $LDFLAGS"
15012 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
15013 -      else
15014 +#include <stdarg.h>
15015 +int foo(int x, ...) {
15016 +       va_list va;
15017 +       va_start(va, x);
15018 +       va_arg(va, int);
15019 +       va_arg(va, char *);
15020 +       va_arg(va, double);
15021 +       return 0;
15022 +}
15023 +int main() { return foo(10, "", 3.14); }
15024
15025 -
15026 -
15027 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
15028 -
15029 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
15030 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
15031 -    eval "LIBPATH$unique=set"
15032 -
15033 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
15034 -    LDFLAGS="$LDFLAGS -L$ai_p"
15035 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
15036 -
15037 -  fi
15038 -
15039 +EOF
15040 +if { (eval echo configure:58160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15041 +then
15042 +  php_cv_mbstring_stdarg=yes
15043 +else
15044 +  echo "configure: failed program was:" >&5
15045 +  cat conftest.$ac_ext >&5
15046 +  rm -fr conftest*
15047 +  php_cv_mbstring_stdarg=no
15048 +fi
15049 +rm -fr conftest*
15050 +fi
15051
15052 -      fi
15053 -
15054 -  fi
15055 +
15056 +fi
15057
15058 -    ;;
15059 -    esac
15060 -  done
15061 +echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6
15062
15063 -  echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
15064 -echo "configure:57499: checking for mbfl_buffer_converter_new in -lmbfl" >&5
15065 -ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'`
15066 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15067 +      for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h
15068 +do
15069 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
15070 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
15071 +echo "configure:58181: checking for $ac_hdr" >&5
15072 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
15073    echo $ac_n "(cached) $ac_c" 1>&6
15074  else
15075 -  ac_save_LIBS="$LIBS"
15076 -LIBS="-lmbfl  $LIBS"
15077 -cat > conftest.$ac_ext <<EOF
15078 -#line 57507 "configure"
15079 +  cat > conftest.$ac_ext <<EOF
15080 +#line 58186 "configure"
15081  #include "confdefs.h"
15082 -/* Override any gcc2 internal prototype to avoid an error.  */
15083 -/* We use char because int might match the return type of a gcc2
15084 -    builtin and then its argument prototype would still apply.  */
15085 -char mbfl_buffer_converter_new();
15086 -
15087 -int main() {
15088 -mbfl_buffer_converter_new()
15089 -; return 0; }
15090 +#include <$ac_hdr>
15091  EOF
15092 -if { (eval echo configure:57518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15093 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
15094 +{ (eval echo configure:58191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
15095 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
15096 +if test -z "$ac_err"; then
15097    rm -rf conftest*
15098 -  eval "ac_cv_lib_$ac_lib_var=yes"
15099 +  eval "ac_cv_header_$ac_safe=yes"
15100  else
15101 +  echo "$ac_err" >&5
15102    echo "configure: failed program was:" >&5
15103    cat conftest.$ac_ext >&5
15104    rm -rf conftest*
15105 -  eval "ac_cv_lib_$ac_lib_var=no"
15106 +  eval "ac_cv_header_$ac_safe=no"
15107  fi
15108  rm -f conftest*
15109 -LIBS="$ac_save_LIBS"
15110 -
15111  fi
15112 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
15113 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
15114    echo "$ac_t""yes" 1>&6
15115 -
15116 -    LDFLAGS=$save_old_LDFLAGS
15117 -    ext_shared=$save_ext_shared
15118 -
15119 -
15120 -
15121 -  if test "$ext_shared" = "yes"; then
15122 -    MBSTRING_SHARED_LIBADD="-lmbfl $MBSTRING_SHARED_LIBADD"
15123 -    if test -n "$PHP_LIBMBFL/$PHP_LIBDIR"; then
15124 -
15125 -  if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then
15126 -
15127 -  if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
15128 -    ai_p=$PHP_LIBMBFL/$PHP_LIBDIR
15129 -  else
15130 -
15131 -    ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
15132 -
15133 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
15134 -    ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`"
15135 -  fi
15136 -
15137 -
15138 -      if test "$ext_shared" = "yes"; then
15139 -        MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD"
15140 -        test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_SHARED_LIBADD"
15141 -      else
15142 -
15143 -
15144 -
15145 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
15146 -
15147 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
15148 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
15149 -    eval "LIBPATH$unique=set"
15150 -
15151 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
15152 -    LDFLAGS="$LDFLAGS -L$ai_p"
15153 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
15154 -
15155 -  fi
15156 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
15157 +  cat >> confdefs.h <<EOF
15158 +#define $ac_tr_hdr 1
15159 +EOF
15160 +
15161 +else
15162 +  echo "$ac_t""no" 1>&6
15163 +fi
15164 +done
15165
15166 +      echo $ac_n "checking size of int""... $ac_c" 1>&6
15167 +echo "configure:58218: checking size of int" >&5
15168 +if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
15169 +  echo $ac_n "(cached) $ac_c" 1>&6
15170 +else
15171 +  if test "$cross_compiling" = yes; then
15172 +  ac_cv_sizeof_int=4
15173 +else
15174 +  cat > conftest.$ac_ext <<EOF
15175 +#line 58226 "configure"
15176 +#include "confdefs.h"
15177 +#include <stdio.h>
15178 +#include <sys/types.h>
15179 +main()
15180 +{
15181 +  FILE *f=fopen("conftestval", "w");
15182 +  if (!f) exit(1);
15183 +  fprintf(f, "%d\n", sizeof(int));
15184 +  exit(0);
15185 +}
15186 +EOF
15187 +if { (eval echo configure:58238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15188 +then
15189 +  ac_cv_sizeof_int=`cat conftestval`
15190 +else
15191 +  echo "configure: failed program was:" >&5
15192 +  cat conftest.$ac_ext >&5
15193 +  rm -fr conftest*
15194 +  ac_cv_sizeof_int=0
15195 +fi
15196 +rm -fr conftest*
15197 +fi
15198
15199 -      fi
15200 -
15201 -  fi
15202 +fi
15203 +echo "$ac_t""$ac_cv_sizeof_int" 1>&6
15204 +cat >> confdefs.h <<EOF
15205 +#define SIZEOF_INT $ac_cv_sizeof_int
15206 +EOF
15207
15208 -    fi
15209 -  else
15210 -
15211
15212 -  if test -n "$PHP_LIBMBFL/$PHP_LIBDIR"; then
15213 -
15214 -  if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then
15215 -
15216 -  if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
15217 -    ai_p=$PHP_LIBMBFL/$PHP_LIBDIR
15218 -  else
15219 -
15220 -    ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
15221 -
15222 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
15223 -    ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`"
15224 -  fi
15225 +      echo $ac_n "checking size of short""... $ac_c" 1>&6
15226 +echo "configure:58258: checking size of short" >&5
15227 +if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
15228 +  echo $ac_n "(cached) $ac_c" 1>&6
15229 +else
15230 +  if test "$cross_compiling" = yes; then
15231 +  ac_cv_sizeof_short=2
15232 +else
15233 +  cat > conftest.$ac_ext <<EOF
15234 +#line 58266 "configure"
15235 +#include "confdefs.h"
15236 +#include <stdio.h>
15237 +#include <sys/types.h>
15238 +main()
15239 +{
15240 +  FILE *f=fopen("conftestval", "w");
15241 +  if (!f) exit(1);
15242 +  fprintf(f, "%d\n", sizeof(short));
15243 +  exit(0);
15244 +}
15245 +EOF
15246 +if { (eval echo configure:58278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15247 +then
15248 +  ac_cv_sizeof_short=`cat conftestval`
15249 +else
15250 +  echo "configure: failed program was:" >&5
15251 +  cat conftest.$ac_ext >&5
15252 +  rm -fr conftest*
15253 +  ac_cv_sizeof_short=0
15254 +fi
15255 +rm -fr conftest*
15256 +fi
15257
15258 -
15259 -
15260 -
15261 -
15262 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
15263 -
15264 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
15265 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
15266 -    eval "LIBPATH$unique=set"
15267 -
15268 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
15269 -    LDFLAGS="$LDFLAGS -L$ai_p"
15270 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
15271 -
15272 -  fi
15273 +fi
15274 +echo "$ac_t""$ac_cv_sizeof_short" 1>&6
15275 +cat >> confdefs.h <<EOF
15276 +#define SIZEOF_SHORT $ac_cv_sizeof_short
15277 +EOF
15278
15279
15280 -
15281 -  fi
15282 +      echo $ac_n "checking size of long""... $ac_c" 1>&6
15283 +echo "configure:58298: checking size of long" >&5
15284 +if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
15285 +  echo $ac_n "(cached) $ac_c" 1>&6
15286 +else
15287 +  if test "$cross_compiling" = yes; then
15288 +  ac_cv_sizeof_long=4
15289 +else
15290 +  cat > conftest.$ac_ext <<EOF
15291 +#line 58306 "configure"
15292 +#include "confdefs.h"
15293 +#include <stdio.h>
15294 +#include <sys/types.h>
15295 +main()
15296 +{
15297 +  FILE *f=fopen("conftestval", "w");
15298 +  if (!f) exit(1);
15299 +  fprintf(f, "%d\n", sizeof(long));
15300 +  exit(0);
15301 +}
15302 +EOF
15303 +if { (eval echo configure:58318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15304 +then
15305 +  ac_cv_sizeof_long=`cat conftestval`
15306 +else
15307 +  echo "configure: failed program was:" >&5
15308 +  cat conftest.$ac_ext >&5
15309 +  rm -fr conftest*
15310 +  ac_cv_sizeof_long=0
15311 +fi
15312 +rm -fr conftest*
15313 +fi
15314
15315 -  fi
15316 -
15317 -
15318 -  case mbfl in
15319 -  c|c_r|pthread*) ;;
15320 -  *)
15321 -      LIBS="-lmbfl $LIBS"
15322 -   ;;
15323 -  esac
15324 +fi
15325 +echo "$ac_t""$ac_cv_sizeof_long" 1>&6
15326 +cat >> confdefs.h <<EOF
15327 +#define SIZEOF_LONG $ac_cv_sizeof_long
15328 +EOF
15329
15330
15331 +      echo $ac_n "checking for working const""... $ac_c" 1>&6
15332 +echo "configure:58338: checking for working const" >&5
15333 +if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
15334 +  echo $ac_n "(cached) $ac_c" 1>&6
15335 +else
15336 +  cat > conftest.$ac_ext <<EOF
15337 +#line 58343 "configure"
15338 +#include "confdefs.h"
15339
15340 +int main() {
15341
15342 -  fi
15343 +/* Ultrix mips cc rejects this.  */
15344 +typedef int charset[2]; const charset x;
15345 +/* SunOS 4.1.1 cc rejects this.  */
15346 +char const *const *ccp;
15347 +char **p;
15348 +/* NEC SVR4.0.2 mips cc rejects this.  */
15349 +struct point {int x, y;};
15350 +static struct point const zero = {0,0};
15351 +/* AIX XL C 1.02.0.0 rejects this.
15352 +   It does not let you subtract one const X* pointer from another in an arm
15353 +   of an if-expression whose if-part is not a constant expression */
15354 +const char *g = "string";
15355 +ccp = &g + (g ? g-g : 0);
15356 +/* HPUX 7.0 cc rejects these. */
15357 +++ccp;
15358 +p = (char**) ccp;
15359 +ccp = (char const *const *) p;
15360 +{ /* SCO 3.2v4 cc rejects this.  */
15361 +  char *t;
15362 +  char const *s = 0 ? (char *) 0 : (char const *) 0;
15363
15364 +  *t++ = 0;
15365 +}
15366 +{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
15367 +  int x[] = {25, 17};
15368 +  const int *foo = &x[0];
15369 +  ++foo;
15370 +}
15371 +{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
15372 +  typedef const int *iptr;
15373 +  iptr p = 0;
15374 +  ++p;
15375 +}
15376 +{ /* AIX XL C 1.02.0.0 rejects this saying
15377 +     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
15378 +  struct s { int j; const int *ap[3]; };
15379 +  struct s *b; b->j = 5;
15380 +}
15381 +{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
15382 +  const int foo = 10;
15383 +}
15384
15385 -
15386 -
15387 +; return 0; }
15388 +EOF
15389 +if { (eval echo configure:58392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
15390 +  rm -rf conftest*
15391 +  ac_cv_c_const=yes
15392  else
15393 -  echo "$ac_t""no" 1>&6
15394 -
15395 -    LDFLAGS=$save_old_LDFLAGS
15396 -    ext_shared=$save_ext_shared
15397 -    unset ac_cv_lib_mbfl_mbfl_buffer_converter_new
15398 -
15399 -      { echo "configure: error: Problem with libmbfl. Please check config.log for more information." 1>&2; exit 1; }
15400 -
15401 -
15402 +  echo "configure: failed program was:" >&5
15403 +  cat conftest.$ac_ext >&5
15404 +  rm -rf conftest*
15405 +  ac_cv_c_const=no
15406 +fi
15407 +rm -f conftest*
15408  fi
15409
15410 -  fi
15411 +echo "$ac_t""$ac_cv_c_const" 1>&6
15412 +if test $ac_cv_c_const = no; then
15413 +  cat >> confdefs.h <<\EOF
15414 +#define const
15415 +EOF
15416
15417 -
15418 -
15419 -  ext_builddir=ext/mbstring
15420 -  ext_srcdir=$abs_srcdir/ext/mbstring
15421 +fi
15422
15423 -  ac_extra=`echo "$PHP_MBSTRING_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
15424 +      echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
15425 +echo "configure:58413: checking whether time.h and sys/time.h may both be included" >&5
15426 +if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
15427 +  echo $ac_n "(cached) $ac_c" 1>&6
15428 +else
15429 +  cat > conftest.$ac_ext <<EOF
15430 +#line 58418 "configure"
15431 +#include "confdefs.h"
15432 +#include <sys/types.h>
15433 +#include <sys/time.h>
15434 +#include <time.h>
15435 +int main() {
15436 +struct tm *tp;
15437 +; return 0; }
15438 +EOF
15439 +if { (eval echo configure:58427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
15440 +  rm -rf conftest*
15441 +  ac_cv_header_time=yes
15442 +else
15443 +  echo "configure: failed program was:" >&5
15444 +  cat conftest.$ac_ext >&5
15445 +  rm -rf conftest*
15446 +  ac_cv_header_time=no
15447 +fi
15448 +rm -f conftest*
15449 +fi
15450
15451 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
15452 -    PHP_MBSTRING_SHARED=no
15453 -
15454 -
15455 -  case ext/mbstring in
15456 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
15457 -  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
15458 -  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
15459 -  esac
15460 -
15461 -
15462 +echo "$ac_t""$ac_cv_header_time" 1>&6
15463 +if test $ac_cv_header_time = yes; then
15464 +  cat >> confdefs.h <<\EOF
15465 +#define TIME_WITH_SYS_TIME 1
15466 +EOF
15467
15468 -  b_c_pre=$php_c_pre
15469 -  b_cxx_pre=$php_cxx_pre
15470 -  b_c_meta=$php_c_meta
15471 -  b_cxx_meta=$php_cxx_meta
15472 -  b_c_post=$php_c_post
15473 -  b_cxx_post=$php_cxx_post
15474 -  b_lo=$php_lo
15475 +fi
15476 +
15477 +      # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
15478 +# for constant arguments.  Useless!
15479 +echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
15480 +echo "configure:58450: checking for working alloca.h" >&5
15481 +if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
15482 +  echo $ac_n "(cached) $ac_c" 1>&6
15483 +else
15484 +  cat > conftest.$ac_ext <<EOF
15485 +#line 58455 "configure"
15486 +#include "confdefs.h"
15487 +#include <alloca.h>
15488 +int main() {
15489 +char *p = alloca(2 * sizeof(int));
15490 +; return 0; }
15491 +EOF
15492 +if { (eval echo configure:58462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15493 +  rm -rf conftest*
15494 +  ac_cv_header_alloca_h=yes
15495 +else
15496 +  echo "configure: failed program was:" >&5
15497 +  cat conftest.$ac_ext >&5
15498 +  rm -rf conftest*
15499 +  ac_cv_header_alloca_h=no
15500 +fi
15501 +rm -f conftest*
15502 +fi
15503
15504 +echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
15505 +if test $ac_cv_header_alloca_h = yes; then
15506 +  cat >> confdefs.h <<\EOF
15507 +#define HAVE_ALLOCA_H 1
15508 +EOF
15509
15510 -  old_IFS=$IFS
15511 -  for ac_src in $PHP_MBSTRING_SOURCES; do
15512 -
15513 -      IFS=.
15514 -      set $ac_src
15515 -      ac_obj=$1
15516 -      IFS=$old_IFS
15517 -
15518 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
15519 +fi
15520
15521 -      case $ac_src in
15522 -        *.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" ;;
15523 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
15524 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
15525 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
15526 -      esac
15527 +echo $ac_n "checking for alloca""... $ac_c" 1>&6
15528 +echo "configure:58483: checking for alloca" >&5
15529 +if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
15530 +  echo $ac_n "(cached) $ac_c" 1>&6
15531 +else
15532 +  cat > conftest.$ac_ext <<EOF
15533 +#line 58488 "configure"
15534 +#include "confdefs.h"
15535
15536 -    cat >>Makefile.objects<<EOF
15537 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
15538 -       $ac_comp
15539 -EOF
15540 -  done
15541 +#ifdef __GNUC__
15542 +# define alloca __builtin_alloca
15543 +#else
15544 +# ifdef _MSC_VER
15545 +#  include <malloc.h>
15546 +#  define alloca _alloca
15547 +# else
15548 +#  if HAVE_ALLOCA_H
15549 +#   include <alloca.h>
15550 +#  else
15551 +#   ifdef _AIX
15552 + #pragma alloca
15553 +#   else
15554 +#    ifndef alloca /* predefined by HP cc +Olibcalls */
15555 +char *alloca ();
15556 +#    endif
15557 +#   endif
15558 +#  endif
15559 +# endif
15560 +#endif
15561
15562 +int main() {
15563 +char *p = (char *) alloca(1);
15564 +; return 0; }
15565 +EOF
15566 +if { (eval echo configure:58516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15567 +  rm -rf conftest*
15568 +  ac_cv_func_alloca_works=yes
15569 +else
15570 +  echo "configure: failed program was:" >&5
15571 +  cat conftest.$ac_ext >&5
15572 +  rm -rf conftest*
15573 +  ac_cv_func_alloca_works=no
15574 +fi
15575 +rm -f conftest*
15576 +fi
15577
15578 -    EXT_STATIC="$EXT_STATIC mbstring"
15579 -    if test "$ext_shared" != "nocli"; then
15580 -      EXT_CLI_STATIC="$EXT_CLI_STATIC mbstring"
15581 -    fi
15582 -  else
15583 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
15584 -      PHP_MBSTRING_SHARED=yes
15585 -
15586 -  case ext/mbstring in
15587 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
15588 -  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
15589 -  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
15590 -  esac
15591 -
15592 -
15593 +echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
15594 +if test $ac_cv_func_alloca_works = yes; then
15595 +  cat >> confdefs.h <<\EOF
15596 +#define HAVE_ALLOCA 1
15597 +EOF
15598
15599 -  b_c_pre=$shared_c_pre
15600 -  b_cxx_pre=$shared_cxx_pre
15601 -  b_c_meta=$shared_c_meta
15602 -  b_cxx_meta=$shared_cxx_meta
15603 -  b_c_post=$shared_c_post
15604 -  b_cxx_post=$shared_cxx_post
15605 -  b_lo=$shared_lo
15606 +fi
15607
15608 +if test $ac_cv_func_alloca_works = no; then
15609 +  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
15610 +  # that cause trouble.  Some versions do not even contain alloca or
15611 +  # contain a buggy version.  If you still want to use their alloca,
15612 +  # use ar to extract alloca.o from them instead of compiling alloca.c.
15613 +  ALLOCA=alloca.${ac_objext}
15614 +  cat >> confdefs.h <<\EOF
15615 +#define C_ALLOCA 1
15616 +EOF
15617
15618 -  old_IFS=$IFS
15619 -  for ac_src in $PHP_MBSTRING_SOURCES; do
15620 -
15621 -      IFS=.
15622 -      set $ac_src
15623 -      ac_obj=$1
15624 -      IFS=$old_IFS
15625 -
15626 -      shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo"
15627
15628 -      case $ac_src in
15629 -        *.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" ;;
15630 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
15631 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
15632 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
15633 -      esac
15634 +echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
15635 +echo "configure:58548: checking whether alloca needs Cray hooks" >&5
15636 +if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
15637 +  echo $ac_n "(cached) $ac_c" 1>&6
15638 +else
15639 +  cat > conftest.$ac_ext <<EOF
15640 +#line 58553 "configure"
15641 +#include "confdefs.h"
15642 +#if defined(CRAY) && ! defined(CRAY2)
15643 +webecray
15644 +#else
15645 +wenotbecray
15646 +#endif
15647
15648 -    cat >>Makefile.objects<<EOF
15649 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
15650 -       $ac_comp
15651  EOF
15652 -  done
15653 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
15654 +  egrep "webecray" >/dev/null 2>&1; then
15655 +  rm -rf conftest*
15656 +  ac_cv_os_cray=yes
15657 +else
15658 +  rm -rf conftest*
15659 +  ac_cv_os_cray=no
15660 +fi
15661 +rm -f conftest*
15662
15663 -      case $host_alias in
15664 -        *netware*)
15665 -
15666 -  install_modules="install-modules"
15667 +fi
15668
15669 -  case $host_alias in
15670 -    *aix*)
15671 -      suffix=so
15672 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmbstring.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) $(PHPMBSTRING_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmbstring.so '$ext_builddir'/phpmbstring.so'
15673 -      ;;
15674 -    *netware*)
15675 -      suffix=nlm
15676 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMBSTRING, 3)_SHARED_LIBADD)'
15677 -      ;;
15678 -    *)
15679 -      suffix=la
15680 -      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_mbstring) $(PHPMBSTRING_SHARED_LIBADD)'
15681 -      ;;
15682 -  esac
15683 +echo "$ac_t""$ac_cv_os_cray" 1>&6
15684 +if test $ac_cv_os_cray = yes; then
15685 +for ac_func in _getb67 GETB67 getb67; do
15686 +  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15687 +echo "configure:58578: checking for $ac_func" >&5
15688 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15689 +  echo $ac_n "(cached) $ac_c" 1>&6
15690 +else
15691 +  cat > conftest.$ac_ext <<EOF
15692 +#line 58583 "configure"
15693 +#include "confdefs.h"
15694 +/* System header to define __stub macros and hopefully few prototypes,
15695 +    which can conflict with char $ac_func(); below.  */
15696 +#include <assert.h>
15697 +/* Override any gcc2 internal prototype to avoid an error.  */
15698 +/* We use char because int might match the return type of a gcc2
15699 +    builtin and then its argument prototype would still apply.  */
15700 +char $ac_func();
15701
15702 -  if test "x" = "xyes"; then
15703 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmbstring.$suffix"
15704 -  else
15705 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmbstring.$suffix"
15706 -  fi
15707 -
15708 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mbstring"
15709 +int main() {
15710
15711 -  cat >>Makefile.objects<<EOF
15712 -\$(phplibdir)/phpmbstring.$suffix: $ext_builddir/phpmbstring.$suffix
15713 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmbstring.$suffix \$(phplibdir)
15714 +/* The GNU C library defines this for functions which it implements
15715 +    to always fail with ENOSYS.  Some functions are actually named
15716 +    something starting with __ and the normal name is an alias.  */
15717 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
15718 +choke me
15719 +#else
15720 +$ac_func();
15721 +#endif
15722
15723 -$ext_builddir/phpmbstring.$suffix: \$(shared_objects_mbstring) \$(PHPMBSTRING_SHARED_DEPENDENCIES)
15724 -       $link_cmd
15725 +; return 0; }
15726 +EOF
15727 +if { (eval echo configure:58606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15728 +  rm -rf conftest*
15729 +  eval "ac_cv_func_$ac_func=yes"
15730 +else
15731 +  echo "configure: failed program was:" >&5
15732 +  cat conftest.$ac_ext >&5
15733 +  rm -rf conftest*
15734 +  eval "ac_cv_func_$ac_func=no"
15735 +fi
15736 +rm -f conftest*
15737 +fi
15738
15739 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
15740 +  echo "$ac_t""yes" 1>&6
15741 +  cat >> confdefs.h <<EOF
15742 +#define CRAY_STACKSEG_END $ac_func
15743  EOF
15744
15745 -          ;;
15746 -        *)
15747 -
15748 -  install_modules="install-modules"
15749 +  break
15750 +else
15751 +  echo "$ac_t""no" 1>&6
15752 +fi
15753
15754 -  case $host_alias in
15755 -    *aix*)
15756 -      suffix=so
15757 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mbstring.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) $(MBSTRING_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mbstring.so '$ext_builddir'/mbstring.so'
15758 -      ;;
15759 -    *netware*)
15760 -      suffix=nlm
15761 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MBSTRING, 3)_SHARED_LIBADD)'
15762 -      ;;
15763 -    *)
15764 -      suffix=la
15765 -      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_mbstring) $(MBSTRING_SHARED_LIBADD)'
15766 -      ;;
15767 -  esac
15768 +done
15769 +fi
15770
15771 -  if test "x" = "xyes"; then
15772 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mbstring.$suffix"
15773 +echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
15774 +echo "configure:58633: checking stack direction for C alloca" >&5
15775 +if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
15776 +  echo $ac_n "(cached) $ac_c" 1>&6
15777 +else
15778 +  if test "$cross_compiling" = yes; then
15779 +  ac_cv_c_stack_direction=0
15780 +else
15781 +  cat > conftest.$ac_ext <<EOF
15782 +#line 58641 "configure"
15783 +#include "confdefs.h"
15784 +find_stack_direction ()
15785 +{
15786 +  static char *addr = 0;
15787 +  auto char dummy;
15788 +  if (addr == 0)
15789 +    {
15790 +      addr = &dummy;
15791 +      return find_stack_direction ();
15792 +    }
15793    else
15794 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mbstring.$suffix"
15795 -  fi
15796 -
15797 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mbstring"
15798 -
15799 -  cat >>Makefile.objects<<EOF
15800 -\$(phplibdir)/mbstring.$suffix: $ext_builddir/mbstring.$suffix
15801 -       \$(LIBTOOL) --mode=install cp $ext_builddir/mbstring.$suffix \$(phplibdir)
15802 -
15803 -$ext_builddir/mbstring.$suffix: \$(shared_objects_mbstring) \$(MBSTRING_SHARED_DEPENDENCIES)
15804 -       $link_cmd
15805 -
15806 +    return (&dummy > addr) ? 1 : -1;
15807 +}
15808 +main ()
15809 +{
15810 +  exit (find_stack_direction() < 0);
15811 +}
15812  EOF
15813 +if { (eval echo configure:58660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15814 +then
15815 +  ac_cv_c_stack_direction=1
15816 +else
15817 +  echo "configure: failed program was:" >&5
15818 +  cat conftest.$ac_ext >&5
15819 +  rm -fr conftest*
15820 +  ac_cv_c_stack_direction=-1
15821 +fi
15822 +rm -fr conftest*
15823 +fi
15824
15825 -          ;;
15826 -      esac
15827 -      cat >> confdefs.h <<EOF
15828 -#define COMPILE_DL_MBSTRING 1
15829 +fi
15830 +
15831 +echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
15832 +cat >> confdefs.h <<EOF
15833 +#define STACK_DIRECTION $ac_cv_c_stack_direction
15834  EOF
15835
15836 -    fi
15837 -  fi
15838 +fi
15839
15840 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
15841 -    PHP_MBSTRING_SHARED=no
15842 -    case "$PHP_SAPI" in
15843 -      cgi|embed)
15844 -
15845 -
15846 -  case ext/mbstring in
15847 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
15848 -  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
15849 -  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
15850 -  esac
15851 -
15852 -
15853 +      echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
15854 +echo "configure:58682: checking for 8-bit clean memcmp" >&5
15855 +if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
15856 +  echo $ac_n "(cached) $ac_c" 1>&6
15857 +else
15858 +  if test "$cross_compiling" = yes; then
15859 +  ac_cv_func_memcmp_clean=no
15860 +else
15861 +  cat > conftest.$ac_ext <<EOF
15862 +#line 58690 "configure"
15863 +#include "confdefs.h"
15864
15865 -  b_c_pre=$php_c_pre
15866 -  b_cxx_pre=$php_cxx_pre
15867 -  b_c_meta=$php_c_meta
15868 -  b_cxx_meta=$php_cxx_meta
15869 -  b_c_post=$php_c_post
15870 -  b_cxx_post=$php_cxx_post
15871 -  b_lo=$php_lo
15872 +main()
15873 +{
15874 +  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
15875 +  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
15876 +}
15877
15878 +EOF
15879 +if { (eval echo configure:58700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15880 +then
15881 +  ac_cv_func_memcmp_clean=yes
15882 +else
15883 +  echo "configure: failed program was:" >&5
15884 +  cat conftest.$ac_ext >&5
15885 +  rm -fr conftest*
15886 +  ac_cv_func_memcmp_clean=no
15887 +fi
15888 +rm -fr conftest*
15889 +fi
15890
15891 -  old_IFS=$IFS
15892 -  for ac_src in $PHP_MBSTRING_SOURCES; do
15893 -
15894 -      IFS=.
15895 -      set $ac_src
15896 -      ac_obj=$1
15897 -      IFS=$old_IFS
15898 -
15899 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
15900 +fi
15901
15902 -      case $ac_src in
15903 -        *.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" ;;
15904 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
15905 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
15906 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
15907 -      esac
15908 +echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
15909 +test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
15910
15911 -    cat >>Makefile.objects<<EOF
15912 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
15913 -       $ac_comp
15914 +      ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'`
15915 +echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6
15916 +echo "configure:58719: checking for stdarg.h" >&5
15917 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
15918 +  echo $ac_n "(cached) $ac_c" 1>&6
15919 +else
15920 +  cat > conftest.$ac_ext <<EOF
15921 +#line 58724 "configure"
15922 +#include "confdefs.h"
15923 +#include <stdarg.h>
15924  EOF
15925 -  done
15926 -
15927 -
15928 -        EXT_STATIC="$EXT_STATIC mbstring"
15929 -        ;;
15930 -      *)
15931 -
15932 -
15933 -  case ext/mbstring in
15934 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
15935 -  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
15936 -  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
15937 -  esac
15938 -
15939 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
15940 +{ (eval echo configure:58729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
15941 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
15942 +if test -z "$ac_err"; then
15943 +  rm -rf conftest*
15944 +  eval "ac_cv_header_$ac_safe=yes"
15945 +else
15946 +  echo "$ac_err" >&5
15947 +  echo "configure: failed program was:" >&5
15948 +  cat conftest.$ac_ext >&5
15949 +  rm -rf conftest*
15950 +  eval "ac_cv_header_$ac_safe=no"
15951 +fi
15952 +rm -f conftest*
15953 +fi
15954 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
15955 +  echo "$ac_t""yes" 1>&6
15956
15957 +        cat >> confdefs.h <<\EOF
15958 +#define HAVE_STDARG_PROTOTYPES 1
15959 +EOF
15960
15961 -  b_c_pre=$php_c_pre
15962 -  b_cxx_pre=$php_cxx_pre
15963 -  b_c_meta=$php_c_meta
15964 -  b_cxx_meta=$php_cxx_meta
15965 -  b_c_post=$php_c_post
15966 -  b_cxx_post=$php_cxx_post
15967 -  b_lo=$php_lo
15968 -
15969 -
15970 -  old_IFS=$IFS
15971 -  for ac_src in $PHP_MBSTRING_SOURCES; do
15972 -
15973 -      IFS=.
15974 -      set $ac_src
15975 -      ac_obj=$1
15976 -      IFS=$old_IFS
15977
15978 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
15979 -
15980 -      case $ac_src in
15981 -        *.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" ;;
15982 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
15983 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
15984 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
15985 -      esac
15986 +else
15987 +  echo "$ac_t""no" 1>&6
15988 +fi
15989
15990 -    cat >>Makefile.objects<<EOF
15991 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
15992 -       $ac_comp
15993 +      cat >> confdefs.h <<\EOF
15994 +#define PHP_ONIG_BUNDLED 1
15995  EOF
15996 -  done
15997
15998 +      cat >> confdefs.h <<\EOF
15999 +#define HAVE_ONIG 1
16000 +EOF
16001 +
16002 +
16003 +  PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY"
16004
16005 -        ;;
16006 -    esac
16007 -    EXT_CLI_STATIC="$EXT_CLI_STATIC mbstring"
16008 -  fi
16009 -
16010 -
16011 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
16012 -
16013 +
16014 +  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma"
16015
16016 +
16017 +  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma/enc"
16018
16019 -  if test "$ext_builddir" = "."; then
16020 -    PHP_PECL_EXTENSION=mbstring
16021 -
16022 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
16023 +
16024 +  PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES oniguruma"
16025
16026 -  fi
16027 +
16028 +  PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS oniguruma/config.h"
16029
16030 -
16031 -  PHP_VAR_SUBST="$PHP_VAR_SUBST MBSTRING_SHARED_LIBADD"
16032 +
16033 +  PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES
16034 +        oniguruma/regcomp.c
16035 +        oniguruma/regerror.c
16036 +        oniguruma/regexec.c
16037 +        oniguruma/reggnu.c
16038 +        oniguruma/regparse.c
16039 +        oniguruma/regenc.c
16040 +        oniguruma/regext.c
16041 +        oniguruma/regsyntax.c
16042 +        oniguruma/regtrav.c
16043 +        oniguruma/regversion.c
16044 +        oniguruma/st.c
16045 +        oniguruma/enc/unicode.c
16046 +        oniguruma/enc/ascii.c
16047 +        oniguruma/enc/utf8.c
16048 +        oniguruma/enc/euc_jp.c
16049 +        oniguruma/enc/euc_tw.c
16050 +        oniguruma/enc/euc_kr.c
16051 +        oniguruma/enc/sjis.c
16052 +        oniguruma/enc/iso8859_1.c
16053 +        oniguruma/enc/iso8859_2.c
16054 +        oniguruma/enc/iso8859_3.c
16055 +        oniguruma/enc/iso8859_4.c
16056 +        oniguruma/enc/iso8859_5.c
16057 +        oniguruma/enc/iso8859_6.c
16058 +        oniguruma/enc/iso8859_7.c
16059 +        oniguruma/enc/iso8859_8.c
16060 +        oniguruma/enc/iso8859_9.c
16061 +        oniguruma/enc/iso8859_10.c
16062 +        oniguruma/enc/iso8859_11.c
16063 +        oniguruma/enc/iso8859_13.c
16064 +        oniguruma/enc/iso8859_14.c
16065 +        oniguruma/enc/iso8859_15.c
16066 +        oniguruma/enc/iso8859_16.c
16067 +        oniguruma/enc/koi8.c
16068 +        oniguruma/enc/koi8_r.c
16069 +        oniguruma/enc/big5.c
16070 +        oniguruma/enc/utf16_be.c
16071 +        oniguruma/enc/utf16_le.c
16072 +        oniguruma/enc/utf32_be.c
16073 +        oniguruma/enc/utf32_le.c
16074 +      "
16075
16076 +
16077 +  PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS oniguruma/oniguruma.h"
16078
16079 -  for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do
16080 +    else
16081 +                        if test ! -f "$PHP_ONIG/include/oniguruma.h"; then
16082 +        { echo "configure: error: oniguruma.h not found in $PHP_ONIG/include" 1>&2; exit 1; }
16083 +      fi
16084 +
16085 +  if test "$PHP_ONIG/include" != "/usr/include"; then
16086
16087 -
16088 -    $php_shtool mkdir -p $ext_builddir/$dir
16089 -
16090 -
16091 -  done
16092 -
16093 -  for dir in $PHP_MBSTRING_EXTRA_INCLUDES; do
16094 -
16095 -  if test "$ext_srcdir/$dir" != "/usr/include"; then
16096 -
16097 -  if test -z "$ext_srcdir/$dir" || echo "$ext_srcdir/$dir" | grep '^/' >/dev/null ; then
16098 -    ai_p=$ext_srcdir/$dir
16099 -  else
16100 -
16101 -    ep_dir="`echo $ext_srcdir/$dir|$SED 's%/*[^/][^/]*/*$%%'`"
16102 -
16103 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
16104 -    ai_p="$ep_realdir/`basename \"$ext_srcdir/$dir\"`"
16105 -  fi
16106 -
16107 -
16108 -
16109 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
16110 -
16111 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
16112 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
16113 -    eval "INCLUDEPATH$unique=set"
16114 -
16115 -      if test ""; then
16116 -        INCLUDES="-I$ai_p $INCLUDES"
16117 -      else
16118 -        INCLUDES="$INCLUDES -I$ai_p"
16119 -      fi
16120 -
16121 -  fi
16122 -
16123 -  fi
16124 -
16125 -
16126 -  if test "$ext_builddir/$dir" != "/usr/include"; then
16127 -
16128 -  if test -z "$ext_builddir/$dir" || echo "$ext_builddir/$dir" | grep '^/' >/dev/null ; then
16129 -    ai_p=$ext_builddir/$dir
16130 +  if test -z "$PHP_ONIG/include" || echo "$PHP_ONIG/include" | grep '^/' >/dev/null ; then
16131 +    ai_p=$PHP_ONIG/include
16132    else
16133
16134 -    ep_dir="`echo $ext_builddir/$dir|$SED 's%/*[^/][^/]*/*$%%'`"
16135 +    ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`"
16136
16137      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
16138 -    ai_p="$ep_realdir/`basename \"$ext_builddir/$dir\"`"
16139 +    ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`"
16140    fi
16141
16142
16143 @@ -58014,229 +58856,12 @@ EOF
16144
16145    fi
16146
16147 -  done
16148 -
16149 -  if test "$ext_shared" = "no"; then
16150 -
16151 -
16152 -  case ext/mbstring in
16153 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
16154 -  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
16155 -  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
16156 -  esac
16157 -
16158 -
16159 -
16160 -  b_c_pre=$php_c_pre
16161 -  b_cxx_pre=$php_cxx_pre
16162 -  b_c_meta=$php_c_meta
16163 -  b_cxx_meta=$php_cxx_meta
16164 -  b_c_post=$php_c_post
16165 -  b_cxx_post=$php_cxx_post
16166 -  b_lo=$php_lo
16167 -
16168 -
16169 -  old_IFS=$IFS
16170 -  for ac_src in $PHP_MBSTRING_BASE_SOURCES; do
16171 -
16172 -      IFS=.
16173 -      set $ac_src
16174 -      ac_obj=$1
16175 -      IFS=$old_IFS
16176 -
16177 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
16178 -
16179 -      case $ac_src in
16180 -        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
16181 -        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
16182 -        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
16183 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
16184 -      esac
16185 -
16186 -    cat >>Makefile.objects<<EOF
16187 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
16188 -       $ac_comp
16189 -EOF
16190 -  done
16191 -
16192 -
16193 -    out="php_config.h"
16194 -  else
16195 -
16196 -  case ext/mbstring in
16197 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
16198 -  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
16199 -  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
16200 -  esac
16201 -
16202 -
16203 -
16204 -  b_c_pre=$shared_c_pre
16205 -  b_cxx_pre=$shared_cxx_pre
16206 -  b_c_meta=$shared_c_meta
16207 -  b_cxx_meta=$shared_cxx_meta
16208 -  b_c_post=$shared_c_post
16209 -  b_cxx_post=$shared_cxx_post
16210 -  b_lo=$shared_lo
16211 -
16212 -
16213 -  old_IFS=$IFS
16214 -  for ac_src in $PHP_MBSTRING_BASE_SOURCES; do
16215 -
16216 -      IFS=.
16217 -      set $ac_src
16218 -      ac_obj=$1
16219 -      IFS=$old_IFS
16220 -
16221 -      shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo"
16222 -
16223 -      case $ac_src in
16224 -        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
16225 -        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
16226 -        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
16227 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
16228 -      esac
16229 -
16230 -    cat >>Makefile.objects<<EOF
16231 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
16232 -       $ac_comp
16233 -EOF
16234 -  done
16235 -
16236 -    if test -f "$ext_builddir/config.h.in"; then
16237 -      out="$abs_builddir/config.h"
16238 -    else
16239 -      out="php_config.h"
16240 -    fi
16241 -  fi
16242 -
16243 -  for cfg in $PHP_MBSTRING_EXTRA_CONFIG_HEADERS; do
16244 -    cat > $ext_builddir/$cfg <<EOF
16245 -#include "$out"
16246 -EOF
16247 -  done
16248 -
16249 -  PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS mbstring.h"
16250
16251 -
16252 -
16253 -    header_path=ext/mbstring
16254 -    for header_file in $PHP_MBSTRING_INSTALL_HEADERS; do
16255 -      hp_hf="$header_path/$header_file"
16256 -
16257 -
16258 -  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
16259 -
16260 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
16261 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
16262 -    eval "INSTALLHEADERS$unique=set"
16263 -
16264 -        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
16265
16266 -  fi
16267 -
16268 -    done
16269 -
16270 -
16271 -
16272 -fi
16273 -
16274 -# vim600: sts=2 sw=2 et
16275 -
16276 -
16277 -
16278 -
16279 -
16280 -
16281 -php_with_mcrypt=no
16282 -
16283 -echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
16284 -echo "configure:58155: checking for mcrypt support" >&5
16285 -# Check whether --with-mcrypt or --without-mcrypt was given.
16286 -if test "${with_mcrypt+set}" = set; then
16287 -  withval="$with_mcrypt"
16288 -  PHP_MCRYPT=$withval
16289 -else
16290 -
16291 -  PHP_MCRYPT=no
16292 -  test "$PHP_ENABLE_ALL" && PHP_MCRYPT=$PHP_ENABLE_ALL
16293 -
16294 -fi
16295 -
16296 -
16297 -
16298 -ext_output="yes, shared"
16299 -ext_shared=yes
16300 -case $PHP_MCRYPT in
16301 -shared,*)
16302 -  PHP_MCRYPT=`echo "$PHP_MCRYPT"|$SED 's/^shared,//'`
16303 -  ;;
16304 -shared)
16305 -  PHP_MCRYPT=yes
16306 -  ;;
16307 -no)
16308 -  ext_output=no
16309 -  ext_shared=no
16310 -  ;;
16311 -*)
16312 -  ext_output=yes
16313 -  ext_shared=no
16314 -  ;;
16315 -esac
16316 -
16317 -
16318 -
16319 -echo "$ac_t""$ext_output" 1>&6
16320 -
16321 -
16322 -
16323 -
16324 -if test "$PHP_MCRYPT" != "no"; then
16325 -  for i in $PHP_MCRYPT /usr/local /usr; do
16326 -    test -f $i/include/mcrypt.h && MCRYPT_DIR=$i && break
16327 -  done
16328 -
16329 -  if test -z "$MCRYPT_DIR"; then
16330 -    { echo "configure: error: mcrypt.h not found. Please reinstall libmcrypt." 1>&2; exit 1; }
16331 -  fi
16332 -
16333 -
16334 -  old_CPPFLAGS=$CPPFLAGS
16335 -  CPPFLAGS=-I$MCRYPT_DIR/include
16336 -  echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6
16337 -echo "configure:58208: checking for libmcrypt version" >&5
16338 -  cat > conftest.$ac_ext <<EOF
16339 -#line 58210 "configure"
16340 -#include "confdefs.h"
16341 -
16342 -#include <mcrypt.h>
16343 -#if MCRYPT_API_VERSION >= 20021217
16344 -  yes
16345 -#endif
16346 -
16347 -EOF
16348 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
16349 -  egrep "yes" >/dev/null 2>&1; then
16350 -  rm -rf conftest*
16351 -
16352 -    echo "$ac_t"">= 2.5.6" 1>&6
16353 -
16354 -else
16355 -  rm -rf conftest*
16356 -
16357 -    { echo "configure: error: libmcrypt version 2.5.6 or greater required." 1>&2; exit 1; }
16358 -
16359 -fi
16360 -rm -f conftest*
16361 -
16362 -  CPPFLAGS=$old_CPPFLAGS
16363 -
16364 -
16365 -
16366    save_old_LDFLAGS=$LDFLAGS
16367    ac_stuff="
16368 -    -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl
16369 -  "
16370 +        -L$PHP_ONIG/$PHP_LIBDIR
16371 +      "
16372
16373    save_ext_shared=$ext_shared
16374    ext_shared=yes
16375 @@ -58329,27 +58954,27 @@ rm -f conftest*
16376      esac
16377    done
16378
16379 -  echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
16380 -echo "configure:58334: checking for mcrypt_module_open in -lmcrypt" >&5
16381 -ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
16382 +  echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6
16383 +echo "configure:58959: checking for onig_init in -lonig" >&5
16384 +ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'`
16385  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16386    echo $ac_n "(cached) $ac_c" 1>&6
16387  else
16388    ac_save_LIBS="$LIBS"
16389 -LIBS="-lmcrypt  $LIBS"
16390 +LIBS="-lonig  $LIBS"
16391  cat > conftest.$ac_ext <<EOF
16392 -#line 58342 "configure"
16393 +#line 58967 "configure"
16394  #include "confdefs.h"
16395  /* Override any gcc2 internal prototype to avoid an error.  */
16396  /* We use char because int might match the return type of a gcc2
16397      builtin and then its argument prototype would still apply.  */
16398 -char mcrypt_module_open();
16399 +char onig_init();
16400
16401  int main() {
16402 -mcrypt_module_open()
16403 +onig_init()
16404  ; return 0; }
16405  EOF
16406 -if { (eval echo configure:58353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16407 +if { (eval echo configure:58978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16408    rm -rf conftest*
16409    eval "ac_cv_lib_$ac_lib_var=yes"
16410  else
16411 @@ -58368,52 +58993,125 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
16412      LDFLAGS=$save_old_LDFLAGS
16413      ext_shared=$save_ext_shared
16414
16415 +
16416 +
16417 +  if test "$ext_shared" = "yes"; then
16418 +    MBSTRING_SHARED_LIBADD="-lonig $MBSTRING_SHARED_LIBADD"
16419 +    if test -n "$PHP_ONIG/$PHP_LIBDIR"; then
16420 +
16421 +  if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then
16422 +
16423 +  if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
16424 +    ai_p=$PHP_ONIG/$PHP_LIBDIR
16425 +  else
16426 +
16427 +    ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
16428 +
16429 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
16430 +    ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`"
16431 +  fi
16432 +
16433
16434 +      if test "$ext_shared" = "yes"; then
16435 +        MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD"
16436 +        test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_SHARED_LIBADD"
16437 +      else
16438 +
16439
16440 -  case ltdl in
16441 -  c|c_r|pthread*) ;;
16442 -  *)
16443 -    if test "$ext_shared" = "yes"; then
16444 -        MCRYPT_SHARED_LIBADD="-lltdl $MCRYPT_SHARED_LIBADD"
16445 -    else
16446 +
16447 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
16448 +
16449 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
16450 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
16451 +    eval "LIBPATH$unique=set"
16452 +
16453 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
16454 +    LDFLAGS="$LDFLAGS -L$ai_p"
16455 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
16456 +
16457 +  fi
16458 +
16459 +
16460 +      fi
16461 +
16462 +  fi
16463 +
16464 +    fi
16465 +  else
16466 +
16467 +
16468 +  if test -n "$PHP_ONIG/$PHP_LIBDIR"; then
16469 +
16470 +  if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then
16471 +
16472 +  if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
16473 +    ai_p=$PHP_ONIG/$PHP_LIBDIR
16474 +  else
16475 +
16476 +    ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
16477 +
16478 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
16479 +    ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`"
16480 +  fi
16481 +
16482 +
16483
16484
16485 -  case ltdl in
16486 +
16487 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
16488 +
16489 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
16490 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
16491 +    eval "LIBPATH$unique=set"
16492 +
16493 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
16494 +    LDFLAGS="$LDFLAGS -L$ai_p"
16495 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
16496 +
16497 +  fi
16498 +
16499 +
16500 +
16501 +  fi
16502 +
16503 +  fi
16504 +
16505 +
16506 +  case onig in
16507    c|c_r|pthread*) ;;
16508    *)
16509 -      LIBS="-lltdl $LIBS"
16510 +      LIBS="-lonig $LIBS"
16511     ;;
16512    esac
16513
16514
16515 -    fi
16516 -   ;;
16517 -  esac
16518
16519
16520 -    cat >> confdefs.h <<\EOF
16521 -#define HAVE_LIBMCRYPT 1
16522 -EOF
16523 +  fi
16524
16525 -
16526 +
16527 +        cat >> confdefs.h <<\EOF
16528 +#define HAVE_ONIG 1
16529 +EOF
16530 +
16531 +
16532
16533  else
16534    echo "$ac_t""no" 1>&6
16535
16536      LDFLAGS=$save_old_LDFLAGS
16537      ext_shared=$save_ext_shared
16538 -    unset ac_cv_lib_mcrypt_mcrypt_module_open
16539 -
16540 +    unset ac_cv_lib_onig_onig_init
16541
16542 -  save_old_LDFLAGS=$LDFLAGS
16543 -  ac_stuff="
16544 -      -L$MCRYPT_DIR/$PHP_LIBDIR
16545 -    "
16546 -
16547 -  save_ext_shared=$ext_shared
16548 -  ext_shared=yes
16549 +        { echo "configure: error: Problem with oniguruma. Please check config.log for more information." 1>&2; exit 1; }
16550 +
16551
16552 -  for ac_i in $ac_stuff; do
16553 +fi
16554 +
16555 +
16556 +      save_old_LDFLAGS=$LDFLAGS
16557 +
16558 +  for ac_i in $MBSTRING_SHARED_LIBADD; do
16559      case $ac_i in
16560      -pthread)
16561        if test "$ext_shared" = "yes"; then
16562 @@ -58501,131 +59199,294 @@ else
16563      esac
16564    done
16565
16566 -  echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
16567 -echo "configure:58506: checking for mcrypt_module_open in -lmcrypt" >&5
16568 -ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
16569 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16570 -  echo $ac_n "(cached) $ac_c" 1>&6
16571 -else
16572 -  ac_save_LIBS="$LIBS"
16573 -LIBS="-lmcrypt  $LIBS"
16574 -cat > conftest.$ac_ext <<EOF
16575 -#line 58514 "configure"
16576 +      echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6
16577 +echo "configure:59204: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
16578 +      cat > conftest.$ac_ext <<EOF
16579 +#line 59206 "configure"
16580  #include "confdefs.h"
16581 -/* Override any gcc2 internal prototype to avoid an error.  */
16582 -/* We use char because int might match the return type of a gcc2
16583 -    builtin and then its argument prototype would still apply.  */
16584 -char mcrypt_module_open();
16585
16586 +#include <oniguruma.h>
16587 +
16588  int main() {
16589 -mcrypt_module_open()
16590 +
16591 +return (int)(ONIG_ENCODING_KOI8 + 1);
16592 +
16593  ; return 0; }
16594  EOF
16595 -if { (eval echo configure:58525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16596 +if { (eval echo configure:59217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16597    rm -rf conftest*
16598 -  eval "ac_cv_lib_$ac_lib_var=yes"
16599 +
16600 +        echo "$ac_t""no" 1>&6
16601 +
16602  else
16603    echo "configure: failed program was:" >&5
16604    cat conftest.$ac_ext >&5
16605    rm -rf conftest*
16606 -  eval "ac_cv_lib_$ac_lib_var=no"
16607 -fi
16608 -rm -f conftest*
16609 -LIBS="$ac_save_LIBS"
16610 -
16611 -fi
16612 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
16613 -  echo "$ac_t""yes" 1>&6
16614
16615 -    LDFLAGS=$save_old_LDFLAGS
16616 -    ext_shared=$save_ext_shared
16617 -
16618 -      cat >> confdefs.h <<\EOF
16619 -#define HAVE_LIBMCRYPT 1
16620 +        echo "$ac_t""yes" 1>&6
16621 +        cat >> confdefs.h <<\EOF
16622 +#define PHP_ONIG_BAD_KOI8_ENTRY 1
16623  EOF
16624
16625 -
16626 -
16627 -else
16628 -  echo "$ac_t""no" 1>&6
16629 +
16630 +fi
16631 +rm -f conftest*
16632 +      LDFLAGS=$save_old_LDFLAGS
16633 +    fi
16634
16635 -    LDFLAGS=$save_old_LDFLAGS
16636 -    ext_shared=$save_ext_shared
16637 -    unset ac_cv_lib_mcrypt_mcrypt_module_open
16638
16639 -      { echo "configure: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." 1>&2; exit 1; }
16640 +  PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DONIG_ESCAPE_UCHAR_COLLISION=1"
16641 +
16642
16643 -
16644 -fi
16645 +  PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DUChar=OnigUChar"
16646
16647 -
16648 -
16649 -fi
16650
16651 +    cat >> confdefs.h <<\EOF
16652 +#define HAVE_MBREGEX 1
16653 +EOF
16654
16655 -
16656
16657 -  if test "$ext_shared" = "yes"; then
16658 -    MCRYPT_SHARED_LIBADD="-lmcrypt $MCRYPT_SHARED_LIBADD"
16659 -    if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then
16660 -
16661 -  if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
16662 -
16663 -  if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
16664 -    ai_p=$MCRYPT_DIR/$PHP_LIBDIR
16665 -  else
16666
16667 -    ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
16668 +  PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES php_mbregex.c"
16669 +
16670
16671 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
16672 -    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`"
16673 +  PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS php_mbregex.h php_onig_compat.h"
16674 +
16675    fi
16676
16677 -
16678 -      if test "$ext_shared" = "yes"; then
16679 -        MCRYPT_SHARED_LIBADD="-L$ai_p $MCRYPT_SHARED_LIBADD"
16680 -        test -n "$ld_runpath_switch" && MCRYPT_SHARED_LIBADD="$ld_runpath_switch$ai_p $MCRYPT_SHARED_LIBADD"
16681 -      else
16682 -
16683 -
16684 -
16685 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
16686 +  fi
16687
16688 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
16689 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
16690 -    eval "LIBPATH$unique=set"
16691
16692 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
16693 -    LDFLAGS="$LDFLAGS -L$ai_p"
16694 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
16695 -
16696 -  fi
16697 +    if test "$PHP_LIBMBFL" = "yes" || test "$PHP_LIBMBFL" = "no"; then
16698 +
16699 +  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl"
16700
16701 +
16702 +  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/mbfl"
16703
16704 -      fi
16705
16706 -  fi
16707 +  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/filters"
16708
16709 -    fi
16710 -  else
16711
16712 +  PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/nls"
16713
16714 -  if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then
16715
16716 -  if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
16717 +  PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl"
16718 +
16719
16720 -  if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
16721 -    ai_p=$MCRYPT_DIR/$PHP_LIBDIR
16722 +  PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl/mbfl"
16723 +
16724 +
16725 +  PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS libmbfl/config.h"
16726 +
16727 +
16728 +
16729 +  PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES
16730 +     libmbfl/filters/html_entities.c
16731 +     libmbfl/filters/mbfilter_7bit.c
16732 +     libmbfl/filters/mbfilter_ascii.c
16733 +     libmbfl/filters/mbfilter_base64.c
16734 +     libmbfl/filters/mbfilter_big5.c
16735 +     libmbfl/filters/mbfilter_byte2.c
16736 +     libmbfl/filters/mbfilter_byte4.c
16737 +     libmbfl/filters/mbfilter_cp1251.c
16738 +     libmbfl/filters/mbfilter_cp1252.c
16739 +     libmbfl/filters/mbfilter_cp1254.c
16740 +     libmbfl/filters/mbfilter_cp5022x.c
16741 +     libmbfl/filters/mbfilter_cp51932.c
16742 +     libmbfl/filters/mbfilter_cp850.c
16743 +     libmbfl/filters/mbfilter_cp866.c
16744 +     libmbfl/filters/mbfilter_cp932.c
16745 +     libmbfl/filters/mbfilter_cp936.c
16746 +     libmbfl/filters/mbfilter_euc_cn.c
16747 +     libmbfl/filters/mbfilter_euc_jp.c
16748 +     libmbfl/filters/mbfilter_euc_jp_win.c
16749 +     libmbfl/filters/mbfilter_euc_kr.c
16750 +     libmbfl/filters/mbfilter_euc_tw.c
16751 +     libmbfl/filters/mbfilter_htmlent.c
16752 +     libmbfl/filters/mbfilter_hz.c
16753 +     libmbfl/filters/mbfilter_iso2022_jp_ms.c
16754 +     libmbfl/filters/mbfilter_iso2022_kr.c
16755 +     libmbfl/filters/mbfilter_iso8859_1.c
16756 +     libmbfl/filters/mbfilter_iso8859_10.c
16757 +     libmbfl/filters/mbfilter_iso8859_13.c
16758 +     libmbfl/filters/mbfilter_iso8859_14.c
16759 +     libmbfl/filters/mbfilter_iso8859_15.c
16760 +     libmbfl/filters/mbfilter_iso8859_16.c
16761 +     libmbfl/filters/mbfilter_iso8859_2.c
16762 +     libmbfl/filters/mbfilter_iso8859_3.c
16763 +     libmbfl/filters/mbfilter_iso8859_4.c
16764 +     libmbfl/filters/mbfilter_iso8859_5.c
16765 +     libmbfl/filters/mbfilter_iso8859_6.c
16766 +     libmbfl/filters/mbfilter_iso8859_7.c
16767 +     libmbfl/filters/mbfilter_iso8859_8.c
16768 +     libmbfl/filters/mbfilter_iso8859_9.c
16769 +     libmbfl/filters/mbfilter_jis.c
16770 +     libmbfl/filters/mbfilter_koi8r.c
16771 +     libmbfl/filters/mbfilter_armscii8.c
16772 +     libmbfl/filters/mbfilter_qprint.c
16773 +     libmbfl/filters/mbfilter_sjis.c
16774 +     libmbfl/filters/mbfilter_sjis_open.c
16775 +     libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c
16776 +     libmbfl/filters/mbfilter_ucs2.c
16777 +     libmbfl/filters/mbfilter_ucs4.c
16778 +     libmbfl/filters/mbfilter_uhc.c
16779 +     libmbfl/filters/mbfilter_utf16.c
16780 +     libmbfl/filters/mbfilter_utf32.c
16781 +     libmbfl/filters/mbfilter_utf7.c
16782 +     libmbfl/filters/mbfilter_utf7imap.c
16783 +     libmbfl/filters/mbfilter_utf8.c
16784 +     libmbfl/filters/mbfilter_uuencode.c
16785 +     libmbfl/filters/mbfilter_koi8u.c
16786 +     libmbfl/mbfl/mbfilter.c
16787 +     libmbfl/mbfl/mbfilter_8bit.c
16788 +     libmbfl/mbfl/mbfilter_pass.c
16789 +     libmbfl/mbfl/mbfilter_wchar.c
16790 +     libmbfl/mbfl/mbfl_convert.c
16791 +     libmbfl/mbfl/mbfl_encoding.c
16792 +     libmbfl/mbfl/mbfl_filter_output.c
16793 +     libmbfl/mbfl/mbfl_ident.c
16794 +     libmbfl/mbfl/mbfl_language.c
16795 +     libmbfl/mbfl/mbfl_memory_device.c
16796 +     libmbfl/mbfl/mbfl_string.c
16797 +     libmbfl/mbfl/mbfl_allocators.c
16798 +     libmbfl/nls/nls_de.c
16799 +     libmbfl/nls/nls_en.c
16800 +     libmbfl/nls/nls_ja.c
16801 +     libmbfl/nls/nls_kr.c
16802 +     libmbfl/nls/nls_neutral.c
16803 +     libmbfl/nls/nls_ru.c
16804 +     libmbfl/nls/nls_uni.c
16805 +     libmbfl/nls/nls_zh.c
16806 +     libmbfl/nls/nls_hy.c
16807 +     libmbfl/nls/nls_tr.c
16808 +     libmbfl/nls/nls_ua.c
16809 +    "
16810 +
16811 +
16812 +  PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DHAVE_CONFIG_H"
16813 +
16814 +
16815 +  PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h"
16816 +
16817    else
16818 +                for inc in include include/mbfl-1.0 include/mbfl; do
16819 +      if test -f "$PHP_LIBMBFL/$inc/mbfilter.h"; then
16820 +        PHP_LIBMBFL_INCLUDE="$inc"
16821 +        break
16822 +      fi
16823 +    done
16824 +
16825 +    if test -z "$PHP_LIBMBFL_INCLUDE"; then
16826 +      { echo "configure: error: mbfilter.h not found. Please reinstall libmbfl library." 1>&2; exit 1; }
16827 +    else
16828 +
16829 +  if test "$PHP_LIBMBFL_INCLUDE" != "/usr/include"; then
16830
16831 -    ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
16832 +  if test -z "$PHP_LIBMBFL_INCLUDE" || echo "$PHP_LIBMBFL_INCLUDE" | grep '^/' >/dev/null ; then
16833 +    ai_p=$PHP_LIBMBFL_INCLUDE
16834 +  else
16835 +
16836 +    ep_dir="`echo $PHP_LIBMBFL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
16837
16838      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
16839 -    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`"
16840 +    ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL_INCLUDE\"`"
16841 +  fi
16842 +
16843 +
16844 +
16845 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
16846 +
16847 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
16848 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
16849 +    eval "INCLUDEPATH$unique=set"
16850 +
16851 +      if test ""; then
16852 +        INCLUDES="-I$ai_p $INCLUDES"
16853 +      else
16854 +        INCLUDES="$INCLUDES -I$ai_p"
16855 +      fi
16856 +
16857 +  fi
16858 +
16859    fi
16860
16861 +    fi
16862 +
16863
16864 +  save_old_LDFLAGS=$LDFLAGS
16865 +  ac_stuff="
16866 +      -L$PHP_LIBMBFL/$PHP_LIBDIR
16867 +    "
16868 +
16869 +  save_ext_shared=$ext_shared
16870 +  ext_shared=yes
16871 +
16872 +  for ac_i in $ac_stuff; do
16873 +    case $ac_i in
16874 +    -pthread)
16875 +      if test "$ext_shared" = "yes"; then
16876 +        LDFLAGS="$LDFLAGS -pthread"
16877 +      else
16878 +
16879 +
16880 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
16881 +
16882 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
16883 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
16884 +    eval "EXTRA_LDFLAGS$unique=set"
16885 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
16886 +  fi
16887 +
16888 +      fi
16889 +    ;;
16890 +    -l*)
16891 +      ac_ii=`echo $ac_i|cut -c 3-`
16892 +
16893 +
16894 +  case $ac_ii in
16895 +  c|c_r|pthread*) ;;
16896 +  *)
16897 +    if test "$ext_shared" = "yes"; then
16898 +        LDFLAGS="$LDFLAGS -l$ac_ii"
16899 +    else
16900 +
16901 +
16902 +  case $ac_ii in
16903 +  c|c_r|pthread*) ;;
16904 +  *)
16905 +      LIBS="$LIBS -l$ac_ii"
16906 +   ;;
16907 +  esac
16908 +
16909 +
16910 +    fi
16911 +   ;;
16912 +  esac
16913 +
16914 +
16915 +    ;;
16916 +    -L*)
16917 +      ac_ii=`echo $ac_i|cut -c 3-`
16918
16919 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
16920 +
16921 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
16922 +    ai_p=$ac_ii
16923 +  else
16924 +
16925 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
16926 +
16927 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
16928 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
16929 +  fi
16930 +
16931 +
16932 +      if test "$ext_shared" = "yes"; then
16933 +        LDFLAGS="-L$ai_p $LDFLAGS"
16934 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
16935 +      else
16936 +
16937
16938
16939    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
16940 @@ -58641,74 +59502,181 @@ fi
16941    fi
16942
16943
16944 +      fi
16945
16946    fi
16947
16948 -  fi
16949 -
16950 +    ;;
16951 +    esac
16952 +  done
16953 +
16954 +  echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
16955 +echo "configure:59515: checking for mbfl_buffer_converter_new in -lmbfl" >&5
16956 +ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'`
16957 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16958 +  echo $ac_n "(cached) $ac_c" 1>&6
16959 +else
16960 +  ac_save_LIBS="$LIBS"
16961 +LIBS="-lmbfl  $LIBS"
16962 +cat > conftest.$ac_ext <<EOF
16963 +#line 59523 "configure"
16964 +#include "confdefs.h"
16965 +/* Override any gcc2 internal prototype to avoid an error.  */
16966 +/* We use char because int might match the return type of a gcc2
16967 +    builtin and then its argument prototype would still apply.  */
16968 +char mbfl_buffer_converter_new();
16969 +
16970 +int main() {
16971 +mbfl_buffer_converter_new()
16972 +; return 0; }
16973 +EOF
16974 +if { (eval echo configure:59534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16975 +  rm -rf conftest*
16976 +  eval "ac_cv_lib_$ac_lib_var=yes"
16977 +else
16978 +  echo "configure: failed program was:" >&5
16979 +  cat conftest.$ac_ext >&5
16980 +  rm -rf conftest*
16981 +  eval "ac_cv_lib_$ac_lib_var=no"
16982 +fi
16983 +rm -f conftest*
16984 +LIBS="$ac_save_LIBS"
16985 +
16986 +fi
16987 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
16988 +  echo "$ac_t""yes" 1>&6
16989
16990 -  case mcrypt in
16991 -  c|c_r|pthread*) ;;
16992 -  *)
16993 -      LIBS="-lmcrypt $LIBS"
16994 -   ;;
16995 -  esac
16996 +    LDFLAGS=$save_old_LDFLAGS
16997 +    ext_shared=$save_ext_shared
16998 +
16999 +
17000
17001 +  if test "$ext_shared" = "yes"; then
17002 +    MBSTRING_SHARED_LIBADD="-lmbfl $MBSTRING_SHARED_LIBADD"
17003 +    if test -n "$PHP_LIBMBFL/$PHP_LIBDIR"; then
17004 +
17005 +  if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then
17006 +
17007 +  if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
17008 +    ai_p=$PHP_LIBMBFL/$PHP_LIBDIR
17009 +  else
17010 +
17011 +    ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
17012 +
17013 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17014 +    ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`"
17015 +  fi
17016
17017 +
17018 +      if test "$ext_shared" = "yes"; then
17019 +        MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD"
17020 +        test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_SHARED_LIBADD"
17021 +      else
17022 +
17023 +
17024 +
17025 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
17026 +
17027 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
17028 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
17029 +    eval "LIBPATH$unique=set"
17030 +
17031 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
17032 +    LDFLAGS="$LDFLAGS -L$ai_p"
17033 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
17034 +
17035 +  fi
17036
17037
17038 +      fi
17039 +
17040    fi
17041
17042 +    fi
17043 +  else
17044 +
17045
17046 -
17047 -  if test "$MCRYPT_DIR/include" != "/usr/include"; then
17048 +  if test -n "$PHP_LIBMBFL/$PHP_LIBDIR"; then
17049
17050 -  if test -z "$MCRYPT_DIR/include" || echo "$MCRYPT_DIR/include" | grep '^/' >/dev/null ; then
17051 -    ai_p=$MCRYPT_DIR/include
17052 +  if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then
17053 +
17054 +  if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
17055 +    ai_p=$PHP_LIBMBFL/$PHP_LIBDIR
17056    else
17057
17058 -    ep_dir="`echo $MCRYPT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
17059 +    ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
17060
17061      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17062 -    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/include\"`"
17063 +    ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`"
17064    fi
17065
17066
17067 +
17068 +
17069
17070    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
17071
17072 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
17073 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
17074    if test -n "$unique" && test "`eval $cmd`" = "" ; then
17075 -    eval "INCLUDEPATH$unique=set"
17076 +    eval "LIBPATH$unique=set"
17077
17078 -      if test ""; then
17079 -        INCLUDES="-I$ai_p $INCLUDES"
17080 -      else
17081 -        INCLUDES="$INCLUDES -I$ai_p"
17082 -      fi
17083 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
17084 +    LDFLAGS="$LDFLAGS -L$ai_p"
17085 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
17086 +
17087 +  fi
17088 +
17089 +
17090
17091    fi
17092
17093    fi
17094 +
17095 +
17096 +  case mbfl in
17097 +  c|c_r|pthread*) ;;
17098 +  *)
17099 +      LIBS="-lmbfl $LIBS"
17100 +   ;;
17101 +  esac
17102 +
17103 +
17104 +
17105 +
17106 +  fi
17107
17108
17109 +
17110
17111 -  PHP_VAR_SUBST="$PHP_VAR_SUBST MCRYPT_SHARED_LIBADD"
17112 +else
17113 +  echo "$ac_t""no" 1>&6
17114
17115 +    LDFLAGS=$save_old_LDFLAGS
17116 +    ext_shared=$save_ext_shared
17117 +    unset ac_cv_lib_mbfl_mbfl_buffer_converter_new
17118 +
17119 +      { echo "configure: error: Problem with libmbfl. Please check config.log for more information." 1>&2; exit 1; }
17120 +
17121
17122 -  ext_builddir=ext/mcrypt
17123 -  ext_srcdir=$abs_srcdir/ext/mcrypt
17124 +fi
17125
17126 -  ac_extra=
17127 +  fi
17128 +
17129 +
17130 +
17131 +  ext_builddir=ext/mbstring
17132 +  ext_srcdir=$abs_srcdir/ext/mbstring
17133 +
17134 +  ac_extra=`echo "$PHP_MBSTRING_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
17135
17136    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
17137 -    PHP_MCRYPT_SHARED=no
17138 +    PHP_MBSTRING_SHARED=no
17139
17140
17141 -  case ext/mcrypt in
17142 +  case ext/mbstring in
17143    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17144 -  /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17145 -  *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17146 +  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17147 +  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17148    esac
17149
17150
17151 @@ -58723,7 +59691,7 @@ fi
17152
17153
17154    old_IFS=$IFS
17155 -  for ac_src in mcrypt.c mcrypt_filter.c; do
17156 +  for ac_src in $PHP_MBSTRING_SOURCES; do
17157
17158        IFS=.
17159        set $ac_src
17160 @@ -58746,18 +59714,18 @@ EOF
17161    done
17162
17163
17164 -    EXT_STATIC="$EXT_STATIC mcrypt"
17165 +    EXT_STATIC="$EXT_STATIC mbstring"
17166      if test "$ext_shared" != "nocli"; then
17167 -      EXT_CLI_STATIC="$EXT_CLI_STATIC mcrypt"
17168 +      EXT_CLI_STATIC="$EXT_CLI_STATIC mbstring"
17169      fi
17170    else
17171      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
17172 -      PHP_MCRYPT_SHARED=yes
17173 +      PHP_MBSTRING_SHARED=yes
17174
17175 -  case ext/mcrypt in
17176 +  case ext/mbstring in
17177    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17178 -  /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17179 -  *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17180 +  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17181 +  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17182    esac
17183
17184
17185 @@ -58772,14 +59740,14 @@ EOF
17186
17187
17188    old_IFS=$IFS
17189 -  for ac_src in mcrypt.c mcrypt_filter.c; do
17190 +  for ac_src in $PHP_MBSTRING_SOURCES; do
17191
17192        IFS=.
17193        set $ac_src
17194        ac_obj=$1
17195        IFS=$old_IFS
17196
17197 -      shared_objects_mcrypt="$shared_objects_mcrypt $ac_bdir$ac_obj.lo"
17198 +      shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo"
17199
17200        case $ac_src in
17201          *.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" ;;
17202 @@ -58802,31 +59770,31 @@ EOF
17203    case $host_alias in
17204      *aix*)
17205        suffix=so
17206 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmcrypt.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) $(PHPMCRYPT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmcrypt.so '$ext_builddir'/phpmcrypt.so'
17207 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmbstring.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) $(PHPMBSTRING_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmbstring.so '$ext_builddir'/phpmbstring.so'
17208        ;;
17209      *netware*)
17210        suffix=nlm
17211 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMCRYPT, 3)_SHARED_LIBADD)'
17212 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMBSTRING, 3)_SHARED_LIBADD)'
17213        ;;
17214      *)
17215        suffix=la
17216 -      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_mcrypt) $(PHPMCRYPT_SHARED_LIBADD)'
17217 +      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_mbstring) $(PHPMBSTRING_SHARED_LIBADD)'
17218        ;;
17219    esac
17220
17221    if test "x" = "xyes"; then
17222 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmcrypt.$suffix"
17223 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmbstring.$suffix"
17224    else
17225 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmcrypt.$suffix"
17226 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmbstring.$suffix"
17227    fi
17228
17229 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mcrypt"
17230 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mbstring"
17231
17232    cat >>Makefile.objects<<EOF
17233 -\$(phplibdir)/phpmcrypt.$suffix: $ext_builddir/phpmcrypt.$suffix
17234 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmcrypt.$suffix \$(phplibdir)
17235 +\$(phplibdir)/phpmbstring.$suffix: $ext_builddir/phpmbstring.$suffix
17236 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmbstring.$suffix \$(phplibdir)
17237
17238 -$ext_builddir/phpmcrypt.$suffix: \$(shared_objects_mcrypt) \$(PHPMCRYPT_SHARED_DEPENDENCIES)
17239 +$ext_builddir/phpmbstring.$suffix: \$(shared_objects_mbstring) \$(PHPMBSTRING_SHARED_DEPENDENCIES)
17240         $link_cmd
17241
17242  EOF
17243 @@ -58839,31 +59807,31 @@ EOF
17244    case $host_alias in
17245      *aix*)
17246        suffix=so
17247 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mcrypt.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) $(MCRYPT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mcrypt.so '$ext_builddir'/mcrypt.so'
17248 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mbstring.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) $(MBSTRING_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mbstring.so '$ext_builddir'/mbstring.so'
17249        ;;
17250      *netware*)
17251        suffix=nlm
17252 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MCRYPT, 3)_SHARED_LIBADD)'
17253 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MBSTRING, 3)_SHARED_LIBADD)'
17254        ;;
17255      *)
17256        suffix=la
17257 -      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_mcrypt) $(MCRYPT_SHARED_LIBADD)'
17258 +      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_mbstring) $(MBSTRING_SHARED_LIBADD)'
17259        ;;
17260    esac
17261
17262    if test "x" = "xyes"; then
17263 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mcrypt.$suffix"
17264 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mbstring.$suffix"
17265    else
17266 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mcrypt.$suffix"
17267 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mbstring.$suffix"
17268    fi
17269
17270 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mcrypt"
17271 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mbstring"
17272
17273    cat >>Makefile.objects<<EOF
17274 -\$(phplibdir)/mcrypt.$suffix: $ext_builddir/mcrypt.$suffix
17275 -       \$(LIBTOOL) --mode=install cp $ext_builddir/mcrypt.$suffix \$(phplibdir)
17276 +\$(phplibdir)/mbstring.$suffix: $ext_builddir/mbstring.$suffix
17277 +       \$(LIBTOOL) --mode=install cp $ext_builddir/mbstring.$suffix \$(phplibdir)
17278
17279 -$ext_builddir/mcrypt.$suffix: \$(shared_objects_mcrypt) \$(MCRYPT_SHARED_DEPENDENCIES)
17280 +$ext_builddir/mbstring.$suffix: \$(shared_objects_mbstring) \$(MBSTRING_SHARED_DEPENDENCIES)
17281         $link_cmd
17282
17283  EOF
17284 @@ -58871,22 +59839,22 @@ EOF
17285            ;;
17286        esac
17287        cat >> confdefs.h <<EOF
17288 -#define COMPILE_DL_MCRYPT 1
17289 +#define COMPILE_DL_MBSTRING 1
17290  EOF
17291
17292      fi
17293    fi
17294
17295    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
17296 -    PHP_MCRYPT_SHARED=no
17297 +    PHP_MBSTRING_SHARED=no
17298      case "$PHP_SAPI" in
17299        cgi|embed)
17300
17301
17302 -  case ext/mcrypt in
17303 +  case ext/mbstring in
17304    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17305 -  /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17306 -  *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17307 +  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17308 +  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17309    esac
17310
17311
17312 @@ -58901,7 +59869,7 @@ EOF
17313
17314
17315    old_IFS=$IFS
17316 -  for ac_src in mcrypt.c mcrypt_filter.c; do
17317 +  for ac_src in $PHP_MBSTRING_SOURCES; do
17318
17319        IFS=.
17320        set $ac_src
17321 @@ -58924,15 +59892,15 @@ EOF
17322    done
17323
17324
17325 -        EXT_STATIC="$EXT_STATIC mcrypt"
17326 +        EXT_STATIC="$EXT_STATIC mbstring"
17327          ;;
17328        *)
17329
17330
17331 -  case ext/mcrypt in
17332 +  case ext/mbstring in
17333    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17334 -  /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17335 -  *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17336 +  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17337 +  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17338    esac
17339
17340
17341 @@ -58947,7 +59915,7 @@ EOF
17342
17343
17344    old_IFS=$IFS
17345 -  for ac_src in mcrypt.c mcrypt_filter.c; do
17346 +  for ac_src in $PHP_MBSTRING_SOURCES; do
17347
17348        IFS=.
17349        set $ac_src
17350 @@ -58972,7 +59940,7 @@ EOF
17351
17352          ;;
17353      esac
17354 -    EXT_CLI_STATIC="$EXT_CLI_STATIC mcrypt"
17355 +    EXT_CLI_STATIC="$EXT_CLI_STATIC mbstring"
17356    fi
17357
17358
17359 @@ -58981,107 +59949,68 @@ EOF
17360
17361
17362    if test "$ext_builddir" = "."; then
17363 -    PHP_PECL_EXTENSION=mcrypt
17364 +    PHP_PECL_EXTENSION=mbstring
17365
17366    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
17367
17368    fi
17369
17370 -fi
17371 -
17372 +
17373 +  PHP_VAR_SUBST="$PHP_VAR_SUBST MBSTRING_SHARED_LIBADD"
17374
17375
17376 -php_with_mssql=no
17377 +  for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do
17378 +
17379 +
17380 +    $php_shtool mkdir -p $ext_builddir/$dir
17381 +
17382
17383 -echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
17384 -echo "configure:58998: checking for MSSQL support via FreeTDS" >&5
17385 -# Check whether --with-mssql or --without-mssql was given.
17386 -if test "${with_mssql+set}" = set; then
17387 -  withval="$with_mssql"
17388 -  PHP_MSSQL=$withval
17389 -else
17390 +  done
17391
17392 -  PHP_MSSQL=no
17393 -  test "$PHP_ENABLE_ALL" && PHP_MSSQL=$PHP_ENABLE_ALL
17394 +  for dir in $PHP_MBSTRING_EXTRA_INCLUDES; do
17395 +
17396 +  if test "$ext_srcdir/$dir" != "/usr/include"; then
17397 +
17398 +  if test -z "$ext_srcdir/$dir" || echo "$ext_srcdir/$dir" | grep '^/' >/dev/null ; then
17399 +    ai_p=$ext_srcdir/$dir
17400 +  else
17401 +
17402 +    ep_dir="`echo $ext_srcdir/$dir|$SED 's%/*[^/][^/]*/*$%%'`"
17403 +
17404 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17405 +    ai_p="$ep_realdir/`basename \"$ext_srcdir/$dir\"`"
17406 +  fi
17407
17408 -fi
17409 +
17410 +
17411 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
17412 +
17413 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
17414 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
17415 +    eval "INCLUDEPATH$unique=set"
17416 +
17417 +      if test ""; then
17418 +        INCLUDES="-I$ai_p $INCLUDES"
17419 +      else
17420 +        INCLUDES="$INCLUDES -I$ai_p"
17421 +      fi
17422 +
17423 +  fi
17424
17425 +  fi
17426
17427 -
17428 -ext_output="yes, shared"
17429 -ext_shared=yes
17430 -case $PHP_MSSQL in
17431 -shared,*)
17432 -  PHP_MSSQL=`echo "$PHP_MSSQL"|$SED 's/^shared,//'`
17433 -  ;;
17434 -shared)
17435 -  PHP_MSSQL=yes
17436 -  ;;
17437 -no)
17438 -  ext_output=no
17439 -  ext_shared=no
17440 -  ;;
17441 -*)
17442 -  ext_output=yes
17443 -  ext_shared=no
17444 -  ;;
17445 -esac
17446 -
17447 -
17448 -
17449 -echo "$ac_t""$ext_output" 1>&6
17450 -
17451 -
17452 -
17453 -
17454 -if test "$PHP_MSSQL" != "no"; then
17455 -
17456 -  if test "$PHP_MSSQL" = "yes"; then
17457 -    for i in /usr/local /usr; do
17458 -      if test -f $i/include/sybdb.h; then
17459 -        FREETDS_INSTALLATION_DIR=$i
17460 -        FREETDS_INCLUDE_DIR=$i/include
17461 -        break
17462 -      elif test -f $i/include/freetds/sybdb.h; then
17463 -        FREETDS_INSTALLATION_DIR=$i
17464 -        FREETDS_INCLUDE_DIR=$i/include/freetds
17465 -        break
17466 -      fi
17467 -    done
17468 -
17469 -    if test -z "$FREETDS_INSTALLATION_DIR"; then
17470 -      { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; }
17471 -    fi
17472 -
17473 -  elif test "$PHP_MSSQL" != "no"; then
17474 -
17475 -    if test -f $PHP_MSSQL/include/sybdb.h; then
17476 -      FREETDS_INSTALLATION_DIR=$PHP_MSSQL
17477 -      FREETDS_INCLUDE_DIR=$PHP_MSSQL/include
17478 -    elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then
17479 -      FREETDS_INSTALLATION_DIR=$PHP_MSSQL
17480 -      FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
17481 -    else
17482 -      { echo "configure: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" 1>&2; exit 1; }
17483 -    fi
17484 -  fi
17485 -
17486 -  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
17487 -     { echo "configure: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; }
17488 -  fi
17489 -
17490 -
17491 -  if test "$FREETDS_INCLUDE_DIR" != "/usr/include"; then
17492 -
17493 -  if test -z "$FREETDS_INCLUDE_DIR" || echo "$FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then
17494 -    ai_p=$FREETDS_INCLUDE_DIR
17495 -  else
17496 -
17497 -    ep_dir="`echo $FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
17498 -
17499 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17500 -    ai_p="$ep_realdir/`basename \"$FREETDS_INCLUDE_DIR\"`"
17501 -  fi
17502 +
17503 +  if test "$ext_builddir/$dir" != "/usr/include"; then
17504 +
17505 +  if test -z "$ext_builddir/$dir" || echo "$ext_builddir/$dir" | grep '^/' >/dev/null ; then
17506 +    ai_p=$ext_builddir/$dir
17507 +  else
17508 +
17509 +    ep_dir="`echo $ext_builddir/$dir|$SED 's%/*[^/][^/]*/*$%%'`"
17510 +
17511 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17512 +    ai_p="$ep_realdir/`basename \"$ext_builddir/$dir\"`"
17513 +  fi
17514
17515
17516
17517 @@ -59101,118 +60030,15 @@ if test "$PHP_MSSQL" != "no"; then
17518
17519    fi
17520
17521 -
17522 -
17523 -  if test "$ext_shared" = "yes"; then
17524 -    MSSQL_SHARED_LIBADD="-lsybdb $MSSQL_SHARED_LIBADD"
17525 -    if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
17526 -
17527 -  if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
17528 -
17529 -  if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
17530 -    ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
17531 -  else
17532 -
17533 -    ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
17534 -
17535 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17536 -    ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
17537 -  fi
17538 -
17539 -
17540 -      if test "$ext_shared" = "yes"; then
17541 -        MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD"
17542 -        test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_SHARED_LIBADD"
17543 -      else
17544 -
17545 -
17546 -
17547 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
17548 -
17549 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
17550 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
17551 -    eval "LIBPATH$unique=set"
17552 -
17553 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
17554 -    LDFLAGS="$LDFLAGS -L$ai_p"
17555 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
17556 -
17557 -  fi
17558 -
17559 -
17560 -      fi
17561 -
17562 -  fi
17563 -
17564 -    fi
17565 -  else
17566 -
17567 -
17568 -  if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
17569 -
17570 -  if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
17571 -
17572 -  if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
17573 -    ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
17574 -  else
17575 -
17576 -    ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
17577 -
17578 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17579 -    ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
17580 -  fi
17581 -
17582 -
17583 -
17584 -
17585 -
17586 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
17587 -
17588 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
17589 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
17590 -    eval "LIBPATH$unique=set"
17591 -
17592 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
17593 -    LDFLAGS="$LDFLAGS -L$ai_p"
17594 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
17595 -
17596 -  fi
17597 -
17598 -
17599 -
17600 -  fi
17601 -
17602 -  fi
17603 -
17604 -
17605 -  case sybdb in
17606 -  c|c_r|pthread*) ;;
17607 -  *)
17608 -      LIBS="-lsybdb $LIBS"
17609 -   ;;
17610 -  esac
17611 -
17612 -
17613 -
17614 -
17615 -  fi
17616 -
17617 -
17618 -
17619 -
17620 -  ext_builddir=ext/mssql
17621 -  ext_srcdir=$abs_srcdir/ext/mssql
17622 -
17623 -  ac_extra=
17624 +  done
17625
17626 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
17627 -    PHP_MSSQL_SHARED=no
17628 +  if test "$ext_shared" = "no"; then
17629
17630
17631 -  case ext/mssql in
17632 +  case ext/mbstring in
17633    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17634 -  /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17635 -  *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17636 +  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17637 +  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17638    esac
17639
17640
17641 @@ -59227,7 +60053,7 @@ if test "$PHP_MSSQL" != "no"; then
17642
17643
17644    old_IFS=$IFS
17645 -  for ac_src in php_mssql.c; do
17646 +  for ac_src in $PHP_MBSTRING_BASE_SOURCES; do
17647
17648        IFS=.
17649        set $ac_src
17650 @@ -59237,10 +60063,10 @@ if test "$PHP_MSSQL" != "no"; then
17651        PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
17652
17653        case $ac_src in
17654 -        *.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" ;;
17655 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17656 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17657 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
17658 +        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17659 +        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17660 +        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17661 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
17662        esac
17663
17664      cat >>Makefile.objects<<EOF
17665 @@ -59250,18 +60076,13 @@ EOF
17666    done
17667
17668
17669 -    EXT_STATIC="$EXT_STATIC mssql"
17670 -    if test "$ext_shared" != "nocli"; then
17671 -      EXT_CLI_STATIC="$EXT_CLI_STATIC mssql"
17672 -    fi
17673 +    out="php_config.h"
17674    else
17675 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
17676 -      PHP_MSSQL_SHARED=yes
17677 -
17678 -  case ext/mssql in
17679 +
17680 +  case ext/mbstring in
17681    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17682 -  /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17683 -  *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17684 +  /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17685 +  *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17686    esac
17687
17688
17689 @@ -59276,20 +60097,20 @@ EOF
17690
17691
17692    old_IFS=$IFS
17693 -  for ac_src in php_mssql.c; do
17694 +  for ac_src in $PHP_MBSTRING_BASE_SOURCES; do
17695
17696        IFS=.
17697        set $ac_src
17698        ac_obj=$1
17699        IFS=$old_IFS
17700
17701 -      shared_objects_mssql="$shared_objects_mssql $ac_bdir$ac_obj.lo"
17702 +      shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo"
17703
17704        case $ac_src in
17705 -        *.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" ;;
17706 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17707 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17708 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
17709 +        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17710 +        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17711 +        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17712 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
17713        esac
17714
17715      cat >>Makefile.objects<<EOF
17716 @@ -59298,511 +60119,139 @@ $ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
17717  EOF
17718    done
17719
17720 -      case $host_alias in
17721 -        *netware*)
17722 -
17723 -  install_modules="install-modules"
17724 -
17725 -  case $host_alias in
17726 -    *aix*)
17727 -      suffix=so
17728 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmssql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(PHPMSSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmssql.so '$ext_builddir'/phpmssql.so'
17729 -      ;;
17730 -    *netware*)
17731 -      suffix=nlm
17732 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMSSQL, 3)_SHARED_LIBADD)'
17733 -      ;;
17734 -    *)
17735 -      suffix=la
17736 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(PHPMSSQL_SHARED_LIBADD)'
17737 -      ;;
17738 -  esac
17739 -
17740 -  if test "x" = "xyes"; then
17741 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmssql.$suffix"
17742 -  else
17743 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmssql.$suffix"
17744 +    if test -f "$ext_builddir/config.h.in"; then
17745 +      out="$abs_builddir/config.h"
17746 +    else
17747 +      out="php_config.h"
17748 +    fi
17749    fi
17750
17751 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql"
17752 -
17753 -  cat >>Makefile.objects<<EOF
17754 -\$(phplibdir)/phpmssql.$suffix: $ext_builddir/phpmssql.$suffix
17755 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmssql.$suffix \$(phplibdir)
17756 -
17757 -$ext_builddir/phpmssql.$suffix: \$(shared_objects_mssql) \$(PHPMSSQL_SHARED_DEPENDENCIES)
17758 -       $link_cmd
17759 -
17760 +  for cfg in $PHP_MBSTRING_EXTRA_CONFIG_HEADERS; do
17761 +    cat > $ext_builddir/$cfg <<EOF
17762 +#include "$out"
17763  EOF
17764 +  done
17765 +
17766 +  PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS mbstring.h"
17767
17768 -          ;;
17769 -        *)
17770 -
17771 -  install_modules="install-modules"
17772 -
17773 -  case $host_alias in
17774 -    *aix*)
17775 -      suffix=so
17776 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mssql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(MSSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mssql.so '$ext_builddir'/mssql.so'
17777 -      ;;
17778 -    *netware*)
17779 -      suffix=nlm
17780 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MSSQL, 3)_SHARED_LIBADD)'
17781 -      ;;
17782 -    *)
17783 -      suffix=la
17784 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(MSSQL_SHARED_LIBADD)'
17785 -      ;;
17786 -  esac
17787 -
17788 -  if test "x" = "xyes"; then
17789 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mssql.$suffix"
17790 -  else
17791 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mssql.$suffix"
17792 -  fi
17793
17794 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql"
17795 +
17796 +    header_path=ext/mbstring
17797 +    for header_file in $PHP_MBSTRING_INSTALL_HEADERS; do
17798 +      hp_hf="$header_path/$header_file"
17799 +
17800 +
17801 +  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
17802 +
17803 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
17804 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
17805 +    eval "INSTALLHEADERS$unique=set"
17806 +
17807 +        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
17808 +
17809 +  fi
17810
17811 -  cat >>Makefile.objects<<EOF
17812 -\$(phplibdir)/mssql.$suffix: $ext_builddir/mssql.$suffix
17813 -       \$(LIBTOOL) --mode=install cp $ext_builddir/mssql.$suffix \$(phplibdir)
17814 +    done
17815 +
17816
17817 -$ext_builddir/mssql.$suffix: \$(shared_objects_mssql) \$(MSSQL_SHARED_DEPENDENCIES)
17818 -       $link_cmd
17819
17820 -EOF
17821 +fi
17822
17823 -          ;;
17824 -      esac
17825 -      cat >> confdefs.h <<EOF
17826 -#define COMPILE_DL_MSSQL 1
17827 -EOF
17828 +# vim600: sts=2 sw=2 et
17829
17830 -    fi
17831 -  fi
17832
17833 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
17834 -    PHP_MSSQL_SHARED=no
17835 -    case "$PHP_SAPI" in
17836 -      cgi|embed)
17837 -
17838 -
17839 -  case ext/mssql in
17840 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17841 -  /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17842 -  *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17843 -  esac
17844
17845 -
17846 -
17847 -  b_c_pre=$php_c_pre
17848 -  b_cxx_pre=$php_cxx_pre
17849 -  b_c_meta=$php_c_meta
17850 -  b_cxx_meta=$php_cxx_meta
17851 -  b_c_post=$php_c_post
17852 -  b_cxx_post=$php_cxx_post
17853 -  b_lo=$php_lo
17854
17855
17856 -  old_IFS=$IFS
17857 -  for ac_src in php_mssql.c; do
17858 -
17859 -      IFS=.
17860 -      set $ac_src
17861 -      ac_obj=$1
17862 -      IFS=$old_IFS
17863 -
17864 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
17865
17866 -      case $ac_src in
17867 -        *.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" ;;
17868 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17869 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17870 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
17871 -      esac
17872 +php_with_mcrypt=no
17873
17874 -    cat >>Makefile.objects<<EOF
17875 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
17876 -       $ac_comp
17877 -EOF
17878 -  done
17879 +echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
17880 +echo "configure:60171: checking for mcrypt support" >&5
17881 +# Check whether --with-mcrypt or --without-mcrypt was given.
17882 +if test "${with_mcrypt+set}" = set; then
17883 +  withval="$with_mcrypt"
17884 +  PHP_MCRYPT=$withval
17885 +else
17886 +
17887 +  PHP_MCRYPT=no
17888 +  test "$PHP_ENABLE_ALL" && PHP_MCRYPT=$PHP_ENABLE_ALL
17889
17890 +fi
17891
17892 -        EXT_STATIC="$EXT_STATIC mssql"
17893 -        ;;
17894 -      *)
17895 -
17896 -
17897 -  case ext/mssql in
17898 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17899 -  /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17900 -  *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17901 -  esac
17902 -
17903 -
17904
17905 -  b_c_pre=$php_c_pre
17906 -  b_cxx_pre=$php_cxx_pre
17907 -  b_c_meta=$php_c_meta
17908 -  b_cxx_meta=$php_cxx_meta
17909 -  b_c_post=$php_c_post
17910 -  b_cxx_post=$php_cxx_post
17911 -  b_lo=$php_lo
17912
17913 +ext_output="yes, shared"
17914 +ext_shared=yes
17915 +case $PHP_MCRYPT in
17916 +shared,*)
17917 +  PHP_MCRYPT=`echo "$PHP_MCRYPT"|$SED 's/^shared,//'`
17918 +  ;;
17919 +shared)
17920 +  PHP_MCRYPT=yes
17921 +  ;;
17922 +no)
17923 +  ext_output=no
17924 +  ext_shared=no
17925 +  ;;
17926 +*)
17927 +  ext_output=yes
17928 +  ext_shared=no
17929 +  ;;
17930 +esac
17931
17932 -  old_IFS=$IFS
17933 -  for ac_src in php_mssql.c; do
17934 -
17935 -      IFS=.
17936 -      set $ac_src
17937 -      ac_obj=$1
17938 -      IFS=$old_IFS
17939 -
17940 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
17941
17942 -      case $ac_src in
17943 -        *.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" ;;
17944 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17945 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17946 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
17947 -      esac
17948
17949 -    cat >>Makefile.objects<<EOF
17950 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
17951 -       $ac_comp
17952 -EOF
17953 -  done
17954 +echo "$ac_t""$ext_output" 1>&6
17955
17956
17957 -        ;;
17958 -    esac
17959 -    EXT_CLI_STATIC="$EXT_CLI_STATIC mssql"
17960 -  fi
17961 -
17962 -
17963 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
17964 -
17965
17966
17967 -  if test "$ext_builddir" = "."; then
17968 -    PHP_PECL_EXTENSION=mssql
17969 -
17970 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
17971 +if test "$PHP_MCRYPT" != "no"; then
17972 +  for i in $PHP_MCRYPT /usr/local /usr; do
17973 +    test -f $i/include/mcrypt.h && MCRYPT_DIR=$i && break
17974 +  done
17975
17976 +  if test -z "$MCRYPT_DIR"; then
17977 +    { echo "configure: error: mcrypt.h not found. Please reinstall libmcrypt." 1>&2; exit 1; }
17978    fi
17979
17980 -  echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
17981 -echo "configure:59496: checking for dnet_addr in -ldnet_stub" >&5
17982 -ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
17983 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17984 -  echo $ac_n "(cached) $ac_c" 1>&6
17985 -else
17986 -  ac_save_LIBS="$LIBS"
17987 -LIBS="-ldnet_stub  $LIBS"
17988 -cat > conftest.$ac_ext <<EOF
17989 -#line 59504 "configure"
17990 +
17991 +  old_CPPFLAGS=$CPPFLAGS
17992 +  CPPFLAGS=-I$MCRYPT_DIR/include
17993 +  echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6
17994 +echo "configure:60224: checking for libmcrypt version" >&5
17995 +  cat > conftest.$ac_ext <<EOF
17996 +#line 60226 "configure"
17997  #include "confdefs.h"
17998 -/* Override any gcc2 internal prototype to avoid an error.  */
17999 -/* We use char because int might match the return type of a gcc2
18000 -    builtin and then its argument prototype would still apply.  */
18001 -char dnet_addr();
18002
18003 -int main() {
18004 -dnet_addr()
18005 -; return 0; }
18006 +#include <mcrypt.h>
18007 +#if MCRYPT_API_VERSION >= 20021217
18008 +  yes
18009 +#endif
18010 +
18011  EOF
18012 -if { (eval echo configure:59515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18013 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
18014 +  egrep "yes" >/dev/null 2>&1; then
18015    rm -rf conftest*
18016 -  eval "ac_cv_lib_$ac_lib_var=yes"
18017 +
18018 +    echo "$ac_t"">= 2.5.6" 1>&6
18019 +
18020  else
18021 -  echo "configure: failed program was:" >&5
18022 -  cat conftest.$ac_ext >&5
18023    rm -rf conftest*
18024 -  eval "ac_cv_lib_$ac_lib_var=no"
18025 +
18026 +    { echo "configure: error: libmcrypt version 2.5.6 or greater required." 1>&2; exit 1; }
18027 +
18028  fi
18029  rm -f conftest*
18030 -LIBS="$ac_save_LIBS"
18031
18032 -fi
18033 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
18034 -  echo "$ac_t""yes" 1>&6
18035 -
18036 +  CPPFLAGS=$old_CPPFLAGS
18037
18038 -  if test "$ext_shared" = "yes"; then
18039 -    MSSQL_SHARED_LIBADD="-ldnet_stub $MSSQL_SHARED_LIBADD"
18040 -    if test -n ""; then
18041 -
18042 -  if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
18043 -
18044 -  if test -z "" || echo "" | grep '^/' >/dev/null ; then
18045 -    ai_p=
18046 -  else
18047 -
18048 -    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
18049 -
18050 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
18051 -    ai_p="$ep_realdir/`basename \"\"`"
18052 -  fi
18053 -
18054 -
18055 -      if test "$ext_shared" = "yes"; then
18056 -        MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD"
18057 -        test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_SHARED_LIBADD"
18058 -      else
18059 -
18060 -
18061 -
18062 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
18063 -
18064 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
18065 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
18066 -    eval "LIBPATH$unique=set"
18067 -
18068 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
18069 -    LDFLAGS="$LDFLAGS -L$ai_p"
18070 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
18071 -
18072 -  fi
18073 -
18074 -
18075 -      fi
18076 -
18077 -  fi
18078 -
18079 -    fi
18080 -  else
18081 -
18082 -
18083 -  if test -n ""; then
18084 -
18085 -  if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
18086 -
18087 -  if test -z "" || echo "" | grep '^/' >/dev/null ; then
18088 -    ai_p=
18089 -  else
18090 -
18091 -    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
18092 -
18093 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
18094 -    ai_p="$ep_realdir/`basename \"\"`"
18095 -  fi
18096 -
18097 -
18098 -
18099 -
18100 -
18101 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
18102 -
18103 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
18104 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
18105 -    eval "LIBPATH$unique=set"
18106 -
18107 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
18108 -    LDFLAGS="$LDFLAGS -L$ai_p"
18109 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
18110 -
18111 -  fi
18112 -
18113 -
18114 -
18115 -  fi
18116 -
18117 -  fi
18118 -
18119 -
18120 -  case dnet_stub in
18121 -  c|c_r|pthread*) ;;
18122 -  *)
18123 -      LIBS="-ldnet_stub $LIBS"
18124 -   ;;
18125 -  esac
18126 -
18127 -
18128 -
18129 -
18130 -  fi
18131 -
18132 -
18133 -        cat >> confdefs.h <<\EOF
18134 -#define HAVE_LIBDNET_STUB 1
18135 -EOF
18136 -
18137 -
18138 -else
18139 -  echo "$ac_t""no" 1>&6
18140 -fi
18141 -
18142 -  cat >> confdefs.h <<\EOF
18143 -#define HAVE_MSSQL 1
18144 -EOF
18145 -
18146 -  cat >> confdefs.h <<\EOF
18147 -#define HAVE_FREETDS 1
18148 -EOF
18149 -
18150 -
18151 -  PHP_VAR_SUBST="$PHP_VAR_SUBST MSSQL_SHARED_LIBADD"
18152 -
18153 -fi
18154 -
18155 -
18156 -
18157 -
18158 -
18159 -
18160 -
18161 -
18162 -php_with_mysql=no
18163 -
18164 -echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
18165 -echo "configure:59659: checking for MySQL support" >&5
18166 -# Check whether --with-mysql or --without-mysql was given.
18167 -if test "${with_mysql+set}" = set; then
18168 -  withval="$with_mysql"
18169 -  PHP_MYSQL=$withval
18170 -else
18171 -
18172 -  PHP_MYSQL=no
18173 -  test "$PHP_ENABLE_ALL" && PHP_MYSQL=$PHP_ENABLE_ALL
18174 -
18175 -fi
18176 -
18177 -
18178 -
18179 -ext_output="yes, shared"
18180 -ext_shared=yes
18181 -case $PHP_MYSQL in
18182 -shared,*)
18183 -  PHP_MYSQL=`echo "$PHP_MYSQL"|$SED 's/^shared,//'`
18184 -  ;;
18185 -shared)
18186 -  PHP_MYSQL=yes
18187 -  ;;
18188 -no)
18189 -  ext_output=no
18190 -  ext_shared=no
18191 -  ;;
18192 -*)
18193 -  ext_output=yes
18194 -  ext_shared=no
18195 -  ;;
18196 -esac
18197 -
18198 -
18199 -
18200 -echo "$ac_t""$ext_output" 1>&6
18201 -
18202 -
18203 -
18204 -
18205 -
18206 -php_with_mysql_sock=no
18207 -
18208 -echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
18209 -echo "configure:59703: checking for specified location of the MySQL UNIX socket" >&5
18210 -# Check whether --with-mysql-sock or --without-mysql-sock was given.
18211 -if test "${with_mysql_sock+set}" = set; then
18212 -  withval="$with_mysql_sock"
18213 -  PHP_MYSQL_SOCK=$withval
18214 -else
18215 -
18216 -  PHP_MYSQL_SOCK=no
18217 -
18218 -
18219 -fi
18220 -
18221 -
18222 -ext_output=$PHP_MYSQL_SOCK
18223 -echo "$ac_t""$ext_output" 1>&6
18224 -
18225 -
18226 -
18227 -
18228 -if test -z "$PHP_ZLIB_DIR"; then
18229 -
18230 -php_with_zlib_dir=no
18231 -
18232 -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
18233 -echo "configure:59727: checking for the location of libz" >&5
18234 -# Check whether --with-zlib-dir or --without-zlib-dir was given.
18235 -if test "${with_zlib_dir+set}" = set; then
18236 -  withval="$with_zlib_dir"
18237 -  PHP_ZLIB_DIR=$withval
18238 -else
18239 -
18240 -  PHP_ZLIB_DIR=no
18241 -
18242 -
18243 -fi
18244 -
18245 -
18246 -ext_output=$PHP_ZLIB_DIR
18247 -echo "$ac_t""$ext_output" 1>&6
18248 -
18249 -
18250 -
18251 -fi
18252 -
18253 -if test "$PHP_MYSQL" = "mysqlnd"; then
18254 -    PHP_MYSQLND_ENABLED=yes
18255 -
18256 -elif test "$PHP_MYSQL" != "no"; then
18257 -  MYSQL_DIR=
18258 -  MYSQL_INC_DIR=
18259 -
18260 -  for i in $PHP_MYSQL /usr/local /usr; do
18261 -    if test -r $i/include/mysql/mysql.h; then
18262 -      MYSQL_DIR=$i
18263 -      MYSQL_INC_DIR=$i/include/mysql
18264 -      break
18265 -    elif test -r $i/include/mysql.h; then
18266 -      MYSQL_DIR=$i
18267 -      MYSQL_INC_DIR=$i/include
18268 -      break
18269 -    fi
18270 -  done
18271 -
18272 -  if test -z "$MYSQL_DIR"; then
18273 -    { echo "configure: error: Cannot find MySQL header files under $PHP_MYSQL.
18274 -Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; }
18275 -  fi
18276 -
18277 -  if test "$enable_maintainer_zts" = "yes"; then
18278 -    MYSQL_LIBNAME=mysqlclient_r
18279 -  else
18280 -    MYSQL_LIBNAME=mysqlclient
18281 -  fi
18282 -  case $host_alias in
18283 -    *netware*)
18284 -      MYSQL_LIBNAME=mysql
18285 -      ;;
18286 -  esac
18287 -
18288 -    if test -z "$PHP_LIBDIR"; then
18289 -    PHP_LIBDIR=lib
18290 -  fi
18291 -
18292 -  for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do
18293 -
18294 -  str="$MYSQL_DIR/$i/lib$MYSQL_LIBNAME.*"
18295 -  for j in `echo $str`; do
18296 -    if test -r $j; then
18297 -      MYSQL_LIB_DIR=$MYSQL_DIR/$i
18298 -      break 2
18299 -    fi
18300 -  done
18301 -
18302 -  done
18303 -
18304 -  if test -z "$MYSQL_LIB_DIR"; then
18305 -    { echo "configure: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
18306 -Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; }
18307 -  fi
18308
18309
18310    save_old_LDFLAGS=$LDFLAGS
18311    ac_stuff="
18312 -    -L$MYSQL_LIB_DIR
18313 +    -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl
18314    "
18315
18316    save_ext_shared=$ext_shared
18317 @@ -59896,27 +60345,27 @@ Note that the MySQL client library is no
18318      esac
18319    done
18320
18321 -  echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
18322 -echo "configure:59901: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
18323 -ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'`
18324 +  echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
18325 +echo "configure:60350: checking for mcrypt_module_open in -lmcrypt" >&5
18326 +ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
18327  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
18328    echo $ac_n "(cached) $ac_c" 1>&6
18329  else
18330    ac_save_LIBS="$LIBS"
18331 -LIBS="-l$MYSQL_LIBNAME  $LIBS"
18332 +LIBS="-lmcrypt  $LIBS"
18333  cat > conftest.$ac_ext <<EOF
18334 -#line 59909 "configure"
18335 +#line 60358 "configure"
18336  #include "confdefs.h"
18337  /* Override any gcc2 internal prototype to avoid an error.  */
18338  /* We use char because int might match the return type of a gcc2
18339      builtin and then its argument prototype would still apply.  */
18340 -char mysql_close();
18341 +char mcrypt_module_open();
18342
18343  int main() {
18344 -mysql_close()
18345 +mcrypt_module_open()
18346  ; return 0; }
18347  EOF
18348 -if { (eval echo configure:59920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18349 +if { (eval echo configure:60369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18350    rm -rf conftest*
18351    eval "ac_cv_lib_$ac_lib_var=yes"
18352  else
18353 @@ -59934,118 +60383,48 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
18354
18355      LDFLAGS=$save_old_LDFLAGS
18356      ext_shared=$save_ext_shared
18357 -
18358 -
18359 -else
18360 -  echo "$ac_t""no" 1>&6
18361 -
18362 -    LDFLAGS=$save_old_LDFLAGS
18363 -    ext_shared=$save_ext_shared
18364 -    unset ac_cv_lib_$MYSQL_LIBNAME_mysql_close
18365 -
18366 -    if test "$PHP_ZLIB_DIR" != "no"; then
18367 -
18368 -
18369 -  if test "$ext_shared" = "yes"; then
18370 -    MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD"
18371 -    if test -n "$PHP_ZLIB_DIR"; then
18372 -
18373 -  if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
18374 -
18375 -  if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
18376 -    ai_p=$PHP_ZLIB_DIR
18377 -  else
18378 -
18379 -    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
18380 -
18381 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
18382 -    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
18383 -  fi
18384 -
18385
18386 -      if test "$ext_shared" = "yes"; then
18387 -        MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD"
18388 -        test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_SHARED_LIBADD"
18389 -      else
18390 -
18391 -
18392 -
18393 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
18394 -
18395 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
18396 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
18397 -    eval "LIBPATH$unique=set"
18398
18399 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
18400 -    LDFLAGS="$LDFLAGS -L$ai_p"
18401 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
18402
18403 -  fi
18404 -
18405 -
18406 -      fi
18407 -
18408 -  fi
18409 -
18410 -    fi
18411 -  else
18412 -
18413 -
18414 -  if test -n "$PHP_ZLIB_DIR"; then
18415 -
18416 -  if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
18417 -
18418 -  if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
18419 -    ai_p=$PHP_ZLIB_DIR
18420 -  else
18421 -
18422 -    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
18423 -
18424 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
18425 -    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
18426 -  fi
18427 -
18428 -
18429 +  case ltdl in
18430 +  c|c_r|pthread*) ;;
18431 +  *)
18432 +    if test "$ext_shared" = "yes"; then
18433 +        MCRYPT_SHARED_LIBADD="-lltdl $MCRYPT_SHARED_LIBADD"
18434 +    else
18435
18436
18437 -
18438 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
18439 -
18440 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
18441 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
18442 -    eval "LIBPATH$unique=set"
18443 -
18444 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
18445 -    LDFLAGS="$LDFLAGS -L$ai_p"
18446 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
18447 -
18448 -  fi
18449 -
18450 -
18451 -
18452 -  fi
18453 -
18454 -  fi
18455 -
18456 -
18457 -  case z in
18458 +  case ltdl in
18459    c|c_r|pthread*) ;;
18460    *)
18461 -      LIBS="-lz $LIBS"
18462 +      LIBS="-lltdl $LIBS"
18463     ;;
18464    esac
18465
18466
18467 +    fi
18468 +   ;;
18469 +  esac
18470
18471
18472 -  fi
18473 +    cat >> confdefs.h <<\EOF
18474 +#define HAVE_LIBMCRYPT 1
18475 +EOF
18476
18477 +
18478 +
18479 +else
18480 +  echo "$ac_t""no" 1>&6
18481
18482 -
18483 +    LDFLAGS=$save_old_LDFLAGS
18484 +    ext_shared=$save_ext_shared
18485 +    unset ac_cv_lib_mcrypt_mcrypt_module_open
18486 +
18487 +
18488    save_old_LDFLAGS=$LDFLAGS
18489    ac_stuff="
18490 -        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR
18491 -      "
18492 +      -L$MCRYPT_DIR/$PHP_LIBDIR
18493 +    "
18494
18495    save_ext_shared=$ext_shared
18496    ext_shared=yes
18497 @@ -60138,27 +60517,27 @@ else
18498      esac
18499    done
18500
18501 -  echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
18502 -echo "configure:60143: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
18503 -ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'`
18504 +  echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
18505 +echo "configure:60522: checking for mcrypt_module_open in -lmcrypt" >&5
18506 +ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
18507  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
18508    echo $ac_n "(cached) $ac_c" 1>&6
18509  else
18510    ac_save_LIBS="$LIBS"
18511 -LIBS="-l$MYSQL_LIBNAME  $LIBS"
18512 +LIBS="-lmcrypt  $LIBS"
18513  cat > conftest.$ac_ext <<EOF
18514 -#line 60151 "configure"
18515 +#line 60530 "configure"
18516  #include "confdefs.h"
18517  /* Override any gcc2 internal prototype to avoid an error.  */
18518  /* We use char because int might match the return type of a gcc2
18519      builtin and then its argument prototype would still apply.  */
18520 -char mysql_error();
18521 +char mcrypt_module_open();
18522
18523  int main() {
18524 -mysql_error()
18525 +mcrypt_module_open()
18526  ; return 0; }
18527  EOF
18528 -if { (eval echo configure:60162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18529 +if { (eval echo configure:60541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18530    rm -rf conftest*
18531    eval "ac_cv_lib_$ac_lib_var=yes"
18532  else
18533 @@ -60177,116 +60556,51 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
18534      LDFLAGS=$save_old_LDFLAGS
18535      ext_shared=$save_ext_shared
18536
18537 +      cat >> confdefs.h <<\EOF
18538 +#define HAVE_LIBMCRYPT 1
18539 +EOF
18540 +
18541 +
18542
18543  else
18544    echo "$ac_t""no" 1>&6
18545
18546      LDFLAGS=$save_old_LDFLAGS
18547      ext_shared=$save_ext_shared
18548 -    unset ac_cv_lib_$MYSQL_LIBNAME_mysql_error
18549 +    unset ac_cv_lib_mcrypt_mcrypt_module_open
18550 +
18551 +      { echo "configure: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." 1>&2; exit 1; }
18552
18553 -        { echo "configure: error: mysql configure failed. Please check config.log for more information." 1>&2; exit 1; }
18554 -
18555
18556  fi
18557 -
18558 -      MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
18559 -    else
18560 -
18561 -
18562 -  case z in
18563 -  c|c_r|pthread*) ;;
18564 -  *)
18565 -    if test "$ext_shared" = "yes"; then
18566 -        MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD"
18567 -    else
18568 -
18569 -
18570 -  case z in
18571 -  c|c_r|pthread*) ;;
18572 -  *)
18573 -      LIBS="-lz $LIBS"
18574 -   ;;
18575 -  esac
18576 -
18577 -
18578 -    fi
18579 -   ;;
18580 -  esac
18581 -
18582 -
18583 -
18584 -  save_old_LDFLAGS=$LDFLAGS
18585 -  ac_stuff="
18586 -        -L$MYSQL_LIB_DIR
18587 -      "
18588 -
18589 -  save_ext_shared=$ext_shared
18590 -  ext_shared=yes
18591 -
18592 -  for ac_i in $ac_stuff; do
18593 -    case $ac_i in
18594 -    -pthread)
18595 -      if test "$ext_shared" = "yes"; then
18596 -        LDFLAGS="$LDFLAGS -pthread"
18597 -      else
18598 -
18599 -
18600 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
18601 -
18602 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
18603 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
18604 -    eval "EXTRA_LDFLAGS$unique=set"
18605 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
18606 -  fi
18607
18608 -      fi
18609 -    ;;
18610 -    -l*)
18611 -      ac_ii=`echo $ac_i|cut -c 3-`
18612 -
18613
18614 -  case $ac_ii in
18615 -  c|c_r|pthread*) ;;
18616 -  *)
18617 -    if test "$ext_shared" = "yes"; then
18618 -        LDFLAGS="$LDFLAGS -l$ac_ii"
18619 -    else
18620 -
18621
18622 -  case $ac_ii in
18623 -  c|c_r|pthread*) ;;
18624 -  *)
18625 -      LIBS="$LIBS -l$ac_ii"
18626 -   ;;
18627 -  esac
18628 -
18629 +fi
18630
18631 -    fi
18632 -   ;;
18633 -  esac
18634
18635 +
18636
18637 -    ;;
18638 -    -L*)
18639 -      ac_ii=`echo $ac_i|cut -c 3-`
18640 +  if test "$ext_shared" = "yes"; then
18641 +    MCRYPT_SHARED_LIBADD="-lmcrypt $MCRYPT_SHARED_LIBADD"
18642 +    if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then
18643
18644 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
18645 +  if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
18646
18647 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
18648 -    ai_p=$ac_ii
18649 +  if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
18650 +    ai_p=$MCRYPT_DIR/$PHP_LIBDIR
18651    else
18652
18653 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
18654 +    ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
18655
18656      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
18657 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
18658 +    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`"
18659    fi
18660
18661
18662        if test "$ext_shared" = "yes"; then
18663 -        LDFLAGS="-L$ai_p $LDFLAGS"
18664 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
18665 +        MCRYPT_SHARED_LIBADD="-L$ai_p $MCRYPT_SHARED_LIBADD"
18666 +        test -n "$ld_runpath_switch" && MCRYPT_SHARED_LIBADD="$ld_runpath_switch$ai_p $MCRYPT_SHARED_LIBADD"
18667        else
18668
18669
18670 @@ -60308,128 +60622,22 @@ fi
18671
18672    fi
18673
18674 -    ;;
18675 -    esac
18676 -  done
18677 +    fi
18678 +  else
18679 +
18680
18681 -  echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
18682 -echo "configure:60317: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
18683 -ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'`
18684 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
18685 -  echo $ac_n "(cached) $ac_c" 1>&6
18686 -else
18687 -  ac_save_LIBS="$LIBS"
18688 -LIBS="-l$MYSQL_LIBNAME  $LIBS"
18689 -cat > conftest.$ac_ext <<EOF
18690 -#line 60325 "configure"
18691 -#include "confdefs.h"
18692 -/* Override any gcc2 internal prototype to avoid an error.  */
18693 -/* We use char because int might match the return type of a gcc2
18694 -    builtin and then its argument prototype would still apply.  */
18695 -char mysql_errno();
18696 -
18697 -int main() {
18698 -mysql_errno()
18699 -; return 0; }
18700 -EOF
18701 -if { (eval echo configure:60336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18702 -  rm -rf conftest*
18703 -  eval "ac_cv_lib_$ac_lib_var=yes"
18704 -else
18705 -  echo "configure: failed program was:" >&5
18706 -  cat conftest.$ac_ext >&5
18707 -  rm -rf conftest*
18708 -  eval "ac_cv_lib_$ac_lib_var=no"
18709 -fi
18710 -rm -f conftest*
18711 -LIBS="$ac_save_LIBS"
18712 -
18713 -fi
18714 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
18715 -  echo "$ac_t""yes" 1>&6
18716 -
18717 -    LDFLAGS=$save_old_LDFLAGS
18718 -    ext_shared=$save_ext_shared
18719 -
18720 -
18721 -else
18722 -  echo "$ac_t""no" 1>&6
18723 -
18724 -    LDFLAGS=$save_old_LDFLAGS
18725 -    ext_shared=$save_ext_shared
18726 -    unset ac_cv_lib_$MYSQL_LIBNAME_mysql_errno
18727 -
18728 -        { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; }
18729 -
18730 -
18731 -fi
18732 -
18733 -      MYSQL_LIBS="-lz"
18734 -    fi
18735 -
18736 -
18737 -fi
18738 -
18739 -
18740 -
18741 -
18742 -  if test "$ext_shared" = "yes"; then
18743 -    MYSQL_SHARED_LIBADD="-l$MYSQL_LIBNAME $MYSQL_SHARED_LIBADD"
18744 -    if test -n "$MYSQL_LIB_DIR"; then
18745 -
18746 -  if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then
18747 -
18748 -  if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then
18749 -    ai_p=$MYSQL_LIB_DIR
18750 -  else
18751 -
18752 -    ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
18753 -
18754 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
18755 -    ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`"
18756 -  fi
18757 -
18758 -
18759 -      if test "$ext_shared" = "yes"; then
18760 -        MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD"
18761 -        test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_SHARED_LIBADD"
18762 -      else
18763 -
18764 -
18765 -
18766 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
18767 -
18768 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
18769 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
18770 -    eval "LIBPATH$unique=set"
18771 -
18772 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
18773 -    LDFLAGS="$LDFLAGS -L$ai_p"
18774 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
18775 -
18776 -  fi
18777 -
18778 -
18779 -      fi
18780 -
18781 -  fi
18782 -
18783 -    fi
18784 -  else
18785 -
18786 -
18787 -  if test -n "$MYSQL_LIB_DIR"; then
18788 +  if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then
18789
18790 -  if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then
18791 +  if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
18792
18793 -  if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then
18794 -    ai_p=$MYSQL_LIB_DIR
18795 +  if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
18796 +    ai_p=$MCRYPT_DIR/$PHP_LIBDIR
18797    else
18798
18799 -    ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
18800 +    ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
18801
18802      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
18803 -    ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`"
18804 +    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`"
18805    fi
18806
18807
18808 @@ -60455,10 +60663,10 @@ fi
18809    fi
18810
18811
18812 -  case $MYSQL_LIBNAME in
18813 +  case mcrypt in
18814    c|c_r|pthread*) ;;
18815    *)
18816 -      LIBS="-l$MYSQL_LIBNAME $LIBS"
18817 +      LIBS="-lmcrypt $LIBS"
18818     ;;
18819    esac
18820
18821 @@ -60469,16 +60677,16 @@ fi
18822
18823
18824
18825 -  if test "$MYSQL_INC_DIR" != "/usr/include"; then
18826 +  if test "$MCRYPT_DIR/include" != "/usr/include"; then
18827
18828 -  if test -z "$MYSQL_INC_DIR" || echo "$MYSQL_INC_DIR" | grep '^/' >/dev/null ; then
18829 -    ai_p=$MYSQL_INC_DIR
18830 +  if test -z "$MCRYPT_DIR/include" || echo "$MCRYPT_DIR/include" | grep '^/' >/dev/null ; then
18831 +    ai_p=$MCRYPT_DIR/include
18832    else
18833
18834 -    ep_dir="`echo $MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
18835 +    ep_dir="`echo $MCRYPT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
18836
18837      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
18838 -    ai_p="$ep_realdir/`basename \"$MYSQL_INC_DIR\"`"
18839 +    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/include\"`"
18840    fi
18841
18842
18843 @@ -60500,91 +60708,23 @@ fi
18844    fi
18845
18846
18847 -  MYSQL_MODULE_TYPE=external
18848 -  MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS"
18849 -  MYSQL_INCLUDE=-I$MYSQL_INC_DIR
18850 -
18851 -
18852 -
18853 -  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_MODULE_TYPE"
18854 -
18855 -
18856 -
18857 -
18858 -
18859 -  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_LIBS"
18860 -
18861 -
18862 -
18863 -
18864 -
18865 -  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_INCLUDE"
18866 -
18867
18868 -
18869 -fi
18870 -
18871 -if test "$PHP_MYSQL" != "no"; then
18872 -  echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
18873 -echo "configure:60530: checking for MySQL UNIX socket location" >&5
18874 -  if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
18875 -    MYSQL_SOCK=$PHP_MYSQL_SOCK
18876 -    cat >> confdefs.h <<EOF
18877 -#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
18878 -EOF
18879 -
18880 -    echo "$ac_t""$MYSQL_SOCK" 1>&6
18881 -  elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then
18882 -
18883 -  for i in  \
18884 -    /var/run/mysqld/mysqld.sock \
18885 -    /var/tmp/mysql.sock \
18886 -    /var/run/mysql/mysql.sock \
18887 -    /var/lib/mysql/mysql.sock \
18888 -    /var/mysql/mysql.sock \
18889 -    /usr/local/mysql/var/mysql.sock \
18890 -    /Private/tmp/mysql.sock \
18891 -    /private/tmp/mysql.sock \
18892 -    /tmp/mysql.sock \
18893 -  ; do
18894 -    if test -r $i; then
18895 -      MYSQL_SOCK=$i
18896 -      break 2
18897 -    fi
18898 -  done
18899 -
18900 -  if test -n "$MYSQL_SOCK"; then
18901 -    cat >> confdefs.h <<EOF
18902 -#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
18903 -EOF
18904 -
18905 -    echo "$ac_t""$MYSQL_SOCK" 1>&6
18906 -  else
18907 -    echo "$ac_t""no" 1>&6
18908 -  fi
18909 -
18910 -  else
18911 -    echo "$ac_t""no" 1>&6
18912 -  fi
18913 -
18914 -  cat >> confdefs.h <<\EOF
18915 -#define HAVE_MYSQL 1
18916 -EOF
18917 +  PHP_VAR_SUBST="$PHP_VAR_SUBST MCRYPT_SHARED_LIBADD"
18918
18919
18920 -  ext_builddir=ext/mysql
18921 -  ext_srcdir=$abs_srcdir/ext/mysql
18922 +  ext_builddir=ext/mcrypt
18923 +  ext_srcdir=$abs_srcdir/ext/mcrypt
18924
18925    ac_extra=
18926
18927    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
18928 -    PHP_MYSQL_SHARED=no
18929 +    PHP_MCRYPT_SHARED=no
18930
18931
18932 -  case ext/mysql in
18933 +  case ext/mcrypt in
18934    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18935 -  /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18936 -  *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18937 +  /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18938 +  *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18939    esac
18940
18941
18942 @@ -60599,7 +60739,7 @@ EOF
18943
18944
18945    old_IFS=$IFS
18946 -  for ac_src in php_mysql.c; do
18947 +  for ac_src in mcrypt.c mcrypt_filter.c; do
18948
18949        IFS=.
18950        set $ac_src
18951 @@ -60622,18 +60762,18 @@ EOF
18952    done
18953
18954
18955 -    EXT_STATIC="$EXT_STATIC mysql"
18956 +    EXT_STATIC="$EXT_STATIC mcrypt"
18957      if test "$ext_shared" != "nocli"; then
18958 -      EXT_CLI_STATIC="$EXT_CLI_STATIC mysql"
18959 +      EXT_CLI_STATIC="$EXT_CLI_STATIC mcrypt"
18960      fi
18961    else
18962      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
18963 -      PHP_MYSQL_SHARED=yes
18964 +      PHP_MCRYPT_SHARED=yes
18965
18966 -  case ext/mysql in
18967 +  case ext/mcrypt in
18968    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18969 -  /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18970 -  *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18971 +  /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18972 +  *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18973    esac
18974
18975
18976 @@ -60648,14 +60788,14 @@ EOF
18977
18978
18979    old_IFS=$IFS
18980 -  for ac_src in php_mysql.c; do
18981 +  for ac_src in mcrypt.c mcrypt_filter.c; do
18982
18983        IFS=.
18984        set $ac_src
18985        ac_obj=$1
18986        IFS=$old_IFS
18987
18988 -      shared_objects_mysql="$shared_objects_mysql $ac_bdir$ac_obj.lo"
18989 +      shared_objects_mcrypt="$shared_objects_mcrypt $ac_bdir$ac_obj.lo"
18990
18991        case $ac_src in
18992          *.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" ;;
18993 @@ -60678,31 +60818,31 @@ EOF
18994    case $host_alias in
18995      *aix*)
18996        suffix=so
18997 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(PHPMYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmysql.so '$ext_builddir'/phpmysql.so'
18998 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmcrypt.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) $(PHPMCRYPT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmcrypt.so '$ext_builddir'/phpmcrypt.so'
18999        ;;
19000      *netware*)
19001        suffix=nlm
19002 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQL, 3)_SHARED_LIBADD)'
19003 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMCRYPT, 3)_SHARED_LIBADD)'
19004        ;;
19005      *)
19006        suffix=la
19007 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(PHPMYSQL_SHARED_LIBADD)'
19008 +      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_mcrypt) $(PHPMCRYPT_SHARED_LIBADD)'
19009        ;;
19010    esac
19011
19012    if test "x" = "xyes"; then
19013 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmysql.$suffix"
19014 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmcrypt.$suffix"
19015    else
19016 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysql.$suffix"
19017 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmcrypt.$suffix"
19018    fi
19019
19020 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql"
19021 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mcrypt"
19022
19023    cat >>Makefile.objects<<EOF
19024 -\$(phplibdir)/phpmysql.$suffix: $ext_builddir/phpmysql.$suffix
19025 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmysql.$suffix \$(phplibdir)
19026 +\$(phplibdir)/phpmcrypt.$suffix: $ext_builddir/phpmcrypt.$suffix
19027 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmcrypt.$suffix \$(phplibdir)
19028
19029 -$ext_builddir/phpmysql.$suffix: \$(shared_objects_mysql) \$(PHPMYSQL_SHARED_DEPENDENCIES)
19030 +$ext_builddir/phpmcrypt.$suffix: \$(shared_objects_mcrypt) \$(PHPMCRYPT_SHARED_DEPENDENCIES)
19031         $link_cmd
19032
19033  EOF
19034 @@ -60715,31 +60855,31 @@ EOF
19035    case $host_alias in
19036      *aix*)
19037        suffix=so
19038 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mysql.so '$ext_builddir'/mysql.so'
19039 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mcrypt.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) $(MCRYPT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mcrypt.so '$ext_builddir'/mcrypt.so'
19040        ;;
19041      *netware*)
19042        suffix=nlm
19043 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQL, 3)_SHARED_LIBADD)'
19044 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MCRYPT, 3)_SHARED_LIBADD)'
19045        ;;
19046      *)
19047        suffix=la
19048 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(MYSQL_SHARED_LIBADD)'
19049 +      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_mcrypt) $(MCRYPT_SHARED_LIBADD)'
19050        ;;
19051    esac
19052
19053    if test "x" = "xyes"; then
19054 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mysql.$suffix"
19055 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mcrypt.$suffix"
19056    else
19057 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysql.$suffix"
19058 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mcrypt.$suffix"
19059    fi
19060
19061 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql"
19062 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mcrypt"
19063
19064    cat >>Makefile.objects<<EOF
19065 -\$(phplibdir)/mysql.$suffix: $ext_builddir/mysql.$suffix
19066 -       \$(LIBTOOL) --mode=install cp $ext_builddir/mysql.$suffix \$(phplibdir)
19067 +\$(phplibdir)/mcrypt.$suffix: $ext_builddir/mcrypt.$suffix
19068 +       \$(LIBTOOL) --mode=install cp $ext_builddir/mcrypt.$suffix \$(phplibdir)
19069
19070 -$ext_builddir/mysql.$suffix: \$(shared_objects_mysql) \$(MYSQL_SHARED_DEPENDENCIES)
19071 +$ext_builddir/mcrypt.$suffix: \$(shared_objects_mcrypt) \$(MCRYPT_SHARED_DEPENDENCIES)
19072         $link_cmd
19073
19074  EOF
19075 @@ -60747,22 +60887,22 @@ EOF
19076            ;;
19077        esac
19078        cat >> confdefs.h <<EOF
19079 -#define COMPILE_DL_MYSQL 1
19080 +#define COMPILE_DL_MCRYPT 1
19081  EOF
19082
19083      fi
19084    fi
19085
19086    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
19087 -    PHP_MYSQL_SHARED=no
19088 +    PHP_MCRYPT_SHARED=no
19089      case "$PHP_SAPI" in
19090        cgi|embed)
19091
19092
19093 -  case ext/mysql in
19094 +  case ext/mcrypt in
19095    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
19096 -  /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19097 -  *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19098 +  /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19099 +  *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19100    esac
19101
19102
19103 @@ -60777,7 +60917,7 @@ EOF
19104
19105
19106    old_IFS=$IFS
19107 -  for ac_src in php_mysql.c; do
19108 +  for ac_src in mcrypt.c mcrypt_filter.c; do
19109
19110        IFS=.
19111        set $ac_src
19112 @@ -60800,15 +60940,15 @@ EOF
19113    done
19114
19115
19116 -        EXT_STATIC="$EXT_STATIC mysql"
19117 +        EXT_STATIC="$EXT_STATIC mcrypt"
19118          ;;
19119        *)
19120
19121
19122 -  case ext/mysql in
19123 +  case ext/mcrypt in
19124    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
19125 -  /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19126 -  *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19127 +  /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19128 +  *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19129    esac
19130
19131
19132 @@ -60823,7 +60963,7 @@ EOF
19133
19134
19135    old_IFS=$IFS
19136 -  for ac_src in php_mysql.c; do
19137 +  for ac_src in mcrypt.c mcrypt_filter.c; do
19138
19139        IFS=.
19140        set $ac_src
19141 @@ -60848,7 +60988,7 @@ EOF
19142
19143          ;;
19144      esac
19145 -    EXT_CLI_STATIC="$EXT_CLI_STATIC mysql"
19146 +    EXT_CLI_STATIC="$EXT_CLI_STATIC mcrypt"
19147    fi
19148
19149
19150 @@ -60857,57 +60997,28 @@ EOF
19151
19152
19153    if test "$ext_builddir" = "."; then
19154 -    PHP_PECL_EXTENSION=mysql
19155 +    PHP_PECL_EXTENSION=mcrypt
19156
19157    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
19158
19159    fi
19160
19161 -
19162 -  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_SHARED_LIBADD"
19163 -
19164 -
19165 -  if test "$PHP_MYSQL" = "mysqlnd"; then
19166 -
19167 -  am_i_shared=$PHP_MYSQL_SHARED
19168 -  is_it_shared=$PHP_MYSQLND_SHARED
19169 -  is_it_enabled=$PHP_MYSQLND
19170 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
19171 -    { echo "configure: error:
19172 -You've configured extension mysql to build statically, but it
19173 -depends on extension mysqlnd, which you've configured to build shared.
19174 -You either need to build mysql shared or build mysqlnd statically for the
19175 -build to be successful.
19176 -" 1>&2; exit 1; }
19177 -  fi
19178 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
19179 -    { echo "configure: error:
19180 -You've configured extension mysql, which depends on extension mysqlnd,
19181 -but you've either not enabled mysqlnd, or have disabled it.
19182 -" 1>&2; exit 1; }
19183 -  fi
19184 -
19185 -    cat >> confdefs.h <<\EOF
19186 -#define MYSQL_USE_MYSQLND 1
19187 -EOF
19188 -
19189 -  fi
19190  fi
19191
19192
19193
19194 -php_with_mysqli=no
19195 +php_with_mssql=no
19196
19197 -echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6
19198 -echo "configure:60903: checking for MySQLi support" >&5
19199 -# Check whether --with-mysqli or --without-mysqli was given.
19200 -if test "${with_mysqli+set}" = set; then
19201 -  withval="$with_mysqli"
19202 -  PHP_MYSQLI=$withval
19203 +echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
19204 +echo "configure:61014: checking for MSSQL support via FreeTDS" >&5
19205 +# Check whether --with-mssql or --without-mssql was given.
19206 +if test "${with_mssql+set}" = set; then
19207 +  withval="$with_mssql"
19208 +  PHP_MSSQL=$withval
19209  else
19210
19211 -  PHP_MYSQLI=no
19212 -  test "$PHP_ENABLE_ALL" && PHP_MYSQLI=$PHP_ENABLE_ALL
19213 +  PHP_MSSQL=no
19214 +  test "$PHP_ENABLE_ALL" && PHP_MSSQL=$PHP_ENABLE_ALL
19215
19216  fi
19217
19218 @@ -60915,12 +61026,12 @@ fi
19219
19220  ext_output="yes, shared"
19221  ext_shared=yes
19222 -case $PHP_MYSQLI in
19223 +case $PHP_MSSQL in
19224  shared,*)
19225 -  PHP_MYSQLI=`echo "$PHP_MYSQLI"|$SED 's/^shared,//'`
19226 +  PHP_MSSQL=`echo "$PHP_MSSQL"|$SED 's/^shared,//'`
19227    ;;
19228  shared)
19229 -  PHP_MYSQLI=yes
19230 +  PHP_MSSQL=yes
19231    ;;
19232  no)
19233    ext_output=no
19234 @@ -60939,135 +61050,95 @@ echo "$ac_t""$ext_output" 1>&6
19235
19236
19237
19238 +if test "$PHP_MSSQL" != "no"; then
19239
19240 -php_enable_embedded_mysqli=no
19241 -
19242 -echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6
19243 -echo "configure:60947: checking whether to enable embedded MySQLi support" >&5
19244 -# Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given.
19245 -if test "${enable_embedded_mysqli+set}" = set; then
19246 -  enableval="$enable_embedded_mysqli"
19247 -  PHP_EMBEDDED_MYSQLI=$enableval
19248 -else
19249 -
19250 -  PHP_EMBEDDED_MYSQLI=no
19251 -
19252 -
19253 -fi
19254 -
19255 -
19256 -ext_output=$PHP_EMBEDDED_MYSQLI
19257 -echo "$ac_t""$ext_output" 1>&6
19258 -
19259 -
19260 +  if test "$PHP_MSSQL" = "yes"; then
19261 +    for i in /usr/local /usr; do
19262 +      if test -f $i/include/sybdb.h; then
19263 +        FREETDS_INSTALLATION_DIR=$i
19264 +        FREETDS_INCLUDE_DIR=$i/include
19265 +        break
19266 +      elif test -f $i/include/freetds/sybdb.h; then
19267 +        FREETDS_INSTALLATION_DIR=$i
19268 +        FREETDS_INCLUDE_DIR=$i/include/freetds
19269 +        break
19270 +      fi
19271 +    done
19272
19273 +    if test -z "$FREETDS_INSTALLATION_DIR"; then
19274 +      { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; }
19275 +    fi
19276
19277 -if test "$PHP_MYSQLI" = "mysqlnd"; then
19278 -    PHP_MYSQLND_ENABLED=yes
19279 +  elif test "$PHP_MSSQL" != "no"; then
19280
19281 -elif test "$PHP_MYSQLI" != "no"; then
19282 +    if test -f $PHP_MSSQL/include/sybdb.h; then
19283 +      FREETDS_INSTALLATION_DIR=$PHP_MSSQL
19284 +      FREETDS_INCLUDE_DIR=$PHP_MSSQL/include
19285 +    elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then
19286 +      FREETDS_INSTALLATION_DIR=$PHP_MSSQL
19287 +      FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
19288 +    else
19289 +      { echo "configure: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" 1>&2; exit 1; }
19290 +    fi
19291 +  fi
19292
19293 -  if test "$PHP_MYSQLI" = "yes"; then
19294 -    MYSQL_CONFIG=`$php_shtool path mysql_config`
19295 -  else
19296 -    MYSQL_CONFIG=$PHP_MYSQLI
19297 +  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
19298 +     { echo "configure: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; }
19299    fi
19300
19301 -  MYSQL_LIB_NAME='mysqlclient'
19302 -  if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
19303 -    cat >> confdefs.h <<\EOF
19304 -#define HAVE_EMBEDDED_MYSQLI 1
19305 -EOF
19306 -
19307 -    MYSQL_LIB_CFG='--libmysqld-libs'
19308 -        mysqli_extra_sources="mysqli_embedded.c"
19309 -  elif test "$enable_maintainer_zts" = "yes"; then
19310 -    MYSQL_LIB_CFG='--libs_r'
19311 -    MYSQL_LIB_NAME='mysqlclient_r'
19312 -  else
19313 -    MYSQL_LIB_CFG='--libs'
19314 -  fi
19315
19316 -  if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then
19317 -    MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
19318 -    MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`
19319 +  if test "$FREETDS_INCLUDE_DIR" != "/usr/include"; then
19320 +
19321 +  if test -z "$FREETDS_INCLUDE_DIR" || echo "$FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then
19322 +    ai_p=$FREETDS_INCLUDE_DIR
19323    else
19324 -    echo "$ac_t""mysql_config not found" 1>&6
19325 -    { echo "configure: error: Please reinstall the mysql distribution" 1>&2; exit 1; }
19326 +
19327 +    ep_dir="`echo $FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
19328 +
19329 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19330 +    ai_p="$ep_realdir/`basename \"$FREETDS_INCLUDE_DIR\"`"
19331    fi
19332
19333 -
19334 -  save_old_LDFLAGS=$LDFLAGS
19335 -  ac_stuff="
19336 -    $MYSQLI_LIBLINE
19337 -  "
19338 -
19339 -  save_ext_shared=$ext_shared
19340 -  ext_shared=yes
19341 -
19342 -  for ac_i in $ac_stuff; do
19343 -    case $ac_i in
19344 -    -pthread)
19345 -      if test "$ext_shared" = "yes"; then
19346 -        LDFLAGS="$LDFLAGS -pthread"
19347 -      else
19348 -
19349 +
19350
19351 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
19352 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19353
19354 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
19355 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
19356    if test -n "$unique" && test "`eval $cmd`" = "" ; then
19357 -    eval "EXTRA_LDFLAGS$unique=set"
19358 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
19359 -  fi
19360 -
19361 +    eval "INCLUDEPATH$unique=set"
19362 +
19363 +      if test ""; then
19364 +        INCLUDES="-I$ai_p $INCLUDES"
19365 +      else
19366 +        INCLUDES="$INCLUDES -I$ai_p"
19367        fi
19368 -    ;;
19369 -    -l*)
19370 -      ac_ii=`echo $ac_i|cut -c 3-`
19371 -
19372 -
19373 -  case $ac_ii in
19374 -  c|c_r|pthread*) ;;
19375 -  *)
19376 -    if test "$ext_shared" = "yes"; then
19377 -        LDFLAGS="$LDFLAGS -l$ac_ii"
19378 -    else
19379 -
19380 -
19381 -  case $ac_ii in
19382 -  c|c_r|pthread*) ;;
19383 -  *)
19384 -      LIBS="$LIBS -l$ac_ii"
19385 -   ;;
19386 -  esac
19387 -
19388 +
19389 +  fi
19390
19391 -    fi
19392 -   ;;
19393 -  esac
19394 +  fi
19395
19396 +
19397
19398 -    ;;
19399 -    -L*)
19400 -      ac_ii=`echo $ac_i|cut -c 3-`
19401 +  if test "$ext_shared" = "yes"; then
19402 +    MSSQL_SHARED_LIBADD="-lsybdb $MSSQL_SHARED_LIBADD"
19403 +    if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
19404
19405 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
19406 +  if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
19407
19408 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
19409 -    ai_p=$ac_ii
19410 +  if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
19411 +    ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
19412    else
19413
19414 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
19415 +    ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
19416
19417      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19418 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
19419 +    ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
19420    fi
19421
19422
19423        if test "$ext_shared" = "yes"; then
19424 -        LDFLAGS="-L$ai_p $LDFLAGS"
19425 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
19426 +        MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD"
19427 +        test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_SHARED_LIBADD"
19428        else
19429
19430
19431 @@ -61089,254 +61160,26 @@ EOF
19432
19433    fi
19434
19435 -    ;;
19436 -    esac
19437 -  done
19438 -
19439 -  echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
19440 -echo "configure:61098: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
19441 -ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'`
19442 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
19443 -  echo $ac_n "(cached) $ac_c" 1>&6
19444 -else
19445 -  ac_save_LIBS="$LIBS"
19446 -LIBS="-l$MYSQL_LIB_NAME  $LIBS"
19447 -cat > conftest.$ac_ext <<EOF
19448 -#line 61106 "configure"
19449 -#include "confdefs.h"
19450 -/* Override any gcc2 internal prototype to avoid an error.  */
19451 -/* We use char because int might match the return type of a gcc2
19452 -    builtin and then its argument prototype would still apply.  */
19453 -char mysql_set_server_option();
19454 -
19455 -int main() {
19456 -mysql_set_server_option()
19457 -; return 0; }
19458 -EOF
19459 -if { (eval echo configure:61117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19460 -  rm -rf conftest*
19461 -  eval "ac_cv_lib_$ac_lib_var=yes"
19462 -else
19463 -  echo "configure: failed program was:" >&5
19464 -  cat conftest.$ac_ext >&5
19465 -  rm -rf conftest*
19466 -  eval "ac_cv_lib_$ac_lib_var=no"
19467 -fi
19468 -rm -f conftest*
19469 -LIBS="$ac_save_LIBS"
19470 -
19471 -fi
19472 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
19473 -  echo "$ac_t""yes" 1>&6
19474 -
19475 -    LDFLAGS=$save_old_LDFLAGS
19476 -    ext_shared=$save_ext_shared
19477 -
19478 -
19479 -  for ac_i in $MYSQLI_INCLINE; do
19480 -    case $ac_i in
19481 -    -I*)
19482 -      ac_ii=`echo $ac_i|cut -c 3-`
19483 -
19484 -  if test "$ac_ii" != "/usr/include"; then
19485 -
19486 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
19487 -    ai_p=$ac_ii
19488 -  else
19489 -
19490 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
19491 -
19492 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19493 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
19494 -  fi
19495 -
19496 -
19497 -
19498 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19499 -
19500 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
19501 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
19502 -    eval "INCLUDEPATH$unique=set"
19503 -
19504 -      if test ""; then
19505 -        INCLUDES="-I$ai_p $INCLUDES"
19506 -      else
19507 -        INCLUDES="$INCLUDES -I$ai_p"
19508 -      fi
19509 -
19510 -  fi
19511 -
19512 -  fi
19513 -
19514 -    ;;
19515 -    esac
19516 -  done
19517 +    fi
19518 +  else
19519 +
19520
19521 +  if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
19522
19523 -  for ac_i in $MYSQLI_LIBLINE; do
19524 -    case $ac_i in
19525 -    -pthread)
19526 -      if test "$ext_shared" = "yes"; then
19527 -        MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -pthread"
19528 -      else
19529 -
19530 -
19531 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
19532 -
19533 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
19534 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
19535 -    eval "EXTRA_LDFLAGS$unique=set"
19536 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
19537 -  fi
19538 -
19539 -      fi
19540 -    ;;
19541 -    -l*)
19542 -      ac_ii=`echo $ac_i|cut -c 3-`
19543 -
19544 -
19545 -  case $ac_ii in
19546 -  c|c_r|pthread*) ;;
19547 -  *)
19548 -    if test "$ext_shared" = "yes"; then
19549 -        MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii"
19550 -    else
19551 -
19552 -
19553 -  case $ac_ii in
19554 -  c|c_r|pthread*) ;;
19555 -  *)
19556 -      LIBS="$LIBS -l$ac_ii"
19557 -   ;;
19558 -  esac
19559 -
19560 -
19561 -    fi
19562 -   ;;
19563 -  esac
19564 -
19565 -
19566 -    ;;
19567 -    -L*)
19568 -      ac_ii=`echo $ac_i|cut -c 3-`
19569 -
19570 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
19571 +  if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
19572
19573 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
19574 -    ai_p=$ac_ii
19575 +  if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
19576 +    ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
19577    else
19578
19579 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
19580 +    ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
19581
19582      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19583 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
19584 -  fi
19585 -
19586 -
19587 -      if test "$ext_shared" = "yes"; then
19588 -        MYSQLI_SHARED_LIBADD="-L$ai_p $MYSQLI_SHARED_LIBADD"
19589 -        test -n "$ld_runpath_switch" && MYSQLI_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQLI_SHARED_LIBADD"
19590 -      else
19591 -
19592 -
19593 -
19594 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19595 -
19596 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
19597 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
19598 -    eval "LIBPATH$unique=set"
19599 -
19600 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
19601 -    LDFLAGS="$LDFLAGS -L$ai_p"
19602 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
19603 -
19604 -  fi
19605 -
19606 -
19607 -      fi
19608 -
19609 +    ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
19610    fi
19611
19612 -    ;;
19613 -    esac
19614 -  done
19615 -
19616 -    cat >> confdefs.h <<\EOF
19617 -#define HAVE_MYSQLILIB 1
19618 -EOF
19619 -
19620
19621 -  save_old_LDFLAGS=$LDFLAGS
19622 -  ac_stuff="$MYSQLI_LIBLINE"
19623 -
19624 -  save_ext_shared=$ext_shared
19625 -  ext_shared=yes
19626 -
19627 -  for ac_i in $ac_stuff; do
19628 -    case $ac_i in
19629 -    -pthread)
19630 -      if test "$ext_shared" = "yes"; then
19631 -        LDFLAGS="$LDFLAGS -pthread"
19632 -      else
19633 -
19634 -
19635 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
19636 -
19637 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
19638 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
19639 -    eval "EXTRA_LDFLAGS$unique=set"
19640 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
19641 -  fi
19642 -
19643 -      fi
19644 -    ;;
19645 -    -l*)
19646 -      ac_ii=`echo $ac_i|cut -c 3-`
19647 -
19648 -
19649 -  case $ac_ii in
19650 -  c|c_r|pthread*) ;;
19651 -  *)
19652 -    if test "$ext_shared" = "yes"; then
19653 -        LDFLAGS="$LDFLAGS -l$ac_ii"
19654 -    else
19655 -
19656 -
19657 -  case $ac_ii in
19658 -  c|c_r|pthread*) ;;
19659 -  *)
19660 -      LIBS="$LIBS -l$ac_ii"
19661 -   ;;
19662 -  esac
19663 -
19664 -
19665 -    fi
19666 -   ;;
19667 -  esac
19668 -
19669 -
19670 -    ;;
19671 -    -L*)
19672 -      ac_ii=`echo $ac_i|cut -c 3-`
19673
19674 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
19675 -
19676 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
19677 -    ai_p=$ac_ii
19678 -  else
19679 -
19680 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
19681 -
19682 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19683 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
19684 -  fi
19685 -
19686 -
19687 -      if test "$ext_shared" = "yes"; then
19688 -        LDFLAGS="-L$ai_p $LDFLAGS"
19689 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
19690 -      else
19691 -
19692
19693
19694    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19695 @@ -61352,253 +61195,40 @@ EOF
19696    fi
19697
19698
19699 -      fi
19700
19701    fi
19702
19703 -    ;;
19704 -    esac
19705 -  done
19706 -
19707 -  echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
19708 -echo "configure:61365: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
19709 -ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'`
19710 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
19711 -  echo $ac_n "(cached) $ac_c" 1>&6
19712 -else
19713 -  ac_save_LIBS="$LIBS"
19714 -LIBS="-l$MYSQL_LIB_NAME  $LIBS"
19715 -cat > conftest.$ac_ext <<EOF
19716 -#line 61373 "configure"
19717 -#include "confdefs.h"
19718 -/* Override any gcc2 internal prototype to avoid an error.  */
19719 -/* We use char because int might match the return type of a gcc2
19720 -    builtin and then its argument prototype would still apply.  */
19721 -char mysql_set_character_set();
19722 -
19723 -int main() {
19724 -mysql_set_character_set()
19725 -; return 0; }
19726 -EOF
19727 -if { (eval echo configure:61384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19728 -  rm -rf conftest*
19729 -  eval "ac_cv_lib_$ac_lib_var=yes"
19730 -else
19731 -  echo "configure: failed program was:" >&5
19732 -  cat conftest.$ac_ext >&5
19733 -  rm -rf conftest*
19734 -  eval "ac_cv_lib_$ac_lib_var=no"
19735 -fi
19736 -rm -f conftest*
19737 -LIBS="$ac_save_LIBS"
19738 -
19739 -fi
19740 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
19741 -  echo "$ac_t""yes" 1>&6
19742 -
19743 -    LDFLAGS=$save_old_LDFLAGS
19744 -    ext_shared=$save_ext_shared
19745 -
19746 -
19747 -else
19748 -  echo "$ac_t""no" 1>&6
19749 -
19750 -    LDFLAGS=$save_old_LDFLAGS
19751 -    ext_shared=$save_ext_shared
19752 -    unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_character_set
19753 -
19754 -      { echo "configure: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." 1>&2; exit 1; }
19755 -
19756 -
19757 -fi
19758 -
19759 -
19760 -
19761 -else
19762 -  echo "$ac_t""no" 1>&6
19763 -
19764 -    LDFLAGS=$save_old_LDFLAGS
19765 -    ext_shared=$save_ext_shared
19766 -    unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_server_option
19767 -
19768 -    { echo "configure: error: wrong mysql library version or lib not found. Check config.log for more information." 1>&2; exit 1; }
19769 -
19770 -
19771 -fi
19772 -
19773 -
19774 -  save_old_LDFLAGS=$LDFLAGS
19775 -  ac_stuff="
19776 -    $MYSQLI_LIBLINE
19777 -  "
19778 -
19779 -  save_ext_shared=$ext_shared
19780 -  ext_shared=yes
19781 -
19782 -  for ac_i in $ac_stuff; do
19783 -    case $ac_i in
19784 -    -pthread)
19785 -      if test "$ext_shared" = "yes"; then
19786 -        LDFLAGS="$LDFLAGS -pthread"
19787 -      else
19788 -
19789 -
19790 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
19791 -
19792 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
19793 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
19794 -    eval "EXTRA_LDFLAGS$unique=set"
19795 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
19796    fi
19797 -
19798 -      fi
19799 -    ;;
19800 -    -l*)
19801 -      ac_ii=`echo $ac_i|cut -c 3-`
19802 -
19803
19804 -  case $ac_ii in
19805 -  c|c_r|pthread*) ;;
19806 -  *)
19807 -    if test "$ext_shared" = "yes"; then
19808 -        LDFLAGS="$LDFLAGS -l$ac_ii"
19809 -    else
19810 -
19811
19812 -  case $ac_ii in
19813 +  case sybdb in
19814    c|c_r|pthread*) ;;
19815    *)
19816 -      LIBS="$LIBS -l$ac_ii"
19817 -   ;;
19818 -  esac
19819 -
19820 -
19821 -    fi
19822 +      LIBS="-lsybdb $LIBS"
19823     ;;
19824    esac
19825
19826
19827 -    ;;
19828 -    -L*)
19829 -      ac_ii=`echo $ac_i|cut -c 3-`
19830 -
19831 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
19832 -
19833 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
19834 -    ai_p=$ac_ii
19835 -  else
19836 -
19837 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
19838 -
19839 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19840 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
19841 -  fi
19842 -
19843 -
19844 -      if test "$ext_shared" = "yes"; then
19845 -        LDFLAGS="-L$ai_p $LDFLAGS"
19846 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
19847 -      else
19848 -
19849 -
19850 -
19851 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19852 -
19853 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
19854 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
19855 -    eval "LIBPATH$unique=set"
19856 -
19857 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
19858 -    LDFLAGS="$LDFLAGS -L$ai_p"
19859 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
19860 -
19861 -  fi
19862
19863
19864 -      fi
19865 -
19866    fi
19867
19868 -    ;;
19869 -    esac
19870 -  done
19871 -
19872 -  echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
19873 -echo "configure:61528: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
19874 -ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'`
19875 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
19876 -  echo $ac_n "(cached) $ac_c" 1>&6
19877 -else
19878 -  ac_save_LIBS="$LIBS"
19879 -LIBS="-l$MYSQL_LIB_NAME  $LIBS"
19880 -cat > conftest.$ac_ext <<EOF
19881 -#line 61536 "configure"
19882 -#include "confdefs.h"
19883 -/* Override any gcc2 internal prototype to avoid an error.  */
19884 -/* We use char because int might match the return type of a gcc2
19885 -    builtin and then its argument prototype would still apply.  */
19886 -char mysql_stmt_next_result();
19887 -
19888 -int main() {
19889 -mysql_stmt_next_result()
19890 -; return 0; }
19891 -EOF
19892 -if { (eval echo configure:61547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19893 -  rm -rf conftest*
19894 -  eval "ac_cv_lib_$ac_lib_var=yes"
19895 -else
19896 -  echo "configure: failed program was:" >&5
19897 -  cat conftest.$ac_ext >&5
19898 -  rm -rf conftest*
19899 -  eval "ac_cv_lib_$ac_lib_var=no"
19900 -fi
19901 -rm -f conftest*
19902 -LIBS="$ac_save_LIBS"
19903 -
19904 -fi
19905 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
19906 -  echo "$ac_t""yes" 1>&6
19907 -
19908 -    LDFLAGS=$save_old_LDFLAGS
19909 -    ext_shared=$save_ext_shared
19910 -
19911 -    cat >> confdefs.h <<\EOF
19912 -#define HAVE_STMT_NEXT_RESULT 1
19913 -EOF
19914 -
19915 -
19916 -
19917 -else
19918 -  echo "$ac_t""no" 1>&6
19919 -
19920 -    LDFLAGS=$save_old_LDFLAGS
19921 -    ext_shared=$save_ext_shared
19922 -    unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_stmt_next_result
19923 -
19924 -
19925 -
19926 -fi
19927
19928 -fi
19929
19930 -if test "$PHP_MYSQLI" != "no"; then
19931 -  mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
19932 -                  mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
19933 -                  mysqli_exception.c $mysqli_extra_sources"
19934
19935 -  ext_builddir=ext/mysqli
19936 -  ext_srcdir=$abs_srcdir/ext/mysqli
19937 +  ext_builddir=ext/mssql
19938 +  ext_srcdir=$abs_srcdir/ext/mssql
19939
19940    ac_extra=
19941
19942    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
19943 -    PHP_MYSQLI_SHARED=no
19944 +    PHP_MSSQL_SHARED=no
19945
19946
19947 -  case ext/mysqli in
19948 +  case ext/mssql in
19949    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
19950 -  /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19951 -  *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19952 +  /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19953 +  *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19954    esac
19955
19956
19957 @@ -61613,7 +61243,7 @@ if test "$PHP_MYSQLI" != "no"; then
19958
19959
19960    old_IFS=$IFS
19961 -  for ac_src in $mysqli_sources; do
19962 +  for ac_src in php_mssql.c; do
19963
19964        IFS=.
19965        set $ac_src
19966 @@ -61636,18 +61266,18 @@ EOF
19967    done
19968
19969
19970 -    EXT_STATIC="$EXT_STATIC mysqli"
19971 +    EXT_STATIC="$EXT_STATIC mssql"
19972      if test "$ext_shared" != "nocli"; then
19973 -      EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
19974 +      EXT_CLI_STATIC="$EXT_CLI_STATIC mssql"
19975      fi
19976    else
19977      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
19978 -      PHP_MYSQLI_SHARED=yes
19979 +      PHP_MSSQL_SHARED=yes
19980
19981 -  case ext/mysqli in
19982 +  case ext/mssql in
19983    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
19984 -  /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19985 -  *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19986 +  /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19987 +  *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19988    esac
19989
19990
19991 @@ -61662,14 +61292,14 @@ EOF
19992
19993
19994    old_IFS=$IFS
19995 -  for ac_src in $mysqli_sources; do
19996 +  for ac_src in php_mssql.c; do
19997
19998        IFS=.
19999        set $ac_src
20000        ac_obj=$1
20001        IFS=$old_IFS
20002
20003 -      shared_objects_mysqli="$shared_objects_mysqli $ac_bdir$ac_obj.lo"
20004 +      shared_objects_mssql="$shared_objects_mssql $ac_bdir$ac_obj.lo"
20005
20006        case $ac_src in
20007          *.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" ;;
20008 @@ -61692,31 +61322,31 @@ EOF
20009    case $host_alias in
20010      *aix*)
20011        suffix=so
20012 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmysqli.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(PHPMYSQLI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmysqli.so '$ext_builddir'/phpmysqli.so'
20013 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmssql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(PHPMSSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmssql.so '$ext_builddir'/phpmssql.so'
20014        ;;
20015      *netware*)
20016        suffix=nlm
20017 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLI, 3)_SHARED_LIBADD)'
20018 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMSSQL, 3)_SHARED_LIBADD)'
20019        ;;
20020      *)
20021        suffix=la
20022 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(PHPMYSQLI_SHARED_LIBADD)'
20023 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(PHPMSSQL_SHARED_LIBADD)'
20024        ;;
20025    esac
20026
20027    if test "x" = "xyes"; then
20028 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmysqli.$suffix"
20029 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmssql.$suffix"
20030    else
20031 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqli.$suffix"
20032 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmssql.$suffix"
20033    fi
20034
20035 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
20036 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql"
20037
20038    cat >>Makefile.objects<<EOF
20039 -\$(phplibdir)/phpmysqli.$suffix: $ext_builddir/phpmysqli.$suffix
20040 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmysqli.$suffix \$(phplibdir)
20041 +\$(phplibdir)/phpmssql.$suffix: $ext_builddir/phpmssql.$suffix
20042 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmssql.$suffix \$(phplibdir)
20043
20044 -$ext_builddir/phpmysqli.$suffix: \$(shared_objects_mysqli) \$(PHPMYSQLI_SHARED_DEPENDENCIES)
20045 +$ext_builddir/phpmssql.$suffix: \$(shared_objects_mssql) \$(PHPMSSQL_SHARED_DEPENDENCIES)
20046         $link_cmd
20047
20048  EOF
20049 @@ -61729,31 +61359,31 @@ EOF
20050    case $host_alias in
20051      *aix*)
20052        suffix=so
20053 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mysqli.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(MYSQLI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mysqli.so '$ext_builddir'/mysqli.so'
20054 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mssql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(MSSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mssql.so '$ext_builddir'/mssql.so'
20055        ;;
20056      *netware*)
20057        suffix=nlm
20058 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQLI, 3)_SHARED_LIBADD)'
20059 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MSSQL, 3)_SHARED_LIBADD)'
20060        ;;
20061      *)
20062        suffix=la
20063 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(MYSQLI_SHARED_LIBADD)'
20064 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) $(MSSQL_SHARED_LIBADD)'
20065        ;;
20066    esac
20067
20068    if test "x" = "xyes"; then
20069 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mysqli.$suffix"
20070 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mssql.$suffix"
20071    else
20072 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysqli.$suffix"
20073 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mssql.$suffix"
20074    fi
20075
20076 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
20077 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql"
20078
20079    cat >>Makefile.objects<<EOF
20080 -\$(phplibdir)/mysqli.$suffix: $ext_builddir/mysqli.$suffix
20081 -       \$(LIBTOOL) --mode=install cp $ext_builddir/mysqli.$suffix \$(phplibdir)
20082 +\$(phplibdir)/mssql.$suffix: $ext_builddir/mssql.$suffix
20083 +       \$(LIBTOOL) --mode=install cp $ext_builddir/mssql.$suffix \$(phplibdir)
20084
20085 -$ext_builddir/mysqli.$suffix: \$(shared_objects_mysqli) \$(MYSQLI_SHARED_DEPENDENCIES)
20086 +$ext_builddir/mssql.$suffix: \$(shared_objects_mssql) \$(MSSQL_SHARED_DEPENDENCIES)
20087         $link_cmd
20088
20089  EOF
20090 @@ -61761,23 +61391,23 @@ EOF
20091            ;;
20092        esac
20093        cat >> confdefs.h <<EOF
20094 -#define COMPILE_DL_MYSQLI 1
20095 +#define COMPILE_DL_MSSQL 1
20096  EOF
20097
20098      fi
20099    fi
20100
20101    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
20102 -    PHP_MYSQLI_SHARED=no
20103 +    PHP_MSSQL_SHARED=no
20104      case "$PHP_SAPI" in
20105        cgi|embed)
20106
20107
20108 -  case ext/mysqli in
20109 +  case ext/mssql in
20110    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
20111 -  /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
20112 -  *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
20113 -  esac
20114 +  /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
20115 +  *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
20116 +  esac
20117
20118
20119
20120 @@ -61791,7 +61421,7 @@ EOF
20121
20122
20123    old_IFS=$IFS
20124 -  for ac_src in $mysqli_sources; do
20125 +  for ac_src in php_mssql.c; do
20126
20127        IFS=.
20128        set $ac_src
20129 @@ -61814,15 +61444,15 @@ EOF
20130    done
20131
20132
20133 -        EXT_STATIC="$EXT_STATIC mysqli"
20134 +        EXT_STATIC="$EXT_STATIC mssql"
20135          ;;
20136        *)
20137
20138
20139 -  case ext/mysqli in
20140 +  case ext/mssql in
20141    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
20142 -  /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
20143 -  *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
20144 +  /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
20145 +  *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
20146    esac
20147
20148
20149 @@ -61837,7 +61467,7 @@ EOF
20150
20151
20152    old_IFS=$IFS
20153 -  for ac_src in $mysqli_sources; do
20154 +  for ac_src in php_mssql.c; do
20155
20156        IFS=.
20157        set $ac_src
20158 @@ -61862,7 +61492,7 @@ EOF
20159
20160          ;;
20161      esac
20162 -    EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
20163 +    EXT_CLI_STATIC="$EXT_CLI_STATIC mssql"
20164    fi
20165
20166
20167 @@ -61871,71 +61501,165 @@ EOF
20168
20169
20170    if test "$ext_builddir" = "."; then
20171 -    PHP_PECL_EXTENSION=mysqli
20172 +    PHP_PECL_EXTENSION=mssql
20173
20174    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
20175
20176    fi
20177
20178 -
20179 -  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQLI_SHARED_LIBADD"
20180 +  echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
20181 +echo "configure:61512: checking for dnet_addr in -ldnet_stub" >&5
20182 +ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
20183 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20184 +  echo $ac_n "(cached) $ac_c" 1>&6
20185 +else
20186 +  ac_save_LIBS="$LIBS"
20187 +LIBS="-ldnet_stub  $LIBS"
20188 +cat > conftest.$ac_ext <<EOF
20189 +#line 61520 "configure"
20190 +#include "confdefs.h"
20191 +/* Override any gcc2 internal prototype to avoid an error.  */
20192 +/* We use char because int might match the return type of a gcc2
20193 +    builtin and then its argument prototype would still apply.  */
20194 +char dnet_addr();
20195
20196 -
20197 -
20198 -    for header_file in ext/mysqli/php_mysqli_structs.h; do
20199 +int main() {
20200 +dnet_addr()
20201 +; return 0; }
20202 +EOF
20203 +if { (eval echo configure:61531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20204 +  rm -rf conftest*
20205 +  eval "ac_cv_lib_$ac_lib_var=yes"
20206 +else
20207 +  echo "configure: failed program was:" >&5
20208 +  cat conftest.$ac_ext >&5
20209 +  rm -rf conftest*
20210 +  eval "ac_cv_lib_$ac_lib_var=no"
20211 +fi
20212 +rm -f conftest*
20213 +LIBS="$ac_save_LIBS"
20214 +
20215 +fi
20216 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20217 +  echo "$ac_t""yes" 1>&6
20218 +
20219 +
20220 +  if test "$ext_shared" = "yes"; then
20221 +    MSSQL_SHARED_LIBADD="-ldnet_stub $MSSQL_SHARED_LIBADD"
20222 +    if test -n ""; then
20223
20224 +  if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
20225 +
20226 +  if test -z "" || echo "" | grep '^/' >/dev/null ; then
20227 +    ai_p=
20228 +  else
20229 +
20230 +    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
20231 +
20232 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20233 +    ai_p="$ep_realdir/`basename \"\"`"
20234 +  fi
20235 +
20236 +
20237 +      if test "$ext_shared" = "yes"; then
20238 +        MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD"
20239 +        test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_SHARED_LIBADD"
20240 +      else
20241 +
20242
20243 -  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
20244
20245 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
20246 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20247 +
20248 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20249    if test -n "$unique" && test "`eval $cmd`" = "" ; then
20250 -    eval "INSTALLHEADERS$unique=set"
20251 +    eval "LIBPATH$unique=set"
20252
20253 -        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
20254 -
20255 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20256 +    LDFLAGS="$LDFLAGS -L$ai_p"
20257 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
20258 +
20259    fi
20260
20261 -    done
20262 +
20263 +      fi
20264 +
20265 +  fi
20266 +
20267 +    fi
20268 +  else
20269 +
20270 +
20271 +  if test -n ""; then
20272 +
20273 +  if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
20274 +
20275 +  if test -z "" || echo "" | grep '^/' >/dev/null ; then
20276 +    ai_p=
20277 +  else
20278 +
20279 +    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
20280 +
20281 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20282 +    ai_p="$ep_realdir/`basename \"\"`"
20283 +  fi
20284 +
20285 +
20286 +
20287 +
20288 +
20289 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20290 +
20291 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20292 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
20293 +    eval "LIBPATH$unique=set"
20294 +
20295 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20296 +    LDFLAGS="$LDFLAGS -L$ai_p"
20297 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
20298
20299 +  fi
20300
20301
20302 -  if test "$PHP_MYSQLI" = "mysqlnd"; then
20303
20304 -  am_i_shared=$PHP_MYSQLI_SHARED
20305 -  is_it_shared=$PHP_MYSQLND_SHARED
20306 -  is_it_enabled=$PHP_MYSQLND
20307 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
20308 -    { echo "configure: error:
20309 -You've configured extension mysqli to build statically, but it
20310 -depends on extension mysqlnd, which you've configured to build shared.
20311 -You either need to build mysqli shared or build mysqlnd statically for the
20312 -build to be successful.
20313 -" 1>&2; exit 1; }
20314    fi
20315 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
20316 -    { echo "configure: error:
20317 -You've configured extension mysqli, which depends on extension mysqlnd,
20318 -but you've either not enabled mysqlnd, or have disabled it.
20319 -" 1>&2; exit 1; }
20320 +
20321    fi
20322
20323 -    cat >> confdefs.h <<\EOF
20324 -#define MYSQLI_USE_MYSQLND 1
20325 -EOF
20326 +
20327 +  case dnet_stub in
20328 +  c|c_r|pthread*) ;;
20329 +  *)
20330 +      LIBS="-ldnet_stub $LIBS"
20331 +   ;;
20332 +  esac
20333 +
20334 +
20335 +
20336
20337    fi
20338 -fi
20339
20340
20341 -if test -z "$SED"; then
20342 -  PHP_OCI8_SED="sed";
20343 +        cat >> confdefs.h <<\EOF
20344 +#define HAVE_LIBDNET_STUB 1
20345 +EOF
20346 +
20347 +
20348  else
20349 -  PHP_OCI8_SED="$SED";
20350 +  echo "$ac_t""no" 1>&6
20351  fi
20352
20353 +  cat >> confdefs.h <<\EOF
20354 +#define HAVE_MSSQL 1
20355 +EOF
20356
20357 +  cat >> confdefs.h <<\EOF
20358 +#define HAVE_FREETDS 1
20359 +EOF
20360
20361 +
20362 +  PHP_VAR_SUBST="$PHP_VAR_SUBST MSSQL_SHARED_LIBADD"
20363
20364 +fi
20365
20366
20367
20368 @@ -61944,18 +61668,18 @@ fi
20369
20370
20371
20372 -php_with_oci8=no
20373 +php_with_mysql=no
20374
20375 -echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6
20376 -echo "configure:61951: checking for Oracle (OCI8) support" >&5
20377 -# Check whether --with-oci8 or --without-oci8 was given.
20378 -if test "${with_oci8+set}" = set; then
20379 -  withval="$with_oci8"
20380 -  PHP_OCI8=$withval
20381 +echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
20382 +echo "configure:61675: checking for MySQL support" >&5
20383 +# Check whether --with-mysql or --without-mysql was given.
20384 +if test "${with_mysql+set}" = set; then
20385 +  withval="$with_mysql"
20386 +  PHP_MYSQL=$withval
20387  else
20388
20389 -  PHP_OCI8=no
20390 -  test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL
20391 +  PHP_MYSQL=no
20392 +  test "$PHP_ENABLE_ALL" && PHP_MYSQL=$PHP_ENABLE_ALL
20393
20394  fi
20395
20396 @@ -61963,12 +61687,12 @@ fi
20397
20398  ext_output="yes, shared"
20399  ext_shared=yes
20400 -case $PHP_OCI8 in
20401 +case $PHP_MYSQL in
20402  shared,*)
20403 -  PHP_OCI8=`echo "$PHP_OCI8"|$SED 's/^shared,//'`
20404 +  PHP_MYSQL=`echo "$PHP_MYSQL"|$SED 's/^shared,//'`
20405    ;;
20406  shared)
20407 -  PHP_OCI8=yes
20408 +  PHP_MYSQL=yes
20409    ;;
20410  no)
20411    ext_output=no
20412 @@ -61987,364 +61711,318 @@ echo "$ac_t""$ext_output" 1>&6
20413
20414
20415
20416 -if test "$PHP_OCI8" != "no"; then
20417
20418 -  if test -z "$PHP_OCI8"; then
20419 -        { echo "configure: error: Empty parameter value passed to --with-oci8" 1>&2; exit 1; }
20420 -  fi
20421 +php_with_mysql_sock=no
20422
20423 +echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
20424 +echo "configure:61719: checking for specified location of the MySQL UNIX socket" >&5
20425 +# Check whether --with-mysql-sock or --without-mysql-sock was given.
20426 +if test "${with_mysql_sock+set}" = set; then
20427 +  withval="$with_mysql_sock"
20428 +  PHP_MYSQL_SOCK=$withval
20429 +else
20430 +
20431 +  PHP_MYSQL_SOCK=no
20432
20433 -  echo $ac_n "checking PHP version""... $ac_c" 1>&6
20434 -echo "configure:61999: checking PHP version" >&5
20435
20436 -  tmp_version=$PHP_VERSION
20437 -  if test -z "$tmp_version"; then
20438 -    if test -z "$PHP_CONFIG"; then
20439 -      { echo "configure: error: php-config not found" 1>&2; exit 1; }
20440 -    fi
20441 -    php_version=`$PHP_CONFIG --version 2>/dev/null|head -n 1|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
20442 -  else
20443 -    php_version=`echo "$tmp_version"|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
20444 -  fi
20445 +fi
20446
20447 -  if test -z "$php_version"; then
20448 -    { echo "configure: error: failed to detect PHP version, please report" 1>&2; exit 1; }
20449 -  fi
20450
20451 -  ac_IFS=$IFS
20452 -  IFS="."
20453 -  set $php_version
20454 -  IFS=$ac_IFS
20455 -  oci8_php_version=`expr $1 \* 1000000 + $2 \* 1000 + $3`
20456 +ext_output=$PHP_MYSQL_SOCK
20457 +echo "$ac_t""$ext_output" 1>&6
20458 +
20459
20460 -  if test "$oci8_php_version" -lt "4003009"; then
20461 -    { echo "configure: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" 1>&2; exit 1; }
20462 -  elif test "$oci8_php_version" -ge "6000000"; then
20463 -    { echo "configure: error: This version of OCI8 is not compatible with PHP 6 or higher" 1>&2; exit 1; }
20464 -  else
20465 -    echo "$ac_t""$php_version, ok" 1>&6
20466 -  fi
20467
20468 +
20469 +if test -z "$PHP_ZLIB_DIR"; then
20470
20471 -  echo $ac_n "checking size of long int""... $ac_c" 1>&6
20472 -echo "configure:62031: checking size of long int" >&5
20473 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
20474 -  echo $ac_n "(cached) $ac_c" 1>&6
20475 -else
20476 -  if test "$cross_compiling" = yes; then
20477 -  ac_cv_sizeof_long_int=4
20478 -else
20479 -  cat > conftest.$ac_ext <<EOF
20480 -#line 62039 "configure"
20481 -#include "confdefs.h"
20482 -#include <stdio.h>
20483 -int main()
20484 -{
20485 -  FILE *f=fopen("conftestval", "w");
20486 -  if (!f) return(1);
20487 -  fprintf(f, "%d\n", sizeof(long int));
20488 -  return(0);
20489 -}
20490 -EOF
20491 -if { (eval echo configure:62050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
20492 -then
20493 -  ac_cv_sizeof_long_int=`cat conftestval`
20494 +php_with_zlib_dir=no
20495 +
20496 +echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
20497 +echo "configure:61743: checking for the location of libz" >&5
20498 +# Check whether --with-zlib-dir or --without-zlib-dir was given.
20499 +if test "${with_zlib_dir+set}" = set; then
20500 +  withval="$with_zlib_dir"
20501 +  PHP_ZLIB_DIR=$withval
20502  else
20503 -  echo "configure: failed program was:" >&5
20504 -  cat conftest.$ac_ext >&5
20505 -  rm -fr conftest*
20506 -  ac_cv_sizeof_long_int=0
20507 -fi
20508 -rm -fr conftest*
20509 -fi
20510 +
20511 +  PHP_ZLIB_DIR=no
20512 +
20513
20514  fi
20515 -echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
20516 -cat >> confdefs.h <<EOF
20517 -#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
20518 -EOF
20519
20520
20521 -  echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
20522 -echo "configure:62070: checking checking if we're on a 64-bit platform" >&5
20523 -  if test "$ac_cv_sizeof_long_int" = "4"; then
20524 -    echo "$ac_t""no" 1>&6
20525 -    PHP_OCI8_OH_LIBDIR=lib32
20526 -    PHP_OCI8_IC_LIBDIR_SUFFIX=""
20527 -  else
20528 -    echo "$ac_t""yes" 1>&6
20529 -    PHP_OCI8_OH_LIBDIR=lib
20530 -    PHP_OCI8_IC_LIBDIR_SUFFIX=64
20531 -  fi
20532 +ext_output=$PHP_ZLIB_DIR
20533 +echo "$ac_t""$ext_output" 1>&6
20534
20535 -
20536 -  PHP_OCI8_INSTANT_CLIENT="no"
20537
20538 -            if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then
20539 -    echo "configure: warning: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" 1>&2
20540 -    PHP_OCI8=instantclient
20541 -  fi
20542
20543 -  if test "`echo $PHP_OCI8`" = "instantclient"; then
20544 -    PHP_OCI8_INSTANT_CLIENT="yes"
20545 -  elif test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then
20546 -    PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
20547 -    PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f1,4`"
20548 -    if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
20549 -       PHP_OCI8_INSTANT_CLIENT="yes"
20550 -    fi
20551 -    if test -z "$PHP_OCI8"; then
20552 -       PHP_OCI8=yes
20553 -    fi
20554 -  elif test "`echo $PHP_OCI8 | cut -d, -f1`" = "instantclient"; then
20555 -    PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
20556 -    PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f3,4`"
20557 -    if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
20558 -       PHP_OCI8_INSTANT_CLIENT="yes"
20559 -    fi
20560 -    if test -z "$PHP_OCI8"; then
20561 -       PHP_OCI8=yes
20562 -    fi
20563 -  fi
20564 +fi
20565
20566 -  if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
20567 -
20568 -    echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6
20569 -echo "configure:62114: checking Oracle ORACLE_HOME install directory" >&5
20570 +if test "$PHP_MYSQL" = "mysqlnd"; then
20571 +    PHP_MYSQLND_ENABLED=yes
20572
20573 -    if test "$PHP_OCI8" = "yes"; then
20574 -      OCI8_DIR=$ORACLE_HOME
20575 -    else
20576 -      OCI8_DIR=$PHP_OCI8
20577 +elif test "$PHP_MYSQL" != "no"; then
20578 +  MYSQL_DIR=
20579 +  MYSQL_INC_DIR=
20580 +
20581 +  for i in $PHP_MYSQL /usr/local /usr; do
20582 +    if test -r $i/include/mysql/mysql.h; then
20583 +      MYSQL_DIR=$i
20584 +      MYSQL_INC_DIR=$i/include/mysql
20585 +      break
20586 +    elif test -r $i/include/mysql.h; then
20587 +      MYSQL_DIR=$i
20588 +      MYSQL_INC_DIR=$i/include
20589 +      break
20590      fi
20591 -    echo "$ac_t""$OCI8_DIR" 1>&6
20592 +  done
20593
20594 -
20595 -  echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
20596 -echo "configure:62125: checking ORACLE_HOME library validity" >&5
20597 -  if test ! -d "$OCI8_DIR"; then
20598 -    { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; }
20599 +  if test -z "$MYSQL_DIR"; then
20600 +    { echo "configure: error: Cannot find MySQL header files under $PHP_MYSQL.
20601 +Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; }
20602    fi
20603 -  if test -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then
20604 -    OCI8_LIB_DIR=lib
20605 -  elif test ! -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
20606 -    OCI8_LIB_DIR=lib32
20607 -  elif test -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
20608 -    OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
20609 +
20610 +  if test "$enable_maintainer_zts" = "yes"; then
20611 +    MYSQL_LIBNAME=mysqlclient_r
20612    else
20613 -        if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then
20614 -      { echo "configure: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" 1>&2; exit 1; }
20615 -    else
20616 -      { echo "configure: error: Oracle library directory not found in ${OCI8_DIR}" 1>&2; exit 1; }
20617 -    fi
20618 +    MYSQL_LIBNAME=mysqlclient
20619    fi
20620 -  echo "$ac_t""$OCI8_LIB_DIR" 1>&6
20621 +  case $host_alias in
20622 +    *netware*)
20623 +      MYSQL_LIBNAME=mysql
20624 +      ;;
20625 +  esac
20626
20627 +    if test -z "$PHP_LIBDIR"; then
20628 +    PHP_LIBDIR=lib
20629 +  fi
20630
20631 -    if test -d "$OCI8_DIR/rdbms/public"; then
20632 -
20633 -  if test "$OCI8_DIR/rdbms/public" != "/usr/include"; then
20634 -
20635 -  if test -z "$OCI8_DIR/rdbms/public" || echo "$OCI8_DIR/rdbms/public" | grep '^/' >/dev/null ; then
20636 -    ai_p=$OCI8_DIR/rdbms/public
20637 -  else
20638 -
20639 -    ep_dir="`echo $OCI8_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
20640 +  for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do
20641
20642 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20643 -    ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/public\"`"
20644 +  str="$MYSQL_DIR/$i/lib$MYSQL_LIBNAME.*"
20645 +  for j in `echo $str`; do
20646 +    if test -r $j; then
20647 +      MYSQL_LIB_DIR=$MYSQL_DIR/$i
20648 +      break 2
20649 +    fi
20650 +  done
20651 +
20652 +  done
20653 +
20654 +  if test -z "$MYSQL_LIB_DIR"; then
20655 +    { echo "configure: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
20656 +Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; }
20657    fi
20658
20659 -
20660
20661 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20662 +  save_old_LDFLAGS=$LDFLAGS
20663 +  ac_stuff="
20664 +    -L$MYSQL_LIB_DIR
20665 +  "
20666
20667 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
20668 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
20669 -    eval "INCLUDEPATH$unique=set"
20670 -
20671 -      if test ""; then
20672 -        INCLUDES="-I$ai_p $INCLUDES"
20673 +  save_ext_shared=$ext_shared
20674 +  ext_shared=yes
20675 +
20676 +  for ac_i in $ac_stuff; do
20677 +    case $ac_i in
20678 +    -pthread)
20679 +      if test "$ext_shared" = "yes"; then
20680 +        LDFLAGS="$LDFLAGS -pthread"
20681        else
20682 -        INCLUDES="$INCLUDES -I$ai_p"
20683 -      fi
20684 -
20685 +
20686 +
20687 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
20688 +
20689 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
20690 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
20691 +    eval "EXTRA_LDFLAGS$unique=set"
20692 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
20693    fi
20694
20695 -  fi
20696 +      fi
20697 +    ;;
20698 +    -l*)
20699 +      ac_ii=`echo $ac_i|cut -c 3-`
20700 +
20701 +
20702 +  case $ac_ii in
20703 +  c|c_r|pthread*) ;;
20704 +  *)
20705 +    if test "$ext_shared" = "yes"; then
20706 +        LDFLAGS="$LDFLAGS -l$ac_ii"
20707 +    else
20708 +
20709 +
20710 +  case $ac_ii in
20711 +  c|c_r|pthread*) ;;
20712 +  *)
20713 +      LIBS="$LIBS -l$ac_ii"
20714 +   ;;
20715 +  esac
20716 +
20717
20718 -      OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/public"
20719      fi
20720 -    if test -d "$OCI8_DIR/rdbms/demo"; then
20721 +   ;;
20722 +  esac
20723 +
20724 +
20725 +    ;;
20726 +    -L*)
20727 +      ac_ii=`echo $ac_i|cut -c 3-`
20728
20729 -  if test "$OCI8_DIR/rdbms/demo" != "/usr/include"; then
20730 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
20731
20732 -  if test -z "$OCI8_DIR/rdbms/demo" || echo "$OCI8_DIR/rdbms/demo" | grep '^/' >/dev/null ; then
20733 -    ai_p=$OCI8_DIR/rdbms/demo
20734 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
20735 +    ai_p=$ac_ii
20736    else
20737
20738 -    ep_dir="`echo $OCI8_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
20739 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
20740
20741      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20742 -    ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/demo\"`"
20743 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
20744    fi
20745
20746
20747 +      if test "$ext_shared" = "yes"; then
20748 +        LDFLAGS="-L$ai_p $LDFLAGS"
20749 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
20750 +      else
20751 +
20752 +
20753
20754    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20755
20756 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
20757 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20758    if test -n "$unique" && test "`eval $cmd`" = "" ; then
20759 -    eval "INCLUDEPATH$unique=set"
20760 -
20761 -      if test ""; then
20762 -        INCLUDES="-I$ai_p $INCLUDES"
20763 -      else
20764 -        INCLUDES="$INCLUDES -I$ai_p"
20765 -      fi
20766 +    eval "LIBPATH$unique=set"
20767
20768 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20769 +    LDFLAGS="$LDFLAGS -L$ai_p"
20770 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
20771 +
20772    fi
20773
20774 -  fi
20775
20776 -      OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/demo"
20777 -    fi
20778 -    if test -d "$OCI8_DIR/network/public"; then
20779 -
20780 -  if test "$OCI8_DIR/network/public" != "/usr/include"; then
20781 -
20782 -  if test -z "$OCI8_DIR/network/public" || echo "$OCI8_DIR/network/public" | grep '^/' >/dev/null ; then
20783 -    ai_p=$OCI8_DIR/network/public
20784 -  else
20785 -
20786 -    ep_dir="`echo $OCI8_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`"
20787 +      fi
20788
20789 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20790 -    ai_p="$ep_realdir/`basename \"$OCI8_DIR/network/public\"`"
20791    fi
20792
20793 -
20794 -
20795 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20796 +    ;;
20797 +    esac
20798 +  done
20799 +
20800 +  echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
20801 +echo "configure:61917: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
20802 +ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'`
20803 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20804 +  echo $ac_n "(cached) $ac_c" 1>&6
20805 +else
20806 +  ac_save_LIBS="$LIBS"
20807 +LIBS="-l$MYSQL_LIBNAME  $LIBS"
20808 +cat > conftest.$ac_ext <<EOF
20809 +#line 61925 "configure"
20810 +#include "confdefs.h"
20811 +/* Override any gcc2 internal prototype to avoid an error.  */
20812 +/* We use char because int might match the return type of a gcc2
20813 +    builtin and then its argument prototype would still apply.  */
20814 +char mysql_close();
20815 +
20816 +int main() {
20817 +mysql_close()
20818 +; return 0; }
20819 +EOF
20820 +if { (eval echo configure:61936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20821 +  rm -rf conftest*
20822 +  eval "ac_cv_lib_$ac_lib_var=yes"
20823 +else
20824 +  echo "configure: failed program was:" >&5
20825 +  cat conftest.$ac_ext >&5
20826 +  rm -rf conftest*
20827 +  eval "ac_cv_lib_$ac_lib_var=no"
20828 +fi
20829 +rm -f conftest*
20830 +LIBS="$ac_save_LIBS"
20831 +
20832 +fi
20833 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20834 +  echo "$ac_t""yes" 1>&6
20835
20836 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
20837 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
20838 -    eval "INCLUDEPATH$unique=set"
20839 -
20840 -      if test ""; then
20841 -        INCLUDES="-I$ai_p $INCLUDES"
20842 -      else
20843 -        INCLUDES="$INCLUDES -I$ai_p"
20844 -      fi
20845 -
20846 -  fi
20847 +    LDFLAGS=$save_old_LDFLAGS
20848 +    ext_shared=$save_ext_shared
20849 +
20850 +
20851 +else
20852 +  echo "$ac_t""no" 1>&6
20853
20854 -  fi
20855 +    LDFLAGS=$save_old_LDFLAGS
20856 +    ext_shared=$save_ext_shared
20857 +    unset ac_cv_lib_$MYSQL_LIBNAME_mysql_close
20858 +
20859 +    if test "$PHP_ZLIB_DIR" != "no"; then
20860 +
20861
20862 -      OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/network/public"
20863 -    fi
20864 -    if test -d "$OCI8_DIR/plsql/public"; then
20865 +  if test "$ext_shared" = "yes"; then
20866 +    MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD"
20867 +    if test -n "$PHP_ZLIB_DIR"; then
20868
20869 -  if test "$OCI8_DIR/plsql/public" != "/usr/include"; then
20870 +  if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
20871
20872 -  if test -z "$OCI8_DIR/plsql/public" || echo "$OCI8_DIR/plsql/public" | grep '^/' >/dev/null ; then
20873 -    ai_p=$OCI8_DIR/plsql/public
20874 +  if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
20875 +    ai_p=$PHP_ZLIB_DIR
20876    else
20877
20878 -    ep_dir="`echo $OCI8_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
20879 +    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
20880
20881      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20882 -    ai_p="$ep_realdir/`basename \"$OCI8_DIR/plsql/public\"`"
20883 +    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
20884    fi
20885
20886
20887 -
20888 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20889 -
20890 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
20891 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
20892 -    eval "INCLUDEPATH$unique=set"
20893 -
20894 -      if test ""; then
20895 -        INCLUDES="-I$ai_p $INCLUDES"
20896 -      else
20897 -        INCLUDES="$INCLUDES -I$ai_p"
20898 -      fi
20899 -
20900 -  fi
20901 -
20902 -  fi
20903 -
20904 -      OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/plsql/public"
20905 -    fi
20906 -
20907 -    if test -f "$OCI8_DIR/$OCI8_LIB_DIR/sysliblist"; then
20908 -
20909 -  for ac_i in `cat $OCI8_DIR/$OCI8_LIB_DIR/sysliblist`; do
20910 -    case $ac_i in
20911 -    -pthread)
20912        if test "$ext_shared" = "yes"; then
20913 -        OCI8_SYSLIB="$OCI8_SYSLIB -pthread"
20914 +        MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD"
20915 +        test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_SHARED_LIBADD"
20916        else
20917
20918
20919 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
20920
20921 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
20922 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20923 +
20924 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20925    if test -n "$unique" && test "`eval $cmd`" = "" ; then
20926 -    eval "EXTRA_LDFLAGS$unique=set"
20927 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
20928 +    eval "LIBPATH$unique=set"
20929 +
20930 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20931 +    LDFLAGS="$LDFLAGS -L$ai_p"
20932 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
20933 +
20934    fi
20935
20936 -      fi
20937 -    ;;
20938 -    -l*)
20939 -      ac_ii=`echo $ac_i|cut -c 3-`
20940 -
20941 -
20942 -  case $ac_ii in
20943 -  c|c_r|pthread*) ;;
20944 -  *)
20945 -    if test "$ext_shared" = "yes"; then
20946 -        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
20947 -    else
20948 -
20949 -
20950 -  case $ac_ii in
20951 -  c|c_r|pthread*) ;;
20952 -  *)
20953 -      LIBS="$LIBS -l$ac_ii"
20954 -   ;;
20955 -  esac
20956
20957 +      fi
20958 +
20959 +  fi
20960
20961      fi
20962 -   ;;
20963 -  esac
20964 -
20965 +  else
20966 +
20967
20968 -    ;;
20969 -    -L*)
20970 -      ac_ii=`echo $ac_i|cut -c 3-`
20971 -
20972 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
20973 +  if test -n "$PHP_ZLIB_DIR"; then
20974
20975 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
20976 -    ai_p=$ac_ii
20977 +  if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
20978 +
20979 +  if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
20980 +    ai_p=$PHP_ZLIB_DIR
20981    else
20982
20983 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
20984 +    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
20985
20986      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20987 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
20988 +    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
20989    fi
20990
20991
20992 -      if test "$ext_shared" = "yes"; then
20993 -        OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
20994 -        test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
20995 -      else
20996 -
20997 +
20998
20999
21000    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21001 @@ -62360,21 +62038,39 @@ echo "configure:62125: checking ORACLE_H
21002    fi
21003
21004
21005 -      fi
21006
21007    fi
21008
21009 -    ;;
21010 -    esac
21011 -  done
21012 +  fi
21013 +
21014 +
21015 +  case z in
21016 +  c|c_r|pthread*) ;;
21017 +  *)
21018 +      LIBS="-lz $LIBS"
21019 +   ;;
21020 +  esac
21021 +
21022 +
21023 +
21024 +
21025 +  fi
21026 +
21027
21028 -    elif test -f "$OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist"; then
21029
21030 -  for ac_i in `cat $OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist`; do
21031 +  save_old_LDFLAGS=$LDFLAGS
21032 +  ac_stuff="
21033 +        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR
21034 +      "
21035 +
21036 +  save_ext_shared=$ext_shared
21037 +  ext_shared=yes
21038 +
21039 +  for ac_i in $ac_stuff; do
21040      case $ac_i in
21041      -pthread)
21042        if test "$ext_shared" = "yes"; then
21043 -        OCI8_SYSLIB="$OCI8_SYSLIB -pthread"
21044 +        LDFLAGS="$LDFLAGS -pthread"
21045        else
21046
21047
21048 @@ -62396,7 +62092,7 @@ echo "configure:62125: checking ORACLE_H
21049    c|c_r|pthread*) ;;
21050    *)
21051      if test "$ext_shared" = "yes"; then
21052 -        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
21053 +        LDFLAGS="$LDFLAGS -l$ac_ii"
21054      else
21055
21056
21057 @@ -62431,8 +62127,8 @@ echo "configure:62125: checking ORACLE_H
21058
21059
21060        if test "$ext_shared" = "yes"; then
21061 -        OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
21062 -        test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
21063 +        LDFLAGS="-L$ai_p $LDFLAGS"
21064 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
21065        else
21066
21067
21068 @@ -62458,47 +62154,88 @@ echo "configure:62125: checking ORACLE_H
21069      esac
21070    done
21071
21072 -    fi
21073 +  echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
21074 +echo "configure:62159: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
21075 +ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'`
21076 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21077 +  echo $ac_n "(cached) $ac_c" 1>&6
21078 +else
21079 +  ac_save_LIBS="$LIBS"
21080 +LIBS="-l$MYSQL_LIBNAME  $LIBS"
21081 +cat > conftest.$ac_ext <<EOF
21082 +#line 62167 "configure"
21083 +#include "confdefs.h"
21084 +/* Override any gcc2 internal prototype to avoid an error.  */
21085 +/* We use char because int might match the return type of a gcc2
21086 +    builtin and then its argument prototype would still apply.  */
21087 +char mysql_error();
21088 +
21089 +int main() {
21090 +mysql_error()
21091 +; return 0; }
21092 +EOF
21093 +if { (eval echo configure:62178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21094 +  rm -rf conftest*
21095 +  eval "ac_cv_lib_$ac_lib_var=yes"
21096 +else
21097 +  echo "configure: failed program was:" >&5
21098 +  cat conftest.$ac_ext >&5
21099 +  rm -rf conftest*
21100 +  eval "ac_cv_lib_$ac_lib_var=no"
21101 +fi
21102 +rm -f conftest*
21103 +LIBS="$ac_save_LIBS"
21104
21105 +fi
21106 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21107 +  echo "$ac_t""yes" 1>&6
21108 +
21109 +    LDFLAGS=$save_old_LDFLAGS
21110 +    ext_shared=$save_ext_shared
21111
21112 -  echo $ac_n "checking Oracle version""... $ac_c" 1>&6
21113 -echo "configure:62466: checking Oracle version" >&5
21114 -  if test -s "$OCI8_DIR/orainst/unix.rgs"; then
21115 -    OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
21116 -    test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
21117 -  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
21118 -    OCI8_ORACLE_VERSION=11.1
21119 -  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
21120 -        OCI8_ORACLE_VERSION=10.1
21121 -  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
21122 -        OCI8_ORACLE_VERSION=9.0
21123 -  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
21124 -    OCI8_ORACLE_VERSION=8.1
21125 -  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
21126 -    OCI8_ORACLE_VERSION=8.0
21127 -  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then
21128 -    if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then
21129 -      OCI8_ORACLE_VERSION=8.0
21130 +
21131 +else
21132 +  echo "$ac_t""no" 1>&6
21133 +
21134 +    LDFLAGS=$save_old_LDFLAGS
21135 +    ext_shared=$save_ext_shared
21136 +    unset ac_cv_lib_$MYSQL_LIBNAME_mysql_error
21137 +
21138 +        { echo "configure: error: mysql configure failed. Please check config.log for more information." 1>&2; exit 1; }
21139 +
21140 +
21141 +fi
21142 +
21143 +      MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
21144      else
21145 -      OCI8_ORACLE_VERSION=8.1
21146 -    fi
21147 -  else
21148 -    { echo "configure: error: Oracle client libraries not found" 1>&2; exit 1; }
21149 -  fi
21150 -  echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
21151 +
21152 +
21153 +  case z in
21154 +  c|c_r|pthread*) ;;
21155 +  *)
21156 +    if test "$ext_shared" = "yes"; then
21157 +        MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD"
21158 +    else
21159 +
21160 +
21161 +  case z in
21162 +  c|c_r|pthread*) ;;
21163 +  *)
21164 +      LIBS="-lz $LIBS"
21165 +   ;;
21166 +  esac
21167
21168
21169 -    case $OCI8_ORACLE_VERSION in
21170 -      7.3|8.0|8.1)
21171 -       { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; }
21172 -       ;;
21173 +    fi
21174 +   ;;
21175 +  esac
21176
21177 -      9.0)
21178 -
21179 +
21180 +
21181    save_old_LDFLAGS=$LDFLAGS
21182    ac_stuff="
21183 -         -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
21184 -       "
21185 +        -L$MYSQL_LIB_DIR
21186 +      "
21187
21188    save_ext_shared=$ext_shared
21189    ext_shared=yes
21190 @@ -62591,27 +62328,27 @@ echo "configure:62466: checking Oracle v
21191      esac
21192    done
21193
21194 -  echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
21195 -echo "configure:62596: checking for OCIEnvNlsCreate in -lclntsh" >&5
21196 -ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
21197 +  echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
21198 +echo "configure:62333: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
21199 +ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'`
21200  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21201    echo $ac_n "(cached) $ac_c" 1>&6
21202  else
21203    ac_save_LIBS="$LIBS"
21204 -LIBS="-lclntsh  $LIBS"
21205 +LIBS="-l$MYSQL_LIBNAME  $LIBS"
21206  cat > conftest.$ac_ext <<EOF
21207 -#line 62604 "configure"
21208 +#line 62341 "configure"
21209  #include "confdefs.h"
21210  /* Override any gcc2 internal prototype to avoid an error.  */
21211  /* We use char because int might match the return type of a gcc2
21212      builtin and then its argument prototype would still apply.  */
21213 -char OCIEnvNlsCreate();
21214 +char mysql_errno();
21215
21216  int main() {
21217 -OCIEnvNlsCreate()
21218 +mysql_errno()
21219  ; return 0; }
21220  EOF
21221 -if { (eval echo configure:62615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21222 +if { (eval echo configure:62352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21223    rm -rf conftest*
21224    eval "ac_cv_lib_$ac_lib_var=yes"
21225  else
21226 @@ -62630,75 +62367,48 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
21227      LDFLAGS=$save_old_LDFLAGS
21228      ext_shared=$save_ext_shared
21229
21230 -         OCI8_ORACLE_VERSION=9.2
21231 -
21232
21233  else
21234    echo "$ac_t""no" 1>&6
21235
21236      LDFLAGS=$save_old_LDFLAGS
21237      ext_shared=$save_ext_shared
21238 -    unset ac_cv_lib_clntsh_OCIEnvNlsCreate
21239 +    unset ac_cv_lib_$MYSQL_LIBNAME_mysql_errno
21240
21241 -         { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; }
21242 -
21243 +        { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; }
21244 +
21245
21246  fi
21247 -
21248 -       ;;
21249 -
21250 -      10.1|11.1)
21251 -       cat >> confdefs.h <<\EOF
21252 -#define HAVE_OCI_LOB_READ2 1
21253 -EOF
21254 -
21255 -       ;;
21256 -
21257 -      *)
21258 -       { echo "configure: error: Oracle version $OCI8_ORACLE_VERSION is not supported" 1>&2; exit 1; }
21259 -       ;;
21260 -    esac
21261 -
21262 -
21263 +
21264 +      MYSQL_LIBS="-lz"
21265 +    fi
21266
21267 -  case clntsh in
21268 -  c|c_r|pthread*) ;;
21269 -  *)
21270 -    if test "$ext_shared" = "yes"; then
21271 -        OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
21272 -    else
21273 -
21274
21275 -  case clntsh in
21276 -  c|c_r|pthread*) ;;
21277 -  *)
21278 -      LIBS="$LIBS -lclntsh"
21279 -   ;;
21280 -  esac
21281 -
21282 +fi
21283
21284 -    fi
21285 -   ;;
21286 -  esac
21287
21288 +
21289
21290 +  if test "$ext_shared" = "yes"; then
21291 +    MYSQL_SHARED_LIBADD="-l$MYSQL_LIBNAME $MYSQL_SHARED_LIBADD"
21292 +    if test -n "$MYSQL_LIB_DIR"; then
21293 +
21294 +  if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then
21295
21296 -  if test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/lib"; then
21297 -
21298 -  if test -z "$OCI8_DIR/$OCI8_LIB_DIR" || echo "$OCI8_DIR/$OCI8_LIB_DIR" | grep '^/' >/dev/null ; then
21299 -    ai_p=$OCI8_DIR/$OCI8_LIB_DIR
21300 +  if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then
21301 +    ai_p=$MYSQL_LIB_DIR
21302    else
21303
21304 -    ep_dir="`echo $OCI8_DIR/$OCI8_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
21305 +    ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
21306
21307      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21308 -    ai_p="$ep_realdir/`basename \"$OCI8_DIR/$OCI8_LIB_DIR\"`"
21309 +    ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`"
21310    fi
21311
21312
21313        if test "$ext_shared" = "yes"; then
21314 -        OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD"
21315 -        test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_SHARED_LIBADD"
21316 +        MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD"
21317 +        test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_SHARED_LIBADD"
21318        else
21319
21320
21321 @@ -62720,91 +62430,248 @@ EOF
21322
21323    fi
21324
21325 +    fi
21326 +  else
21327
21328 -  ext_builddir=ext/oci8
21329 -  ext_srcdir=$abs_srcdir/ext/oci8
21330
21331 -  ac_extra=
21332 +  if test -n "$MYSQL_LIB_DIR"; then
21333 +
21334 +  if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then
21335 +
21336 +  if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then
21337 +    ai_p=$MYSQL_LIB_DIR
21338 +  else
21339 +
21340 +    ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
21341 +
21342 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21343 +    ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`"
21344 +  fi
21345
21346 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
21347 -    PHP_OCI8_SHARED=no
21348
21349 +
21350
21351 -  case ext/oci8 in
21352 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21353 -  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21354 -  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21355 -  esac
21356
21357 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21358 +
21359 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
21360 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
21361 +    eval "LIBPATH$unique=set"
21362 +
21363 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
21364 +    LDFLAGS="$LDFLAGS -L$ai_p"
21365 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
21366
21367 +  fi
21368
21369 -  b_c_pre=$php_c_pre
21370 -  b_cxx_pre=$php_cxx_pre
21371 -  b_c_meta=$php_c_meta
21372 -  b_cxx_meta=$php_cxx_meta
21373 -  b_c_post=$php_c_post
21374 -  b_cxx_post=$php_cxx_post
21375 -  b_lo=$php_lo
21376
21377 +
21378 +  fi
21379
21380 -  old_IFS=$IFS
21381 -  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
21382 +  fi
21383
21384 -      IFS=.
21385 -      set $ac_src
21386 -      ac_obj=$1
21387 -      IFS=$old_IFS
21388 -
21389 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
21390 +
21391 +  case $MYSQL_LIBNAME in
21392 +  c|c_r|pthread*) ;;
21393 +  *)
21394 +      LIBS="-l$MYSQL_LIBNAME $LIBS"
21395 +   ;;
21396 +  esac
21397
21398 -      case $ac_src in
21399 -        *.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" ;;
21400 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21401 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21402 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
21403 -      esac
21404
21405 -    cat >>Makefile.objects<<EOF
21406 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
21407 -       $ac_comp
21408 -EOF
21409 -  done
21410
21411
21412 -    EXT_STATIC="$EXT_STATIC oci8"
21413 -    if test "$ext_shared" != "nocli"; then
21414 -      EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
21415 -    fi
21416 +  fi
21417 +
21418 +
21419 +
21420 +  if test "$MYSQL_INC_DIR" != "/usr/include"; then
21421 +
21422 +  if test -z "$MYSQL_INC_DIR" || echo "$MYSQL_INC_DIR" | grep '^/' >/dev/null ; then
21423 +    ai_p=$MYSQL_INC_DIR
21424    else
21425 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
21426 -      PHP_OCI8_SHARED=yes
21427 -
21428 -  case ext/oci8 in
21429 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21430 -  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21431 -  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21432 -  esac
21433 +
21434 +    ep_dir="`echo $MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
21435 +
21436 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21437 +    ai_p="$ep_realdir/`basename \"$MYSQL_INC_DIR\"`"
21438 +  fi
21439 +
21440 +
21441
21442 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21443
21444 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
21445 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
21446 +    eval "INCLUDEPATH$unique=set"
21447 +
21448 +      if test ""; then
21449 +        INCLUDES="-I$ai_p $INCLUDES"
21450 +      else
21451 +        INCLUDES="$INCLUDES -I$ai_p"
21452 +      fi
21453 +
21454 +  fi
21455
21456 -  b_c_pre=$shared_c_pre
21457 -  b_cxx_pre=$shared_cxx_pre
21458 -  b_c_meta=$shared_c_meta
21459 -  b_cxx_meta=$shared_cxx_meta
21460 -  b_c_post=$shared_c_post
21461 -  b_cxx_post=$shared_cxx_post
21462 -  b_lo=$shared_lo
21463 +  fi
21464
21465
21466 -  old_IFS=$IFS
21467 -  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
21468 +  MYSQL_MODULE_TYPE=external
21469 +  MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS"
21470 +  MYSQL_INCLUDE=-I$MYSQL_INC_DIR
21471 +
21472
21473 -      IFS=.
21474 -      set $ac_src
21475 +
21476 +  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_MODULE_TYPE"
21477 +
21478 +
21479 +
21480 +
21481 +
21482 +  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_LIBS"
21483 +
21484 +
21485 +
21486 +
21487 +
21488 +  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_INCLUDE"
21489 +
21490 +
21491 +
21492 +fi
21493 +
21494 +if test "$PHP_MYSQL" != "no"; then
21495 +  echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
21496 +echo "configure:62546: checking for MySQL UNIX socket location" >&5
21497 +  if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
21498 +    MYSQL_SOCK=$PHP_MYSQL_SOCK
21499 +    cat >> confdefs.h <<EOF
21500 +#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
21501 +EOF
21502 +
21503 +    echo "$ac_t""$MYSQL_SOCK" 1>&6
21504 +  elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then
21505 +
21506 +  for i in  \
21507 +    /var/run/mysqld/mysqld.sock \
21508 +    /var/tmp/mysql.sock \
21509 +    /var/run/mysql/mysql.sock \
21510 +    /var/lib/mysql/mysql.sock \
21511 +    /var/mysql/mysql.sock \
21512 +    /usr/local/mysql/var/mysql.sock \
21513 +    /Private/tmp/mysql.sock \
21514 +    /private/tmp/mysql.sock \
21515 +    /tmp/mysql.sock \
21516 +  ; do
21517 +    if test -r $i; then
21518 +      MYSQL_SOCK=$i
21519 +      break 2
21520 +    fi
21521 +  done
21522 +
21523 +  if test -n "$MYSQL_SOCK"; then
21524 +    cat >> confdefs.h <<EOF
21525 +#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
21526 +EOF
21527 +
21528 +    echo "$ac_t""$MYSQL_SOCK" 1>&6
21529 +  else
21530 +    echo "$ac_t""no" 1>&6
21531 +  fi
21532 +
21533 +  else
21534 +    echo "$ac_t""no" 1>&6
21535 +  fi
21536 +
21537 +  cat >> confdefs.h <<\EOF
21538 +#define HAVE_MYSQL 1
21539 +EOF
21540 +
21541 +
21542 +  ext_builddir=ext/mysql
21543 +  ext_srcdir=$abs_srcdir/ext/mysql
21544 +
21545 +  ac_extra=
21546 +
21547 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
21548 +    PHP_MYSQL_SHARED=no
21549 +
21550 +
21551 +  case ext/mysql in
21552 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21553 +  /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21554 +  *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21555 +  esac
21556 +
21557 +
21558 +
21559 +  b_c_pre=$php_c_pre
21560 +  b_cxx_pre=$php_cxx_pre
21561 +  b_c_meta=$php_c_meta
21562 +  b_cxx_meta=$php_cxx_meta
21563 +  b_c_post=$php_c_post
21564 +  b_cxx_post=$php_cxx_post
21565 +  b_lo=$php_lo
21566 +
21567 +
21568 +  old_IFS=$IFS
21569 +  for ac_src in php_mysql.c; do
21570 +
21571 +      IFS=.
21572 +      set $ac_src
21573        ac_obj=$1
21574        IFS=$old_IFS
21575
21576 -      shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo"
21577 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
21578 +
21579 +      case $ac_src in
21580 +        *.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" ;;
21581 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21582 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21583 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
21584 +      esac
21585 +
21586 +    cat >>Makefile.objects<<EOF
21587 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
21588 +       $ac_comp
21589 +EOF
21590 +  done
21591 +
21592 +
21593 +    EXT_STATIC="$EXT_STATIC mysql"
21594 +    if test "$ext_shared" != "nocli"; then
21595 +      EXT_CLI_STATIC="$EXT_CLI_STATIC mysql"
21596 +    fi
21597 +  else
21598 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
21599 +      PHP_MYSQL_SHARED=yes
21600 +
21601 +  case ext/mysql in
21602 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21603 +  /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21604 +  *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21605 +  esac
21606 +
21607 +
21608 +
21609 +  b_c_pre=$shared_c_pre
21610 +  b_cxx_pre=$shared_cxx_pre
21611 +  b_c_meta=$shared_c_meta
21612 +  b_cxx_meta=$shared_cxx_meta
21613 +  b_c_post=$shared_c_post
21614 +  b_cxx_post=$shared_cxx_post
21615 +  b_lo=$shared_lo
21616 +
21617 +
21618 +  old_IFS=$IFS
21619 +  for ac_src in php_mysql.c; do
21620 +
21621 +      IFS=.
21622 +      set $ac_src
21623 +      ac_obj=$1
21624 +      IFS=$old_IFS
21625 +
21626 +      shared_objects_mysql="$shared_objects_mysql $ac_bdir$ac_obj.lo"
21627
21628        case $ac_src in
21629          *.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" ;;
21630 @@ -62827,31 +62694,31 @@ EOF
21631    case $host_alias in
21632      *aix*)
21633        suffix=so
21634 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpoci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpoci8.so '$ext_builddir'/phpoci8.so'
21635 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(PHPMYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmysql.so '$ext_builddir'/phpmysql.so'
21636        ;;
21637      *netware*)
21638        suffix=nlm
21639 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
21640 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQL, 3)_SHARED_LIBADD)'
21641        ;;
21642      *)
21643        suffix=la
21644 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD)'
21645 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(PHPMYSQL_SHARED_LIBADD)'
21646        ;;
21647    esac
21648
21649    if test "x" = "xyes"; then
21650 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpoci8.$suffix"
21651 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmysql.$suffix"
21652    else
21653 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
21654 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysql.$suffix"
21655    fi
21656
21657 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
21658 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql"
21659
21660    cat >>Makefile.objects<<EOF
21661 -\$(phplibdir)/phpoci8.$suffix: $ext_builddir/phpoci8.$suffix
21662 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpoci8.$suffix \$(phplibdir)
21663 +\$(phplibdir)/phpmysql.$suffix: $ext_builddir/phpmysql.$suffix
21664 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmysql.$suffix \$(phplibdir)
21665
21666 -$ext_builddir/phpoci8.$suffix: \$(shared_objects_oci8) \$(PHPOCI8_SHARED_DEPENDENCIES)
21667 +$ext_builddir/phpmysql.$suffix: \$(shared_objects_mysql) \$(PHPMYSQL_SHARED_DEPENDENCIES)
21668         $link_cmd
21669
21670  EOF
21671 @@ -62864,31 +62731,31 @@ EOF
21672    case $host_alias in
21673      *aix*)
21674        suffix=so
21675 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/oci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/oci8.so '$ext_builddir'/oci8.so'
21676 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mysql.so '$ext_builddir'/mysql.so'
21677        ;;
21678      *netware*)
21679        suffix=nlm
21680 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
21681 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQL, 3)_SHARED_LIBADD)'
21682        ;;
21683      *)
21684        suffix=la
21685 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD)'
21686 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) $(MYSQL_SHARED_LIBADD)'
21687        ;;
21688    esac
21689
21690    if test "x" = "xyes"; then
21691 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/oci8.$suffix"
21692 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mysql.$suffix"
21693    else
21694 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
21695 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysql.$suffix"
21696    fi
21697
21698 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
21699 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql"
21700
21701    cat >>Makefile.objects<<EOF
21702 -\$(phplibdir)/oci8.$suffix: $ext_builddir/oci8.$suffix
21703 -       \$(LIBTOOL) --mode=install cp $ext_builddir/oci8.$suffix \$(phplibdir)
21704 +\$(phplibdir)/mysql.$suffix: $ext_builddir/mysql.$suffix
21705 +       \$(LIBTOOL) --mode=install cp $ext_builddir/mysql.$suffix \$(phplibdir)
21706
21707 -$ext_builddir/oci8.$suffix: \$(shared_objects_oci8) \$(OCI8_SHARED_DEPENDENCIES)
21708 +$ext_builddir/mysql.$suffix: \$(shared_objects_mysql) \$(MYSQL_SHARED_DEPENDENCIES)
21709         $link_cmd
21710
21711  EOF
21712 @@ -62896,22 +62763,22 @@ EOF
21713            ;;
21714        esac
21715        cat >> confdefs.h <<EOF
21716 -#define COMPILE_DL_OCI8 1
21717 +#define COMPILE_DL_MYSQL 1
21718  EOF
21719
21720      fi
21721    fi
21722
21723    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
21724 -    PHP_OCI8_SHARED=no
21725 +    PHP_MYSQL_SHARED=no
21726      case "$PHP_SAPI" in
21727        cgi|embed)
21728
21729
21730 -  case ext/oci8 in
21731 +  case ext/mysql in
21732    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21733 -  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21734 -  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21735 +  /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21736 +  *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21737    esac
21738
21739
21740 @@ -62926,7 +62793,7 @@ EOF
21741
21742
21743    old_IFS=$IFS
21744 -  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
21745 +  for ac_src in php_mysql.c; do
21746
21747        IFS=.
21748        set $ac_src
21749 @@ -62949,15 +62816,15 @@ EOF
21750    done
21751
21752
21753 -        EXT_STATIC="$EXT_STATIC oci8"
21754 +        EXT_STATIC="$EXT_STATIC mysql"
21755          ;;
21756        *)
21757
21758
21759 -  case ext/oci8 in
21760 +  case ext/mysql in
21761    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21762 -  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21763 -  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21764 +  /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21765 +  *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21766    esac
21767
21768
21769 @@ -62972,7 +62839,7 @@ EOF
21770
21771
21772    old_IFS=$IFS
21773 -  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
21774 +  for ac_src in php_mysql.c; do
21775
21776        IFS=.
21777        set $ac_src
21778 @@ -62997,7 +62864,7 @@ EOF
21779
21780          ;;
21781      esac
21782 -    EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
21783 +    EXT_CLI_STATIC="$EXT_CLI_STATIC mysql"
21784    fi
21785
21786
21787 @@ -63006,183 +62873,159 @@ EOF
21788
21789
21790    if test "$ext_builddir" = "."; then
21791 -    PHP_PECL_EXTENSION=oci8
21792 +    PHP_PECL_EXTENSION=mysql
21793
21794    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
21795
21796    fi
21797
21798 -    cat >> confdefs.h <<\EOF
21799 -#define HAVE_OCI8 1
21800 -EOF
21801 +
21802 +  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_SHARED_LIBADD"
21803
21804
21805 +  if test "$PHP_MYSQL" = "mysqlnd"; then
21806
21807 +  am_i_shared=$PHP_MYSQL_SHARED
21808 +  is_it_shared=$PHP_MYSQLND_SHARED
21809 +  is_it_enabled=$PHP_MYSQLND
21810 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
21811 +    { echo "configure: error:
21812 +You've configured extension mysql to build statically, but it
21813 +depends on extension mysqlnd, which you've configured to build shared.
21814 +You either need to build mysql shared or build mysqlnd statically for the
21815 +build to be successful.
21816 +" 1>&2; exit 1; }
21817 +  fi
21818 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
21819 +    { echo "configure: error:
21820 +You've configured extension mysql, which depends on extension mysqlnd,
21821 +but you've either not enabled mysqlnd, or have disabled it.
21822 +" 1>&2; exit 1; }
21823 +  fi
21824
21825 -  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD"
21826 +    cat >> confdefs.h <<\EOF
21827 +#define MYSQL_USE_MYSQLND 1
21828 +EOF
21829
21830 -
21831 +  fi
21832 +fi
21833
21834 -
21835 -
21836 -  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR"
21837
21838 -
21839
21840 -
21841 -
21842 -  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION"
21843 +php_with_mysqli=no
21844
21845 +echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6
21846 +echo "configure:62919: checking for MySQLi support" >&5
21847 +# Check whether --with-mysqli or --without-mysqli was given.
21848 +if test "${with_mysqli+set}" = set; then
21849 +  withval="$with_mysqli"
21850 +  PHP_MYSQLI=$withval
21851 +else
21852
21853 +  PHP_MYSQLI=no
21854 +  test "$PHP_ENABLE_ALL" && PHP_MYSQLI=$PHP_ENABLE_ALL
21855
21856 +fi
21857
21858 -        cat >> confdefs.h <<EOF
21859 -#define PHP_OCI8_DEF_DIR "$OCI8_DIR"
21860 -EOF
21861
21862 -    cat >> confdefs.h <<EOF
21863 -#define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD"
21864 -EOF
21865
21866 +ext_output="yes, shared"
21867 +ext_shared=yes
21868 +case $PHP_MYSQLI in
21869 +shared,*)
21870 +  PHP_MYSQLI=`echo "$PHP_MYSQLI"|$SED 's/^shared,//'`
21871 +  ;;
21872 +shared)
21873 +  PHP_MYSQLI=yes
21874 +  ;;
21875 +no)
21876 +  ext_output=no
21877 +  ext_shared=no
21878 +  ;;
21879 +*)
21880 +  ext_output=yes
21881 +  ext_shared=no
21882 +  ;;
21883 +esac
21884
21885 -  else
21886 -
21887 -    echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
21888 -echo "configure:63052: checking Oracle Instant Client directory" >&5
21889
21890 -    if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
21891 -                                    PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
21892 -      if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
21893 -       { echo "configure: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" 1>&2; exit 1; }
21894 -      fi
21895 -    fi
21896 -    echo "$ac_t""$PHP_OCI8_INSTANT_CLIENT" 1>&6
21897
21898 -    OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
21899 +echo "$ac_t""$ext_output" 1>&6
21900
21901 -    echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
21902 -echo "configure:63065: checking Oracle Instant Client SDK header directory" >&5
21903
21904 -        OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'`
21905
21906 -        OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
21907
21908 -        OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib/*$!\1/include!'`
21909
21910 -    if test -f "$OCISDKRPMINC/oci.h"; then
21911 -      echo "$ac_t""$OCISDKRPMINC" 1>&6
21912 -
21913 -  if test "$OCISDKRPMINC" != "/usr/include"; then
21914 -
21915 -  if test -z "$OCISDKRPMINC" || echo "$OCISDKRPMINC" | grep '^/' >/dev/null ; then
21916 -    ai_p=$OCISDKRPMINC
21917 -  else
21918 -
21919 -    ep_dir="`echo $OCISDKRPMINC|$SED 's%/*[^/][^/]*/*$%%'`"
21920 -
21921 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21922 -    ai_p="$ep_realdir/`basename \"$OCISDKRPMINC\"`"
21923 -  fi
21924 +php_enable_embedded_mysqli=no
21925
21926 -
21927 +echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6
21928 +echo "configure:62963: checking whether to enable embedded MySQLi support" >&5
21929 +# Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given.
21930 +if test "${enable_embedded_mysqli+set}" = set; then
21931 +  enableval="$enable_embedded_mysqli"
21932 +  PHP_EMBEDDED_MYSQLI=$enableval
21933 +else
21934
21935 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21936 +  PHP_EMBEDDED_MYSQLI=no
21937
21938 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
21939 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
21940 -    eval "INCLUDEPATH$unique=set"
21941 -
21942 -      if test ""; then
21943 -        INCLUDES="-I$ai_p $INCLUDES"
21944 -      else
21945 -        INCLUDES="$INCLUDES -I$ai_p"
21946 -      fi
21947 -
21948 -  fi
21949
21950 -  fi
21951 +fi
21952
21953 -      OCI8INCDIR=$OCISDKRPMINC
21954 -    elif test -f "$OCISDKZIPINC/oci.h"; then
21955 -      echo "$ac_t""$OCISDKZIPINC" 1>&6
21956 -
21957 -  if test "$OCISDKZIPINC" != "/usr/include"; then
21958 -
21959 -  if test -z "$OCISDKZIPINC" || echo "$OCISDKZIPINC" | grep '^/' >/dev/null ; then
21960 -    ai_p=$OCISDKZIPINC
21961 +
21962 +ext_output=$PHP_EMBEDDED_MYSQLI
21963 +echo "$ac_t""$ext_output" 1>&6
21964 +
21965 +
21966 +
21967 +
21968 +if test "$PHP_MYSQLI" = "mysqlnd"; then
21969 +    PHP_MYSQLND_ENABLED=yes
21970 +
21971 +elif test "$PHP_MYSQLI" != "no"; then
21972 +
21973 +  if test "$PHP_MYSQLI" = "yes"; then
21974 +    MYSQL_CONFIG=`$php_shtool path mysql_config`
21975    else
21976 -
21977 -    ep_dir="`echo $OCISDKZIPINC|$SED 's%/*[^/][^/]*/*$%%'`"
21978 -
21979 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21980 -    ai_p="$ep_realdir/`basename \"$OCISDKZIPINC\"`"
21981 +    MYSQL_CONFIG=$PHP_MYSQLI
21982    fi
21983
21984 -
21985 -
21986 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21987 -
21988 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
21989 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
21990 -    eval "INCLUDEPATH$unique=set"
21991 -
21992 -      if test ""; then
21993 -        INCLUDES="-I$ai_p $INCLUDES"
21994 -      else
21995 -        INCLUDES="$INCLUDES -I$ai_p"
21996 -      fi
21997 -
21998 -  fi
21999 +  MYSQL_LIB_NAME='mysqlclient'
22000 +  if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
22001 +    cat >> confdefs.h <<\EOF
22002 +#define HAVE_EMBEDDED_MYSQLI 1
22003 +EOF
22004
22005 +    MYSQL_LIB_CFG='--libmysqld-libs'
22006 +        mysqli_extra_sources="mysqli_embedded.c"
22007 +  elif test "$enable_maintainer_zts" = "yes"; then
22008 +    MYSQL_LIB_CFG='--libs_r'
22009 +    MYSQL_LIB_NAME='mysqlclient_r'
22010 +  else
22011 +    MYSQL_LIB_CFG='--libs'
22012    fi
22013 -
22014 -      OCI8INCDIR=$OCISDKZIPINC
22015 -    elif test -f "$OCISDKMANINC/oci.h"; then
22016 -      echo "$ac_t""$OCISDKMANINC" 1>&6
22017 -
22018 -  if test "$OCISDKMANINC" != "/usr/include"; then
22019 -
22020 -  if test -z "$OCISDKMANINC" || echo "$OCISDKMANINC" | grep '^/' >/dev/null ; then
22021 -    ai_p=$OCISDKMANINC
22022 +
22023 +  if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then
22024 +    MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
22025 +    MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`
22026    else
22027 -
22028 -    ep_dir="`echo $OCISDKMANINC|$SED 's%/*[^/][^/]*/*$%%'`"
22029 -
22030 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
22031 -    ai_p="$ep_realdir/`basename \"$OCISDKMANINC\"`"
22032 +    echo "$ac_t""mysql_config not found" 1>&6
22033 +    { echo "configure: error: Please reinstall the mysql distribution" 1>&2; exit 1; }
22034    fi
22035
22036 -
22037 +
22038 +  save_old_LDFLAGS=$LDFLAGS
22039 +  ac_stuff="
22040 +    $MYSQLI_LIBLINE
22041 +  "
22042
22043 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
22044 +  save_ext_shared=$ext_shared
22045 +  ext_shared=yes
22046
22047 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
22048 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
22049 -    eval "INCLUDEPATH$unique=set"
22050 -
22051 -      if test ""; then
22052 -        INCLUDES="-I$ai_p $INCLUDES"
22053 -      else
22054 -        INCLUDES="$INCLUDES -I$ai_p"
22055 -      fi
22056 -
22057 -  fi
22058 -
22059 -  fi
22060 -
22061 -      OCI8INCDIR=$OCISDKMANINC
22062 -    else
22063 -      { echo "configure: error: Oracle Instant Client SDK header files not found" 1>&2; exit 1; }
22064 -    fi
22065 -
22066 -    OCISYSLIBLIST=`echo "$OCI8INCDIR" | $PHP_OCI8_SED -e 's!\(.*\)/include$!\1/demo/sysliblist!'`
22067 -    if test -f "$OCISYSLIBLIST"; then
22068 -
22069 -  for ac_i in `cat $OCISYSLIBLIST`; do
22070 +  for ac_i in $ac_stuff; do
22071      case $ac_i in
22072      -pthread)
22073        if test "$ext_shared" = "yes"; then
22074 -        OCI8_SYSLIB="$OCI8_SYSLIB -pthread"
22075 +        LDFLAGS="$LDFLAGS -pthread"
22076        else
22077
22078
22079 @@ -63204,7 +63047,7 @@ echo "configure:63065: checking Oracle I
22080    c|c_r|pthread*) ;;
22081    *)
22082      if test "$ext_shared" = "yes"; then
22083 -        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
22084 +        LDFLAGS="$LDFLAGS -l$ac_ii"
22085      else
22086
22087
22088 @@ -63239,8 +63082,8 @@ echo "configure:63065: checking Oracle I
22089
22090
22091        if test "$ext_shared" = "yes"; then
22092 -        OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
22093 -        test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
22094 +        LDFLAGS="-L$ai_p $LDFLAGS"
22095 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
22096        else
22097
22098
22099 @@ -63266,50 +63109,120 @@ echo "configure:63065: checking Oracle I
22100      esac
22101    done
22102
22103 -    fi
22104 +  echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
22105 +echo "configure:63114: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
22106 +ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'`
22107 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22108 +  echo $ac_n "(cached) $ac_c" 1>&6
22109 +else
22110 +  ac_save_LIBS="$LIBS"
22111 +LIBS="-l$MYSQL_LIB_NAME  $LIBS"
22112 +cat > conftest.$ac_ext <<EOF
22113 +#line 63122 "configure"
22114 +#include "confdefs.h"
22115 +/* Override any gcc2 internal prototype to avoid an error.  */
22116 +/* We use char because int might match the return type of a gcc2
22117 +    builtin and then its argument prototype would still apply.  */
22118 +char mysql_set_server_option();
22119
22120 -
22121 -  echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
22122 -echo "configure:63274: checking Oracle Instant Client version" >&5
22123 -  if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then
22124 -    if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
22125 -      if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
22126 -        { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.11.1 not found" 1>&2; exit 1; }
22127 -      fi
22128 -      OCI8_ORACLE_VERSION=11.1
22129 -    else
22130 -      { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; }
22131 -    fi
22132 -  elif test -f $PHP_OCI8_INSTANT_CLIENT/libnnz10.$SHLIB_SUFFIX_NAME; then
22133 -    if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
22134 -      if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
22135 -        { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found" 1>&2; exit 1; }
22136 -      fi
22137 -      OCI8_ORACLE_VERSION=10.1
22138 -    else
22139 -      { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; }
22140 -    fi
22141 -  else
22142 -    { echo "configure: error: Oracle Instant Client libraries not found" 1>&2; exit 1; }
22143 -  fi
22144 -  echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
22145 +int main() {
22146 +mysql_set_server_option()
22147 +; return 0; }
22148 +EOF
22149 +if { (eval echo configure:63133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22150 +  rm -rf conftest*
22151 +  eval "ac_cv_lib_$ac_lib_var=yes"
22152 +else
22153 +  echo "configure: failed program was:" >&5
22154 +  cat conftest.$ac_ext >&5
22155 +  rm -rf conftest*
22156 +  eval "ac_cv_lib_$ac_lib_var=no"
22157 +fi
22158 +rm -f conftest*
22159 +LIBS="$ac_save_LIBS"
22160
22161 -    case $OCI8_ORACLE_VERSION in
22162 -      10.1|11.1)
22163 -
22164 +fi
22165 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22166 +  echo "$ac_t""yes" 1>&6
22167
22168 -  case clntsh in
22169 -  c|c_r|pthread*) ;;
22170 -  *)
22171 -    if test "$ext_shared" = "yes"; then
22172 -        OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
22173 +    LDFLAGS=$save_old_LDFLAGS
22174 +    ext_shared=$save_ext_shared
22175 +
22176 +
22177 +  for ac_i in $MYSQLI_INCLINE; do
22178 +    case $ac_i in
22179 +    -I*)
22180 +      ac_ii=`echo $ac_i|cut -c 3-`
22181 +
22182 +  if test "$ac_ii" != "/usr/include"; then
22183 +
22184 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
22185 +    ai_p=$ac_ii
22186 +  else
22187 +
22188 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
22189 +
22190 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
22191 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
22192 +  fi
22193 +
22194 +
22195 +
22196 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
22197 +
22198 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
22199 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
22200 +    eval "INCLUDEPATH$unique=set"
22201 +
22202 +      if test ""; then
22203 +        INCLUDES="-I$ai_p $INCLUDES"
22204 +      else
22205 +        INCLUDES="$INCLUDES -I$ai_p"
22206 +      fi
22207 +
22208 +  fi
22209 +
22210 +  fi
22211 +
22212 +    ;;
22213 +    esac
22214 +  done
22215 +
22216 +
22217 +  for ac_i in $MYSQLI_LIBLINE; do
22218 +    case $ac_i in
22219 +    -pthread)
22220 +      if test "$ext_shared" = "yes"; then
22221 +        MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -pthread"
22222 +      else
22223 +
22224 +
22225 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
22226 +
22227 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
22228 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
22229 +    eval "EXTRA_LDFLAGS$unique=set"
22230 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
22231 +  fi
22232 +
22233 +      fi
22234 +    ;;
22235 +    -l*)
22236 +      ac_ii=`echo $ac_i|cut -c 3-`
22237 +
22238 +
22239 +  case $ac_ii in
22240 +  c|c_r|pthread*) ;;
22241 +  *)
22242 +    if test "$ext_shared" = "yes"; then
22243 +        MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii"
22244      else
22245
22246
22247 -  case clntsh in
22248 +  case $ac_ii in
22249    c|c_r|pthread*) ;;
22250    *)
22251 -      LIBS="$LIBS -lclntsh"
22252 +      LIBS="$LIBS -l$ac_ii"
22253     ;;
22254    esac
22255
22256 @@ -63319,23 +63232,26 @@ echo "configure:63274: checking Oracle I
22257    esac
22258
22259
22260 -
22261 -  if test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/$PHP_LIBDIR" && test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/lib"; then
22262 +    ;;
22263 +    -L*)
22264 +      ac_ii=`echo $ac_i|cut -c 3-`
22265 +
22266 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
22267
22268 -  if test -z "$PHP_OCI8_INSTANT_CLIENT" || echo "$PHP_OCI8_INSTANT_CLIENT" | grep '^/' >/dev/null ; then
22269 -    ai_p=$PHP_OCI8_INSTANT_CLIENT
22270 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
22271 +    ai_p=$ac_ii
22272    else
22273
22274 -    ep_dir="`echo $PHP_OCI8_INSTANT_CLIENT|$SED 's%/*[^/][^/]*/*$%%'`"
22275 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
22276
22277      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
22278 -    ai_p="$ep_realdir/`basename \"$PHP_OCI8_INSTANT_CLIENT\"`"
22279 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
22280    fi
22281
22282
22283        if test "$ext_shared" = "yes"; then
22284 -        OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD"
22285 -        test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_SHARED_LIBADD"
22286 +        MYSQLI_SHARED_LIBADD="-L$ai_p $MYSQLI_SHARED_LIBADD"
22287 +        test -n "$ld_runpath_switch" && MYSQLI_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQLI_SHARED_LIBADD"
22288        else
22289
22290
22291 @@ -63357,36 +63273,348 @@ echo "configure:63274: checking Oracle I
22292
22293    fi
22294
22295 -       ;;
22296 -
22297 -      *)
22298 -       { echo "configure: error: Oracle Instant Client version $PHP_OCI8_INSTANT_CLIENT is not supported" 1>&2; exit 1; }
22299 -       ;;
22300 +    ;;
22301      esac
22302 +  done
22303
22304      cat >> confdefs.h <<\EOF
22305 -#define HAVE_OCI_INSTANT_CLIENT 1
22306 +#define HAVE_MYSQLILIB 1
22307 +EOF
22308 +
22309 +
22310 +  save_old_LDFLAGS=$LDFLAGS
22311 +  ac_stuff="$MYSQLI_LIBLINE"
22312 +
22313 +  save_ext_shared=$ext_shared
22314 +  ext_shared=yes
22315 +
22316 +  for ac_i in $ac_stuff; do
22317 +    case $ac_i in
22318 +    -pthread)
22319 +      if test "$ext_shared" = "yes"; then
22320 +        LDFLAGS="$LDFLAGS -pthread"
22321 +      else
22322 +
22323 +
22324 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
22325 +
22326 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
22327 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
22328 +    eval "EXTRA_LDFLAGS$unique=set"
22329 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
22330 +  fi
22331 +
22332 +      fi
22333 +    ;;
22334 +    -l*)
22335 +      ac_ii=`echo $ac_i|cut -c 3-`
22336 +
22337 +
22338 +  case $ac_ii in
22339 +  c|c_r|pthread*) ;;
22340 +  *)
22341 +    if test "$ext_shared" = "yes"; then
22342 +        LDFLAGS="$LDFLAGS -l$ac_ii"
22343 +    else
22344 +
22345 +
22346 +  case $ac_ii in
22347 +  c|c_r|pthread*) ;;
22348 +  *)
22349 +      LIBS="$LIBS -l$ac_ii"
22350 +   ;;
22351 +  esac
22352 +
22353 +
22354 +    fi
22355 +   ;;
22356 +  esac
22357 +
22358 +
22359 +    ;;
22360 +    -L*)
22361 +      ac_ii=`echo $ac_i|cut -c 3-`
22362 +
22363 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
22364 +
22365 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
22366 +    ai_p=$ac_ii
22367 +  else
22368 +
22369 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
22370 +
22371 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
22372 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
22373 +  fi
22374 +
22375 +
22376 +      if test "$ext_shared" = "yes"; then
22377 +        LDFLAGS="-L$ai_p $LDFLAGS"
22378 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
22379 +      else
22380 +
22381 +
22382 +
22383 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
22384 +
22385 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
22386 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
22387 +    eval "LIBPATH$unique=set"
22388 +
22389 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
22390 +    LDFLAGS="$LDFLAGS -L$ai_p"
22391 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
22392 +
22393 +  fi
22394 +
22395 +
22396 +      fi
22397 +
22398 +  fi
22399 +
22400 +    ;;
22401 +    esac
22402 +  done
22403 +
22404 +  echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
22405 +echo "configure:63381: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
22406 +ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'`
22407 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22408 +  echo $ac_n "(cached) $ac_c" 1>&6
22409 +else
22410 +  ac_save_LIBS="$LIBS"
22411 +LIBS="-l$MYSQL_LIB_NAME  $LIBS"
22412 +cat > conftest.$ac_ext <<EOF
22413 +#line 63389 "configure"
22414 +#include "confdefs.h"
22415 +/* Override any gcc2 internal prototype to avoid an error.  */
22416 +/* We use char because int might match the return type of a gcc2
22417 +    builtin and then its argument prototype would still apply.  */
22418 +char mysql_set_character_set();
22419 +
22420 +int main() {
22421 +mysql_set_character_set()
22422 +; return 0; }
22423 +EOF
22424 +if { (eval echo configure:63400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22425 +  rm -rf conftest*
22426 +  eval "ac_cv_lib_$ac_lib_var=yes"
22427 +else
22428 +  echo "configure: failed program was:" >&5
22429 +  cat conftest.$ac_ext >&5
22430 +  rm -rf conftest*
22431 +  eval "ac_cv_lib_$ac_lib_var=no"
22432 +fi
22433 +rm -f conftest*
22434 +LIBS="$ac_save_LIBS"
22435 +
22436 +fi
22437 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22438 +  echo "$ac_t""yes" 1>&6
22439 +
22440 +    LDFLAGS=$save_old_LDFLAGS
22441 +    ext_shared=$save_ext_shared
22442 +
22443 +
22444 +else
22445 +  echo "$ac_t""no" 1>&6
22446 +
22447 +    LDFLAGS=$save_old_LDFLAGS
22448 +    ext_shared=$save_ext_shared
22449 +    unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_character_set
22450 +
22451 +      { echo "configure: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." 1>&2; exit 1; }
22452 +
22453 +
22454 +fi
22455 +
22456 +
22457 +
22458 +else
22459 +  echo "$ac_t""no" 1>&6
22460 +
22461 +    LDFLAGS=$save_old_LDFLAGS
22462 +    ext_shared=$save_ext_shared
22463 +    unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_server_option
22464 +
22465 +    { echo "configure: error: wrong mysql library version or lib not found. Check config.log for more information." 1>&2; exit 1; }
22466 +
22467 +
22468 +fi
22469 +
22470 +
22471 +  save_old_LDFLAGS=$LDFLAGS
22472 +  ac_stuff="
22473 +    $MYSQLI_LIBLINE
22474 +  "
22475 +
22476 +  save_ext_shared=$ext_shared
22477 +  ext_shared=yes
22478 +
22479 +  for ac_i in $ac_stuff; do
22480 +    case $ac_i in
22481 +    -pthread)
22482 +      if test "$ext_shared" = "yes"; then
22483 +        LDFLAGS="$LDFLAGS -pthread"
22484 +      else
22485 +
22486 +
22487 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
22488 +
22489 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
22490 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
22491 +    eval "EXTRA_LDFLAGS$unique=set"
22492 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
22493 +  fi
22494 +
22495 +      fi
22496 +    ;;
22497 +    -l*)
22498 +      ac_ii=`echo $ac_i|cut -c 3-`
22499 +
22500 +
22501 +  case $ac_ii in
22502 +  c|c_r|pthread*) ;;
22503 +  *)
22504 +    if test "$ext_shared" = "yes"; then
22505 +        LDFLAGS="$LDFLAGS -l$ac_ii"
22506 +    else
22507 +
22508 +
22509 +  case $ac_ii in
22510 +  c|c_r|pthread*) ;;
22511 +  *)
22512 +      LIBS="$LIBS -l$ac_ii"
22513 +   ;;
22514 +  esac
22515 +
22516 +
22517 +    fi
22518 +   ;;
22519 +  esac
22520 +
22521 +
22522 +    ;;
22523 +    -L*)
22524 +      ac_ii=`echo $ac_i|cut -c 3-`
22525 +
22526 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
22527 +
22528 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
22529 +    ai_p=$ac_ii
22530 +  else
22531 +
22532 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
22533 +
22534 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
22535 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
22536 +  fi
22537 +
22538 +
22539 +      if test "$ext_shared" = "yes"; then
22540 +        LDFLAGS="-L$ai_p $LDFLAGS"
22541 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
22542 +      else
22543 +
22544 +
22545 +
22546 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
22547 +
22548 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
22549 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
22550 +    eval "LIBPATH$unique=set"
22551 +
22552 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
22553 +    LDFLAGS="$LDFLAGS -L$ai_p"
22554 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
22555 +
22556 +  fi
22557 +
22558 +
22559 +      fi
22560 +
22561 +  fi
22562 +
22563 +    ;;
22564 +    esac
22565 +  done
22566 +
22567 +  echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
22568 +echo "configure:63544: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
22569 +ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'`
22570 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22571 +  echo $ac_n "(cached) $ac_c" 1>&6
22572 +else
22573 +  ac_save_LIBS="$LIBS"
22574 +LIBS="-l$MYSQL_LIB_NAME  $LIBS"
22575 +cat > conftest.$ac_ext <<EOF
22576 +#line 63552 "configure"
22577 +#include "confdefs.h"
22578 +/* Override any gcc2 internal prototype to avoid an error.  */
22579 +/* We use char because int might match the return type of a gcc2
22580 +    builtin and then its argument prototype would still apply.  */
22581 +char mysql_stmt_next_result();
22582 +
22583 +int main() {
22584 +mysql_stmt_next_result()
22585 +; return 0; }
22586  EOF
22587 +if { (eval echo configure:63563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22588 +  rm -rf conftest*
22589 +  eval "ac_cv_lib_$ac_lib_var=yes"
22590 +else
22591 +  echo "configure: failed program was:" >&5
22592 +  cat conftest.$ac_ext >&5
22593 +  rm -rf conftest*
22594 +  eval "ac_cv_lib_$ac_lib_var=no"
22595 +fi
22596 +rm -f conftest*
22597 +LIBS="$ac_save_LIBS"
22598
22599 +fi
22600 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22601 +  echo "$ac_t""yes" 1>&6
22602 +
22603 +    LDFLAGS=$save_old_LDFLAGS
22604 +    ext_shared=$save_ext_shared
22605 +
22606      cat >> confdefs.h <<\EOF
22607 -#define HAVE_OCI_LOB_READ2 1
22608 +#define HAVE_STMT_NEXT_RESULT 1
22609  EOF
22610
22611 +
22612 +
22613 +else
22614 +  echo "$ac_t""no" 1>&6
22615
22616 +    LDFLAGS=$save_old_LDFLAGS
22617 +    ext_shared=$save_ext_shared
22618 +    unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_stmt_next_result
22619
22620 -  ext_builddir=ext/oci8
22621 -  ext_srcdir=$abs_srcdir/ext/oci8
22622 +
22623 +
22624 +fi
22625 +
22626 +fi
22627 +
22628 +if test "$PHP_MYSQLI" != "no"; then
22629 +  mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
22630 +                  mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
22631 +                  mysqli_exception.c $mysqli_extra_sources"
22632 +
22633 +  ext_builddir=ext/mysqli
22634 +  ext_srcdir=$abs_srcdir/ext/mysqli
22635
22636    ac_extra=
22637
22638    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
22639 -    PHP_OCI8_SHARED=no
22640 +    PHP_MYSQLI_SHARED=no
22641
22642
22643 -  case ext/oci8 in
22644 +  case ext/mysqli in
22645    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22646 -  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22647 -  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22648 +  /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22649 +  *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22650    esac
22651
22652
22653 @@ -63401,7 +63629,7 @@ EOF
22654
22655
22656    old_IFS=$IFS
22657 -  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
22658 +  for ac_src in $mysqli_sources; do
22659
22660        IFS=.
22661        set $ac_src
22662 @@ -63424,18 +63652,18 @@ EOF
22663    done
22664
22665
22666 -    EXT_STATIC="$EXT_STATIC oci8"
22667 +    EXT_STATIC="$EXT_STATIC mysqli"
22668      if test "$ext_shared" != "nocli"; then
22669 -      EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
22670 +      EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
22671      fi
22672    else
22673      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
22674 -      PHP_OCI8_SHARED=yes
22675 +      PHP_MYSQLI_SHARED=yes
22676
22677 -  case ext/oci8 in
22678 +  case ext/mysqli in
22679    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22680 -  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22681 -  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22682 +  /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22683 +  *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22684    esac
22685
22686
22687 @@ -63450,14 +63678,14 @@ EOF
22688
22689
22690    old_IFS=$IFS
22691 -  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
22692 +  for ac_src in $mysqli_sources; do
22693
22694        IFS=.
22695        set $ac_src
22696        ac_obj=$1
22697        IFS=$old_IFS
22698
22699 -      shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo"
22700 +      shared_objects_mysqli="$shared_objects_mysqli $ac_bdir$ac_obj.lo"
22701
22702        case $ac_src in
22703          *.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" ;;
22704 @@ -63480,31 +63708,31 @@ EOF
22705    case $host_alias in
22706      *aix*)
22707        suffix=so
22708 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpoci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpoci8.so '$ext_builddir'/phpoci8.so'
22709 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpmysqli.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(PHPMYSQLI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpmysqli.so '$ext_builddir'/phpmysqli.so'
22710        ;;
22711      *netware*)
22712        suffix=nlm
22713 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
22714 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLI, 3)_SHARED_LIBADD)'
22715        ;;
22716      *)
22717        suffix=la
22718 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD)'
22719 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(PHPMYSQLI_SHARED_LIBADD)'
22720        ;;
22721    esac
22722
22723    if test "x" = "xyes"; then
22724 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpoci8.$suffix"
22725 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpmysqli.$suffix"
22726    else
22727 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
22728 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqli.$suffix"
22729    fi
22730
22731 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
22732 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
22733
22734    cat >>Makefile.objects<<EOF
22735 -\$(phplibdir)/phpoci8.$suffix: $ext_builddir/phpoci8.$suffix
22736 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpoci8.$suffix \$(phplibdir)
22737 +\$(phplibdir)/phpmysqli.$suffix: $ext_builddir/phpmysqli.$suffix
22738 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpmysqli.$suffix \$(phplibdir)
22739
22740 -$ext_builddir/phpoci8.$suffix: \$(shared_objects_oci8) \$(PHPOCI8_SHARED_DEPENDENCIES)
22741 +$ext_builddir/phpmysqli.$suffix: \$(shared_objects_mysqli) \$(PHPMYSQLI_SHARED_DEPENDENCIES)
22742         $link_cmd
22743
22744  EOF
22745 @@ -63517,31 +63745,31 @@ EOF
22746    case $host_alias in
22747      *aix*)
22748        suffix=so
22749 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/oci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/oci8.so '$ext_builddir'/oci8.so'
22750 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/mysqli.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(MYSQLI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/mysqli.so '$ext_builddir'/mysqli.so'
22751        ;;
22752      *netware*)
22753        suffix=nlm
22754 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
22755 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQLI, 3)_SHARED_LIBADD)'
22756        ;;
22757      *)
22758        suffix=la
22759 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD)'
22760 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) $(MYSQLI_SHARED_LIBADD)'
22761        ;;
22762    esac
22763
22764    if test "x" = "xyes"; then
22765 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/oci8.$suffix"
22766 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mysqli.$suffix"
22767    else
22768 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
22769 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysqli.$suffix"
22770    fi
22771
22772 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
22773 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli"
22774
22775    cat >>Makefile.objects<<EOF
22776 -\$(phplibdir)/oci8.$suffix: $ext_builddir/oci8.$suffix
22777 -       \$(LIBTOOL) --mode=install cp $ext_builddir/oci8.$suffix \$(phplibdir)
22778 +\$(phplibdir)/mysqli.$suffix: $ext_builddir/mysqli.$suffix
22779 +       \$(LIBTOOL) --mode=install cp $ext_builddir/mysqli.$suffix \$(phplibdir)
22780
22781 -$ext_builddir/oci8.$suffix: \$(shared_objects_oci8) \$(OCI8_SHARED_DEPENDENCIES)
22782 +$ext_builddir/mysqli.$suffix: \$(shared_objects_mysqli) \$(MYSQLI_SHARED_DEPENDENCIES)
22783         $link_cmd
22784
22785  EOF
22786 @@ -63549,22 +63777,22 @@ EOF
22787            ;;
22788        esac
22789        cat >> confdefs.h <<EOF
22790 -#define COMPILE_DL_OCI8 1
22791 +#define COMPILE_DL_MYSQLI 1
22792  EOF
22793
22794      fi
22795    fi
22796
22797    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
22798 -    PHP_OCI8_SHARED=no
22799 +    PHP_MYSQLI_SHARED=no
22800      case "$PHP_SAPI" in
22801        cgi|embed)
22802
22803
22804 -  case ext/oci8 in
22805 +  case ext/mysqli in
22806    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22807 -  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22808 -  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22809 +  /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22810 +  *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22811    esac
22812
22813
22814 @@ -63579,7 +63807,7 @@ EOF
22815
22816
22817    old_IFS=$IFS
22818 -  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
22819 +  for ac_src in $mysqli_sources; do
22820
22821        IFS=.
22822        set $ac_src
22823 @@ -63602,15 +63830,15 @@ EOF
22824    done
22825
22826
22827 -        EXT_STATIC="$EXT_STATIC oci8"
22828 +        EXT_STATIC="$EXT_STATIC mysqli"
22829          ;;
22830        *)
22831
22832
22833 -  case ext/oci8 in
22834 +  case ext/mysqli in
22835    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22836 -  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22837 -  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22838 +  /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22839 +  *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22840    esac
22841
22842
22843 @@ -63625,7 +63853,7 @@ EOF
22844
22845
22846    old_IFS=$IFS
22847 -  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
22848 +  for ac_src in $mysqli_sources; do
22849
22850        IFS=.
22851        set $ac_src
22852 @@ -63650,7 +63878,7 @@ EOF
22853
22854          ;;
22855      esac
22856 -    EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
22857 +    EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
22858    fi
22859
22860
22861 @@ -63659,40 +63887,67 @@ EOF
22862
22863
22864    if test "$ext_builddir" = "."; then
22865 -    PHP_PECL_EXTENSION=oci8
22866 +    PHP_PECL_EXTENSION=mysqli
22867
22868    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
22869
22870    fi
22871
22872 -    cat >> confdefs.h <<\EOF
22873 -#define HAVE_OCI8 1
22874 -EOF
22875 +
22876 +  PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQLI_SHARED_LIBADD"
22877
22878 -
22879 -
22880
22881 -  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD"
22882 -
22883
22884 -
22885 -
22886 +    for header_file in ext/mysqli/php_mysqli_structs.h; do
22887 +
22888
22889 -  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR"
22890 -
22891 +  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
22892
22893 -
22894 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
22895 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
22896 +    eval "INSTALLHEADERS$unique=set"
22897
22898 -
22899 -  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION"
22900 +        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
22901 +
22902 +  fi
22903
22904 +    done
22905
22906
22907
22908 +  if test "$PHP_MYSQLI" = "mysqlnd"; then
22909 +
22910 +  am_i_shared=$PHP_MYSQLI_SHARED
22911 +  is_it_shared=$PHP_MYSQLND_SHARED
22912 +  is_it_enabled=$PHP_MYSQLND
22913 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
22914 +    { echo "configure: error:
22915 +You've configured extension mysqli to build statically, but it
22916 +depends on extension mysqlnd, which you've configured to build shared.
22917 +You either need to build mysqli shared or build mysqlnd statically for the
22918 +build to be successful.
22919 +" 1>&2; exit 1; }
22920 +  fi
22921 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
22922 +    { echo "configure: error:
22923 +You've configured extension mysqli, which depends on extension mysqlnd,
22924 +but you've either not enabled mysqlnd, or have disabled it.
22925 +" 1>&2; exit 1; }
22926 +  fi
22927 +
22928 +    cat >> confdefs.h <<\EOF
22929 +#define MYSQLI_USE_MYSQLND 1
22930 +EOF
22931 +
22932    fi
22933  fi
22934
22935
22936 +if test -z "$SED"; then
22937 +  PHP_OCI8_SED="sed";
22938 +else
22939 +  PHP_OCI8_SED="$SED";
22940 +fi
22941
22942
22943
22944 @@ -63703,19 +63958,20 @@ fi
22945
22946
22947
22948 -if test -z "$ODBC_TYPE"; then
22949
22950 -php_with_adabas=no
22951
22952 +php_with_oci8=no
22953
22954 -# Check whether --with-adabas or --without-adabas was given.
22955 -if test "${with_adabas+set}" = set; then
22956 -  withval="$with_adabas"
22957 -  PHP_ADABAS=$withval
22958 +echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6
22959 +echo "configure:63967: checking for Oracle (OCI8) support" >&5
22960 +# Check whether --with-oci8 or --without-oci8 was given.
22961 +if test "${with_oci8+set}" = set; then
22962 +  withval="$with_oci8"
22963 +  PHP_OCI8=$withval
22964  else
22965
22966 -  PHP_ADABAS=no
22967 -  test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL
22968 +  PHP_OCI8=no
22969 +  test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL
22970
22971  fi
22972
22973 @@ -63723,12 +63979,12 @@ fi
22974
22975  ext_output="yes, shared"
22976  ext_shared=yes
22977 -case $PHP_ADABAS in
22978 +case $PHP_OCI8 in
22979  shared,*)
22980 -  PHP_ADABAS=`echo "$PHP_ADABAS"|$SED 's/^shared,//'`
22981 +  PHP_OCI8=`echo "$PHP_OCI8"|$SED 's/^shared,//'`
22982    ;;
22983  shared)
22984 -  PHP_ADABAS=yes
22985 +  PHP_OCI8=yes
22986    ;;
22987  no)
22988    ext_output=no
22989 @@ -63742,28 +63998,178 @@ esac
22990
22991
22992
22993 +echo "$ac_t""$ext_output" 1>&6
22994
22995
22996
22997
22998 +if test "$PHP_OCI8" != "no"; then
22999
23000 -  if test "$PHP_ADABAS" != "no"; then
23001 -    echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
23002 -echo "configure:63753: checking for Adabas support" >&5
23003 -    if test "$PHP_ADABAS" = "yes"; then
23004 -      PHP_ADABAS=/usr/local
23005 +  if test -z "$PHP_OCI8"; then
23006 +        { echo "configure: error: Empty parameter value passed to --with-oci8" 1>&2; exit 1; }
23007 +  fi
23008 +
23009 +
23010 +  echo $ac_n "checking PHP version""... $ac_c" 1>&6
23011 +echo "configure:64015: checking PHP version" >&5
23012 +
23013 +  tmp_version=$PHP_VERSION
23014 +  if test -z "$tmp_version"; then
23015 +    if test -z "$PHP_CONFIG"; then
23016 +      { echo "configure: error: php-config not found" 1>&2; exit 1; }
23017 +    fi
23018 +    php_version=`$PHP_CONFIG --version 2>/dev/null|head -n 1|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
23019 +  else
23020 +    php_version=`echo "$tmp_version"|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
23021 +  fi
23022 +
23023 +  if test -z "$php_version"; then
23024 +    { echo "configure: error: failed to detect PHP version, please report" 1>&2; exit 1; }
23025 +  fi
23026 +
23027 +  ac_IFS=$IFS
23028 +  IFS="."
23029 +  set $php_version
23030 +  IFS=$ac_IFS
23031 +  oci8_php_version=`expr $1 \* 1000000 + $2 \* 1000 + $3`
23032 +
23033 +  if test "$oci8_php_version" -lt "4003009"; then
23034 +    { echo "configure: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" 1>&2; exit 1; }
23035 +  elif test "$oci8_php_version" -ge "6000000"; then
23036 +    { echo "configure: error: This version of OCI8 is not compatible with PHP 6 or higher" 1>&2; exit 1; }
23037 +  else
23038 +    echo "$ac_t""$php_version, ok" 1>&6
23039 +  fi
23040 +
23041 +
23042 +  echo $ac_n "checking size of long int""... $ac_c" 1>&6
23043 +echo "configure:64047: checking size of long int" >&5
23044 +if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
23045 +  echo $ac_n "(cached) $ac_c" 1>&6
23046 +else
23047 +  if test "$cross_compiling" = yes; then
23048 +  ac_cv_sizeof_long_int=4
23049 +else
23050 +  cat > conftest.$ac_ext <<EOF
23051 +#line 64055 "configure"
23052 +#include "confdefs.h"
23053 +#include <stdio.h>
23054 +#include <sys/types.h>
23055 +main()
23056 +{
23057 +  FILE *f=fopen("conftestval", "w");
23058 +  if (!f) exit(1);
23059 +  fprintf(f, "%d\n", sizeof(long int));
23060 +  exit(0);
23061 +}
23062 +EOF
23063 +if { (eval echo configure:64067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
23064 +then
23065 +  ac_cv_sizeof_long_int=`cat conftestval`
23066 +else
23067 +  echo "configure: failed program was:" >&5
23068 +  cat conftest.$ac_ext >&5
23069 +  rm -fr conftest*
23070 +  ac_cv_sizeof_long_int=0
23071 +fi
23072 +rm -fr conftest*
23073 +fi
23074 +
23075 +fi
23076 +echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
23077 +cat >> confdefs.h <<EOF
23078 +#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
23079 +EOF
23080 +
23081 +
23082 +  echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
23083 +echo "configure:64087: checking checking if we're on a 64-bit platform" >&5
23084 +  if test "$ac_cv_sizeof_long_int" = "4"; then
23085 +    echo "$ac_t""no" 1>&6
23086 +    PHP_OCI8_OH_LIBDIR=lib32
23087 +    PHP_OCI8_IC_LIBDIR_SUFFIX=""
23088 +  else
23089 +    echo "$ac_t""yes" 1>&6
23090 +    PHP_OCI8_OH_LIBDIR=lib
23091 +    PHP_OCI8_IC_LIBDIR_SUFFIX=64
23092 +  fi
23093 +
23094 +
23095 +  PHP_OCI8_INSTANT_CLIENT="no"
23096 +
23097 +            if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then
23098 +    echo "configure: warning: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" 1>&2
23099 +    PHP_OCI8=instantclient
23100 +  fi
23101 +
23102 +  if test "`echo $PHP_OCI8`" = "instantclient"; then
23103 +    PHP_OCI8_INSTANT_CLIENT="yes"
23104 +  elif test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then
23105 +    PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
23106 +    PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f1,4`"
23107 +    if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
23108 +       PHP_OCI8_INSTANT_CLIENT="yes"
23109 +    fi
23110 +    if test -z "$PHP_OCI8"; then
23111 +       PHP_OCI8=yes
23112 +    fi
23113 +  elif test "`echo $PHP_OCI8 | cut -d, -f1`" = "instantclient"; then
23114 +    PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
23115 +    PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f3,4`"
23116 +    if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
23117 +       PHP_OCI8_INSTANT_CLIENT="yes"
23118 +    fi
23119 +    if test -z "$PHP_OCI8"; then
23120 +       PHP_OCI8=yes
23121 +    fi
23122 +  fi
23123 +
23124 +  if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
23125 +
23126 +    echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6
23127 +echo "configure:64131: checking Oracle ORACLE_HOME install directory" >&5
23128 +
23129 +    if test "$PHP_OCI8" = "yes"; then
23130 +      OCI8_DIR=$ORACLE_HOME
23131 +    else
23132 +      OCI8_DIR=$PHP_OCI8
23133      fi
23134 +    echo "$ac_t""$OCI8_DIR" 1>&6
23135 +
23136
23137 -  if test "$PHP_ADABAS/incl" != "/usr/include"; then
23138 +  echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
23139 +echo "configure:64142: checking ORACLE_HOME library validity" >&5
23140 +  if test ! -d "$OCI8_DIR"; then
23141 +    { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; }
23142 +  fi
23143 +  if test -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then
23144 +    OCI8_LIB_DIR=lib
23145 +  elif test ! -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
23146 +    OCI8_LIB_DIR=lib32
23147 +  elif test -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
23148 +    OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
23149 +  else
23150 +        if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then
23151 +      { echo "configure: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" 1>&2; exit 1; }
23152 +    else
23153 +      { echo "configure: error: Oracle library directory not found in ${OCI8_DIR}" 1>&2; exit 1; }
23154 +    fi
23155 +  fi
23156 +  echo "$ac_t""$OCI8_LIB_DIR" 1>&6
23157 +
23158 +
23159 +    if test -d "$OCI8_DIR/rdbms/public"; then
23160 +
23161 +  if test "$OCI8_DIR/rdbms/public" != "/usr/include"; then
23162
23163 -  if test -z "$PHP_ADABAS/incl" || echo "$PHP_ADABAS/incl" | grep '^/' >/dev/null ; then
23164 -    ai_p=$PHP_ADABAS/incl
23165 +  if test -z "$OCI8_DIR/rdbms/public" || echo "$OCI8_DIR/rdbms/public" | grep '^/' >/dev/null ; then
23166 +    ai_p=$OCI8_DIR/rdbms/public
23167    else
23168
23169 -    ep_dir="`echo $PHP_ADABAS/incl|$SED 's%/*[^/][^/]*/*$%%'`"
23170 +    ep_dir="`echo $OCI8_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
23171
23172      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23173 -    ai_p="$ep_realdir/`basename \"$PHP_ADABAS/incl\"`"
23174 +    ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/public\"`"
23175    fi
23176
23177
23178 @@ -63784,189 +64190,88 @@ echo "configure:63753: checking for Adab
23179
23180    fi
23181
23182 +      OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/public"
23183 +    fi
23184 +    if test -d "$OCI8_DIR/rdbms/demo"; then
23185 +
23186 +  if test "$OCI8_DIR/rdbms/demo" != "/usr/include"; then
23187
23188 -  if test "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/lib"; then
23189 -
23190 -  if test -z "$PHP_ADABAS/$PHP_LIBDIR" || echo "$PHP_ADABAS/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
23191 -    ai_p=$PHP_ADABAS/$PHP_LIBDIR
23192 +  if test -z "$OCI8_DIR/rdbms/demo" || echo "$OCI8_DIR/rdbms/demo" | grep '^/' >/dev/null ; then
23193 +    ai_p=$OCI8_DIR/rdbms/demo
23194    else
23195
23196 -    ep_dir="`echo $PHP_ADABAS/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
23197 +    ep_dir="`echo $OCI8_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
23198
23199      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23200 -    ai_p="$ep_realdir/`basename \"$PHP_ADABAS/$PHP_LIBDIR\"`"
23201 +    ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/demo\"`"
23202    fi
23203
23204
23205 -
23206 -
23207
23208    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23209
23210 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
23211 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
23212    if test -n "$unique" && test "`eval $cmd`" = "" ; then
23213 -    eval "LIBPATH$unique=set"
23214 +    eval "INCLUDEPATH$unique=set"
23215
23216 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
23217 -    LDFLAGS="$LDFLAGS -L$ai_p"
23218 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
23219 -
23220 -  fi
23221 -
23222 -
23223 +      if test ""; then
23224 +        INCLUDES="-I$ai_p $INCLUDES"
23225 +      else
23226 +        INCLUDES="$INCLUDES -I$ai_p"
23227 +      fi
23228
23229    fi
23230
23231 -    ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a"
23232 -    ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
23233 -    $srcdir/build/shtool mkdir -f -p ext/odbc
23234 -    rm -f "$ODBC_LIB"
23235 -    cp "$ODBC_OBJS" "$ODBC_LIB"
23236 -
23237 -
23238 -  case sqlptc in
23239 -  c|c_r|pthread*) ;;
23240 -  *)
23241 -      LIBS="-lsqlptc $LIBS"
23242 -   ;;
23243 -  esac
23244 -
23245 -
23246 -
23247 -
23248 -  case sqlrte in
23249 -  c|c_r|pthread*) ;;
23250 -  *)
23251 -      LIBS="-lsqlrte $LIBS"
23252 -   ;;
23253 -  esac
23254 -
23255 -
23256 -
23257 +  fi
23258
23259 -  if test -n "$abs_builddir/ext/odbc"; then
23260 -
23261 -  if test "$abs_builddir/ext/odbc" != "/usr/$PHP_LIBDIR" && test "$abs_builddir/ext/odbc" != "/usr/lib"; then
23262 +      OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/demo"
23263 +    fi
23264 +    if test -d "$OCI8_DIR/network/public"; then
23265 +
23266 +  if test "$OCI8_DIR/network/public" != "/usr/include"; then
23267
23268 -  if test -z "$abs_builddir/ext/odbc" || echo "$abs_builddir/ext/odbc" | grep '^/' >/dev/null ; then
23269 -    ai_p=$abs_builddir/ext/odbc
23270 +  if test -z "$OCI8_DIR/network/public" || echo "$OCI8_DIR/network/public" | grep '^/' >/dev/null ; then
23271 +    ai_p=$OCI8_DIR/network/public
23272    else
23273
23274 -    ep_dir="`echo $abs_builddir/ext/odbc|$SED 's%/*[^/][^/]*/*$%%'`"
23275 +    ep_dir="`echo $OCI8_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`"
23276
23277      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23278 -    ai_p="$ep_realdir/`basename \"$abs_builddir/ext/odbc\"`"
23279 +    ai_p="$ep_realdir/`basename \"$OCI8_DIR/network/public\"`"
23280    fi
23281
23282
23283 -
23284 -
23285
23286    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23287
23288 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
23289 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
23290    if test -n "$unique" && test "`eval $cmd`" = "" ; then
23291 -    eval "LIBPATH$unique=set"
23292 +    eval "INCLUDEPATH$unique=set"
23293
23294 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
23295 -    LDFLAGS="$LDFLAGS -L$ai_p"
23296 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
23297 -
23298 -  fi
23299 -
23300 -
23301 +      if test ""; then
23302 +        INCLUDES="-I$ai_p $INCLUDES"
23303 +      else
23304 +        INCLUDES="$INCLUDES -I$ai_p"
23305 +      fi
23306
23307    fi
23308
23309    fi
23310 -
23311 -
23312 -  case odbc_adabas in
23313 -  c|c_r|pthread*) ;;
23314 -  *)
23315 -      LIBS="-lodbc_adabas $LIBS"
23316 -   ;;
23317 -  esac
23318 -
23319 -
23320 -
23321 -
23322 -    ODBC_TYPE=adabas
23323 -    ODBC_INCDIR=$PHP_ADABAS/incl
23324 -
23325 -if ! test -f "$ODBC_INCDIR/sqlext.h"; then
23326 -  { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
23327 -fi
23328 -
23329 -    cat >> confdefs.h <<\EOF
23330 -#define HAVE_ADABAS 1
23331 -EOF
23332 -
23333 -    echo "$ac_t""$ext_output" 1>&6
23334 -  fi
23335 -fi
23336 -
23337 -if test -z "$ODBC_TYPE"; then
23338 -
23339 -php_with_sapdb=no
23340 -
23341 -
23342 -# Check whether --with-sapdb or --without-sapdb was given.
23343 -if test "${with_sapdb+set}" = set; then
23344 -  withval="$with_sapdb"
23345 -  PHP_SAPDB=$withval
23346 -else
23347 -
23348 -  PHP_SAPDB=no
23349 -  test "$PHP_ENABLE_ALL" && PHP_SAPDB=$PHP_ENABLE_ALL
23350 -
23351 -fi
23352 -
23353 -
23354 -
23355 -ext_output="yes, shared"
23356 -ext_shared=yes
23357 -case $PHP_SAPDB in
23358 -shared,*)
23359 -  PHP_SAPDB=`echo "$PHP_SAPDB"|$SED 's/^shared,//'`
23360 -  ;;
23361 -shared)
23362 -  PHP_SAPDB=yes
23363 -  ;;
23364 -no)
23365 -  ext_output=no
23366 -  ext_shared=no
23367 -  ;;
23368 -*)
23369 -  ext_output=yes
23370 -  ext_shared=no
23371 -  ;;
23372 -esac
23373 -
23374 -
23375
23376 -
23377 -
23378 -
23379 -
23380 -
23381 -  if test "$PHP_SAPDB" != "no"; then
23382 -    echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
23383 -echo "configure:63956: checking for SAP DB support" >&5
23384 -    if test "$PHP_SAPDB" = "yes"; then
23385 -      PHP_SAPDB=/usr/local
23386 +      OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/network/public"
23387      fi
23388 +    if test -d "$OCI8_DIR/plsql/public"; then
23389 +
23390 +  if test "$OCI8_DIR/plsql/public" != "/usr/include"; then
23391
23392 -  if test "$PHP_SAPDB/incl" != "/usr/include"; then
23393 -
23394 -  if test -z "$PHP_SAPDB/incl" || echo "$PHP_SAPDB/incl" | grep '^/' >/dev/null ; then
23395 -    ai_p=$PHP_SAPDB/incl
23396 +  if test -z "$OCI8_DIR/plsql/public" || echo "$OCI8_DIR/plsql/public" | grep '^/' >/dev/null ; then
23397 +    ai_p=$OCI8_DIR/plsql/public
23398    else
23399
23400 -    ep_dir="`echo $PHP_SAPDB/incl|$SED 's%/*[^/][^/]*/*$%%'`"
23401 +    ep_dir="`echo $OCI8_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
23402
23403      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23404 -    ai_p="$ep_realdir/`basename \"$PHP_SAPDB/incl\"`"
23405 +    ai_p="$ep_realdir/`basename \"$OCI8_DIR/plsql/public\"`"
23406    fi
23407
23408
23409 @@ -63987,21 +64292,76 @@ echo "configure:63956: checking for SAP
23410
23411    fi
23412
23413 +      OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/plsql/public"
23414 +    fi
23415 +
23416 +    if test -f "$OCI8_DIR/$OCI8_LIB_DIR/sysliblist"; then
23417 +
23418 +  for ac_i in `cat $OCI8_DIR/$OCI8_LIB_DIR/sysliblist`; do
23419 +    case $ac_i in
23420 +    -pthread)
23421 +      if test "$ext_shared" = "yes"; then
23422 +        OCI8_SYSLIB="$OCI8_SYSLIB -pthread"
23423 +      else
23424 +
23425 +
23426 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
23427 +
23428 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
23429 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
23430 +    eval "EXTRA_LDFLAGS$unique=set"
23431 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
23432 +  fi
23433 +
23434 +      fi
23435 +    ;;
23436 +    -l*)
23437 +      ac_ii=`echo $ac_i|cut -c 3-`
23438 +
23439 +
23440 +  case $ac_ii in
23441 +  c|c_r|pthread*) ;;
23442 +  *)
23443 +    if test "$ext_shared" = "yes"; then
23444 +        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
23445 +    else
23446 +
23447 +
23448 +  case $ac_ii in
23449 +  c|c_r|pthread*) ;;
23450 +  *)
23451 +      LIBS="$LIBS -l$ac_ii"
23452 +   ;;
23453 +  esac
23454 +
23455 +
23456 +    fi
23457 +   ;;
23458 +  esac
23459 +
23460 +
23461 +    ;;
23462 +    -L*)
23463 +      ac_ii=`echo $ac_i|cut -c 3-`
23464 +
23465 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
23466
23467 -  if test "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/lib"; then
23468 -
23469 -  if test -z "$PHP_SAPDB/$PHP_LIBDIR" || echo "$PHP_SAPDB/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
23470 -    ai_p=$PHP_SAPDB/$PHP_LIBDIR
23471 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
23472 +    ai_p=$ac_ii
23473    else
23474
23475 -    ep_dir="`echo $PHP_SAPDB/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
23476 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
23477
23478      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23479 -    ai_p="$ep_realdir/`basename \"$PHP_SAPDB/$PHP_LIBDIR\"`"
23480 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
23481    fi
23482
23483
23484 -
23485 +      if test "$ext_shared" = "yes"; then
23486 +        OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
23487 +        test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
23488 +      else
23489 +
23490
23491
23492    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23493 @@ -64017,813 +64377,728 @@ echo "configure:63956: checking for SAP
23494    fi
23495
23496
23497 +      fi
23498
23499    fi
23500
23501 -
23502 +    ;;
23503 +    esac
23504 +  done
23505 +
23506 +    elif test -f "$OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist"; then
23507 +
23508 +  for ac_i in `cat $OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist`; do
23509 +    case $ac_i in
23510 +    -pthread)
23511 +      if test "$ext_shared" = "yes"; then
23512 +        OCI8_SYSLIB="$OCI8_SYSLIB -pthread"
23513 +      else
23514 +
23515
23516 -  case sqlod in
23517 -  c|c_r|pthread*) ;;
23518 -  *)
23519 -      LIBS="-lsqlod $LIBS"
23520 -   ;;
23521 -  esac
23522 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
23523 +
23524 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
23525 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
23526 +    eval "EXTRA_LDFLAGS$unique=set"
23527 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
23528 +  fi
23529
23530 +      fi
23531 +    ;;
23532 +    -l*)
23533 +      ac_ii=`echo $ac_i|cut -c 3-`
23534 +
23535 +
23536 +  case $ac_ii in
23537 +  c|c_r|pthread*) ;;
23538 +  *)
23539 +    if test "$ext_shared" = "yes"; then
23540 +        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
23541 +    else
23542 +
23543 +
23544 +  case $ac_ii in
23545 +  c|c_r|pthread*) ;;
23546 +  *)
23547 +      LIBS="$LIBS -l$ac_ii"
23548 +   ;;
23549 +  esac
23550
23551 -    ODBC_TYPE=sapdb
23552 -    cat >> confdefs.h <<\EOF
23553 -#define HAVE_SAPDB 1
23554 -EOF
23555 -
23556 -    echo "$ac_t""$ext_output" 1>&6
23557 -  fi
23558 -fi
23559
23560 -if test -z "$ODBC_TYPE"; then
23561 +    fi
23562 +   ;;
23563 +  esac
23564
23565 -php_with_solid=no
23566
23567 +    ;;
23568 +    -L*)
23569 +      ac_ii=`echo $ac_i|cut -c 3-`
23570 +
23571 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
23572 +
23573 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
23574 +    ai_p=$ac_ii
23575 +  else
23576 +
23577 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
23578 +
23579 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23580 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
23581 +  fi
23582
23583 -# Check whether --with-solid or --without-solid was given.
23584 -if test "${with_solid+set}" = set; then
23585 -  withval="$with_solid"
23586 -  PHP_SOLID=$withval
23587 -else
23588 +
23589 +      if test "$ext_shared" = "yes"; then
23590 +        OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
23591 +        test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
23592 +      else
23593 +
23594
23595 -  PHP_SOLID=no
23596 -  test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL
23597 -
23598 -fi
23599 +
23600 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23601 +
23602 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
23603 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
23604 +    eval "LIBPATH$unique=set"
23605 +
23606 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
23607 +    LDFLAGS="$LDFLAGS -L$ai_p"
23608 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
23609 +
23610 +  fi
23611
23612
23613 +      fi
23614 +
23615 +  fi
23616
23617 -ext_output="yes, shared"
23618 -ext_shared=yes
23619 -case $PHP_SOLID in
23620 -shared,*)
23621 -  PHP_SOLID=`echo "$PHP_SOLID"|$SED 's/^shared,//'`
23622 -  ;;
23623 -shared)
23624 -  PHP_SOLID=yes
23625 -  ;;
23626 -no)
23627 -  ext_output=no
23628 -  ext_shared=no
23629 -  ;;
23630 -*)
23631 -  ext_output=yes
23632 -  ext_shared=no
23633 -  ;;
23634 -esac
23635 +    ;;
23636 +    esac
23637 +  done
23638
23639 +    fi
23640
23641 +
23642 +  echo $ac_n "checking Oracle version""... $ac_c" 1>&6
23643 +echo "configure:64483: checking Oracle version" >&5
23644 +  if test -s "$OCI8_DIR/orainst/unix.rgs"; then
23645 +    OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
23646 +    test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
23647 +  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
23648 +    OCI8_ORACLE_VERSION=11.1
23649 +  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
23650 +        OCI8_ORACLE_VERSION=10.1
23651 +  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
23652 +        OCI8_ORACLE_VERSION=9.0
23653 +  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
23654 +    OCI8_ORACLE_VERSION=8.1
23655 +  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
23656 +    OCI8_ORACLE_VERSION=8.0
23657 +  elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then
23658 +    if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then
23659 +      OCI8_ORACLE_VERSION=8.0
23660 +    else
23661 +      OCI8_ORACLE_VERSION=8.1
23662 +    fi
23663 +  else
23664 +    { echo "configure: error: Oracle client libraries not found" 1>&2; exit 1; }
23665 +  fi
23666 +  echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
23667
23668
23669 +    case $OCI8_ORACLE_VERSION in
23670 +      7.3|8.0|8.1)
23671 +       { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; }
23672 +       ;;
23673
23674 +      9.0)
23675 +
23676 +  save_old_LDFLAGS=$LDFLAGS
23677 +  ac_stuff="
23678 +         -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
23679 +       "
23680 +
23681 +  save_ext_shared=$ext_shared
23682 +  ext_shared=yes
23683 +
23684 +  for ac_i in $ac_stuff; do
23685 +    case $ac_i in
23686 +    -pthread)
23687 +      if test "$ext_shared" = "yes"; then
23688 +        LDFLAGS="$LDFLAGS -pthread"
23689 +      else
23690 +
23691 +
23692 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
23693 +
23694 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
23695 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
23696 +    eval "EXTRA_LDFLAGS$unique=set"
23697 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
23698 +  fi
23699
23700 +      fi
23701 +    ;;
23702 +    -l*)
23703 +      ac_ii=`echo $ac_i|cut -c 3-`
23704 +
23705 +
23706 +  case $ac_ii in
23707 +  c|c_r|pthread*) ;;
23708 +  *)
23709 +    if test "$ext_shared" = "yes"; then
23710 +        LDFLAGS="$LDFLAGS -l$ac_ii"
23711 +    else
23712 +
23713 +
23714 +  case $ac_ii in
23715 +  c|c_r|pthread*) ;;
23716 +  *)
23717 +      LIBS="$LIBS -l$ac_ii"
23718 +   ;;
23719 +  esac
23720
23721
23722 -  if test "$PHP_SOLID" != "no"; then
23723 -    echo $ac_n "checking for Solid support""... $ac_c" 1>&6
23724 -echo "configure:64089: checking for Solid support" >&5
23725 -    if test "$PHP_SOLID" = "yes"; then
23726 -      PHP_SOLID=/usr/local/solid
23727      fi
23728 -    ODBC_INCDIR=$PHP_SOLID/include
23729 -    ODBC_LIBDIR=$PHP_SOLID/$PHP_LIBDIR
23730 -    ODBC_INCLUDE=-I$ODBC_INCDIR
23731 -    ODBC_TYPE=solid
23732 -    if test -f $ODBC_LIBDIR/soc*35.a; then
23733 -      cat >> confdefs.h <<\EOF
23734 -#define HAVE_SOLID_35 1
23735 -EOF
23736 -
23737 -    elif test -f $ODBC_LIBDIR/scl*30.a; then
23738 -      cat >> confdefs.h <<\EOF
23739 -#define HAVE_SOLID_30 1
23740 -EOF
23741 +   ;;
23742 +  esac
23743
23744 -    elif test -f $ODBC_LIBDIR/scl*23.a; then
23745 -      cat >> confdefs.h <<\EOF
23746 -#define HAVE_SOLID 1
23747 -EOF
23748
23749 -    fi
23750 -    echo "$ac_t""$ext_output" 1>&6
23751 +    ;;
23752 +    -L*)
23753 +      ac_ii=`echo $ac_i|cut -c 3-`
23754 +
23755 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
23756
23757 -  echo $ac_n "checking Solid library file""... $ac_c" 1>&6
23758 -echo "configure:64116: checking Solid library file" >&5
23759 -  ac_solid_uname_r=`uname -r 2>/dev/null`
23760 -  ac_solid_uname_s=`uname -s 2>/dev/null`
23761 -  case $ac_solid_uname_s in
23762 -    AIX) ac_solid_os=a3x;;   # a4x for AIX4/ Solid 2.3/3.0 only
23763 -    HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10
23764 -    IRIX) ac_solid_os=irx;;  # Solid 2.3(?)/ 3.0 only
23765 -    Linux)
23766 -      if ldd -v /bin/sh | grep GLIBC > /dev/null; then
23767 -        cat >> confdefs.h <<\EOF
23768 -#define SS_LINUX 1
23769 -EOF
23770 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
23771 +    ai_p=$ac_ii
23772 +  else
23773 +
23774 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
23775 +
23776 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23777 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
23778 +  fi
23779
23780 -        ac_solid_os=l2x
23781 +
23782 +      if test "$ext_shared" = "yes"; then
23783 +        LDFLAGS="-L$ai_p $LDFLAGS"
23784 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
23785        else
23786 -        cat >> confdefs.h <<\EOF
23787 -#define SS_LINUX 1
23788 -EOF
23789 +
23790 +
23791 +
23792 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23793 +
23794 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
23795 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
23796 +    eval "LIBPATH$unique=set"
23797 +
23798 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
23799 +    LDFLAGS="$LDFLAGS -L$ai_p"
23800 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
23801 +
23802 +  fi
23803
23804 -        ac_solid_os=lux
23805 -      fi;;
23806 -    SunOS)
23807 -      ac_solid_os=ssx;; # should we deal with SunOS 4?
23808 -    FreeBSD)
23809 -      if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
23810 -        cat >> confdefs.h <<\EOF
23811 -#define SS_FBX 1
23812 -EOF
23813
23814 -        ac_solid_os=fex
23815 -      else
23816 -        cat >> confdefs.h <<\EOF
23817 -#define SS_FBX 1
23818 -EOF
23819 +      fi
23820 +
23821 +  fi
23822
23823 -        ac_solid_os=fbx
23824 -      fi;;
23825 -  esac
23826 +    ;;
23827 +    esac
23828 +  done
23829
23830 -  if test -f $ODBC_LIBDIR/soc${ac_solid_os}35.a; then
23831 -    ac_solid_version=35
23832 -    ac_solid_prefix=soc
23833 -  elif test -f $ODBC_LIBDIR/scl${ac_solid_os}30.a; then
23834 -    ac_solid_version=30
23835 -    ac_solid_prefix=scl
23836 -  elif test -f $ODBC_LIBDIR/scl${ac_solid_os}23.a; then
23837 -    ac_solid_version=23
23838 -    ac_solid_prefix=scl
23839 -  fi
23840 +  echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
23841 +echo "configure:64613: checking for OCIEnvNlsCreate in -lclntsh" >&5
23842 +ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
23843 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
23844 +  echo $ac_n "(cached) $ac_c" 1>&6
23845 +else
23846 +  ac_save_LIBS="$LIBS"
23847 +LIBS="-lclntsh  $LIBS"
23848 +cat > conftest.$ac_ext <<EOF
23849 +#line 64621 "configure"
23850 +#include "confdefs.h"
23851 +/* Override any gcc2 internal prototype to avoid an error.  */
23852 +/* We use char because int might match the return type of a gcc2
23853 +    builtin and then its argument prototype would still apply.  */
23854 +char OCIEnvNlsCreate();
23855
23856 -#
23857 -# Check for the library files, and setup the ODBC_LIBS path...
23858 -#
23859 -if test ! -f $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \
23860 -  ! -f $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then
23861 -  #
23862 -  # we have an error and should bail out, as we can't find the libs!
23863 -  #
23864 -  echo ""
23865 -  echo "*********************************************************************"
23866 -  echo "* Unable to locate $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
23867 -  echo "* Please correct this by creating the following links and reconfiguring:"
23868 -  echo "* $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
23869 -  echo "* $ODBC_LIBDIR/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so"
23870 -  echo "*********************************************************************"
23871 +int main() {
23872 +OCIEnvNlsCreate()
23873 +; return 0; }
23874 +EOF
23875 +if { (eval echo configure:64632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
23876 +  rm -rf conftest*
23877 +  eval "ac_cv_lib_$ac_lib_var=yes"
23878  else
23879 -  ODBC_LFLAGS=-L$ODBC_LIBDIR
23880 -  ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
23881 +  echo "configure: failed program was:" >&5
23882 +  cat conftest.$ac_ext >&5
23883 +  rm -rf conftest*
23884 +  eval "ac_cv_lib_$ac_lib_var=no"
23885  fi
23886 +rm -f conftest*
23887 +LIBS="$ac_save_LIBS"
23888
23889 -  echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
23890 -
23891 -  fi
23892  fi
23893 -
23894 -if test -z "$ODBC_TYPE"; then
23895 -
23896 -php_with_ibm_db2=no
23897 -
23898 -
23899 -# Check whether --with-ibm-db2 or --without-ibm-db2 was given.
23900 -if test "${with_ibm_db2+set}" = set; then
23901 -  withval="$with_ibm_db2"
23902 -  PHP_IBM_DB2=$withval
23903 -else
23904 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
23905 +  echo "$ac_t""yes" 1>&6
23906
23907 -  PHP_IBM_DB2=no
23908 -  test "$PHP_ENABLE_ALL" && PHP_IBM_DB2=$PHP_ENABLE_ALL
23909 +    LDFLAGS=$save_old_LDFLAGS
23910 +    ext_shared=$save_ext_shared
23911 +
23912 +         OCI8_ORACLE_VERSION=9.2
23913 +
23914 +
23915 +else
23916 +  echo "$ac_t""no" 1>&6
23917
23918 +    LDFLAGS=$save_old_LDFLAGS
23919 +    ext_shared=$save_ext_shared
23920 +    unset ac_cv_lib_clntsh_OCIEnvNlsCreate
23921 +
23922 +         { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; }
23923 +
23924 +
23925  fi
23926
23927 +       ;;
23928
23929 +      10.1|11.1)
23930 +       cat >> confdefs.h <<\EOF
23931 +#define HAVE_OCI_LOB_READ2 1
23932 +EOF
23933
23934 -ext_output="yes, shared"
23935 -ext_shared=yes
23936 -case $PHP_IBM_DB2 in
23937 -shared,*)
23938 -  PHP_IBM_DB2=`echo "$PHP_IBM_DB2"|$SED 's/^shared,//'`
23939 -  ;;
23940 -shared)
23941 -  PHP_IBM_DB2=yes
23942 -  ;;
23943 -no)
23944 -  ext_output=no
23945 -  ext_shared=no
23946 -  ;;
23947 -*)
23948 -  ext_output=yes
23949 -  ext_shared=no
23950 -  ;;
23951 -esac
23952 -
23953 -
23954 -
23955 -
23956 -
23957 -
23958 +       ;;
23959
23960 +      *)
23961 +       { echo "configure: error: Oracle version $OCI8_ORACLE_VERSION is not supported" 1>&2; exit 1; }
23962 +       ;;
23963 +    esac
23964
23965 -  if test "$PHP_IBM_DB2" != "no"; then
23966 -    echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
23967 -echo "configure:64237: checking for IBM DB2 support" >&5
23968 -    if test "$PHP_IBM_DB2" = "yes"; then
23969 -      ODBC_INCDIR=/home/db2inst1/sqllib/include
23970 -      ODBC_LIBDIR=/home/db2inst1/sqllib/lib
23971 +
23972 +
23973 +  case clntsh in
23974 +  c|c_r|pthread*) ;;
23975 +  *)
23976 +    if test "$ext_shared" = "yes"; then
23977 +        OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
23978      else
23979 -      ODBC_INCDIR=$PHP_IBM_DB2/include
23980 -      ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR
23981 -    fi
23982 +
23983 +
23984 +  case clntsh in
23985 +  c|c_r|pthread*) ;;
23986 +  *)
23987 +      LIBS="$LIBS -lclntsh"
23988 +   ;;
23989 +  esac
23990
23991 -
23992 -if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then
23993 -  { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" 1>&2; exit 1; }
23994 -fi
23995
23996 +    fi
23997 +   ;;
23998 +  esac
23999
24000 -    ODBC_INCLUDE=-I$ODBC_INCDIR
24001 -    ODBC_LFLAGS=-L$ODBC_LIBDIR
24002 -    ODBC_TYPE=ibm-db2
24003 -    ODBC_LIBS=-ldb2
24004
24005
24006 -  old_LIBS=$LIBS
24007 -  LIBS="
24008 -      $ODBC_LFLAGS $ODBC_LIBS
24009 -     $LIBS"
24010 -  if test "$cross_compiling" = yes; then
24011 -
24012 -    LIBS=$old_LIBS
24013 -
24014 -else
24015 -  cat > conftest.$ac_ext <<EOF
24016 -#line 64268 "configure"
24017 -#include "confdefs.h"
24018 -
24019 +  if test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/lib"; then
24020
24021 -    char SQLExecute();
24022 -    int main() {
24023 -      SQLExecute();
24024 -      return 0;
24025 -    }
24026 -
24027 -EOF
24028 -if { (eval echo configure:64279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
24029 -then
24030 -
24031 -    LIBS=$old_LIBS
24032 +  if test -z "$OCI8_DIR/$OCI8_LIB_DIR" || echo "$OCI8_DIR/$OCI8_LIB_DIR" | grep '^/' >/dev/null ; then
24033 +    ai_p=$OCI8_DIR/$OCI8_LIB_DIR
24034 +  else
24035
24036 -      cat >> confdefs.h <<\EOF
24037 -#define HAVE_IBMDB2 1
24038 -EOF
24039 +    ep_dir="`echo $OCI8_DIR/$OCI8_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
24040 +
24041 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
24042 +    ai_p="$ep_realdir/`basename \"$OCI8_DIR/$OCI8_LIB_DIR\"`"
24043 +  fi
24044
24045 -      echo "$ac_t""$ext_output" 1>&6
24046
24047 +      if test "$ext_shared" = "yes"; then
24048 +        OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD"
24049 +        test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_SHARED_LIBADD"
24050 +      else
24051 +
24052
24053 -else
24054 -  echo "configure: failed program was:" >&5
24055 -  cat conftest.$ac_ext >&5
24056 -  rm -fr conftest*
24057
24058 -    LIBS=$old_LIBS
24059 -
24060 -      echo "$ac_t""no" 1>&6
24061 -      { echo "configure: error:
24062 -build test failed. Please check the config.log for details.
24063 -You need to source your DB2 environment before running PHP configure:
24064 -# . \$IBM_DB2/db2profile
24065 -" 1>&2; exit 1; }
24066 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
24067 +
24068 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
24069 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
24070 +    eval "LIBPATH$unique=set"
24071
24072 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
24073 +    LDFLAGS="$LDFLAGS -L$ai_p"
24074 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
24075
24076 -fi
24077 -rm -fr conftest*
24078 -fi
24079 +  fi
24080
24081
24082 +      fi
24083 +
24084    fi
24085 -fi
24086 -
24087 -if test -z "$ODBC_TYPE"; then
24088
24089 -php_with_odbcrouter=no
24090 +
24091 +  ext_builddir=ext/oci8
24092 +  ext_srcdir=$abs_srcdir/ext/oci8
24093
24094 +  ac_extra=
24095
24096 -# Check whether --with-ODBCRouter or --without-ODBCRouter was given.
24097 -if test "${with_ODBCRouter+set}" = set; then
24098 -  withval="$with_ODBCRouter"
24099 -  PHP_ODBCROUTER=$withval
24100 -else
24101 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
24102 +    PHP_OCI8_SHARED=no
24103 +
24104 +
24105 +  case ext/oci8 in
24106 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24107 +  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24108 +  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24109 +  esac
24110 +
24111
24112 -  PHP_ODBCROUTER=no
24113 -  test "$PHP_ENABLE_ALL" && PHP_ODBCROUTER=$PHP_ENABLE_ALL
24114 -
24115 -fi
24116 -
24117 -
24118 -
24119 -ext_output="yes, shared"
24120 -ext_shared=yes
24121 -case $PHP_ODBCROUTER in
24122 -shared,*)
24123 -  PHP_ODBCROUTER=`echo "$PHP_ODBCROUTER"|$SED 's/^shared,//'`
24124 -  ;;
24125 -shared)
24126 -  PHP_ODBCROUTER=yes
24127 -  ;;
24128 -no)
24129 -  ext_output=no
24130 -  ext_shared=no
24131 -  ;;
24132 -*)
24133 -  ext_output=yes
24134 -  ext_shared=no
24135 -  ;;
24136 -esac
24137 -
24138
24139 +  b_c_pre=$php_c_pre
24140 +  b_cxx_pre=$php_cxx_pre
24141 +  b_c_meta=$php_c_meta
24142 +  b_cxx_meta=$php_cxx_meta
24143 +  b_c_post=$php_c_post
24144 +  b_cxx_post=$php_cxx_post
24145 +  b_lo=$php_lo
24146
24147
24148 +  old_IFS=$IFS
24149 +  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
24150 +
24151 +      IFS=.
24152 +      set $ac_src
24153 +      ac_obj=$1
24154 +      IFS=$old_IFS
24155 +
24156 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
24157
24158 +      case $ac_src in
24159 +        *.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" ;;
24160 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24161 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24162 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
24163 +      esac
24164
24165 +    cat >>Makefile.objects<<EOF
24166 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
24167 +       $ac_comp
24168 +EOF
24169 +  done
24170
24171
24172 -  if test "$PHP_ODBCROUTER" != "no"; then
24173 -    echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
24174 -echo "configure:64360: checking for ODBCRouter.com support" >&5
24175 -    if test "$PHP_ODBCROUTER" = "yes"; then
24176 -      PHP_ODBCROUTER=/usr
24177 +    EXT_STATIC="$EXT_STATIC oci8"
24178 +    if test "$ext_shared" != "nocli"; then
24179 +      EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
24180      fi
24181 -    ODBC_INCDIR=$PHP_ODBCROUTER/include
24182 -    ODBC_LIBDIR=$PHP_ODBCROUTER/lib
24183 -    ODBC_LFLAGS=-L$ODBC_LIBDIR
24184 -    ODBC_INCLUDE=-I$ODBC_INCDIR
24185 -    ODBC_LIBS=-lodbcsdk
24186 -    ODBC_TYPE=ODBCRouter
24187 -    cat >> confdefs.h <<\EOF
24188 -#define HAVE_ODBC_ROUTER 1
24189 -EOF
24190 +  else
24191 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
24192 +      PHP_OCI8_SHARED=yes
24193 +
24194 +  case ext/oci8 in
24195 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24196 +  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24197 +  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24198 +  esac
24199 +
24200 +
24201
24202 -    echo "$ac_t""$ext_output" 1>&6
24203 -  fi
24204 -fi
24205 +  b_c_pre=$shared_c_pre
24206 +  b_cxx_pre=$shared_cxx_pre
24207 +  b_c_meta=$shared_c_meta
24208 +  b_cxx_meta=$shared_cxx_meta
24209 +  b_c_post=$shared_c_post
24210 +  b_cxx_post=$shared_cxx_post
24211 +  b_lo=$shared_lo
24212
24213 -if test -z "$ODBC_TYPE"; then
24214
24215 -php_with_empress=no
24216 +  old_IFS=$IFS
24217 +  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
24218 +
24219 +      IFS=.
24220 +      set $ac_src
24221 +      ac_obj=$1
24222 +      IFS=$old_IFS
24223 +
24224 +      shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo"
24225
24226 +      case $ac_src in
24227 +        *.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" ;;
24228 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24229 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24230 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
24231 +      esac
24232
24233 -# Check whether --with-empress or --without-empress was given.
24234 -if test "${with_empress+set}" = set; then
24235 -  withval="$with_empress"
24236 -  PHP_EMPRESS=$withval
24237 -else
24238 -
24239 -  PHP_EMPRESS=no
24240 -  test "$PHP_ENABLE_ALL" && PHP_EMPRESS=$PHP_ENABLE_ALL
24241 +    cat >>Makefile.objects<<EOF
24242 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
24243 +       $ac_comp
24244 +EOF
24245 +  done
24246
24247 -fi
24248 +      case $host_alias in
24249 +        *netware*)
24250 +
24251 +  install_modules="install-modules"
24252
24253 +  case $host_alias in
24254 +    *aix*)
24255 +      suffix=so
24256 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpoci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpoci8.so '$ext_builddir'/phpoci8.so'
24257 +      ;;
24258 +    *netware*)
24259 +      suffix=nlm
24260 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
24261 +      ;;
24262 +    *)
24263 +      suffix=la
24264 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD)'
24265 +      ;;
24266 +  esac
24267
24268 +  if test "x" = "xyes"; then
24269 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpoci8.$suffix"
24270 +  else
24271 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
24272 +  fi
24273 +
24274 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
24275
24276 -ext_output="yes, shared"
24277 -ext_shared=yes
24278 -case $PHP_EMPRESS in
24279 -shared,*)
24280 -  PHP_EMPRESS=`echo "$PHP_EMPRESS"|$SED 's/^shared,//'`
24281 -  ;;
24282 -shared)
24283 -  PHP_EMPRESS=yes
24284 -  ;;
24285 -no)
24286 -  ext_output=no
24287 -  ext_shared=no
24288 -  ;;
24289 -*)
24290 -  ext_output=yes
24291 -  ext_shared=no
24292 -  ;;
24293 -esac
24294 +  cat >>Makefile.objects<<EOF
24295 +\$(phplibdir)/phpoci8.$suffix: $ext_builddir/phpoci8.$suffix
24296 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpoci8.$suffix \$(phplibdir)
24297
24298 +$ext_builddir/phpoci8.$suffix: \$(shared_objects_oci8) \$(PHPOCI8_SHARED_DEPENDENCIES)
24299 +       $link_cmd
24300
24301 +EOF
24302
24303 +          ;;
24304 +        *)
24305 +
24306 +  install_modules="install-modules"
24307
24308 +  case $host_alias in
24309 +    *aix*)
24310 +      suffix=so
24311 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/oci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/oci8.so '$ext_builddir'/oci8.so'
24312 +      ;;
24313 +    *netware*)
24314 +      suffix=nlm
24315 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
24316 +      ;;
24317 +    *)
24318 +      suffix=la
24319 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD)'
24320 +      ;;
24321 +  esac
24322
24323 +  if test "x" = "xyes"; then
24324 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/oci8.$suffix"
24325 +  else
24326 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
24327 +  fi
24328 +
24329 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
24330
24331 +  cat >>Makefile.objects<<EOF
24332 +\$(phplibdir)/oci8.$suffix: $ext_builddir/oci8.$suffix
24333 +       \$(LIBTOOL) --mode=install cp $ext_builddir/oci8.$suffix \$(phplibdir)
24334
24335 +$ext_builddir/oci8.$suffix: \$(shared_objects_oci8) \$(OCI8_SHARED_DEPENDENCIES)
24336 +       $link_cmd
24337
24338 -  if test "$PHP_EMPRESS" != "no"; then
24339 -    echo $ac_n "checking for Empress support""... $ac_c" 1>&6
24340 -echo "configure:64424: checking for Empress support" >&5
24341 -    if test "$PHP_EMPRESS" = "yes"; then
24342 -      ODBC_INCDIR=$EMPRESSPATH/include/odbc
24343 -      ODBC_LIBDIR=$EMPRESSPATH/shlib
24344 -    else
24345 -      ODBC_INCDIR=$PHP_EMPRESS/include/odbc
24346 -      ODBC_LIBDIR=$PHP_EMPRESS/shlib
24347 -    fi
24348 -    ODBC_INCLUDE=-I$ODBC_INCDIR
24349 -    ODBC_LFLAGS=-L$ODBC_LIBDIR
24350 -    ODBC_TYPE=empress
24351 -    cat >> confdefs.h <<\EOF
24352 -#define HAVE_EMPRESS 1
24353  EOF
24354
24355 -    echo "$ac_t""$ext_output" 1>&6
24356 -
24357 -  echo $ac_n "checking Empress library file""... $ac_c" 1>&6
24358 -echo "configure:64442: checking Empress library file" >&5
24359 -  ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
24360 -  if test ! -f $ODBC_LIBS; then
24361 -    ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
24362 -  fi
24363 -  echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
24364 +          ;;
24365 +      esac
24366 +      cat >> confdefs.h <<EOF
24367 +#define COMPILE_DL_OCI8 1
24368 +EOF
24369
24370 +    fi
24371    fi
24372 -fi
24373
24374 -if test -z "$ODBC_TYPE"; then
24375 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
24376 +    PHP_OCI8_SHARED=no
24377 +    case "$PHP_SAPI" in
24378 +      cgi|embed)
24379 +
24380 +
24381 +  case ext/oci8 in
24382 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24383 +  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24384 +  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24385 +  esac
24386 +
24387 +
24388
24389 -php_with_empress_bcs=no
24390 +  b_c_pre=$php_c_pre
24391 +  b_cxx_pre=$php_cxx_pre
24392 +  b_c_meta=$php_c_meta
24393 +  b_cxx_meta=$php_cxx_meta
24394 +  b_c_post=$php_c_post
24395 +  b_cxx_post=$php_cxx_post
24396 +  b_lo=$php_lo
24397
24398
24399 -# Check whether --with-empress-bcs or --without-empress-bcs was given.
24400 -if test "${with_empress_bcs+set}" = set; then
24401 -  withval="$with_empress_bcs"
24402 -  PHP_EMPRESS_BCS=$withval
24403 -else
24404 +  old_IFS=$IFS
24405 +  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
24406
24407 -  PHP_EMPRESS_BCS=no
24408 -  test "$PHP_ENABLE_ALL" && PHP_EMPRESS_BCS=$PHP_ENABLE_ALL
24409 -
24410 -fi
24411 +      IFS=.
24412 +      set $ac_src
24413 +      ac_obj=$1
24414 +      IFS=$old_IFS
24415 +
24416 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
24417
24418 +      case $ac_src in
24419 +        *.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" ;;
24420 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24421 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24422 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
24423 +      esac
24424
24425 +    cat >>Makefile.objects<<EOF
24426 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
24427 +       $ac_comp
24428 +EOF
24429 +  done
24430
24431 -ext_output="yes, shared"
24432 -ext_shared=yes
24433 -case $PHP_EMPRESS_BCS in
24434 -shared,*)
24435 -  PHP_EMPRESS_BCS=`echo "$PHP_EMPRESS_BCS"|$SED 's/^shared,//'`
24436 -  ;;
24437 -shared)
24438 -  PHP_EMPRESS_BCS=yes
24439 -  ;;
24440 -no)
24441 -  ext_output=no
24442 -  ext_shared=no
24443 -  ;;
24444 -*)
24445 -  ext_output=yes
24446 -  ext_shared=no
24447 -  ;;
24448 -esac
24449
24450 +        EXT_STATIC="$EXT_STATIC oci8"
24451 +        ;;
24452 +      *)
24453 +
24454 +
24455 +  case ext/oci8 in
24456 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24457 +  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24458 +  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24459 +  esac
24460 +
24461 +
24462
24463 +  b_c_pre=$php_c_pre
24464 +  b_cxx_pre=$php_cxx_pre
24465 +  b_c_meta=$php_c_meta
24466 +  b_cxx_meta=$php_cxx_meta
24467 +  b_c_post=$php_c_post
24468 +  b_cxx_post=$php_cxx_post
24469 +  b_lo=$php_lo
24470
24471
24472 +  old_IFS=$IFS
24473 +  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
24474 +
24475 +      IFS=.
24476 +      set $ac_src
24477 +      ac_obj=$1
24478 +      IFS=$old_IFS
24479 +
24480 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
24481
24482 +      case $ac_src in
24483 +        *.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" ;;
24484 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24485 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24486 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
24487 +      esac
24488
24489 +    cat >>Makefile.objects<<EOF
24490 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
24491 +       $ac_comp
24492 +EOF
24493 +  done
24494
24495
24496 -  if test "$PHP_EMPRESS_BCS" != "no"; then
24497 -    echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
24498 -echo "configure:64498: checking for Empress local access support" >&5
24499 -    if test "$PHP_EMPRESS_BCS" = "yes"; then
24500 -      ODBC_INCDIR=$EMPRESSPATH/include/odbc
24501 -      ODBC_LIBDIR=$EMPRESSPATH/shlib
24502 -    else
24503 -      ODBC_INCDIR=$PHP_EMPRESS_BCS/include/odbc
24504 -      ODBC_LIBDIR=$PHP_EMPRESS_BCS/shlib
24505 -    fi
24506 -    CC="empocc -bcs";export CC;
24507 -    LD="empocc -bcs";export LD;
24508 -    ODBC_INCLUDE=-I$ODBC_INCDIR
24509 -    ODBC_LFLAGS=-L$ODBC_LIBDIR
24510 -    LIST=`empocc -listlines -bcs -o a a.c`
24511 +        ;;
24512 +    esac
24513 +    EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
24514 +  fi
24515 +
24516 +
24517 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
24518 +
24519
24520 -    NEWLIST=
24521 -    for I in $LIST
24522 -    do
24523 -      case $I in
24524 -        $EMPRESSPATH/odbccl/lib/* | \
24525 -        $EMPRESSPATH/rdbms/lib/* | \
24526 -        $EMPRESSPATH/common/lib/*)
24527 -              NEWLIST="$NEWLIST $I"
24528 -              ;;
24529 -      esac
24530 -    done
24531 -    ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
24532 -    ODBC_TYPE=empress-bcs
24533 -    cat >> confdefs.h <<\EOF
24534 -#define HAVE_EMPRESS 1
24535 -EOF
24536
24537 -    echo "$ac_t""$ext_output" 1>&6
24538 +  if test "$ext_builddir" = "."; then
24539 +    PHP_PECL_EXTENSION=oci8
24540
24541 -  echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
24542 -echo "configure:64532: checking Empress local access library file" >&5
24543 -  ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
24544 -  if test ! -f $ODBCBCS_LIBS; then
24545 -    ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
24546 -  fi
24547 -  echo "$ac_t""`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`" 1>&6
24548 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
24549
24550    fi
24551 -fi
24552 -
24553 -if test -z "$ODBC_TYPE"; then
24554
24555 -php_with_birdstep=no
24556 +    cat >> confdefs.h <<\EOF
24557 +#define HAVE_OCI8 1
24558 +EOF
24559
24560
24561 -# Check whether --with-birdstep or --without-birdstep was given.
24562 -if test "${with_birdstep+set}" = set; then
24563 -  withval="$with_birdstep"
24564 -  PHP_BIRDSTEP=$withval
24565 -else
24566 +
24567
24568 -  PHP_BIRDSTEP=no
24569 -  test "$PHP_ENABLE_ALL" && PHP_BIRDSTEP=$PHP_ENABLE_ALL
24570 +  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD"
24571
24572 -fi
24573 +
24574
24575 +
24576 +
24577 +  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR"
24578
24579 +
24580
24581 -ext_output="yes, shared"
24582 -ext_shared=yes
24583 -case $PHP_BIRDSTEP in
24584 -shared,*)
24585 -  PHP_BIRDSTEP=`echo "$PHP_BIRDSTEP"|$SED 's/^shared,//'`
24586 -  ;;
24587 -shared)
24588 -  PHP_BIRDSTEP=yes
24589 -  ;;
24590 -no)
24591 -  ext_output=no
24592 -  ext_shared=no
24593 -  ;;
24594 -*)
24595 -  ext_output=yes
24596 -  ext_shared=no
24597 -  ;;
24598 -esac
24599 +
24600 +
24601 +  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION"
24602
24603 +
24604
24605
24606 +        cat >> confdefs.h <<EOF
24607 +#define PHP_OCI8_DEF_DIR "$OCI8_DIR"
24608 +EOF
24609
24610 +    cat >> confdefs.h <<EOF
24611 +#define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD"
24612 +EOF
24613
24614
24615 +  else
24616 +
24617 +    echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
24618 +echo "configure:65069: checking Oracle Instant Client directory" >&5
24619
24620 -
24621 -  if test "$PHP_BIRDSTEP" != "no"; then
24622 -    echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
24623 -echo "configure:64588: checking for Birdstep support" >&5
24624 -    if test "$PHP_BIRDSTEP" = "yes"; then
24625 -        ODBC_INCDIR=/usr/local/birdstep/include
24626 -        ODBC_LIBDIR=/usr/local/birdstep/lib
24627 -    else
24628 -        ODBC_INCDIR=$PHP_BIRDSTEP/include
24629 -        ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR
24630 +    if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
24631 +                                    PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
24632 +      if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
24633 +       { echo "configure: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" 1>&2; exit 1; }
24634 +      fi
24635      fi
24636 -
24637 -    case $host_alias in
24638 -      *aix*)
24639 -        cat >> confdefs.h <<\EOF
24640 -#define AIX 1
24641 -EOF
24642 -;;
24643 -      *hpux*)
24644 -        cat >> confdefs.h <<\EOF
24645 -#define HPUX 1
24646 -EOF
24647 -;;
24648 -      *linux*)
24649 -        cat >> confdefs.h <<\EOF
24650 -#define LINUX 1
24651 -EOF
24652 -;;
24653 -      *qnx*)
24654 -        cat >> confdefs.h <<\EOF
24655 -#define NEUTRINO 1
24656 -EOF
24657 -;;
24658 -      i?86-*-solaris*)
24659 -        cat >> confdefs.h <<\EOF
24660 -#define ISOLARIS 1
24661 -EOF
24662 -;;
24663 -      sparc-*-solaris*)
24664 -        cat >> confdefs.h <<\EOF
24665 -#define SOLARIS 1
24666 -EOF
24667 -;;
24668 -      *unixware*)
24669 -        cat >> confdefs.h <<\EOF
24670 -#define UNIXWARE 1
24671 -EOF
24672 -;;
24673 -    esac
24674 +    echo "$ac_t""$PHP_OCI8_INSTANT_CLIENT" 1>&6
24675
24676 -    ODBC_INCLUDE=-I$ODBC_INCDIR
24677 -    ODBC_TYPE=birdstep
24678 -    ODBC_LFLAGS=-L$ODBC_LIBDIR
24679 -    ODBC_LIBS="-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil"
24680 +    OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
24681
24682 -    if test -f "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then
24683 -      ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil"
24684 -    elif test -f "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then
24685 -      ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil"
24686 -    fi
24687 +    echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
24688 +echo "configure:65082: checking Oracle Instant Client SDK header directory" >&5
24689
24690 -    cat >> confdefs.h <<\EOF
24691 -#define HAVE_BIRDSTEP 1
24692 -EOF
24693 +        OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'`
24694
24695 -    echo "$ac_t""$ext_output" 1>&6
24696 -  fi
24697 -fi
24698 +        OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
24699
24700 -if test -z "$ODBC_TYPE"; then
24701 +        OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib/*$!\1/include!'`
24702
24703 -php_with_custom_odbc=no
24704 -
24705 -
24706 -# Check whether --with-custom-odbc or --without-custom-odbc was given.
24707 -if test "${with_custom_odbc+set}" = set; then
24708 -  withval="$with_custom_odbc"
24709 -  PHP_CUSTOM_ODBC=$withval
24710 -else
24711 -
24712 -  PHP_CUSTOM_ODBC=no
24713 -  test "$PHP_ENABLE_ALL" && PHP_CUSTOM_ODBC=$PHP_ENABLE_ALL
24714 -
24715 -fi
24716 -
24717 -
24718 -
24719 -ext_output="yes, shared"
24720 -ext_shared=yes
24721 -case $PHP_CUSTOM_ODBC in
24722 -shared,*)
24723 -  PHP_CUSTOM_ODBC=`echo "$PHP_CUSTOM_ODBC"|$SED 's/^shared,//'`
24724 -  ;;
24725 -shared)
24726 -  PHP_CUSTOM_ODBC=yes
24727 -  ;;
24728 -no)
24729 -  ext_output=no
24730 -  ext_shared=no
24731 -  ;;
24732 -*)
24733 -  ext_output=yes
24734 -  ext_shared=no
24735 -  ;;
24736 -esac
24737 -
24738 -
24739 -
24740 -
24741 -
24742 -
24743 -
24744 -
24745 -  if test "$PHP_CUSTOM_ODBC" != "no"; then
24746 -    echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
24747 -echo "configure:64700: checking for a custom ODBC support" >&5
24748 -    if test "$PHP_CUSTOM_ODBC" = "yes"; then
24749 -      PHP_CUSTOM_ODBC=/usr/local
24750 -    fi
24751 -    ODBC_INCDIR=$PHP_CUSTOM_ODBC/include
24752 -    ODBC_LIBDIR=$PHP_CUSTOM_ODBC/$PHP_LIBDIR
24753 -    ODBC_LFLAGS=-L$ODBC_LIBDIR
24754 -    ODBC_INCLUDE=-I$ODBC_INCDIR
24755 -    ODBC_LIBS=$CUSTOM_ODBC_LIBS
24756 -    ODBC_TYPE=custom-odbc
24757 -    cat >> confdefs.h <<\EOF
24758 -#define HAVE_CODBC 1
24759 -EOF
24760 -
24761 -    echo "$ac_t""$ext_ouput" 1>&6
24762 -  fi
24763 -fi
24764 -
24765 -if test -z "$ODBC_TYPE"; then
24766 -
24767 -php_with_iodbc=no
24768 -
24769 -
24770 -# Check whether --with-iodbc or --without-iodbc was given.
24771 -if test "${with_iodbc+set}" = set; then
24772 -  withval="$with_iodbc"
24773 -  PHP_IODBC=$withval
24774 -else
24775 -
24776 -  PHP_IODBC=no
24777 -  test "$PHP_ENABLE_ALL" && PHP_IODBC=$PHP_ENABLE_ALL
24778 -
24779 -fi
24780 -
24781 -
24782 -
24783 -ext_output="yes, shared"
24784 -ext_shared=yes
24785 -case $PHP_IODBC in
24786 -shared,*)
24787 -  PHP_IODBC=`echo "$PHP_IODBC"|$SED 's/^shared,//'`
24788 -  ;;
24789 -shared)
24790 -  PHP_IODBC=yes
24791 -  ;;
24792 -no)
24793 -  ext_output=no
24794 -  ext_shared=no
24795 -  ;;
24796 -*)
24797 -  ext_output=yes
24798 -  ext_shared=no
24799 -  ;;
24800 -esac
24801 -
24802 -
24803 -
24804 -
24805 -
24806 -
24807 -
24808 -
24809 -  if test "$PHP_IODBC" != "no"; then
24810 -    echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
24811 -echo "configure:64764: checking for iODBC support" >&5
24812 -    if test "$PHP_IODBC" = "yes"; then
24813 -      PHP_IODBC=/usr/local
24814 -    fi
24815 -
24816 -
24817 -  if test -n "$PHP_IODBC/$PHP_LIBDIR"; then
24818 -
24819 -  if test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/lib"; then
24820 -
24821 -  if test -z "$PHP_IODBC/$PHP_LIBDIR" || echo "$PHP_IODBC/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
24822 -    ai_p=$PHP_IODBC/$PHP_LIBDIR
24823 -  else
24824 -
24825 -    ep_dir="`echo $PHP_IODBC/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
24826 -
24827 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
24828 -    ai_p="$ep_realdir/`basename \"$PHP_IODBC/$PHP_LIBDIR\"`"
24829 -  fi
24830 -
24831 -
24832 +    if test -f "$OCISDKRPMINC/oci.h"; then
24833 +      echo "$ac_t""$OCISDKRPMINC" 1>&6
24834
24835 -
24836 -
24837 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
24838 -
24839 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
24840 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
24841 -    eval "LIBPATH$unique=set"
24842 -
24843 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
24844 -    LDFLAGS="$LDFLAGS -L$ai_p"
24845 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
24846 -
24847 -  fi
24848 -
24849 -
24850 -
24851 -  fi
24852 -
24853 -  fi
24854 -
24855 -
24856 -  case iodbc in
24857 -  c|c_r|pthread*) ;;
24858 -  *)
24859 -      LIBS="-liodbc $LIBS"
24860 -   ;;
24861 -  esac
24862 -
24863 -
24864 -
24865 -
24866 -
24867 -  if test "$PHP_IODBC/include" != "/usr/include"; then
24868 +  if test "$OCISDKRPMINC" != "/usr/include"; then
24869
24870 -  if test -z "$PHP_IODBC/include" || echo "$PHP_IODBC/include" | grep '^/' >/dev/null ; then
24871 -    ai_p=$PHP_IODBC/include
24872 +  if test -z "$OCISDKRPMINC" || echo "$OCISDKRPMINC" | grep '^/' >/dev/null ; then
24873 +    ai_p=$OCISDKRPMINC
24874    else
24875
24876 -    ep_dir="`echo $PHP_IODBC/include|$SED 's%/*[^/][^/]*/*$%%'`"
24877 +    ep_dir="`echo $OCISDKRPMINC|$SED 's%/*[^/][^/]*/*$%%'`"
24878
24879      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
24880 -    ai_p="$ep_realdir/`basename \"$PHP_IODBC/include\"`"
24881 +    ai_p="$ep_realdir/`basename \"$OCISDKRPMINC\"`"
24882    fi
24883
24884
24885 @@ -64834,7 +65109,7 @@ echo "configure:64764: checking for iODB
24886    if test -n "$unique" && test "`eval $cmd`" = "" ; then
24887      eval "INCLUDEPATH$unique=set"
24888
24889 -      if test "1"; then
24890 +      if test ""; then
24891          INCLUDES="-I$ai_p $INCLUDES"
24892        else
24893          INCLUDES="$INCLUDES -I$ai_p"
24894 @@ -64844,302 +65119,54 @@ echo "configure:64764: checking for iODB
24895
24896    fi
24897
24898 -    ODBC_TYPE=iodbc
24899 -    ODBC_INCLUDE=-I$PHP_IODBC/include
24900 -    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
24901 -    ODBC_LIBS=-liodbc
24902 -    cat >> confdefs.h <<\EOF
24903 -#define HAVE_IODBC 1
24904 -EOF
24905 -
24906 -    cat >> confdefs.h <<\EOF
24907 -#define HAVE_ODBC2 1
24908 -EOF
24909 -
24910 -    echo "$ac_t""$ext_output" 1>&6
24911 -  fi
24912 -fi
24913 -
24914 -if test -z "$ODBC_TYPE"; then
24915 -
24916 -php_with_esoob=no
24917 -
24918 -
24919 -# Check whether --with-esoob or --without-esoob was given.
24920 -if test "${with_esoob+set}" = set; then
24921 -  withval="$with_esoob"
24922 -  PHP_ESOOB=$withval
24923 -else
24924 -
24925 -  PHP_ESOOB=no
24926 -  test "$PHP_ENABLE_ALL" && PHP_ESOOB=$PHP_ENABLE_ALL
24927 -
24928 -fi
24929 -
24930 -
24931 -
24932 -ext_output="yes, shared"
24933 -ext_shared=yes
24934 -case $PHP_ESOOB in
24935 -shared,*)
24936 -  PHP_ESOOB=`echo "$PHP_ESOOB"|$SED 's/^shared,//'`
24937 -  ;;
24938 -shared)
24939 -  PHP_ESOOB=yes
24940 -  ;;
24941 -no)
24942 -  ext_output=no
24943 -  ext_shared=no
24944 -  ;;
24945 -*)
24946 -  ext_output=yes
24947 -  ext_shared=no
24948 -  ;;
24949 -esac
24950 -
24951 -
24952 -
24953 -
24954 -
24955 -
24956 -
24957 -
24958 -  if test "$PHP_ESOOB" != "no"; then
24959 -    echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
24960 -echo "configure:64910: checking for Easysoft ODBC-ODBC Bridge support" >&5
24961 -    if test "$PHP_ESOOB" = "yes"; then
24962 -      PHP_ESOOB=/usr/local/easysoft/oob/client
24963 -    fi
24964 -    ODBC_INCDIR=$PHP_ESOOB/include
24965 -    ODBC_LIBDIR=$PHP_ESOOB/$PHP_LIBDIR
24966 -    ODBC_LFLAGS=-L$ODBC_LIBDIR
24967 -    ODBC_INCLUDE=-I$ODBC_INCDIR
24968 -    ODBC_LIBS=-lesoobclient
24969 -    ODBC_TYPE=esoob
24970 -    cat >> confdefs.h <<\EOF
24971 -#define HAVE_ESOOB 1
24972 -EOF
24973 -
24974 -    echo "$ac_t""$ext_output" 1>&6
24975 -  fi
24976 -fi
24977 -
24978 -if test -z "$ODBC_TYPE"; then
24979 -
24980 -php_with_unixodbc=no
24981 -
24982 -
24983 -# Check whether --with-unixODBC or --without-unixODBC was given.
24984 -if test "${with_unixODBC+set}" = set; then
24985 -  withval="$with_unixODBC"
24986 -  PHP_UNIXODBC=$withval
24987 -else
24988 -
24989 -  PHP_UNIXODBC=no
24990 -  test "$PHP_ENABLE_ALL" && PHP_UNIXODBC=$PHP_ENABLE_ALL
24991 -
24992 -fi
24993 -
24994 -
24995 -
24996 -ext_output="yes, shared"
24997 -ext_shared=yes
24998 -case $PHP_UNIXODBC in
24999 -shared,*)
25000 -  PHP_UNIXODBC=`echo "$PHP_UNIXODBC"|$SED 's/^shared,//'`
25001 -  ;;
25002 -shared)
25003 -  PHP_UNIXODBC=yes
25004 -  ;;
25005 -no)
25006 -  ext_output=no
25007 -  ext_shared=no
25008 -  ;;
25009 -*)
25010 -  ext_output=yes
25011 -  ext_shared=no
25012 -  ;;
25013 -esac
25014 -
25015 -
25016 -
25017 -
25018 -
25019 -
25020 -
25021 -
25022 -  if test "$PHP_UNIXODBC" != "no"; then
25023 -    echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
25024 -echo "configure:64974: checking for unixODBC support" >&5
25025 -    if test "$PHP_UNIXODBC" = "yes"; then
25026 -      PHP_UNIXODBC=/usr/local
25027 -    fi
25028 -    ODBC_INCDIR=$PHP_UNIXODBC/include
25029 -    ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
25030 -    ODBC_LFLAGS=-L$ODBC_LIBDIR
25031 -    ODBC_INCLUDE=-I$ODBC_INCDIR
25032 -    ODBC_LIBS=-lodbc
25033 -    ODBC_TYPE=unixODBC
25034 -
25035 -if ! test -f "$ODBC_INCDIR/sqlext.h"; then
25036 -  { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
25037 -fi
25038 -
25039 -    cat >> confdefs.h <<\EOF
25040 -#define HAVE_UNIXODBC 1
25041 -EOF
25042 -
25043 -    echo "$ac_t""$ext_output" 1>&6
25044 -  fi
25045 -fi
25046 -
25047 -if test -z "$ODBC_TYPE"; then
25048 -
25049 -php_with_dbmaker=no
25050 -
25051 -
25052 -# Check whether --with-dbmaker or --without-dbmaker was given.
25053 -if test "${with_dbmaker+set}" = set; then
25054 -  withval="$with_dbmaker"
25055 -  PHP_DBMAKER=$withval
25056 -else
25057 -
25058 -  PHP_DBMAKER=no
25059 -  test "$PHP_ENABLE_ALL" && PHP_DBMAKER=$PHP_ENABLE_ALL
25060 -
25061 -fi
25062 -
25063 -
25064 -
25065 -ext_output="yes, shared"
25066 -ext_shared=yes
25067 -case $PHP_DBMAKER in
25068 -shared,*)
25069 -  PHP_DBMAKER=`echo "$PHP_DBMAKER"|$SED 's/^shared,//'`
25070 -  ;;
25071 -shared)
25072 -  PHP_DBMAKER=yes
25073 -  ;;
25074 -no)
25075 -  ext_output=no
25076 -  ext_shared=no
25077 -  ;;
25078 -*)
25079 -  ext_output=yes
25080 -  ext_shared=no
25081 -  ;;
25082 -esac
25083 -
25084 -
25085 -
25086 -
25087 -
25088 -
25089 -
25090 -
25091 -  if test "$PHP_DBMAKER" != "no"; then
25092 -    echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
25093 -echo "configure:65043: checking for DBMaker support" >&5
25094 -    if test "$PHP_DBMAKER" = "yes"; then
25095 -      # find dbmaker's home directory
25096 -      DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
25097 -
25098 -      # check DBMaker version (from 5.0 to 2.0)
25099 -      DBMAKER_VERSION=5.0
25100 -
25101 -      while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do
25102 -        DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | $AWK '{ print $1-1;}'`
25103 -        MAJOR_V=`echo $DM_VER | $AWK '{ print $1/10; }'  | $AWK -F. '{ print $1; }'`
25104 -        MINOR_V=`echo $DM_VER | $AWK '{ print $1%10; }'`
25105 -        DBMAKER_VERSION=$MAJOR_V.$MINOR_V
25106 -      done
25107 -
25108 -      if test "$DBMAKER_VERSION" = "2.9"; then
25109 -        PHP_DBMAKER=$DBMAKER_HOME
25110 -      else
25111 -        PHP_DBMAKER=$DBMAKER_HOME/$DBMAKER_VERSION
25112 -      fi
25113 -    fi
25114 -
25115 -    ODBC_INCDIR=$PHP_DBMAKER/include
25116 -    ODBC_LIBDIR=$PHP_DBMAKER/$PHP_LIBDIR
25117 -    ODBC_INCLUDE=-I$ODBC_INCDIR
25118 -    ODBC_LFLAGS=-L$ODBC_LIBDIR
25119 -    ODBC_INCLUDE=-I$ODBC_INCDIR
25120 -    ODBC_LIBS="-ldmapic -lc"
25121 -    ODBC_TYPE=dbmaker
25122 -
25123 -    cat >> confdefs.h <<\EOF
25124 -#define HAVE_DBMAKER 1
25125 -EOF
25126 -
25127 -
25128 -    if test "$ext_shared" = "yes"; then
25129 -      echo "$ac_t""yes (shared)" 1>&6
25130 -      ODBC_LIBS="-ldmapic -lc -lm"
25131 -      ODBC_SHARED="odbc.la"
25132 -    else
25133 -      echo "$ac_t""yes (static)" 1>&6
25134 +      OCI8INCDIR=$OCISDKRPMINC
25135 +    elif test -f "$OCISDKZIPINC/oci.h"; then
25136 +      echo "$ac_t""$OCISDKZIPINC" 1>&6
25137
25138 -
25139 -  if test -n "$ODBC_LIBDIR"; then
25140 -
25141 -  if test "$ODBC_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ODBC_LIBDIR" != "/usr/lib"; then
25142 +  if test "$OCISDKZIPINC" != "/usr/include"; then
25143
25144 -  if test -z "$ODBC_LIBDIR" || echo "$ODBC_LIBDIR" | grep '^/' >/dev/null ; then
25145 -    ai_p=$ODBC_LIBDIR
25146 +  if test -z "$OCISDKZIPINC" || echo "$OCISDKZIPINC" | grep '^/' >/dev/null ; then
25147 +    ai_p=$OCISDKZIPINC
25148    else
25149
25150 -    ep_dir="`echo $ODBC_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
25151 +    ep_dir="`echo $OCISDKZIPINC|$SED 's%/*[^/][^/]*/*$%%'`"
25152
25153      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25154 -    ai_p="$ep_realdir/`basename \"$ODBC_LIBDIR\"`"
25155 +    ai_p="$ep_realdir/`basename \"$OCISDKZIPINC\"`"
25156    fi
25157
25158
25159 -
25160 -
25161
25162    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
25163
25164 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
25165 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
25166    if test -n "$unique" && test "`eval $cmd`" = "" ; then
25167 -    eval "LIBPATH$unique=set"
25168 +    eval "INCLUDEPATH$unique=set"
25169
25170 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
25171 -    LDFLAGS="$LDFLAGS -L$ai_p"
25172 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
25173 -
25174 -  fi
25175 -
25176 -
25177 +      if test ""; then
25178 +        INCLUDES="-I$ai_p $INCLUDES"
25179 +      else
25180 +        INCLUDES="$INCLUDES -I$ai_p"
25181 +      fi
25182
25183    fi
25184
25185    fi
25186 -
25187 -
25188 -  case dmapic in
25189 -  c|c_r|pthread*) ;;
25190 -  *)
25191 -      LIBS="-ldmapic $LIBS"
25192 -   ;;
25193 -  esac
25194 -
25195 -
25196 -
25197
25198 +      OCI8INCDIR=$OCISDKZIPINC
25199 +    elif test -f "$OCISDKMANINC/oci.h"; then
25200 +      echo "$ac_t""$OCISDKMANINC" 1>&6
25201
25202 -  if test "$ODBC_INCDIR" != "/usr/include"; then
25203 +  if test "$OCISDKMANINC" != "/usr/include"; then
25204
25205 -  if test -z "$ODBC_INCDIR" || echo "$ODBC_INCDIR" | grep '^/' >/dev/null ; then
25206 -    ai_p=$ODBC_INCDIR
25207 +  if test -z "$OCISDKMANINC" || echo "$OCISDKMANINC" | grep '^/' >/dev/null ; then
25208 +    ai_p=$OCISDKMANINC
25209    else
25210
25211 -    ep_dir="`echo $ODBC_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
25212 +    ep_dir="`echo $OCISDKMANINC|$SED 's%/*[^/][^/]*/*$%%'`"
25213
25214      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25215 -    ai_p="$ep_realdir/`basename \"$ODBC_INCDIR\"`"
25216 +    ai_p="$ep_realdir/`basename \"$OCISDKMANINC\"`"
25217    fi
25218
25219
25220 @@ -65160,19 +65187,19 @@ EOF
25221
25222    fi
25223
25224 -      ODBC_STATIC="libphpext_odbc.la"
25225 +      OCI8INCDIR=$OCISDKMANINC
25226 +    else
25227 +      { echo "configure: error: Oracle Instant Client SDK header files not found" 1>&2; exit 1; }
25228      fi
25229 -  fi
25230 -fi
25231
25232 -if test -n "$ODBC_TYPE"; then
25233 -  if test "$ODBC_TYPE" != "dbmaker"; then
25234 -
25235 -  for ac_i in $ODBC_LFLAGS $ODBC_LIBS; do
25236 +    OCISYSLIBLIST=`echo "$OCI8INCDIR" | $PHP_OCI8_SED -e 's!\(.*\)/include$!\1/demo/sysliblist!'`
25237 +    if test -f "$OCISYSLIBLIST"; then
25238 +
25239 +  for ac_i in `cat $OCISYSLIBLIST`; do
25240      case $ac_i in
25241      -pthread)
25242        if test "$ext_shared" = "yes"; then
25243 -        ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -pthread"
25244 +        OCI8_SYSLIB="$OCI8_SYSLIB -pthread"
25245        else
25246
25247
25248 @@ -65194,7 +65221,7 @@ if test -n "$ODBC_TYPE"; then
25249    c|c_r|pthread*) ;;
25250    *)
25251      if test "$ext_shared" = "yes"; then
25252 -        ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii"
25253 +        OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii"
25254      else
25255
25256
25257 @@ -65229,8 +65256,8 @@ if test -n "$ODBC_TYPE"; then
25258
25259
25260        if test "$ext_shared" = "yes"; then
25261 -        ODBC_SHARED_LIBADD="-L$ai_p $ODBC_SHARED_LIBADD"
25262 -        test -n "$ld_runpath_switch" && ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $ODBC_SHARED_LIBADD"
25263 +        OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB"
25264 +        test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB"
25265        else
25266
25267
25268 @@ -65256,66 +65283,127 @@ if test -n "$ODBC_TYPE"; then
25269      esac
25270    done
25271
25272 -    if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then
25273 -      cat >> confdefs.h <<\EOF
25274 -#define HAVE_SQLDATASOURCES 1
25275 -EOF
25276 +    fi
25277
25278 +
25279 +  echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
25280 +echo "configure:65291: checking Oracle Instant Client version" >&5
25281 +  if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then
25282 +    if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
25283 +      if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
25284 +        { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.11.1 not found" 1>&2; exit 1; }
25285 +      fi
25286 +      OCI8_ORACLE_VERSION=11.1
25287 +    else
25288 +      { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; }
25289 +    fi
25290 +  elif test -f $PHP_OCI8_INSTANT_CLIENT/libnnz10.$SHLIB_SUFFIX_NAME; then
25291 +    if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
25292 +      if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
25293 +        { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found" 1>&2; exit 1; }
25294 +      fi
25295 +      OCI8_ORACLE_VERSION=10.1
25296 +    else
25297 +      { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; }
25298      fi
25299 +  else
25300 +    { echo "configure: error: Oracle Instant Client libraries not found" 1>&2; exit 1; }
25301    fi
25302 -
25303 -  cat >> confdefs.h <<\EOF
25304 -#define HAVE_UODBC 1
25305 -EOF
25306 +  echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6
25307
25308 +    case $OCI8_ORACLE_VERSION in
25309 +      10.1|11.1)
25310 +
25311
25312 -  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD"
25313 -
25314 +  case clntsh in
25315 +  c|c_r|pthread*) ;;
25316 +  *)
25317 +    if test "$ext_shared" = "yes"; then
25318 +        OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh"
25319 +    else
25320 +
25321
25322 -  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCDIR"
25323 +  case clntsh in
25324 +  c|c_r|pthread*) ;;
25325 +  *)
25326 +      LIBS="$LIBS -lclntsh"
25327 +   ;;
25328 +  esac
25329
25330 -
25331 -  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBDIR"
25332
25333 -
25334 -
25335 -  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCLUDE"
25336 +    fi
25337 +   ;;
25338 +  esac
25339
25340 -
25341
25342 -
25343 -
25344 -  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBS"
25345 +
25346 +  if test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/$PHP_LIBDIR" && test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/lib"; then
25347 +
25348 +  if test -z "$PHP_OCI8_INSTANT_CLIENT" || echo "$PHP_OCI8_INSTANT_CLIENT" | grep '^/' >/dev/null ; then
25349 +    ai_p=$PHP_OCI8_INSTANT_CLIENT
25350 +  else
25351 +
25352 +    ep_dir="`echo $PHP_OCI8_INSTANT_CLIENT|$SED 's%/*[^/][^/]*/*$%%'`"
25353 +
25354 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25355 +    ai_p="$ep_realdir/`basename \"$PHP_OCI8_INSTANT_CLIENT\"`"
25356 +  fi
25357
25358 +
25359 +      if test "$ext_shared" = "yes"; then
25360 +        OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD"
25361 +        test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_SHARED_LIBADD"
25362 +      else
25363 +
25364
25365 -
25366
25367 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
25368
25369 -  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LFLAGS"
25370 -
25371 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
25372 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
25373 +    eval "LIBPATH$unique=set"
25374 +
25375 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
25376 +    LDFLAGS="$LDFLAGS -L$ai_p"
25377 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
25378
25379 +  fi
25380
25381 -
25382 -
25383 -  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_TYPE"
25384
25385 -
25386 +      fi
25387 +
25388 +  fi
25389
25390 +       ;;
25391
25392 -
25393 -  ext_builddir=ext/odbc
25394 -  ext_srcdir=$abs_srcdir/ext/odbc
25395 +      *)
25396 +       { echo "configure: error: Oracle Instant Client version $PHP_OCI8_INSTANT_CLIENT is not supported" 1>&2; exit 1; }
25397 +       ;;
25398 +    esac
25399
25400 -  ac_extra=`echo "$ODBC_INCLUDE"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
25401 +    cat >> confdefs.h <<\EOF
25402 +#define HAVE_OCI_INSTANT_CLIENT 1
25403 +EOF
25404 +
25405 +    cat >> confdefs.h <<\EOF
25406 +#define HAVE_OCI_LOB_READ2 1
25407 +EOF
25408 +
25409 +
25410 +
25411 +  ext_builddir=ext/oci8
25412 +  ext_srcdir=$abs_srcdir/ext/oci8
25413 +
25414 +  ac_extra=
25415
25416    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
25417 -    PHP_ODBC_SHARED=no
25418 +    PHP_OCI8_SHARED=no
25419
25420
25421 -  case ext/odbc in
25422 +  case ext/oci8 in
25423    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
25424 -  /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25425 -  *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25426 +  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25427 +  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25428    esac
25429
25430
25431 @@ -65330,7 +65418,7 @@ EOF
25432
25433
25434    old_IFS=$IFS
25435 -  for ac_src in php_odbc.c; do
25436 +  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
25437
25438        IFS=.
25439        set $ac_src
25440 @@ -65353,18 +65441,18 @@ EOF
25441    done
25442
25443
25444 -    EXT_STATIC="$EXT_STATIC odbc"
25445 +    EXT_STATIC="$EXT_STATIC oci8"
25446      if test "$ext_shared" != "nocli"; then
25447 -      EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
25448 +      EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
25449      fi
25450    else
25451      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
25452 -      PHP_ODBC_SHARED=yes
25453 +      PHP_OCI8_SHARED=yes
25454
25455 -  case ext/odbc in
25456 +  case ext/oci8 in
25457    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
25458 -  /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25459 -  *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25460 +  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25461 +  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25462    esac
25463
25464
25465 @@ -65379,14 +65467,14 @@ EOF
25466
25467
25468    old_IFS=$IFS
25469 -  for ac_src in php_odbc.c; do
25470 +  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
25471
25472        IFS=.
25473        set $ac_src
25474        ac_obj=$1
25475        IFS=$old_IFS
25476
25477 -      shared_objects_odbc="$shared_objects_odbc $ac_bdir$ac_obj.lo"
25478 +      shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo"
25479
25480        case $ac_src in
25481          *.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" ;;
25482 @@ -65409,31 +65497,31 @@ EOF
25483    case $host_alias in
25484      *aix*)
25485        suffix=so
25486 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpodbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(PHPODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpodbc.so '$ext_builddir'/phpodbc.so'
25487 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpoci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpoci8.so '$ext_builddir'/phpoci8.so'
25488        ;;
25489      *netware*)
25490        suffix=nlm
25491 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPODBC, 3)_SHARED_LIBADD)'
25492 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)'
25493        ;;
25494      *)
25495        suffix=la
25496 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(PHPODBC_SHARED_LIBADD)'
25497 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(PHPOCI8_SHARED_LIBADD)'
25498        ;;
25499    esac
25500
25501    if test "x" = "xyes"; then
25502 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpodbc.$suffix"
25503 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpoci8.$suffix"
25504    else
25505 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpodbc.$suffix"
25506 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix"
25507    fi
25508
25509 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
25510 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
25511
25512    cat >>Makefile.objects<<EOF
25513 -\$(phplibdir)/phpodbc.$suffix: $ext_builddir/phpodbc.$suffix
25514 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpodbc.$suffix \$(phplibdir)
25515 +\$(phplibdir)/phpoci8.$suffix: $ext_builddir/phpoci8.$suffix
25516 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpoci8.$suffix \$(phplibdir)
25517
25518 -$ext_builddir/phpodbc.$suffix: \$(shared_objects_odbc) \$(PHPODBC_SHARED_DEPENDENCIES)
25519 +$ext_builddir/phpoci8.$suffix: \$(shared_objects_oci8) \$(PHPOCI8_SHARED_DEPENDENCIES)
25520         $link_cmd
25521
25522  EOF
25523 @@ -65446,31 +65534,31 @@ EOF
25524    case $host_alias in
25525      *aix*)
25526        suffix=so
25527 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/odbc.so '$ext_builddir'/odbc.so'
25528 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/oci8.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/oci8.so '$ext_builddir'/oci8.so'
25529        ;;
25530      *netware*)
25531        suffix=nlm
25532 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ODBC, 3)_SHARED_LIBADD)'
25533 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)'
25534        ;;
25535      *)
25536        suffix=la
25537 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD)'
25538 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) $(OCI8_SHARED_LIBADD)'
25539        ;;
25540    esac
25541
25542    if test "x" = "xyes"; then
25543 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/odbc.$suffix"
25544 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/oci8.$suffix"
25545    else
25546 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/odbc.$suffix"
25547 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix"
25548    fi
25549
25550 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
25551 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8"
25552
25553    cat >>Makefile.objects<<EOF
25554 -\$(phplibdir)/odbc.$suffix: $ext_builddir/odbc.$suffix
25555 -       \$(LIBTOOL) --mode=install cp $ext_builddir/odbc.$suffix \$(phplibdir)
25556 +\$(phplibdir)/oci8.$suffix: $ext_builddir/oci8.$suffix
25557 +       \$(LIBTOOL) --mode=install cp $ext_builddir/oci8.$suffix \$(phplibdir)
25558
25559 -$ext_builddir/odbc.$suffix: \$(shared_objects_odbc) \$(ODBC_SHARED_DEPENDENCIES)
25560 +$ext_builddir/oci8.$suffix: \$(shared_objects_oci8) \$(OCI8_SHARED_DEPENDENCIES)
25561         $link_cmd
25562
25563  EOF
25564 @@ -65478,22 +65566,22 @@ EOF
25565            ;;
25566        esac
25567        cat >> confdefs.h <<EOF
25568 -#define COMPILE_DL_ODBC 1
25569 +#define COMPILE_DL_OCI8 1
25570  EOF
25571
25572      fi
25573    fi
25574
25575    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
25576 -    PHP_ODBC_SHARED=no
25577 +    PHP_OCI8_SHARED=no
25578      case "$PHP_SAPI" in
25579        cgi|embed)
25580
25581
25582 -  case ext/odbc in
25583 +  case ext/oci8 in
25584    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
25585 -  /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25586 -  *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25587 +  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25588 +  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25589    esac
25590
25591
25592 @@ -65508,7 +65596,7 @@ EOF
25593
25594
25595    old_IFS=$IFS
25596 -  for ac_src in php_odbc.c; do
25597 +  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
25598
25599        IFS=.
25600        set $ac_src
25601 @@ -65531,15 +65619,15 @@ EOF
25602    done
25603
25604
25605 -        EXT_STATIC="$EXT_STATIC odbc"
25606 +        EXT_STATIC="$EXT_STATIC oci8"
25607          ;;
25608        *)
25609
25610
25611 -  case ext/odbc in
25612 +  case ext/oci8 in
25613    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
25614 -  /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25615 -  *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25616 +  /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25617 +  *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25618    esac
25619
25620
25621 @@ -65554,7 +65642,7 @@ EOF
25622
25623
25624    old_IFS=$IFS
25625 -  for ac_src in php_odbc.c; do
25626 +  for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do
25627
25628        IFS=.
25629        set $ac_src
25630 @@ -65579,7 +65667,7 @@ EOF
25631
25632          ;;
25633      esac
25634 -    EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
25635 +    EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
25636    fi
25637
25638
25639 @@ -65588,28 +65676,63 @@ EOF
25640
25641
25642    if test "$ext_builddir" = "."; then
25643 -    PHP_PECL_EXTENSION=odbc
25644 +    PHP_PECL_EXTENSION=oci8
25645
25646    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
25647
25648    fi
25649
25650 +    cat >> confdefs.h <<\EOF
25651 +#define HAVE_OCI8 1
25652 +EOF
25653 +
25654 +
25655 +
25656 +
25657 +  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD"
25658 +
25659 +
25660 +
25661 +
25662 +
25663 +  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR"
25664 +
25665 +
25666 +
25667 +
25668 +
25669 +  PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION"
25670 +
25671 +
25672 +
25673 +
25674 +  fi
25675  fi
25676
25677
25678
25679 -php_enable_pcntl=no
25680
25681 -echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
25682 -echo "configure:65605: checking whether to enable pcntl support" >&5
25683 -# Check whether --enable-pcntl or --disable-pcntl was given.
25684 -if test "${enable_pcntl+set}" = set; then
25685 -  enableval="$enable_pcntl"
25686 -  PHP_PCNTL=$enableval
25687 +
25688 +
25689 +
25690 +
25691 +
25692 +
25693 +
25694 +
25695 +if test -z "$ODBC_TYPE"; then
25696 +
25697 +php_with_adabas=no
25698 +
25699 +
25700 +# Check whether --with-adabas or --without-adabas was given.
25701 +if test "${with_adabas+set}" = set; then
25702 +  withval="$with_adabas"
25703 +  PHP_ADABAS=$withval
25704  else
25705
25706 -  PHP_PCNTL=no
25707 -  test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL
25708 +  PHP_ADABAS=no
25709 +  test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL
25710
25711  fi
25712
25713 @@ -65617,12 +65740,12 @@ fi
25714
25715  ext_output="yes, shared"
25716  ext_shared=yes
25717 -case $PHP_PCNTL in
25718 +case $PHP_ADABAS in
25719  shared,*)
25720 -  PHP_PCNTL=`echo "$PHP_PCNTL"|$SED 's/^shared,//'`
25721 +  PHP_ADABAS=`echo "$PHP_ADABAS"|$SED 's/^shared,//'`
25722    ;;
25723  shared)
25724 -  PHP_PCNTL=yes
25725 +  PHP_ADABAS=yes
25726    ;;
25727  no)
25728    ext_output=no
25729 @@ -65636,554 +65759,316 @@ esac
25730
25731
25732
25733 -echo "$ac_t""$ext_output" 1>&6
25734
25735
25736
25737
25738 -if test "$PHP_PCNTL" != "no"; then
25739 -  for ac_func in fork
25740 -do
25741 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
25742 -echo "configure:65649: checking for $ac_func" >&5
25743 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
25744 -  echo $ac_n "(cached) $ac_c" 1>&6
25745 -else
25746 -  cat > conftest.$ac_ext <<EOF
25747 -#line 65654 "configure"
25748 -#include "confdefs.h"
25749 -/* System header to define __stub macros and hopefully few prototypes,
25750 -    which can conflict with char $ac_func(); below.  */
25751 -#include <assert.h>
25752 -/* Override any gcc2 internal prototype to avoid an error.  */
25753 -/* We use char because int might match the return type of a gcc2
25754 -    builtin and then its argument prototype would still apply.  */
25755 -char $ac_func();
25756
25757 -int main() {
25758 +  if test "$PHP_ADABAS" != "no"; then
25759 +    echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
25760 +echo "configure:65770: checking for Adabas support" >&5
25761 +    if test "$PHP_ADABAS" = "yes"; then
25762 +      PHP_ADABAS=/usr/local
25763 +    fi
25764 +
25765 +  if test "$PHP_ADABAS/incl" != "/usr/include"; then
25766 +
25767 +  if test -z "$PHP_ADABAS/incl" || echo "$PHP_ADABAS/incl" | grep '^/' >/dev/null ; then
25768 +    ai_p=$PHP_ADABAS/incl
25769 +  else
25770 +
25771 +    ep_dir="`echo $PHP_ADABAS/incl|$SED 's%/*[^/][^/]*/*$%%'`"
25772 +
25773 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25774 +    ai_p="$ep_realdir/`basename \"$PHP_ADABAS/incl\"`"
25775 +  fi
25776
25777 -/* The GNU C library defines this for functions which it implements
25778 -    to always fail with ENOSYS.  Some functions are actually named
25779 -    something starting with __ and the normal name is an alias.  */
25780 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
25781 -choke me
25782 -#else
25783 -$ac_func();
25784 -#endif
25785 +
25786 +
25787 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
25788 +
25789 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
25790 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
25791 +    eval "INCLUDEPATH$unique=set"
25792 +
25793 +      if test ""; then
25794 +        INCLUDES="-I$ai_p $INCLUDES"
25795 +      else
25796 +        INCLUDES="$INCLUDES -I$ai_p"
25797 +      fi
25798 +
25799 +  fi
25800
25801 -; return 0; }
25802 -EOF
25803 -if { (eval echo configure:65677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
25804 -  rm -rf conftest*
25805 -  eval "ac_cv_func_$ac_func=yes"
25806 -else
25807 -  echo "configure: failed program was:" >&5
25808 -  cat conftest.$ac_ext >&5
25809 -  rm -rf conftest*
25810 -  eval "ac_cv_func_$ac_func=no"
25811 -fi
25812 -rm -f conftest*
25813 -fi
25814 +  fi
25815
25816 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
25817 -  echo "$ac_t""yes" 1>&6
25818 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
25819 -  cat >> confdefs.h <<EOF
25820 -#define $ac_tr_func 1
25821 -EOF
25822 -  cat >> confdefs.h <<\EOF
25823 -#define HAVE_FORK 1
25824 -EOF
25825 -
25826 -else
25827 -  echo "$ac_t""no" 1>&6
25828 -{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; }
25829 -fi
25830 -done
25831 +
25832 +  if test "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/lib"; then
25833 +
25834 +  if test -z "$PHP_ADABAS/$PHP_LIBDIR" || echo "$PHP_ADABAS/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
25835 +    ai_p=$PHP_ADABAS/$PHP_LIBDIR
25836 +  else
25837 +
25838 +    ep_dir="`echo $PHP_ADABAS/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
25839 +
25840 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25841 +    ai_p="$ep_realdir/`basename \"$PHP_ADABAS/$PHP_LIBDIR\"`"
25842 +  fi
25843
25844 -  for ac_func in waitpid
25845 -do
25846 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
25847 -echo "configure:65708: checking for $ac_func" >&5
25848 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
25849 -  echo $ac_n "(cached) $ac_c" 1>&6
25850 -else
25851 -  cat > conftest.$ac_ext <<EOF
25852 -#line 65713 "configure"
25853 -#include "confdefs.h"
25854 -/* System header to define __stub macros and hopefully few prototypes,
25855 -    which can conflict with char $ac_func(); below.  */
25856 -#include <assert.h>
25857 -/* Override any gcc2 internal prototype to avoid an error.  */
25858 -/* We use char because int might match the return type of a gcc2
25859 -    builtin and then its argument prototype would still apply.  */
25860 -char $ac_func();
25861 +
25862 +
25863 +
25864 +
25865 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
25866 +
25867 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
25868 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
25869 +    eval "LIBPATH$unique=set"
25870 +
25871 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
25872 +    LDFLAGS="$LDFLAGS -L$ai_p"
25873 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
25874 +
25875 +  fi
25876
25877 -int main() {
25878
25879 -/* The GNU C library defines this for functions which it implements
25880 -    to always fail with ENOSYS.  Some functions are actually named
25881 -    something starting with __ and the normal name is an alias.  */
25882 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
25883 -choke me
25884 -#else
25885 -$ac_func();
25886 -#endif
25887 +
25888 +  fi
25889
25890 -; return 0; }
25891 -EOF
25892 -if { (eval echo configure:65736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
25893 -  rm -rf conftest*
25894 -  eval "ac_cv_func_$ac_func=yes"
25895 -else
25896 -  echo "configure: failed program was:" >&5
25897 -  cat conftest.$ac_ext >&5
25898 -  rm -rf conftest*
25899 -  eval "ac_cv_func_$ac_func=no"
25900 -fi
25901 -rm -f conftest*
25902 -fi
25903 +    ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a"
25904 +    ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
25905 +    $srcdir/build/shtool mkdir -f -p ext/odbc
25906 +    rm -f "$ODBC_LIB"
25907 +    cp "$ODBC_OBJS" "$ODBC_LIB"
25908 +
25909 +
25910 +  case sqlptc in
25911 +  c|c_r|pthread*) ;;
25912 +  *)
25913 +      LIBS="-lsqlptc $LIBS"
25914 +   ;;
25915 +  esac
25916
25917 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
25918 -  echo "$ac_t""yes" 1>&6
25919 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
25920 -  cat >> confdefs.h <<EOF
25921 -#define $ac_tr_func 1
25922 -EOF
25923 -  cat >> confdefs.h <<\EOF
25924 -#define HAVE_WAITPID 1
25925 -EOF
25926 -
25927 -else
25928 -  echo "$ac_t""no" 1>&6
25929 -{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; }
25930 -fi
25931 -done
25932
25933 -  for ac_func in sigaction
25934 -do
25935 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
25936 -echo "configure:65767: checking for $ac_func" >&5
25937 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
25938 -  echo $ac_n "(cached) $ac_c" 1>&6
25939 -else
25940 -  cat > conftest.$ac_ext <<EOF
25941 -#line 65772 "configure"
25942 -#include "confdefs.h"
25943 -/* System header to define __stub macros and hopefully few prototypes,
25944 -    which can conflict with char $ac_func(); below.  */
25945 -#include <assert.h>
25946 -/* Override any gcc2 internal prototype to avoid an error.  */
25947 -/* We use char because int might match the return type of a gcc2
25948 -    builtin and then its argument prototype would still apply.  */
25949 -char $ac_func();
25950 +
25951 +
25952 +  case sqlrte in
25953 +  c|c_r|pthread*) ;;
25954 +  *)
25955 +      LIBS="-lsqlrte $LIBS"
25956 +   ;;
25957 +  esac
25958
25959 -int main() {
25960
25961 -/* The GNU C library defines this for functions which it implements
25962 -    to always fail with ENOSYS.  Some functions are actually named
25963 -    something starting with __ and the normal name is an alias.  */
25964 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
25965 -choke me
25966 -#else
25967 -$ac_func();
25968 -#endif
25969 +
25970
25971 -; return 0; }
25972 -EOF
25973 -if { (eval echo configure:65795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
25974 -  rm -rf conftest*
25975 -  eval "ac_cv_func_$ac_func=yes"
25976 -else
25977 -  echo "configure: failed program was:" >&5
25978 -  cat conftest.$ac_ext >&5
25979 -  rm -rf conftest*
25980 -  eval "ac_cv_func_$ac_func=no"
25981 -fi
25982 -rm -f conftest*
25983 -fi
25984 +  if test -n "$abs_builddir/ext/odbc"; then
25985 +
25986 +  if test "$abs_builddir/ext/odbc" != "/usr/$PHP_LIBDIR" && test "$abs_builddir/ext/odbc" != "/usr/lib"; then
25987 +
25988 +  if test -z "$abs_builddir/ext/odbc" || echo "$abs_builddir/ext/odbc" | grep '^/' >/dev/null ; then
25989 +    ai_p=$abs_builddir/ext/odbc
25990 +  else
25991 +
25992 +    ep_dir="`echo $abs_builddir/ext/odbc|$SED 's%/*[^/][^/]*/*$%%'`"
25993 +
25994 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25995 +    ai_p="$ep_realdir/`basename \"$abs_builddir/ext/odbc\"`"
25996 +  fi
25997
25998 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
25999 -  echo "$ac_t""yes" 1>&6
26000 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
26001 -  cat >> confdefs.h <<EOF
26002 -#define $ac_tr_func 1
26003 -EOF
26004 -  cat >> confdefs.h <<\EOF
26005 -#define HAVE_SIGACTION 1
26006 -EOF
26007 -
26008 -else
26009 -  echo "$ac_t""no" 1>&6
26010 -{ echo "configure: error: pcntl: sigaction() not supported by this platform" 1>&2; exit 1; }
26011 -fi
26012 -done
26013 +
26014 +
26015 +
26016 +
26017 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
26018 +
26019 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
26020 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
26021 +    eval "LIBPATH$unique=set"
26022 +
26023 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
26024 +    LDFLAGS="$LDFLAGS -L$ai_p"
26025 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
26026 +
26027 +  fi
26028
26029 -  for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
26030 -do
26031 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
26032 -echo "configure:65826: checking for $ac_func" >&5
26033 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
26034 -  echo $ac_n "(cached) $ac_c" 1>&6
26035 -else
26036 -  cat > conftest.$ac_ext <<EOF
26037 -#line 65831 "configure"
26038 -#include "confdefs.h"
26039 -/* System header to define __stub macros and hopefully few prototypes,
26040 -    which can conflict with char $ac_func(); below.  */
26041 -#include <assert.h>
26042 -/* Override any gcc2 internal prototype to avoid an error.  */
26043 -/* We use char because int might match the return type of a gcc2
26044 -    builtin and then its argument prototype would still apply.  */
26045 -char $ac_func();
26046 -
26047 -int main() {
26048 -
26049 -/* The GNU C library defines this for functions which it implements
26050 -    to always fail with ENOSYS.  Some functions are actually named
26051 -    something starting with __ and the normal name is an alias.  */
26052 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
26053 -choke me
26054 -#else
26055 -$ac_func();
26056 -#endif
26057 -
26058 -; return 0; }
26059 -EOF
26060 -if { (eval echo configure:65854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26061 -  rm -rf conftest*
26062 -  eval "ac_cv_func_$ac_func=yes"
26063 -else
26064 -  echo "configure: failed program was:" >&5
26065 -  cat conftest.$ac_ext >&5
26066 -  rm -rf conftest*
26067 -  eval "ac_cv_func_$ac_func=no"
26068 -fi
26069 -rm -f conftest*
26070 -fi
26071
26072 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
26073 -  echo "$ac_t""yes" 1>&6
26074 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
26075 -  cat >> confdefs.h <<EOF
26076 -#define $ac_tr_func 1
26077 -EOF
26078 -
26079 -else
26080 -  echo "$ac_t""no" 1>&6
26081 -fi
26082 -done
26083 +
26084 +  fi
26085
26086 +  fi
26087
26088 -  ext_builddir=ext/pcntl
26089 -  ext_srcdir=$abs_srcdir/ext/pcntl
26090 -
26091 -  ac_extra=
26092 -
26093 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then
26094 -    PHP_PCNTL_SHARED=no
26095 -
26096
26097 -  case ext/pcntl in
26098 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
26099 -  /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
26100 -  *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
26101 +  case odbc_adabas in
26102 +  c|c_r|pthread*) ;;
26103 +  *)
26104 +      LIBS="-lodbc_adabas $LIBS"
26105 +   ;;
26106    esac
26107 -
26108 -
26109
26110 -  b_c_pre=$php_c_pre
26111 -  b_cxx_pre=$php_cxx_pre
26112 -  b_c_meta=$php_c_meta
26113 -  b_cxx_meta=$php_cxx_meta
26114 -  b_c_post=$php_c_post
26115 -  b_cxx_post=$php_cxx_post
26116 -  b_lo=$php_lo
26117
26118
26119 -  old_IFS=$IFS
26120 -  for ac_src in pcntl.c php_signal.c; do
26121 -
26122 -      IFS=.
26123 -      set $ac_src
26124 -      ac_obj=$1
26125 -      IFS=$old_IFS
26126 -
26127 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
26128
26129 -      case $ac_src in
26130 -        *.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" ;;
26131 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26132 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26133 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
26134 -      esac
26135 +    ODBC_TYPE=adabas
26136 +    ODBC_INCDIR=$PHP_ADABAS/incl
26137 +
26138 +if ! test -f "$ODBC_INCDIR/sqlext.h"; then
26139 +  { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
26140 +fi
26141
26142 -    cat >>Makefile.objects<<EOF
26143 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
26144 -       $ac_comp
26145 +    cat >> confdefs.h <<\EOF
26146 +#define HAVE_ADABAS 1
26147  EOF
26148 -  done
26149
26150 +    echo "$ac_t""$ext_output" 1>&6
26151 +  fi
26152 +fi
26153
26154 -    EXT_STATIC="$EXT_STATIC pcntl"
26155 -    if test "$ext_shared" != "nocli"; then
26156 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
26157 -    fi
26158 -  else
26159 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
26160 -      PHP_PCNTL_SHARED=yes
26161 -
26162 -  case ext/pcntl in
26163 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
26164 -  /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
26165 -  *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
26166 -  esac
26167 -
26168 -
26169 +if test -z "$ODBC_TYPE"; then
26170
26171 -  b_c_pre=$shared_c_pre
26172 -  b_cxx_pre=$shared_cxx_pre
26173 -  b_c_meta=$shared_c_meta
26174 -  b_cxx_meta=$shared_cxx_meta
26175 -  b_c_post=$shared_c_post
26176 -  b_cxx_post=$shared_cxx_post
26177 -  b_lo=$shared_lo
26178 +php_with_sapdb=no
26179
26180
26181 -  old_IFS=$IFS
26182 -  for ac_src in pcntl.c php_signal.c; do
26183 +# Check whether --with-sapdb or --without-sapdb was given.
26184 +if test "${with_sapdb+set}" = set; then
26185 +  withval="$with_sapdb"
26186 +  PHP_SAPDB=$withval
26187 +else
26188
26189 -      IFS=.
26190 -      set $ac_src
26191 -      ac_obj=$1
26192 -      IFS=$old_IFS
26193 -
26194 -      shared_objects_pcntl="$shared_objects_pcntl $ac_bdir$ac_obj.lo"
26195 -
26196 -      case $ac_src in
26197 -        *.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" ;;
26198 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26199 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26200 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
26201 -      esac
26202 -
26203 -    cat >>Makefile.objects<<EOF
26204 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
26205 -       $ac_comp
26206 -EOF
26207 -  done
26208 -
26209 -      case $host_alias in
26210 -        *netware*)
26211 -
26212 -  install_modules="install-modules"
26213 -
26214 -  case $host_alias in
26215 -    *aix*)
26216 -      suffix=so
26217 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppcntl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PHPPCNTL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppcntl.so '$ext_builddir'/phppcntl.so'
26218 -      ;;
26219 -    *netware*)
26220 -      suffix=nlm
26221 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCNTL, 3)_SHARED_LIBADD)'
26222 -      ;;
26223 -    *)
26224 -      suffix=la
26225 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PHPPCNTL_SHARED_LIBADD)'
26226 -      ;;
26227 -  esac
26228 +  PHP_SAPDB=no
26229 +  test "$PHP_ENABLE_ALL" && PHP_SAPDB=$PHP_ENABLE_ALL
26230
26231 -  if test "x" = "xyes"; then
26232 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppcntl.$suffix"
26233 -  else
26234 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcntl.$suffix"
26235 -  fi
26236 -
26237 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
26238 +fi
26239
26240 -  cat >>Makefile.objects<<EOF
26241 -\$(phplibdir)/phppcntl.$suffix: $ext_builddir/phppcntl.$suffix
26242 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppcntl.$suffix \$(phplibdir)
26243
26244 -$ext_builddir/phppcntl.$suffix: \$(shared_objects_pcntl) \$(PHPPCNTL_SHARED_DEPENDENCIES)
26245 -       $link_cmd
26246
26247 -EOF
26248 +ext_output="yes, shared"
26249 +ext_shared=yes
26250 +case $PHP_SAPDB in
26251 +shared,*)
26252 +  PHP_SAPDB=`echo "$PHP_SAPDB"|$SED 's/^shared,//'`
26253 +  ;;
26254 +shared)
26255 +  PHP_SAPDB=yes
26256 +  ;;
26257 +no)
26258 +  ext_output=no
26259 +  ext_shared=no
26260 +  ;;
26261 +*)
26262 +  ext_output=yes
26263 +  ext_shared=no
26264 +  ;;
26265 +esac
26266
26267 -          ;;
26268 -        *)
26269 -
26270 -  install_modules="install-modules"
26271
26272 -  case $host_alias in
26273 -    *aix*)
26274 -      suffix=so
26275 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pcntl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PCNTL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pcntl.so '$ext_builddir'/pcntl.so'
26276 -      ;;
26277 -    *netware*)
26278 -      suffix=nlm
26279 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCNTL, 3)_SHARED_LIBADD)'
26280 -      ;;
26281 -    *)
26282 -      suffix=la
26283 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PCNTL_SHARED_LIBADD)'
26284 -      ;;
26285 -  esac
26286
26287 -  if test "x" = "xyes"; then
26288 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pcntl.$suffix"
26289 -  else
26290 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcntl.$suffix"
26291 -  fi
26292 -
26293 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
26294
26295 -  cat >>Makefile.objects<<EOF
26296 -\$(phplibdir)/pcntl.$suffix: $ext_builddir/pcntl.$suffix
26297 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pcntl.$suffix \$(phplibdir)
26298
26299 -$ext_builddir/pcntl.$suffix: \$(shared_objects_pcntl) \$(PCNTL_SHARED_DEPENDENCIES)
26300 -       $link_cmd
26301
26302 -EOF
26303
26304 -          ;;
26305 -      esac
26306 -      cat >> confdefs.h <<EOF
26307 -#define COMPILE_DL_PCNTL 1
26308 -EOF
26309
26310 +  if test "$PHP_SAPDB" != "no"; then
26311 +    echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
26312 +echo "configure:65973: checking for SAP DB support" >&5
26313 +    if test "$PHP_SAPDB" = "yes"; then
26314 +      PHP_SAPDB=/usr/local
26315      fi
26316 +
26317 +  if test "$PHP_SAPDB/incl" != "/usr/include"; then
26318 +
26319 +  if test -z "$PHP_SAPDB/incl" || echo "$PHP_SAPDB/incl" | grep '^/' >/dev/null ; then
26320 +    ai_p=$PHP_SAPDB/incl
26321 +  else
26322 +
26323 +    ep_dir="`echo $PHP_SAPDB/incl|$SED 's%/*[^/][^/]*/*$%%'`"
26324 +
26325 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26326 +    ai_p="$ep_realdir/`basename \"$PHP_SAPDB/incl\"`"
26327    fi
26328
26329 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
26330 -    PHP_PCNTL_SHARED=no
26331 -    case "$PHP_SAPI" in
26332 -      cgi|embed)
26333 -
26334 -
26335 -  case ext/pcntl in
26336 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
26337 -  /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
26338 -  *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
26339 -  esac
26340 +
26341
26342 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
26343
26344 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
26345 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
26346 +    eval "INCLUDEPATH$unique=set"
26347 +
26348 +      if test ""; then
26349 +        INCLUDES="-I$ai_p $INCLUDES"
26350 +      else
26351 +        INCLUDES="$INCLUDES -I$ai_p"
26352 +      fi
26353 +
26354 +  fi
26355
26356 -  b_c_pre=$php_c_pre
26357 -  b_cxx_pre=$php_cxx_pre
26358 -  b_c_meta=$php_c_meta
26359 -  b_cxx_meta=$php_cxx_meta
26360 -  b_c_post=$php_c_post
26361 -  b_cxx_post=$php_cxx_post
26362 -  b_lo=$php_lo
26363 +  fi
26364
26365 +
26366 +  if test "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/lib"; then
26367 +
26368 +  if test -z "$PHP_SAPDB/$PHP_LIBDIR" || echo "$PHP_SAPDB/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
26369 +    ai_p=$PHP_SAPDB/$PHP_LIBDIR
26370 +  else
26371 +
26372 +    ep_dir="`echo $PHP_SAPDB/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
26373 +
26374 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26375 +    ai_p="$ep_realdir/`basename \"$PHP_SAPDB/$PHP_LIBDIR\"`"
26376 +  fi
26377
26378 -  old_IFS=$IFS
26379 -  for ac_src in pcntl.c php_signal.c; do
26380 -
26381 -      IFS=.
26382 -      set $ac_src
26383 -      ac_obj=$1
26384 -      IFS=$old_IFS
26385 +
26386
26387 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
26388 -
26389 -      case $ac_src in
26390 -        *.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" ;;
26391 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26392 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26393 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
26394 -      esac
26395 -
26396 -    cat >>Makefile.objects<<EOF
26397 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
26398 -       $ac_comp
26399 -EOF
26400 -  done
26401 -
26402 -
26403 -        EXT_STATIC="$EXT_STATIC pcntl"
26404 -        ;;
26405 -      *)
26406 -
26407
26408 -  case ext/pcntl in
26409 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
26410 -  /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
26411 -  *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
26412 -  esac
26413
26414 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
26415
26416 -
26417 -  b_c_pre=$php_c_pre
26418 -  b_cxx_pre=$php_cxx_pre
26419 -  b_c_meta=$php_c_meta
26420 -  b_cxx_meta=$php_cxx_meta
26421 -  b_c_post=$php_c_post
26422 -  b_cxx_post=$php_cxx_post
26423 -  b_lo=$php_lo
26424 -
26425 -
26426 -  old_IFS=$IFS
26427 -  for ac_src in pcntl.c php_signal.c; do
26428 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
26429 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
26430 +    eval "LIBPATH$unique=set"
26431 +
26432 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
26433 +    LDFLAGS="$LDFLAGS -L$ai_p"
26434 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
26435
26436 -      IFS=.
26437 -      set $ac_src
26438 -      ac_obj=$1
26439 -      IFS=$old_IFS
26440 -
26441 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
26442 -
26443 -      case $ac_src in
26444 -        *.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" ;;
26445 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26446 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26447 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
26448 -      esac
26449 -
26450 -    cat >>Makefile.objects<<EOF
26451 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
26452 -       $ac_comp
26453 -EOF
26454 -  done
26455 +  fi
26456
26457
26458 -        ;;
26459 -    esac
26460 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
26461 +
26462    fi
26463 +
26464 +
26465
26466 -
26467 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
26468 -
26469 +  case sqlod in
26470 +  c|c_r|pthread*) ;;
26471 +  *)
26472 +      LIBS="-lsqlod $LIBS"
26473 +   ;;
26474 +  esac
26475
26476
26477 -  if test "$ext_builddir" = "."; then
26478 -    PHP_PECL_EXTENSION=pcntl
26479 -
26480 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
26481 +    ODBC_TYPE=sapdb
26482 +    cat >> confdefs.h <<\EOF
26483 +#define HAVE_SAPDB 1
26484 +EOF
26485
26486 +    echo "$ac_t""$ext_output" 1>&6
26487    fi
26488 -
26489  fi
26490
26491 +if test -z "$ODBC_TYPE"; then
26492
26493 +php_with_solid=no
26494
26495
26496 -
26497 -php_enable_pdo=yes
26498 -
26499 -echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
26500 -echo "configure:66179: checking whether to enable PDO support" >&5
26501 -# Check whether --enable-pdo or --disable-pdo was given.
26502 -if test "${enable_pdo+set}" = set; then
26503 -  enableval="$enable_pdo"
26504 -  PHP_PDO=$enableval
26505 +# Check whether --with-solid or --without-solid was given.
26506 +if test "${with_solid+set}" = set; then
26507 +  withval="$with_solid"
26508 +  PHP_SOLID=$withval
26509  else
26510
26511 -  PHP_PDO=yes
26512 -  test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL
26513 +  PHP_SOLID=no
26514 +  test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL
26515
26516  fi
26517
26518 @@ -66191,12 +66076,12 @@ fi
26519
26520  ext_output="yes, shared"
26521  ext_shared=yes
26522 -case $PHP_PDO in
26523 +case $PHP_SOLID in
26524  shared,*)
26525 -  PHP_PDO=`echo "$PHP_PDO"|$SED 's/^shared,//'`
26526 +  PHP_SOLID=`echo "$PHP_SOLID"|$SED 's/^shared,//'`
26527    ;;
26528  shared)
26529 -  PHP_PDO=yes
26530 +  PHP_SOLID=yes
26531    ;;
26532  no)
26533    ext_output=no
26534 @@ -66210,414 +66095,315 @@ esac
26535
26536
26537
26538 -echo "$ac_t""$ext_output" 1>&6
26539
26540
26541
26542
26543 -if test "$PHP_PDO" != "no"; then
26544
26545 -    PHP_PDO=yes
26546 +  if test "$PHP_SOLID" != "no"; then
26547 +    echo $ac_n "checking for Solid support""... $ac_c" 1>&6
26548 +echo "configure:66106: checking for Solid support" >&5
26549 +    if test "$PHP_SOLID" = "yes"; then
26550 +      PHP_SOLID=/usr/local/solid
26551 +    fi
26552 +    ODBC_INCDIR=$PHP_SOLID/include
26553 +    ODBC_LIBDIR=$PHP_SOLID/$PHP_LIBDIR
26554 +    ODBC_INCLUDE=-I$ODBC_INCDIR
26555 +    ODBC_TYPE=solid
26556 +    if test -f $ODBC_LIBDIR/soc*35.a; then
26557 +      cat >> confdefs.h <<\EOF
26558 +#define HAVE_SOLID_35 1
26559 +EOF
26560
26561 -
26562 -  pdo_running_under_pear=0
26563 -  case `pwd` in
26564 -    /var/tmp/pear-build-*)
26565 -      pdo_running_under_pear=1
26566 -      ;;
26567 -  esac
26568 +    elif test -f $ODBC_LIBDIR/scl*30.a; then
26569 +      cat >> confdefs.h <<\EOF
26570 +#define HAVE_SOLID_30 1
26571 +EOF
26572
26573 -  if test "$pdo_running_under_pear$PHP_PEAR_VERSION" = "1"; then
26574 -    # we're running in an environment that smells like pear,
26575 -    # and the PHP_PEAR_VERSION env var is not set.  That implies
26576 -    # that we're running under a slightly broken pear installer
26577 -    { echo "configure: error:
26578 -PDO requires that you upgrade your PEAR installer tools. Please
26579 -do so now by running:
26580 +    elif test -f $ODBC_LIBDIR/scl*23.a; then
26581 +      cat >> confdefs.h <<\EOF
26582 +#define HAVE_SOLID 1
26583 +EOF
26584
26585 -  % sudo pear upgrade pear
26586 +    fi
26587 +    echo "$ac_t""$ext_output" 1>&6
26588 +
26589 +  echo $ac_n "checking Solid library file""... $ac_c" 1>&6
26590 +echo "configure:66133: checking Solid library file" >&5
26591 +  ac_solid_uname_r=`uname -r 2>/dev/null`
26592 +  ac_solid_uname_s=`uname -s 2>/dev/null`
26593 +  case $ac_solid_uname_s in
26594 +    AIX) ac_solid_os=a3x;;   # a4x for AIX4/ Solid 2.3/3.0 only
26595 +    HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10
26596 +    IRIX) ac_solid_os=irx;;  # Solid 2.3(?)/ 3.0 only
26597 +    Linux)
26598 +      if ldd -v /bin/sh | grep GLIBC > /dev/null; then
26599 +        cat >> confdefs.h <<\EOF
26600 +#define SS_LINUX 1
26601 +EOF
26602
26603 -or by manually downloading and installing PEAR version 1.3.5 or higher.
26604 +        ac_solid_os=l2x
26605 +      else
26606 +        cat >> confdefs.h <<\EOF
26607 +#define SS_LINUX 1
26608 +EOF
26609
26610 -Once you've upgraded, please re-try your PDO install.
26611 -    " 1>&2; exit 1; }
26612 -  fi
26613 +        ac_solid_os=lux
26614 +      fi;;
26615 +    SunOS)
26616 +      ac_solid_os=ssx;; # should we deal with SunOS 4?
26617 +    FreeBSD)
26618 +      if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
26619 +        cat >> confdefs.h <<\EOF
26620 +#define SS_FBX 1
26621 +EOF
26622
26623 +        ac_solid_os=fex
26624 +      else
26625 +        cat >> confdefs.h <<\EOF
26626 +#define SS_FBX 1
26627 +EOF
26628
26629 -  if test "$ext_shared" = "yes" ; then
26630 -    case $host_alias in
26631 -      *darwin*)
26632 -          { echo "configure: error:
26633 -Due to the way that loadable modules work on OSX/Darwin, you need to
26634 -compile the PDO package statically into the PHP core.
26635 +        ac_solid_os=fbx
26636 +      fi;;
26637 +  esac
26638
26639 -Please follow the instructions at: http://netevil.org/node.php?nid=202
26640 -for more detail on this issue.
26641 -          " 1>&2; exit 1; }
26642 -        ext_shared=no
26643 -        ;;
26644 -    esac
26645 +  if test -f $ODBC_LIBDIR/soc${ac_solid_os}35.a; then
26646 +    ac_solid_version=35
26647 +    ac_solid_prefix=soc
26648 +  elif test -f $ODBC_LIBDIR/scl${ac_solid_os}30.a; then
26649 +    ac_solid_version=30
26650 +    ac_solid_prefix=scl
26651 +  elif test -f $ODBC_LIBDIR/scl${ac_solid_os}23.a; then
26652 +    ac_solid_version=23
26653 +    ac_solid_prefix=scl
26654    fi
26655 -
26656 -  ext_builddir=ext/pdo
26657 -  ext_srcdir=$abs_srcdir/ext/pdo
26658 -
26659 -  ac_extra=
26660 -
26661 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
26662 -    PHP_PDO_SHARED=no
26663 -
26664 -
26665 -  case ext/pdo in
26666 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
26667 -  /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
26668 -  *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
26669 -  esac
26670 -
26671 -
26672
26673 -  b_c_pre=$php_c_pre
26674 -  b_cxx_pre=$php_cxx_pre
26675 -  b_c_meta=$php_c_meta
26676 -  b_cxx_meta=$php_cxx_meta
26677 -  b_c_post=$php_c_post
26678 -  b_cxx_post=$php_cxx_post
26679 -  b_lo=$php_lo
26680 +#
26681 +# Check for the library files, and setup the ODBC_LIBS path...
26682 +#
26683 +if test ! -f $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \
26684 +  ! -f $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then
26685 +  #
26686 +  # we have an error and should bail out, as we can't find the libs!
26687 +  #
26688 +  echo ""
26689 +  echo "*********************************************************************"
26690 +  echo "* Unable to locate $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
26691 +  echo "* Please correct this by creating the following links and reconfiguring:"
26692 +  echo "* $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
26693 +  echo "* $ODBC_LIBDIR/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so"
26694 +  echo "*********************************************************************"
26695 +else
26696 +  ODBC_LFLAGS=-L$ODBC_LIBDIR
26697 +  ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
26698 +fi
26699
26700 +  echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
26701
26702 -  old_IFS=$IFS
26703 -  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
26704 -
26705 -      IFS=.
26706 -      set $ac_src
26707 -      ac_obj=$1
26708 -      IFS=$old_IFS
26709 -
26710 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
26711 +  fi
26712 +fi
26713
26714 -      case $ac_src in
26715 -        *.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" ;;
26716 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26717 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26718 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
26719 -      esac
26720 +if test -z "$ODBC_TYPE"; then
26721
26722 -    cat >>Makefile.objects<<EOF
26723 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
26724 -       $ac_comp
26725 -EOF
26726 -  done
26727 +php_with_ibm_db2=no
26728
26729
26730 -    EXT_STATIC="$EXT_STATIC pdo"
26731 -    if test "$ext_shared" != "nocli"; then
26732 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo"
26733 -    fi
26734 -  else
26735 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
26736 -      PHP_PDO_SHARED=yes
26737 -
26738 -  case ext/pdo in
26739 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
26740 -  /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
26741 -  *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
26742 -  esac
26743 -
26744 +# Check whether --with-ibm-db2 or --without-ibm-db2 was given.
26745 +if test "${with_ibm_db2+set}" = set; then
26746 +  withval="$with_ibm_db2"
26747 +  PHP_IBM_DB2=$withval
26748 +else
26749
26750 +  PHP_IBM_DB2=no
26751 +  test "$PHP_ENABLE_ALL" && PHP_IBM_DB2=$PHP_ENABLE_ALL
26752
26753 -  b_c_pre=$shared_c_pre
26754 -  b_cxx_pre=$shared_cxx_pre
26755 -  b_c_meta=$shared_c_meta
26756 -  b_cxx_meta=$shared_cxx_meta
26757 -  b_c_post=$shared_c_post
26758 -  b_cxx_post=$shared_cxx_post
26759 -  b_lo=$shared_lo
26760 +fi
26761
26762
26763 -  old_IFS=$IFS
26764 -  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
26765 -
26766 -      IFS=.
26767 -      set $ac_src
26768 -      ac_obj=$1
26769 -      IFS=$old_IFS
26770 -
26771 -      shared_objects_pdo="$shared_objects_pdo $ac_bdir$ac_obj.lo"
26772
26773 -      case $ac_src in
26774 -        *.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" ;;
26775 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26776 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26777 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
26778 -      esac
26779 +ext_output="yes, shared"
26780 +ext_shared=yes
26781 +case $PHP_IBM_DB2 in
26782 +shared,*)
26783 +  PHP_IBM_DB2=`echo "$PHP_IBM_DB2"|$SED 's/^shared,//'`
26784 +  ;;
26785 +shared)
26786 +  PHP_IBM_DB2=yes
26787 +  ;;
26788 +no)
26789 +  ext_output=no
26790 +  ext_shared=no
26791 +  ;;
26792 +*)
26793 +  ext_output=yes
26794 +  ext_shared=no
26795 +  ;;
26796 +esac
26797
26798 -    cat >>Makefile.objects<<EOF
26799 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
26800 -       $ac_comp
26801 -EOF
26802 -  done
26803
26804 -      case $host_alias in
26805 -        *netware*)
26806 -
26807 -  install_modules="install-modules"
26808
26809 -  case $host_alias in
26810 -    *aix*)
26811 -      suffix=so
26812 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PHPPDO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo.so '$ext_builddir'/phppdo.so'
26813 -      ;;
26814 -    *netware*)
26815 -      suffix=nlm
26816 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO, 3)_SHARED_LIBADD)'
26817 -      ;;
26818 -    *)
26819 -      suffix=la
26820 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PHPPDO_SHARED_LIBADD)'
26821 -      ;;
26822 -  esac
26823
26824 -  if test "x" = "xyes"; then
26825 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo.$suffix"
26826 -  else
26827 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo.$suffix"
26828 -  fi
26829 -
26830 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
26831
26832 -  cat >>Makefile.objects<<EOF
26833 -\$(phplibdir)/phppdo.$suffix: $ext_builddir/phppdo.$suffix
26834 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo.$suffix \$(phplibdir)
26835
26836 -$ext_builddir/phppdo.$suffix: \$(shared_objects_pdo) \$(PHPPDO_SHARED_DEPENDENCIES)
26837 -       $link_cmd
26838
26839 -EOF
26840
26841 -          ;;
26842 -        *)
26843 -
26844 -  install_modules="install-modules"
26845 +  if test "$PHP_IBM_DB2" != "no"; then
26846 +    echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
26847 +echo "configure:66254: checking for IBM DB2 support" >&5
26848 +    if test "$PHP_IBM_DB2" = "yes"; then
26849 +      ODBC_INCDIR=/home/db2inst1/sqllib/include
26850 +      ODBC_LIBDIR=/home/db2inst1/sqllib/lib
26851 +    else
26852 +      ODBC_INCDIR=$PHP_IBM_DB2/include
26853 +      ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR
26854 +    fi
26855
26856 -  case $host_alias in
26857 -    *aix*)
26858 -      suffix=so
26859 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PDO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo.so '$ext_builddir'/pdo.so'
26860 -      ;;
26861 -    *netware*)
26862 -      suffix=nlm
26863 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO, 3)_SHARED_LIBADD)'
26864 -      ;;
26865 -    *)
26866 -      suffix=la
26867 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PDO_SHARED_LIBADD)'
26868 -      ;;
26869 -  esac
26870 +
26871 +if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then
26872 +  { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" 1>&2; exit 1; }
26873 +fi
26874
26875 -  if test "x" = "xyes"; then
26876 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo.$suffix"
26877 -  else
26878 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo.$suffix"
26879 -  fi
26880 -
26881 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
26882
26883 -  cat >>Makefile.objects<<EOF
26884 -\$(phplibdir)/pdo.$suffix: $ext_builddir/pdo.$suffix
26885 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo.$suffix \$(phplibdir)
26886 +    ODBC_INCLUDE=-I$ODBC_INCDIR
26887 +    ODBC_LFLAGS=-L$ODBC_LIBDIR
26888 +    ODBC_TYPE=ibm-db2
26889 +    ODBC_LIBS=-ldb2
26890
26891 -$ext_builddir/pdo.$suffix: \$(shared_objects_pdo) \$(PDO_SHARED_DEPENDENCIES)
26892 -       $link_cmd
26893 +
26894 +  old_LIBS=$LIBS
26895 +  LIBS="
26896 +      $ODBC_LFLAGS $ODBC_LIBS
26897 +     $LIBS"
26898 +  if test "$cross_compiling" = yes; then
26899 +
26900 +    LIBS=$old_LIBS
26901 +
26902 +else
26903 +  cat > conftest.$ac_ext <<EOF
26904 +#line 66285 "configure"
26905 +#include "confdefs.h"
26906
26907 +
26908 +    char SQLExecute();
26909 +    int main() {
26910 +      SQLExecute();
26911 +      return 0;
26912 +    }
26913 +
26914  EOF
26915 -
26916 -          ;;
26917 -      esac
26918 -      cat >> confdefs.h <<EOF
26919 -#define COMPILE_DL_PDO 1
26920 +if { (eval echo configure:66296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
26921 +then
26922 +
26923 +    LIBS=$old_LIBS
26924 +
26925 +      cat >> confdefs.h <<\EOF
26926 +#define HAVE_IBMDB2 1
26927  EOF
26928
26929 -    fi
26930 -  fi
26931 -
26932 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
26933 -    PHP_PDO_SHARED=no
26934 -    case "$PHP_SAPI" in
26935 -      cgi|embed)
26936 -
26937 +      echo "$ac_t""$ext_output" 1>&6
26938 +
26939
26940 -  case ext/pdo in
26941 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
26942 -  /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
26943 -  *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
26944 -  esac
26945 +else
26946 +  echo "configure: failed program was:" >&5
26947 +  cat conftest.$ac_ext >&5
26948 +  rm -fr conftest*
26949
26950 +    LIBS=$old_LIBS
26951 +
26952 +      echo "$ac_t""no" 1>&6
26953 +      { echo "configure: error:
26954 +build test failed. Please check the config.log for details.
26955 +You need to source your DB2 environment before running PHP configure:
26956 +# . \$IBM_DB2/db2profile
26957 +" 1>&2; exit 1; }
26958 +
26959
26960 -
26961 -  b_c_pre=$php_c_pre
26962 -  b_cxx_pre=$php_cxx_pre
26963 -  b_c_meta=$php_c_meta
26964 -  b_cxx_meta=$php_cxx_meta
26965 -  b_c_post=$php_c_post
26966 -  b_cxx_post=$php_cxx_post
26967 -  b_lo=$php_lo
26968 +fi
26969 +rm -fr conftest*
26970 +fi
26971
26972
26973 -  old_IFS=$IFS
26974 -  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
26975 -
26976 -      IFS=.
26977 -      set $ac_src
26978 -      ac_obj=$1
26979 -      IFS=$old_IFS
26980 -
26981 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
26982 +  fi
26983 +fi
26984
26985 -      case $ac_src in
26986 -        *.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" ;;
26987 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26988 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
26989 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
26990 -      esac
26991 +if test -z "$ODBC_TYPE"; then
26992
26993 -    cat >>Makefile.objects<<EOF
26994 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
26995 -       $ac_comp
26996 -EOF
26997 -  done
26998 +php_with_odbcrouter=no
26999
27000
27001 -        EXT_STATIC="$EXT_STATIC pdo"
27002 -        ;;
27003 -      *)
27004 -
27005 -
27006 -  case ext/pdo in
27007 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
27008 -  /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27009 -  *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27010 -  esac
27011 -
27012 +# Check whether --with-ODBCRouter or --without-ODBCRouter was given.
27013 +if test "${with_ODBCRouter+set}" = set; then
27014 +  withval="$with_ODBCRouter"
27015 +  PHP_ODBCROUTER=$withval
27016 +else
27017
27018 +  PHP_ODBCROUTER=no
27019 +  test "$PHP_ENABLE_ALL" && PHP_ODBCROUTER=$PHP_ENABLE_ALL
27020
27021 -  b_c_pre=$php_c_pre
27022 -  b_cxx_pre=$php_cxx_pre
27023 -  b_c_meta=$php_c_meta
27024 -  b_cxx_meta=$php_cxx_meta
27025 -  b_c_post=$php_c_post
27026 -  b_cxx_post=$php_cxx_post
27027 -  b_lo=$php_lo
27028 -
27029 -
27030 -  old_IFS=$IFS
27031 -  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
27032 -
27033 -      IFS=.
27034 -      set $ac_src
27035 -      ac_obj=$1
27036 -      IFS=$old_IFS
27037 -
27038 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
27039 +fi
27040
27041 -      case $ac_src in
27042 -        *.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" ;;
27043 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
27044 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
27045 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
27046 -      esac
27047
27048 -    cat >>Makefile.objects<<EOF
27049 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
27050 -       $ac_comp
27051 -EOF
27052 -  done
27053
27054 +ext_output="yes, shared"
27055 +ext_shared=yes
27056 +case $PHP_ODBCROUTER in
27057 +shared,*)
27058 +  PHP_ODBCROUTER=`echo "$PHP_ODBCROUTER"|$SED 's/^shared,//'`
27059 +  ;;
27060 +shared)
27061 +  PHP_ODBCROUTER=yes
27062 +  ;;
27063 +no)
27064 +  ext_output=no
27065 +  ext_shared=no
27066 +  ;;
27067 +*)
27068 +  ext_output=yes
27069 +  ext_shared=no
27070 +  ;;
27071 +esac
27072
27073 -        ;;
27074 -    esac
27075 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo"
27076 -  fi
27077 -
27078 -
27079 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
27080 -
27081
27082
27083 -  if test "$ext_builddir" = "."; then
27084 -    PHP_PECL_EXTENSION=pdo
27085 -
27086 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
27087
27088 -  fi
27089
27090 -
27091 -
27092 -  am_i_shared=$PHP_PDO_SHARED
27093 -  is_it_shared=$PHP_SPL_SHARED
27094 -  is_it_enabled=$PHP_SPL
27095 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
27096 -    { echo "configure: error:
27097 -You've configured extension pdo to build statically, but it
27098 -depends on extension spl, which you've configured to build shared.
27099 -You either need to build pdo shared or build spl statically for the
27100 -build to be successful.
27101 -" 1>&2; exit 1; }
27102 -  fi
27103 -  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
27104 -    { echo "configure: error:
27105 -You've configured extension pdo, which depends on extension spl,
27106 -but you've either not enabled spl, or have disabled it.
27107 -" 1>&2; exit 1; }
27108 -  fi
27109 -
27110 -
27111 -
27112 -
27113 -
27114 -
27115 -    header_path=ext/pdo
27116 -    for header_file in php_pdo.h php_pdo_driver.h; do
27117 -      hp_hf="$header_path/$header_file"
27118 -
27119 -
27120 -  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
27121 -
27122 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
27123 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
27124 -    eval "INSTALLHEADERS$unique=set"
27125 -
27126 -        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
27127 -
27128 -  fi
27129
27130 -    done
27131 -
27132
27133 -
27134
27135 -
27136 -  src=$ext_srcdir/Makefile.frag
27137 -  ac_srcdir=$ext_srcdir
27138 -  ac_builddir=$ext_builddir
27139 -  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
27140 +  if test "$PHP_ODBCROUTER" != "no"; then
27141 +    echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
27142 +echo "configure:66377: checking for ODBCRouter.com support" >&5
27143 +    if test "$PHP_ODBCROUTER" = "yes"; then
27144 +      PHP_ODBCROUTER=/usr
27145 +    fi
27146 +    ODBC_INCDIR=$PHP_ODBCROUTER/include
27147 +    ODBC_LIBDIR=$PHP_ODBCROUTER/lib
27148 +    ODBC_LFLAGS=-L$ODBC_LIBDIR
27149 +    ODBC_INCLUDE=-I$ODBC_INCDIR
27150 +    ODBC_LIBS=-lodbcsdk
27151 +    ODBC_TYPE=ODBCRouter
27152 +    cat >> confdefs.h <<\EOF
27153 +#define HAVE_ODBC_ROUTER 1
27154 +EOF
27155
27156 +    echo "$ac_t""$ext_output" 1>&6
27157 +  fi
27158  fi
27159
27160 +if test -z "$ODBC_TYPE"; then
27161
27162 +php_with_empress=no
27163
27164
27165 -php_with_pdo_dblib=no
27166 -
27167 -echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
27168 -echo "configure:66613: checking for PDO_DBLIB support via FreeTDS" >&5
27169 -# Check whether --with-pdo-dblib or --without-pdo-dblib was given.
27170 -if test "${with_pdo_dblib+set}" = set; then
27171 -  withval="$with_pdo_dblib"
27172 -  PHP_PDO_DBLIB=$withval
27173 +# Check whether --with-empress or --without-empress was given.
27174 +if test "${with_empress+set}" = set; then
27175 +  withval="$with_empress"
27176 +  PHP_EMPRESS=$withval
27177  else
27178
27179 -  PHP_PDO_DBLIB=no
27180 -  test "$PHP_ENABLE_ALL" && PHP_PDO_DBLIB=$PHP_ENABLE_ALL
27181 +  PHP_EMPRESS=no
27182 +  test "$PHP_ENABLE_ALL" && PHP_EMPRESS=$PHP_ENABLE_ALL
27183
27184  fi
27185
27186 @@ -66625,12 +66411,12 @@ fi
27187
27188  ext_output="yes, shared"
27189  ext_shared=yes
27190 -case $PHP_PDO_DBLIB in
27191 +case $PHP_EMPRESS in
27192  shared,*)
27193 -  PHP_PDO_DBLIB=`echo "$PHP_PDO_DBLIB"|$SED 's/^shared,//'`
27194 +  PHP_EMPRESS=`echo "$PHP_EMPRESS"|$SED 's/^shared,//'`
27195    ;;
27196  shared)
27197 -  PHP_PDO_DBLIB=yes
27198 +  PHP_EMPRESS=yes
27199    ;;
27200  no)
27201    ext_output=no
27202 @@ -66644,146 +66430,371 @@ esac
27203
27204
27205
27206 -echo "$ac_t""$ext_output" 1>&6
27207 -
27208
27209
27210
27211 -if test "$PHP_PDO_DBLIB" != "no"; then
27212
27213 -  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
27214 -    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
27215 -  fi
27216
27217 -  if test "$PHP_PDO_DBLIB" = "yes"; then
27218 +  if test "$PHP_EMPRESS" != "no"; then
27219 +    echo $ac_n "checking for Empress support""... $ac_c" 1>&6
27220 +echo "configure:66441: checking for Empress support" >&5
27221 +    if test "$PHP_EMPRESS" = "yes"; then
27222 +      ODBC_INCDIR=$EMPRESSPATH/include/odbc
27223 +      ODBC_LIBDIR=$EMPRESSPATH/shlib
27224 +    else
27225 +      ODBC_INCDIR=$PHP_EMPRESS/include/odbc
27226 +      ODBC_LIBDIR=$PHP_EMPRESS/shlib
27227 +    fi
27228 +    ODBC_INCLUDE=-I$ODBC_INCDIR
27229 +    ODBC_LFLAGS=-L$ODBC_LIBDIR
27230 +    ODBC_TYPE=empress
27231 +    cat >> confdefs.h <<\EOF
27232 +#define HAVE_EMPRESS 1
27233 +EOF
27234
27235 -    for i in /usr/local /usr; do
27236 -      if test -f $i/include/sybdb.h; then
27237 -        PDO_FREETDS_INSTALLATION_DIR=$i
27238 -        PDO_FREETDS_INCLUDE_DIR=$i/include
27239 -        break
27240 -      elif test -f $i/include/freetds/sybdb.h; then
27241 -        PDO_FREETDS_INSTALLATION_DIR=$i
27242 -        PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
27243 -        break;
27244 -      fi
27245 -    done
27246 +    echo "$ac_t""$ext_output" 1>&6
27247 +
27248 +  echo $ac_n "checking Empress library file""... $ac_c" 1>&6
27249 +echo "configure:66459: checking Empress library file" >&5
27250 +  ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
27251 +  if test ! -f $ODBC_LIBS; then
27252 +    ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
27253 +  fi
27254 +  echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6
27255
27256 -    if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then
27257 -      { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; }
27258 -    fi
27259 +  fi
27260 +fi
27261
27262 -  elif test "$PHP_PDO_DBLIB" != "no"; then
27263 +if test -z "$ODBC_TYPE"; then
27264
27265 -    if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
27266 -      PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
27267 -      PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
27268 -    elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
27269 -      PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
27270 -      PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
27271 +php_with_empress_bcs=no
27272 +
27273 +
27274 +# Check whether --with-empress-bcs or --without-empress-bcs was given.
27275 +if test "${with_empress_bcs+set}" = set; then
27276 +  withval="$with_empress_bcs"
27277 +  PHP_EMPRESS_BCS=$withval
27278 +else
27279 +
27280 +  PHP_EMPRESS_BCS=no
27281 +  test "$PHP_ENABLE_ALL" && PHP_EMPRESS_BCS=$PHP_ENABLE_ALL
27282 +
27283 +fi
27284 +
27285 +
27286 +
27287 +ext_output="yes, shared"
27288 +ext_shared=yes
27289 +case $PHP_EMPRESS_BCS in
27290 +shared,*)
27291 +  PHP_EMPRESS_BCS=`echo "$PHP_EMPRESS_BCS"|$SED 's/^shared,//'`
27292 +  ;;
27293 +shared)
27294 +  PHP_EMPRESS_BCS=yes
27295 +  ;;
27296 +no)
27297 +  ext_output=no
27298 +  ext_shared=no
27299 +  ;;
27300 +*)
27301 +  ext_output=yes
27302 +  ext_shared=no
27303 +  ;;
27304 +esac
27305 +
27306 +
27307 +
27308 +
27309 +
27310 +
27311 +
27312 +
27313 +  if test "$PHP_EMPRESS_BCS" != "no"; then
27314 +    echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
27315 +echo "configure:66515: checking for Empress local access support" >&5
27316 +    if test "$PHP_EMPRESS_BCS" = "yes"; then
27317 +      ODBC_INCDIR=$EMPRESSPATH/include/odbc
27318 +      ODBC_LIBDIR=$EMPRESSPATH/shlib
27319      else
27320 -      { echo "configure: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" 1>&2; exit 1; }
27321 +      ODBC_INCDIR=$PHP_EMPRESS_BCS/include/odbc
27322 +      ODBC_LIBDIR=$PHP_EMPRESS_BCS/shlib
27323      fi
27324 -  fi
27325 +    CC="empocc -bcs";export CC;
27326 +    LD="empocc -bcs";export LD;
27327 +    ODBC_INCLUDE=-I$ODBC_INCDIR
27328 +    ODBC_LFLAGS=-L$ODBC_LIBDIR
27329 +    LIST=`empocc -listlines -bcs -o a a.c`
27330
27331 -  if test "x$PHP_LIBDIR" = "x" ; then
27332 -    PHP_LIBDIR=lib
27333 -  fi
27334 +    NEWLIST=
27335 +    for I in $LIST
27336 +    do
27337 +      case $I in
27338 +        $EMPRESSPATH/odbccl/lib/* | \
27339 +        $EMPRESSPATH/rdbms/lib/* | \
27340 +        $EMPRESSPATH/common/lib/*)
27341 +              NEWLIST="$NEWLIST $I"
27342 +              ;;
27343 +      esac
27344 +    done
27345 +    ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
27346 +    ODBC_TYPE=empress-bcs
27347 +    cat >> confdefs.h <<\EOF
27348 +#define HAVE_EMPRESS 1
27349 +EOF
27350
27351 -  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
27352 -     { echo "configure: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; }
27353 +    echo "$ac_t""$ext_output" 1>&6
27354 +
27355 +  echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
27356 +echo "configure:66549: checking Empress local access library file" >&5
27357 +  ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
27358 +  if test ! -f $ODBCBCS_LIBS; then
27359 +    ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
27360    fi
27361 +  echo "$ac_t""`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`" 1>&6
27362
27363 -
27364 -  if test "$PDO_FREETDS_INCLUDE_DIR" != "/usr/include"; then
27365 -
27366 -  if test -z "$PDO_FREETDS_INCLUDE_DIR" || echo "$PDO_FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then
27367 -    ai_p=$PDO_FREETDS_INCLUDE_DIR
27368 -  else
27369 -
27370 -    ep_dir="`echo $PDO_FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
27371 -
27372 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27373 -    ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INCLUDE_DIR\"`"
27374    fi
27375 +fi
27376
27377 -
27378 +if test -z "$ODBC_TYPE"; then
27379 +
27380 +php_with_birdstep=no
27381 +
27382 +
27383 +# Check whether --with-birdstep or --without-birdstep was given.
27384 +if test "${with_birdstep+set}" = set; then
27385 +  withval="$with_birdstep"
27386 +  PHP_BIRDSTEP=$withval
27387 +else
27388
27389 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
27390 +  PHP_BIRDSTEP=no
27391 +  test "$PHP_ENABLE_ALL" && PHP_BIRDSTEP=$PHP_ENABLE_ALL
27392 +
27393 +fi
27394 +
27395 +
27396 +
27397 +ext_output="yes, shared"
27398 +ext_shared=yes
27399 +case $PHP_BIRDSTEP in
27400 +shared,*)
27401 +  PHP_BIRDSTEP=`echo "$PHP_BIRDSTEP"|$SED 's/^shared,//'`
27402 +  ;;
27403 +shared)
27404 +  PHP_BIRDSTEP=yes
27405 +  ;;
27406 +no)
27407 +  ext_output=no
27408 +  ext_shared=no
27409 +  ;;
27410 +*)
27411 +  ext_output=yes
27412 +  ext_shared=no
27413 +  ;;
27414 +esac
27415 +
27416 +
27417 +
27418 +
27419 +
27420 +
27421 +
27422
27423 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
27424 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
27425 -    eval "INCLUDEPATH$unique=set"
27426 -
27427 -      if test ""; then
27428 -        INCLUDES="-I$ai_p $INCLUDES"
27429 -      else
27430 -        INCLUDES="$INCLUDES -I$ai_p"
27431 -      fi
27432 -
27433 -  fi
27434 +  if test "$PHP_BIRDSTEP" != "no"; then
27435 +    echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
27436 +echo "configure:66605: checking for Birdstep support" >&5
27437 +    if test "$PHP_BIRDSTEP" = "yes"; then
27438 +        ODBC_INCDIR=/usr/local/birdstep/include
27439 +        ODBC_LIBDIR=/usr/local/birdstep/lib
27440 +    else
27441 +        ODBC_INCDIR=$PHP_BIRDSTEP/include
27442 +        ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR
27443 +    fi
27444 +
27445 +    case $host_alias in
27446 +      *aix*)
27447 +        cat >> confdefs.h <<\EOF
27448 +#define AIX 1
27449 +EOF
27450 +;;
27451 +      *hpux*)
27452 +        cat >> confdefs.h <<\EOF
27453 +#define HPUX 1
27454 +EOF
27455 +;;
27456 +      *linux*)
27457 +        cat >> confdefs.h <<\EOF
27458 +#define LINUX 1
27459 +EOF
27460 +;;
27461 +      *qnx*)
27462 +        cat >> confdefs.h <<\EOF
27463 +#define NEUTRINO 1
27464 +EOF
27465 +;;
27466 +      i?86-*-solaris*)
27467 +        cat >> confdefs.h <<\EOF
27468 +#define ISOLARIS 1
27469 +EOF
27470 +;;
27471 +      sparc-*-solaris*)
27472 +        cat >> confdefs.h <<\EOF
27473 +#define SOLARIS 1
27474 +EOF
27475 +;;
27476 +      *unixware*)
27477 +        cat >> confdefs.h <<\EOF
27478 +#define UNIXWARE 1
27479 +EOF
27480 +;;
27481 +    esac
27482 +
27483 +    ODBC_INCLUDE=-I$ODBC_INCDIR
27484 +    ODBC_TYPE=birdstep
27485 +    ODBC_LFLAGS=-L$ODBC_LIBDIR
27486 +    ODBC_LIBS="-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil"
27487 +
27488 +    if test -f "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then
27489 +      ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil"
27490 +    elif test -f "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then
27491 +      ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil"
27492 +    fi
27493 +
27494 +    cat >> confdefs.h <<\EOF
27495 +#define HAVE_BIRDSTEP 1
27496 +EOF
27497
27498 +    echo "$ac_t""$ext_output" 1>&6
27499    fi
27500 +fi
27501 +
27502 +if test -z "$ODBC_TYPE"; then
27503 +
27504 +php_with_custom_odbc=no
27505 +
27506
27507 +# Check whether --with-custom-odbc or --without-custom-odbc was given.
27508 +if test "${with_custom_odbc+set}" = set; then
27509 +  withval="$with_custom_odbc"
27510 +  PHP_CUSTOM_ODBC=$withval
27511 +else
27512
27513 +  PHP_CUSTOM_ODBC=no
27514 +  test "$PHP_ENABLE_ALL" && PHP_CUSTOM_ODBC=$PHP_ENABLE_ALL
27515
27516 -  if test "$ext_shared" = "yes"; then
27517 -    PDO_DBLIB_SHARED_LIBADD="-lsybdb $PDO_DBLIB_SHARED_LIBADD"
27518 -    if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
27519 -
27520 -  if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
27521 -
27522 -  if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
27523 -    ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
27524 -  else
27525 -
27526 -    ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
27527 -
27528 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27529 -    ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
27530 +fi
27531 +
27532 +
27533 +
27534 +ext_output="yes, shared"
27535 +ext_shared=yes
27536 +case $PHP_CUSTOM_ODBC in
27537 +shared,*)
27538 +  PHP_CUSTOM_ODBC=`echo "$PHP_CUSTOM_ODBC"|$SED 's/^shared,//'`
27539 +  ;;
27540 +shared)
27541 +  PHP_CUSTOM_ODBC=yes
27542 +  ;;
27543 +no)
27544 +  ext_output=no
27545 +  ext_shared=no
27546 +  ;;
27547 +*)
27548 +  ext_output=yes
27549 +  ext_shared=no
27550 +  ;;
27551 +esac
27552 +
27553 +
27554 +
27555 +
27556 +
27557 +
27558 +
27559 +
27560 +  if test "$PHP_CUSTOM_ODBC" != "no"; then
27561 +    echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
27562 +echo "configure:66717: checking for a custom ODBC support" >&5
27563 +    if test "$PHP_CUSTOM_ODBC" = "yes"; then
27564 +      PHP_CUSTOM_ODBC=/usr/local
27565 +    fi
27566 +    ODBC_INCDIR=$PHP_CUSTOM_ODBC/include
27567 +    ODBC_LIBDIR=$PHP_CUSTOM_ODBC/$PHP_LIBDIR
27568 +    ODBC_LFLAGS=-L$ODBC_LIBDIR
27569 +    ODBC_INCLUDE=-I$ODBC_INCDIR
27570 +    ODBC_LIBS=$CUSTOM_ODBC_LIBS
27571 +    ODBC_TYPE=custom-odbc
27572 +    cat >> confdefs.h <<\EOF
27573 +#define HAVE_CODBC 1
27574 +EOF
27575 +
27576 +    echo "$ac_t""$ext_ouput" 1>&6
27577    fi
27578 +fi
27579
27580 -
27581 -      if test "$ext_shared" = "yes"; then
27582 -        PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD"
27583 -        test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_SHARED_LIBADD"
27584 -      else
27585 -
27586 -
27587 -
27588 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
27589 -
27590 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
27591 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
27592 -    eval "LIBPATH$unique=set"
27593 -
27594 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
27595 -    LDFLAGS="$LDFLAGS -L$ai_p"
27596 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
27597 +if test -z "$ODBC_TYPE"; then
27598 +
27599 +php_with_iodbc=no
27600 +
27601 +
27602 +# Check whether --with-iodbc or --without-iodbc was given.
27603 +if test "${with_iodbc+set}" = set; then
27604 +  withval="$with_iodbc"
27605 +  PHP_IODBC=$withval
27606 +else
27607
27608 -  fi
27609 +  PHP_IODBC=no
27610 +  test "$PHP_ENABLE_ALL" && PHP_IODBC=$PHP_ENABLE_ALL
27611 +
27612 +fi
27613 +
27614 +
27615 +
27616 +ext_output="yes, shared"
27617 +ext_shared=yes
27618 +case $PHP_IODBC in
27619 +shared,*)
27620 +  PHP_IODBC=`echo "$PHP_IODBC"|$SED 's/^shared,//'`
27621 +  ;;
27622 +shared)
27623 +  PHP_IODBC=yes
27624 +  ;;
27625 +no)
27626 +  ext_output=no
27627 +  ext_shared=no
27628 +  ;;
27629 +*)
27630 +  ext_output=yes
27631 +  ext_shared=no
27632 +  ;;
27633 +esac
27634 +
27635 +
27636 +
27637 +
27638
27639
27640 -      fi
27641 -
27642 -  fi
27643
27644 +
27645 +  if test "$PHP_IODBC" != "no"; then
27646 +    echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
27647 +echo "configure:66781: checking for iODBC support" >&5
27648 +    if test "$PHP_IODBC" = "yes"; then
27649 +      PHP_IODBC=/usr/local
27650      fi
27651 -  else
27652
27653
27654 -  if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
27655 +  if test -n "$PHP_IODBC/$PHP_LIBDIR"; then
27656
27657 -  if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
27658 +  if test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/lib"; then
27659
27660 -  if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
27661 -    ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
27662 +  if test -z "$PHP_IODBC/$PHP_LIBDIR" || echo "$PHP_IODBC/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
27663 +    ai_p=$PHP_IODBC/$PHP_LIBDIR
27664    else
27665
27666 -    ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
27667 +    ep_dir="`echo $PHP_IODBC/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
27668
27669      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27670 -    ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
27671 +    ai_p="$ep_realdir/`basename \"$PHP_IODBC/$PHP_LIBDIR\"`"
27672    fi
27673
27674
27675 @@ -66809,401 +66820,301 @@ if test "$PHP_PDO_DBLIB" != "no"; then
27676    fi
27677
27678
27679 -  case sybdb in
27680 +  case iodbc in
27681    c|c_r|pthread*) ;;
27682    *)
27683 -      LIBS="-lsybdb $LIBS"
27684 +      LIBS="-liodbc $LIBS"
27685     ;;
27686    esac
27687
27688
27689
27690
27691 +
27692 +  if test "$PHP_IODBC/include" != "/usr/include"; then
27693 +
27694 +  if test -z "$PHP_IODBC/include" || echo "$PHP_IODBC/include" | grep '^/' >/dev/null ; then
27695 +    ai_p=$PHP_IODBC/include
27696 +  else
27697 +
27698 +    ep_dir="`echo $PHP_IODBC/include|$SED 's%/*[^/][^/]*/*$%%'`"
27699 +
27700 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27701 +    ai_p="$ep_realdir/`basename \"$PHP_IODBC/include\"`"
27702    fi
27703
27704 -
27705 -
27706 -
27707
27708 -  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
27709 -echo "configure:66830: checking for PDO includes" >&5
27710 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
27711 -  echo $ac_n "(cached) $ac_c" 1>&6
27712 -else
27713
27714 -    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
27715 -echo "configure:66836: checking for PDO includes" >&5
27716 -    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
27717 -      pdo_inc_path=$abs_srcdir/ext
27718 -    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
27719 -      pdo_inc_path=$abs_srcdir/ext
27720 -    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
27721 -      pdo_inc_path=$prefix/include/php/ext
27722 -    fi
27723 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
27724
27725 -fi
27726 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
27727 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
27728 +    eval "INCLUDEPATH$unique=set"
27729 +
27730 +      if test "1"; then
27731 +        INCLUDES="-I$ai_p $INCLUDES"
27732 +      else
27733 +        INCLUDES="$INCLUDES -I$ai_p"
27734 +      fi
27735 +
27736 +  fi
27737
27738 -echo "$ac_t""$pdo_inc_path" 1>&6
27739 -  if test -n "$pdo_inc_path"; then
27740 -:
27741 -  else
27742 -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
27743    fi
27744
27745 -
27746 +    ODBC_TYPE=iodbc
27747 +    ODBC_INCLUDE=-I$PHP_IODBC/include
27748 +    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
27749 +    ODBC_LIBS=-liodbc
27750 +    cat >> confdefs.h <<\EOF
27751 +#define HAVE_IODBC 1
27752 +EOF
27753
27754 -  PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
27755 -
27756 -  ext_builddir=ext/pdo_dblib
27757 -  ext_srcdir=$abs_srcdir/ext/pdo_dblib
27758 +    cat >> confdefs.h <<\EOF
27759 +#define HAVE_ODBC2 1
27760 +EOF
27761
27762 -  ac_extra=`echo "-I$pdo_inc_path $PDO_DBLIB_DEFS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
27763 +    echo "$ac_t""$ext_output" 1>&6
27764 +  fi
27765 +fi
27766
27767 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
27768 -    PHP_PDO_DBLIB_SHARED=no
27769 -
27770 -
27771 -  case ext/pdo_dblib in
27772 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
27773 -  /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27774 -  *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27775 -  esac
27776 -
27777 -
27778 +if test -z "$ODBC_TYPE"; then
27779
27780 -  b_c_pre=$php_c_pre
27781 -  b_cxx_pre=$php_cxx_pre
27782 -  b_c_meta=$php_c_meta
27783 -  b_cxx_meta=$php_cxx_meta
27784 -  b_c_post=$php_c_post
27785 -  b_cxx_post=$php_cxx_post
27786 -  b_lo=$php_lo
27787 +php_with_esoob=no
27788
27789
27790 -  old_IFS=$IFS
27791 -  for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
27792 +# Check whether --with-esoob or --without-esoob was given.
27793 +if test "${with_esoob+set}" = set; then
27794 +  withval="$with_esoob"
27795 +  PHP_ESOOB=$withval
27796 +else
27797
27798 -      IFS=.
27799 -      set $ac_src
27800 -      ac_obj=$1
27801 -      IFS=$old_IFS
27802 -
27803 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
27804 +  PHP_ESOOB=no
27805 +  test "$PHP_ENABLE_ALL" && PHP_ESOOB=$PHP_ENABLE_ALL
27806
27807 -      case $ac_src in
27808 -        *.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" ;;
27809 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
27810 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
27811 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
27812 -      esac
27813 +fi
27814
27815 -    cat >>Makefile.objects<<EOF
27816 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
27817 -       $ac_comp
27818 -EOF
27819 -  done
27820
27821
27822 -    EXT_STATIC="$EXT_STATIC pdo_dblib"
27823 -    if test "$ext_shared" != "nocli"; then
27824 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib"
27825 -    fi
27826 -  else
27827 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
27828 -      PHP_PDO_DBLIB_SHARED=yes
27829 -
27830 -  case ext/pdo_dblib in
27831 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
27832 -  /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27833 -  *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27834 -  esac
27835 -
27836 -
27837 +ext_output="yes, shared"
27838 +ext_shared=yes
27839 +case $PHP_ESOOB in
27840 +shared,*)
27841 +  PHP_ESOOB=`echo "$PHP_ESOOB"|$SED 's/^shared,//'`
27842 +  ;;
27843 +shared)
27844 +  PHP_ESOOB=yes
27845 +  ;;
27846 +no)
27847 +  ext_output=no
27848 +  ext_shared=no
27849 +  ;;
27850 +*)
27851 +  ext_output=yes
27852 +  ext_shared=no
27853 +  ;;
27854 +esac
27855
27856 -  b_c_pre=$shared_c_pre
27857 -  b_cxx_pre=$shared_cxx_pre
27858 -  b_c_meta=$shared_c_meta
27859 -  b_cxx_meta=$shared_cxx_meta
27860 -  b_c_post=$shared_c_post
27861 -  b_cxx_post=$shared_cxx_post
27862 -  b_lo=$shared_lo
27863
27864
27865 -  old_IFS=$IFS
27866 -  for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
27867 -
27868 -      IFS=.
27869 -      set $ac_src
27870 -      ac_obj=$1
27871 -      IFS=$old_IFS
27872 -
27873 -      shared_objects_pdo_dblib="$shared_objects_pdo_dblib $ac_bdir$ac_obj.lo"
27874
27875 -      case $ac_src in
27876 -        *.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" ;;
27877 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
27878 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
27879 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
27880 -      esac
27881
27882 -    cat >>Makefile.objects<<EOF
27883 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
27884 -       $ac_comp
27885 -EOF
27886 -  done
27887
27888 -      case $host_alias in
27889 -        *netware*)
27890 -
27891 -  install_modules="install-modules"
27892
27893 -  case $host_alias in
27894 -    *aix*)
27895 -      suffix=so
27896 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_dblib.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PHPPDO_DBLIB_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_dblib.so '$ext_builddir'/phppdo_dblib.so'
27897 -      ;;
27898 -    *netware*)
27899 -      suffix=nlm
27900 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_DBLIB, 3)_SHARED_LIBADD)'
27901 -      ;;
27902 -    *)
27903 -      suffix=la
27904 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PHPPDO_DBLIB_SHARED_LIBADD)'
27905 -      ;;
27906 -  esac
27907
27908 -  if test "x" = "xyes"; then
27909 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_dblib.$suffix"
27910 -  else
27911 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_dblib.$suffix"
27912 +  if test "$PHP_ESOOB" != "no"; then
27913 +    echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
27914 +echo "configure:66927: checking for Easysoft ODBC-ODBC Bridge support" >&5
27915 +    if test "$PHP_ESOOB" = "yes"; then
27916 +      PHP_ESOOB=/usr/local/easysoft/oob/client
27917 +    fi
27918 +    ODBC_INCDIR=$PHP_ESOOB/include
27919 +    ODBC_LIBDIR=$PHP_ESOOB/$PHP_LIBDIR
27920 +    ODBC_LFLAGS=-L$ODBC_LIBDIR
27921 +    ODBC_INCLUDE=-I$ODBC_INCDIR
27922 +    ODBC_LIBS=-lesoobclient
27923 +    ODBC_TYPE=esoob
27924 +    cat >> confdefs.h <<\EOF
27925 +#define HAVE_ESOOB 1
27926 +EOF
27927 +
27928 +    echo "$ac_t""$ext_output" 1>&6
27929    fi
27930 +fi
27931 +
27932 +if test -z "$ODBC_TYPE"; then
27933 +
27934 +php_with_unixodbc=no
27935 +
27936 +
27937 +# Check whether --with-unixODBC or --without-unixODBC was given.
27938 +if test "${with_unixODBC+set}" = set; then
27939 +  withval="$with_unixODBC"
27940 +  PHP_UNIXODBC=$withval
27941 +else
27942
27943 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
27944 +  PHP_UNIXODBC=no
27945 +  test "$PHP_ENABLE_ALL" && PHP_UNIXODBC=$PHP_ENABLE_ALL
27946
27947 -  cat >>Makefile.objects<<EOF
27948 -\$(phplibdir)/phppdo_dblib.$suffix: $ext_builddir/phppdo_dblib.$suffix
27949 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_dblib.$suffix \$(phplibdir)
27950 +fi
27951
27952 -$ext_builddir/phppdo_dblib.$suffix: \$(shared_objects_pdo_dblib) \$(PHPPDO_DBLIB_SHARED_DEPENDENCIES)
27953 -       $link_cmd
27954
27955 -EOF
27956
27957 -          ;;
27958 -        *)
27959 -
27960 -  install_modules="install-modules"
27961 +ext_output="yes, shared"
27962 +ext_shared=yes
27963 +case $PHP_UNIXODBC in
27964 +shared,*)
27965 +  PHP_UNIXODBC=`echo "$PHP_UNIXODBC"|$SED 's/^shared,//'`
27966 +  ;;
27967 +shared)
27968 +  PHP_UNIXODBC=yes
27969 +  ;;
27970 +no)
27971 +  ext_output=no
27972 +  ext_shared=no
27973 +  ;;
27974 +*)
27975 +  ext_output=yes
27976 +  ext_shared=no
27977 +  ;;
27978 +esac
27979
27980 -  case $host_alias in
27981 -    *aix*)
27982 -      suffix=so
27983 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_dblib.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PDO_DBLIB_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_dblib.so '$ext_builddir'/pdo_dblib.so'
27984 -      ;;
27985 -    *netware*)
27986 -      suffix=nlm
27987 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_DBLIB, 3)_SHARED_LIBADD)'
27988 -      ;;
27989 -    *)
27990 -      suffix=la
27991 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PDO_DBLIB_SHARED_LIBADD)'
27992 -      ;;
27993 -  esac
27994
27995 -  if test "x" = "xyes"; then
27996 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_dblib.$suffix"
27997 -  else
27998 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_dblib.$suffix"
27999 -  fi
28000 -
28001 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
28002
28003 -  cat >>Makefile.objects<<EOF
28004 -\$(phplibdir)/pdo_dblib.$suffix: $ext_builddir/pdo_dblib.$suffix
28005 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_dblib.$suffix \$(phplibdir)
28006
28007 -$ext_builddir/pdo_dblib.$suffix: \$(shared_objects_pdo_dblib) \$(PDO_DBLIB_SHARED_DEPENDENCIES)
28008 -       $link_cmd
28009
28010 -EOF
28011
28012 -          ;;
28013 -      esac
28014 -      cat >> confdefs.h <<EOF
28015 -#define COMPILE_DL_PDO_DBLIB 1
28016 -EOF
28017
28018 +
28019 +  if test "$PHP_UNIXODBC" != "no"; then
28020 +    echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
28021 +echo "configure:66991: checking for unixODBC support" >&5
28022 +    if test "$PHP_UNIXODBC" = "yes"; then
28023 +      PHP_UNIXODBC=/usr/local
28024      fi
28025 +    ODBC_INCDIR=$PHP_UNIXODBC/include
28026 +    ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
28027 +    ODBC_LFLAGS=-L$ODBC_LIBDIR
28028 +    ODBC_INCLUDE=-I$ODBC_INCDIR
28029 +    ODBC_LIBS=-lodbc
28030 +    ODBC_TYPE=unixODBC
28031 +
28032 +if ! test -f "$ODBC_INCDIR/sqlext.h"; then
28033 +  { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; }
28034 +fi
28035 +
28036 +    cat >> confdefs.h <<\EOF
28037 +#define HAVE_UNIXODBC 1
28038 +EOF
28039 +
28040 +    echo "$ac_t""$ext_output" 1>&6
28041    fi
28042 +fi
28043
28044 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
28045 -    PHP_PDO_DBLIB_SHARED=no
28046 -    case "$PHP_SAPI" in
28047 -      cgi|embed)
28048 -
28049 -
28050 -  case ext/pdo_dblib in
28051 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28052 -  /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28053 -  *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28054 -  esac
28055 -
28056 -
28057 +if test -z "$ODBC_TYPE"; then
28058
28059 -  b_c_pre=$php_c_pre
28060 -  b_cxx_pre=$php_cxx_pre
28061 -  b_c_meta=$php_c_meta
28062 -  b_cxx_meta=$php_cxx_meta
28063 -  b_c_post=$php_c_post
28064 -  b_cxx_post=$php_cxx_post
28065 -  b_lo=$php_lo
28066 +php_with_dbmaker=no
28067
28068
28069 -  old_IFS=$IFS
28070 -  for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
28071 +# Check whether --with-dbmaker or --without-dbmaker was given.
28072 +if test "${with_dbmaker+set}" = set; then
28073 +  withval="$with_dbmaker"
28074 +  PHP_DBMAKER=$withval
28075 +else
28076
28077 -      IFS=.
28078 -      set $ac_src
28079 -      ac_obj=$1
28080 -      IFS=$old_IFS
28081 -
28082 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
28083 +  PHP_DBMAKER=no
28084 +  test "$PHP_ENABLE_ALL" && PHP_DBMAKER=$PHP_ENABLE_ALL
28085
28086 -      case $ac_src in
28087 -        *.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" ;;
28088 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28089 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28090 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
28091 -      esac
28092 +fi
28093
28094 -    cat >>Makefile.objects<<EOF
28095 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
28096 -       $ac_comp
28097 -EOF
28098 -  done
28099
28100
28101 -        EXT_STATIC="$EXT_STATIC pdo_dblib"
28102 -        ;;
28103 -      *)
28104 -
28105 -
28106 -  case ext/pdo_dblib in
28107 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28108 -  /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28109 -  *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28110 -  esac
28111 -
28112 -
28113 +ext_output="yes, shared"
28114 +ext_shared=yes
28115 +case $PHP_DBMAKER in
28116 +shared,*)
28117 +  PHP_DBMAKER=`echo "$PHP_DBMAKER"|$SED 's/^shared,//'`
28118 +  ;;
28119 +shared)
28120 +  PHP_DBMAKER=yes
28121 +  ;;
28122 +no)
28123 +  ext_output=no
28124 +  ext_shared=no
28125 +  ;;
28126 +*)
28127 +  ext_output=yes
28128 +  ext_shared=no
28129 +  ;;
28130 +esac
28131
28132 -  b_c_pre=$php_c_pre
28133 -  b_cxx_pre=$php_cxx_pre
28134 -  b_c_meta=$php_c_meta
28135 -  b_cxx_meta=$php_cxx_meta
28136 -  b_c_post=$php_c_post
28137 -  b_cxx_post=$php_cxx_post
28138 -  b_lo=$php_lo
28139
28140
28141 -  old_IFS=$IFS
28142 -  for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
28143 -
28144 -      IFS=.
28145 -      set $ac_src
28146 -      ac_obj=$1
28147 -      IFS=$old_IFS
28148 -
28149 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
28150
28151 -      case $ac_src in
28152 -        *.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" ;;
28153 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28154 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28155 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
28156 -      esac
28157
28158 -    cat >>Makefile.objects<<EOF
28159 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
28160 -       $ac_comp
28161 -EOF
28162 -  done
28163
28164
28165 -        ;;
28166 -    esac
28167 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib"
28168 -  fi
28169 -
28170 -
28171 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
28172 -
28173
28174 +  if test "$PHP_DBMAKER" != "no"; then
28175 +    echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
28176 +echo "configure:67060: checking for DBMaker support" >&5
28177 +    if test "$PHP_DBMAKER" = "yes"; then
28178 +      # find dbmaker's home directory
28179 +      DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
28180
28181 -  if test "$ext_builddir" = "."; then
28182 -    PHP_PECL_EXTENSION=pdo_dblib
28183 -
28184 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
28185 +      # check DBMaker version (from 5.0 to 2.0)
28186 +      DBMAKER_VERSION=5.0
28187
28188 -  fi
28189 +      while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do
28190 +        DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | $AWK '{ print $1-1;}'`
28191 +        MAJOR_V=`echo $DM_VER | $AWK '{ print $1/10; }'  | $AWK -F. '{ print $1; }'`
28192 +        MINOR_V=`echo $DM_VER | $AWK '{ print $1%10; }'`
28193 +        DBMAKER_VERSION=$MAJOR_V.$MINOR_V
28194 +      done
28195
28196 -  echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
28197 -echo "configure:67150: checking for dnet_addr in -ldnet_stub" >&5
28198 -ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
28199 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
28200 -  echo $ac_n "(cached) $ac_c" 1>&6
28201 -else
28202 -  ac_save_LIBS="$LIBS"
28203 -LIBS="-ldnet_stub  $LIBS"
28204 -cat > conftest.$ac_ext <<EOF
28205 -#line 67158 "configure"
28206 -#include "confdefs.h"
28207 -/* Override any gcc2 internal prototype to avoid an error.  */
28208 -/* We use char because int might match the return type of a gcc2
28209 -    builtin and then its argument prototype would still apply.  */
28210 -char dnet_addr();
28211 +      if test "$DBMAKER_VERSION" = "2.9"; then
28212 +        PHP_DBMAKER=$DBMAKER_HOME
28213 +      else
28214 +        PHP_DBMAKER=$DBMAKER_HOME/$DBMAKER_VERSION
28215 +      fi
28216 +    fi
28217
28218 -int main() {
28219 -dnet_addr()
28220 -; return 0; }
28221 +    ODBC_INCDIR=$PHP_DBMAKER/include
28222 +    ODBC_LIBDIR=$PHP_DBMAKER/$PHP_LIBDIR
28223 +    ODBC_INCLUDE=-I$ODBC_INCDIR
28224 +    ODBC_LFLAGS=-L$ODBC_LIBDIR
28225 +    ODBC_INCLUDE=-I$ODBC_INCDIR
28226 +    ODBC_LIBS="-ldmapic -lc"
28227 +    ODBC_TYPE=dbmaker
28228 +
28229 +    cat >> confdefs.h <<\EOF
28230 +#define HAVE_DBMAKER 1
28231  EOF
28232 -if { (eval echo configure:67169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
28233 -  rm -rf conftest*
28234 -  eval "ac_cv_lib_$ac_lib_var=yes"
28235 -else
28236 -  echo "configure: failed program was:" >&5
28237 -  cat conftest.$ac_ext >&5
28238 -  rm -rf conftest*
28239 -  eval "ac_cv_lib_$ac_lib_var=no"
28240 -fi
28241 -rm -f conftest*
28242 -LIBS="$ac_save_LIBS"
28243
28244 -fi
28245 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
28246 -  echo "$ac_t""yes" 1>&6
28247 -
28248
28249 -  if test "$ext_shared" = "yes"; then
28250 -    PDO_DBLIB_SHARED_LIBADD="-ldnet_stub $PDO_DBLIB_SHARED_LIBADD"
28251 -    if test -n ""; then
28252 +    if test "$ext_shared" = "yes"; then
28253 +      echo "$ac_t""yes (shared)" 1>&6
28254 +      ODBC_LIBS="-ldmapic -lc -lm"
28255 +      ODBC_SHARED="odbc.la"
28256 +    else
28257 +      echo "$ac_t""yes (static)" 1>&6
28258
28259 -  if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
28260 +
28261 +  if test -n "$ODBC_LIBDIR"; then
28262
28263 -  if test -z "" || echo "" | grep '^/' >/dev/null ; then
28264 -    ai_p=
28265 +  if test "$ODBC_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ODBC_LIBDIR" != "/usr/lib"; then
28266 +
28267 +  if test -z "$ODBC_LIBDIR" || echo "$ODBC_LIBDIR" | grep '^/' >/dev/null ; then
28268 +    ai_p=$ODBC_LIBDIR
28269    else
28270
28271 -    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
28272 +    ep_dir="`echo $ODBC_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
28273
28274      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
28275 -    ai_p="$ep_realdir/`basename \"\"`"
28276 +    ai_p="$ep_realdir/`basename \"$ODBC_LIBDIR\"`"
28277    fi
28278
28279
28280 -      if test "$ext_shared" = "yes"; then
28281 -        PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD"
28282 -        test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_SHARED_LIBADD"
28283 -      else
28284 -
28285 +
28286
28287
28288    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
28289 @@ -67219,241 +67130,124 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
28290    fi
28291
28292
28293 -      fi
28294
28295    fi
28296
28297 -    fi
28298 -  else
28299 -
28300 +  fi
28301 +
28302 +
28303 +  case dmapic in
28304 +  c|c_r|pthread*) ;;
28305 +  *)
28306 +      LIBS="-ldmapic $LIBS"
28307 +   ;;
28308 +  esac
28309
28310 -  if test -n ""; then
28311 -
28312 -  if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
28313 +
28314 +
28315 +
28316 +
28317 +  if test "$ODBC_INCDIR" != "/usr/include"; then
28318
28319 -  if test -z "" || echo "" | grep '^/' >/dev/null ; then
28320 -    ai_p=
28321 +  if test -z "$ODBC_INCDIR" || echo "$ODBC_INCDIR" | grep '^/' >/dev/null ; then
28322 +    ai_p=$ODBC_INCDIR
28323    else
28324
28325 -    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
28326 +    ep_dir="`echo $ODBC_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
28327
28328      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
28329 -    ai_p="$ep_realdir/`basename \"\"`"
28330 +    ai_p="$ep_realdir/`basename \"$ODBC_INCDIR\"`"
28331    fi
28332
28333
28334 -
28335 -
28336
28337    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
28338
28339 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
28340 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
28341    if test -n "$unique" && test "`eval $cmd`" = "" ; then
28342 -    eval "LIBPATH$unique=set"
28343 +    eval "INCLUDEPATH$unique=set"
28344 +
28345 +      if test ""; then
28346 +        INCLUDES="-I$ai_p $INCLUDES"
28347 +      else
28348 +        INCLUDES="$INCLUDES -I$ai_p"
28349 +      fi
28350
28351 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
28352 -    LDFLAGS="$LDFLAGS -L$ai_p"
28353 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
28354 -
28355    fi
28356
28357 +  fi
28358
28359 -
28360 +      ODBC_STATIC="libphpext_odbc.la"
28361 +    fi
28362    fi
28363 +fi
28364
28365 +if test -n "$ODBC_TYPE"; then
28366 +  if test "$ODBC_TYPE" != "dbmaker"; then
28367 +
28368 +  for ac_i in $ODBC_LFLAGS $ODBC_LIBS; do
28369 +    case $ac_i in
28370 +    -pthread)
28371 +      if test "$ext_shared" = "yes"; then
28372 +        ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -pthread"
28373 +      else
28374 +
28375 +
28376 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
28377 +
28378 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
28379 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
28380 +    eval "EXTRA_LDFLAGS$unique=set"
28381 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
28382    fi
28383 +
28384 +      fi
28385 +    ;;
28386 +    -l*)
28387 +      ac_ii=`echo $ac_i|cut -c 3-`
28388 +
28389
28390 +  case $ac_ii in
28391 +  c|c_r|pthread*) ;;
28392 +  *)
28393 +    if test "$ext_shared" = "yes"; then
28394 +        ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii"
28395 +    else
28396 +
28397
28398 -  case dnet_stub in
28399 +  case $ac_ii in
28400    c|c_r|pthread*) ;;
28401    *)
28402 -      LIBS="-ldnet_stub $LIBS"
28403 +      LIBS="$LIBS -l$ac_ii"
28404     ;;
28405    esac
28406
28407
28408 +    fi
28409 +   ;;
28410 +  esac
28411
28412
28413 -  fi
28414 -
28415 -
28416 -        cat >> confdefs.h <<\EOF
28417 -#define HAVE_LIBDNET_STUB 1
28418 -EOF
28419 -
28420 -
28421 -else
28422 -  echo "$ac_t""no" 1>&6
28423 -fi
28424 -
28425 -  cat >> confdefs.h <<\EOF
28426 -#define HAVE_PDO_DBLIB 1
28427 -EOF
28428 -
28429 -  cat >> confdefs.h <<\EOF
28430 -#define HAVE_FREETDS 1
28431 -EOF
28432 -
28433 -
28434 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_DBLIB_SHARED_LIBADD"
28435 -
28436 -
28437 -
28438 -
28439 -  am_i_shared=$PHP_PDO_DBLIB_SHARED
28440 -  is_it_shared=$PHP_PDO_SHARED
28441 -  is_it_enabled=$PHP_PDO
28442 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
28443 -    { echo "configure: error:
28444 -You've configured extension pdo_dblib to build statically, but it
28445 -depends on extension pdo, which you've configured to build shared.
28446 -You either need to build pdo_dblib shared or build pdo statically for the
28447 -build to be successful.
28448 -" 1>&2; exit 1; }
28449 -  fi
28450 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
28451 -    { echo "configure: error:
28452 -You've configured extension pdo_dblib, which depends on extension pdo,
28453 -but you've either not enabled pdo, or have disabled it.
28454 -" 1>&2; exit 1; }
28455 -  fi
28456 -
28457 -
28458 -fi
28459 -
28460 -
28461 -
28462 -php_with_pdo_firebird=no
28463 -
28464 -echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
28465 -echo "configure:67330: checking for Firebird support for PDO" >&5
28466 -# Check whether --with-pdo-firebird or --without-pdo-firebird was given.
28467 -if test "${with_pdo_firebird+set}" = set; then
28468 -  withval="$with_pdo_firebird"
28469 -  PHP_PDO_FIREBIRD=$withval
28470 -else
28471 -
28472 -  PHP_PDO_FIREBIRD=no
28473 -  test "$PHP_ENABLE_ALL" && PHP_PDO_FIREBIRD=$PHP_ENABLE_ALL
28474 -
28475 -fi
28476 -
28477 -
28478 -
28479 -ext_output="yes, shared"
28480 -ext_shared=yes
28481 -case $PHP_PDO_FIREBIRD in
28482 -shared,*)
28483 -  PHP_PDO_FIREBIRD=`echo "$PHP_PDO_FIREBIRD"|$SED 's/^shared,//'`
28484 -  ;;
28485 -shared)
28486 -  PHP_PDO_FIREBIRD=yes
28487 -  ;;
28488 -no)
28489 -  ext_output=no
28490 -  ext_shared=no
28491 -  ;;
28492 -*)
28493 -  ext_output=yes
28494 -  ext_shared=no
28495 -  ;;
28496 -esac
28497 -
28498 -
28499 -
28500 -echo "$ac_t""$ext_output" 1>&6
28501 -
28502 -
28503 -
28504 -
28505 -if test "$PHP_PDO_FIREBIRD" != "no"; then
28506 -
28507 -  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
28508 -    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
28509 -  fi
28510 -
28511 -  if test "$PHP_PDO_FIREBIRD" = "yes"; then
28512 -    FIREBIRD_INCDIR=
28513 -    FIREBIRD_LIBDIR=
28514 -    FIREBIRD_LIBDIR_FLAG=
28515 -  else
28516 -    FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
28517 -    FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
28518 -    FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR
28519 -  fi
28520 -
28521 -
28522 -  save_old_LDFLAGS=$LDFLAGS
28523 -  ac_stuff="
28524 -    $FIREBIRD_LIBDIR_FLAG
28525 -  "
28526 -
28527 -  save_ext_shared=$ext_shared
28528 -  ext_shared=yes
28529 -
28530 -  for ac_i in $ac_stuff; do
28531 -    case $ac_i in
28532 -    -pthread)
28533 -      if test "$ext_shared" = "yes"; then
28534 -        LDFLAGS="$LDFLAGS -pthread"
28535 -      else
28536 -
28537 -
28538 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
28539 -
28540 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
28541 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
28542 -    eval "EXTRA_LDFLAGS$unique=set"
28543 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
28544 -  fi
28545 -
28546 -      fi
28547 -    ;;
28548 -    -l*)
28549 -      ac_ii=`echo $ac_i|cut -c 3-`
28550 -
28551 -
28552 -  case $ac_ii in
28553 -  c|c_r|pthread*) ;;
28554 -  *)
28555 -    if test "$ext_shared" = "yes"; then
28556 -        LDFLAGS="$LDFLAGS -l$ac_ii"
28557 -    else
28558 -
28559 -
28560 -  case $ac_ii in
28561 -  c|c_r|pthread*) ;;
28562 -  *)
28563 -      LIBS="$LIBS -l$ac_ii"
28564 -   ;;
28565 -  esac
28566 -
28567 -
28568 -    fi
28569 -   ;;
28570 -  esac
28571 -
28572 -
28573 -    ;;
28574 -    -L*)
28575 -      ac_ii=`echo $ac_i|cut -c 3-`
28576 -
28577 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
28578 -
28579 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
28580 -    ai_p=$ac_ii
28581 -  else
28582 -
28583 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
28584 -
28585 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
28586 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
28587 +    ;;
28588 +    -L*)
28589 +      ac_ii=`echo $ac_i|cut -c 3-`
28590 +
28591 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
28592 +
28593 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
28594 +    ai_p=$ac_ii
28595 +  else
28596 +
28597 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
28598 +
28599 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
28600 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
28601    fi
28602
28603
28604        if test "$ext_shared" = "yes"; then
28605 -        LDFLAGS="-L$ai_p $LDFLAGS"
28606 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
28607 +        ODBC_SHARED_LIBADD="-L$ai_p $ODBC_SHARED_LIBADD"
28608 +        test -n "$ld_runpath_switch" && ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $ODBC_SHARED_LIBADD"
28609        else
28610
28611
28612 @@ -67479,652 +67273,184 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the
28613      esac
28614    done
28615
28616 -  echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
28617 -echo "configure:67484: checking for isc_detach_database in -lfbclient" >&5
28618 -ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
28619 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
28620 -  echo $ac_n "(cached) $ac_c" 1>&6
28621 -else
28622 -  ac_save_LIBS="$LIBS"
28623 -LIBS="-lfbclient  $LIBS"
28624 -cat > conftest.$ac_ext <<EOF
28625 -#line 67492 "configure"
28626 -#include "confdefs.h"
28627 -/* Override any gcc2 internal prototype to avoid an error.  */
28628 -/* We use char because int might match the return type of a gcc2
28629 -    builtin and then its argument prototype would still apply.  */
28630 -char isc_detach_database();
28631 +    if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then
28632 +      cat >> confdefs.h <<\EOF
28633 +#define HAVE_SQLDATASOURCES 1
28634 +EOF
28635
28636 -int main() {
28637 -isc_detach_database()
28638 -; return 0; }
28639 +    fi
28640 +  fi
28641 +
28642 +  cat >> confdefs.h <<\EOF
28643 +#define HAVE_UODBC 1
28644  EOF
28645 -if { (eval echo configure:67503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
28646 -  rm -rf conftest*
28647 -  eval "ac_cv_lib_$ac_lib_var=yes"
28648 -else
28649 -  echo "configure: failed program was:" >&5
28650 -  cat conftest.$ac_ext >&5
28651 -  rm -rf conftest*
28652 -  eval "ac_cv_lib_$ac_lib_var=no"
28653 -fi
28654 -rm -f conftest*
28655 -LIBS="$ac_save_LIBS"
28656
28657 -fi
28658 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
28659 -  echo "$ac_t""yes" 1>&6
28660
28661 -    LDFLAGS=$save_old_LDFLAGS
28662 -    ext_shared=$save_ext_shared
28663 -
28664 -    FIREBIRD_LIBNAME=fbclient
28665 +  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD"
28666 +
28667
28668 +  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCDIR"
28669 +
28670
28671 -else
28672 -  echo "$ac_t""no" 1>&6
28673 +  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBDIR"
28674
28675 -    LDFLAGS=$save_old_LDFLAGS
28676 -    ext_shared=$save_ext_shared
28677 -    unset ac_cv_lib_fbclient_isc_detach_database
28678 -
28679 -
28680 -  save_old_LDFLAGS=$LDFLAGS
28681 -  ac_stuff="
28682 -      $FIREBIRD_LIBDIR_FLAG
28683 -    "
28684
28685 -  save_ext_shared=$ext_shared
28686 -  ext_shared=yes
28687
28688 -  for ac_i in $ac_stuff; do
28689 -    case $ac_i in
28690 -    -pthread)
28691 -      if test "$ext_shared" = "yes"; then
28692 -        LDFLAGS="$LDFLAGS -pthread"
28693 -      else
28694 -
28695 +  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCLUDE"
28696 +
28697
28698 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
28699 +
28700
28701 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
28702 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
28703 -    eval "EXTRA_LDFLAGS$unique=set"
28704 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
28705 -  fi
28706 +
28707 +  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBS"
28708
28709 -      fi
28710 -    ;;
28711 -    -l*)
28712 -      ac_ii=`echo $ac_i|cut -c 3-`
28713 -
28714
28715 -  case $ac_ii in
28716 -  c|c_r|pthread*) ;;
28717 -  *)
28718 -    if test "$ext_shared" = "yes"; then
28719 -        LDFLAGS="$LDFLAGS -l$ac_ii"
28720 -    else
28721 -
28722 +
28723
28724 -  case $ac_ii in
28725 -  c|c_r|pthread*) ;;
28726 -  *)
28727 -      LIBS="$LIBS -l$ac_ii"
28728 -   ;;
28729 -  esac
28730 +
28731 +  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LFLAGS"
28732
28733 +
28734
28735 -    fi
28736 -   ;;
28737 -  esac
28738 +
28739 +
28740 +  PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_TYPE"
28741
28742 +
28743
28744 -    ;;
28745 -    -L*)
28746 -      ac_ii=`echo $ac_i|cut -c 3-`
28747 -
28748 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
28749 -
28750 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
28751 -    ai_p=$ac_ii
28752 -  else
28753 -
28754 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
28755 -
28756 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
28757 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
28758 -  fi
28759
28760 -
28761 -      if test "$ext_shared" = "yes"; then
28762 -        LDFLAGS="-L$ai_p $LDFLAGS"
28763 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
28764 -      else
28765 -
28766
28767 +  ext_builddir=ext/odbc
28768 +  ext_srcdir=$abs_srcdir/ext/odbc
28769 +
28770 +  ac_extra=`echo "$ODBC_INCLUDE"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
28771 +
28772 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
28773 +    PHP_ODBC_SHARED=no
28774 +
28775
28776 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
28777 +  case ext/odbc in
28778 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28779 +  /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28780 +  *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28781 +  esac
28782
28783 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
28784 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
28785 -    eval "LIBPATH$unique=set"
28786 -
28787 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
28788 -    LDFLAGS="$LDFLAGS -L$ai_p"
28789 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
28790
28791 -  fi
28792
28793 +  b_c_pre=$php_c_pre
28794 +  b_cxx_pre=$php_cxx_pre
28795 +  b_c_meta=$php_c_meta
28796 +  b_cxx_meta=$php_cxx_meta
28797 +  b_c_post=$php_c_post
28798 +  b_cxx_post=$php_cxx_post
28799 +  b_lo=$php_lo
28800
28801 -      fi
28802 -
28803 -  fi
28804
28805 -    ;;
28806 -    esac
28807 -  done
28808 +  old_IFS=$IFS
28809 +  for ac_src in php_odbc.c; do
28810 +
28811 +      IFS=.
28812 +      set $ac_src
28813 +      ac_obj=$1
28814 +      IFS=$old_IFS
28815 +
28816 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
28817
28818 -  echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
28819 -echo "configure:67630: checking for isc_detach_database in -lgds" >&5
28820 -ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
28821 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
28822 -  echo $ac_n "(cached) $ac_c" 1>&6
28823 -else
28824 -  ac_save_LIBS="$LIBS"
28825 -LIBS="-lgds  $LIBS"
28826 -cat > conftest.$ac_ext <<EOF
28827 -#line 67638 "configure"
28828 -#include "confdefs.h"
28829 -/* Override any gcc2 internal prototype to avoid an error.  */
28830 -/* We use char because int might match the return type of a gcc2
28831 -    builtin and then its argument prototype would still apply.  */
28832 -char isc_detach_database();
28833 +      case $ac_src in
28834 +        *.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" ;;
28835 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28836 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28837 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
28838 +      esac
28839
28840 -int main() {
28841 -isc_detach_database()
28842 -; return 0; }
28843 +    cat >>Makefile.objects<<EOF
28844 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
28845 +       $ac_comp
28846  EOF
28847 -if { (eval echo configure:67649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
28848 -  rm -rf conftest*
28849 -  eval "ac_cv_lib_$ac_lib_var=yes"
28850 -else
28851 -  echo "configure: failed program was:" >&5
28852 -  cat conftest.$ac_ext >&5
28853 -  rm -rf conftest*
28854 -  eval "ac_cv_lib_$ac_lib_var=no"
28855 -fi
28856 -rm -f conftest*
28857 -LIBS="$ac_save_LIBS"
28858 +  done
28859
28860 -fi
28861 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
28862 -  echo "$ac_t""yes" 1>&6
28863 -
28864 -    LDFLAGS=$save_old_LDFLAGS
28865 -    ext_shared=$save_ext_shared
28866 -
28867 -      FIREBIRD_LIBNAME=gds
28868 -
28869 -
28870 -else
28871 -  echo "$ac_t""no" 1>&6
28872
28873 -    LDFLAGS=$save_old_LDFLAGS
28874 -    ext_shared=$save_ext_shared
28875 -    unset ac_cv_lib_gds_isc_detach_database
28876 -
28877 +    EXT_STATIC="$EXT_STATIC odbc"
28878 +    if test "$ext_shared" != "nocli"; then
28879 +      EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
28880 +    fi
28881 +  else
28882 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
28883 +      PHP_ODBC_SHARED=yes
28884
28885 -  save_old_LDFLAGS=$LDFLAGS
28886 -  ac_stuff="
28887 -        $FIREBIRD_LIBDIR_FLAG
28888 -      "
28889 -
28890 -  save_ext_shared=$ext_shared
28891 -  ext_shared=yes
28892 -
28893 -  for ac_i in $ac_stuff; do
28894 -    case $ac_i in
28895 -    -pthread)
28896 -      if test "$ext_shared" = "yes"; then
28897 -        LDFLAGS="$LDFLAGS -pthread"
28898 -      else
28899 -
28900 +  case ext/odbc in
28901 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28902 +  /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28903 +  *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28904 +  esac
28905
28906 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
28907
28908 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
28909 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
28910 -    eval "EXTRA_LDFLAGS$unique=set"
28911 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
28912 -  fi
28913
28914 -      fi
28915 -    ;;
28916 -    -l*)
28917 -      ac_ii=`echo $ac_i|cut -c 3-`
28918 -
28919 +  b_c_pre=$shared_c_pre
28920 +  b_cxx_pre=$shared_cxx_pre
28921 +  b_c_meta=$shared_c_meta
28922 +  b_cxx_meta=$shared_cxx_meta
28923 +  b_c_post=$shared_c_post
28924 +  b_cxx_post=$shared_cxx_post
28925 +  b_lo=$shared_lo
28926 +
28927 +
28928 +  old_IFS=$IFS
28929 +  for ac_src in php_odbc.c; do
28930
28931 -  case $ac_ii in
28932 -  c|c_r|pthread*) ;;
28933 -  *)
28934 -    if test "$ext_shared" = "yes"; then
28935 -        LDFLAGS="$LDFLAGS -l$ac_ii"
28936 -    else
28937 +      IFS=.
28938 +      set $ac_src
28939 +      ac_obj=$1
28940 +      IFS=$old_IFS
28941
28942 -
28943 -  case $ac_ii in
28944 -  c|c_r|pthread*) ;;
28945 -  *)
28946 -      LIBS="$LIBS -l$ac_ii"
28947 -   ;;
28948 -  esac
28949 +      shared_objects_odbc="$shared_objects_odbc $ac_bdir$ac_obj.lo"
28950
28951 +      case $ac_src in
28952 +        *.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" ;;
28953 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28954 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28955 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
28956 +      esac
28957
28958 -    fi
28959 -   ;;
28960 -  esac
28961 +    cat >>Makefile.objects<<EOF
28962 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
28963 +       $ac_comp
28964 +EOF
28965 +  done
28966
28967 +      case $host_alias in
28968 +        *netware*)
28969 +
28970 +  install_modules="install-modules"
28971
28972 -    ;;
28973 -    -L*)
28974 -      ac_ii=`echo $ac_i|cut -c 3-`
28975 -
28976 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
28977 -
28978 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
28979 -    ai_p=$ac_ii
28980 +  case $host_alias in
28981 +    *aix*)
28982 +      suffix=so
28983 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpodbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(PHPODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpodbc.so '$ext_builddir'/phpodbc.so'
28984 +      ;;
28985 +    *netware*)
28986 +      suffix=nlm
28987 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPODBC, 3)_SHARED_LIBADD)'
28988 +      ;;
28989 +    *)
28990 +      suffix=la
28991 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(PHPODBC_SHARED_LIBADD)'
28992 +      ;;
28993 +  esac
28994 +
28995 +  if test "x" = "xyes"; then
28996 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpodbc.$suffix"
28997    else
28998 -
28999 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
29000 -
29001 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29002 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
29003 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpodbc.$suffix"
29004    fi
29005 -
29006 -
29007 -      if test "$ext_shared" = "yes"; then
29008 -        LDFLAGS="-L$ai_p $LDFLAGS"
29009 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
29010 -      else
29011 -
29012 -
29013
29014 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
29015 -
29016 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
29017 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
29018 -    eval "LIBPATH$unique=set"
29019 -
29020 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
29021 -    LDFLAGS="$LDFLAGS -L$ai_p"
29022 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
29023 -
29024 -  fi
29025 -
29026 -
29027 -      fi
29028 -
29029 -  fi
29030 -
29031 -    ;;
29032 -    esac
29033 -  done
29034 -
29035 -  echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
29036 -echo "configure:67776: checking for isc_detach_database in -lib_util" >&5
29037 -ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
29038 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
29039 -  echo $ac_n "(cached) $ac_c" 1>&6
29040 -else
29041 -  ac_save_LIBS="$LIBS"
29042 -LIBS="-lib_util  $LIBS"
29043 -cat > conftest.$ac_ext <<EOF
29044 -#line 67784 "configure"
29045 -#include "confdefs.h"
29046 -/* Override any gcc2 internal prototype to avoid an error.  */
29047 -/* We use char because int might match the return type of a gcc2
29048 -    builtin and then its argument prototype would still apply.  */
29049 -char isc_detach_database();
29050 -
29051 -int main() {
29052 -isc_detach_database()
29053 -; return 0; }
29054 -EOF
29055 -if { (eval echo configure:67795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
29056 -  rm -rf conftest*
29057 -  eval "ac_cv_lib_$ac_lib_var=yes"
29058 -else
29059 -  echo "configure: failed program was:" >&5
29060 -  cat conftest.$ac_ext >&5
29061 -  rm -rf conftest*
29062 -  eval "ac_cv_lib_$ac_lib_var=no"
29063 -fi
29064 -rm -f conftest*
29065 -LIBS="$ac_save_LIBS"
29066 -
29067 -fi
29068 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
29069 -  echo "$ac_t""yes" 1>&6
29070 -
29071 -    LDFLAGS=$save_old_LDFLAGS
29072 -    ext_shared=$save_ext_shared
29073 -
29074 -        FIREBIRD_LIBNAME=ib_util
29075 -
29076 -
29077 -else
29078 -  echo "$ac_t""no" 1>&6
29079 -
29080 -    LDFLAGS=$save_old_LDFLAGS
29081 -    ext_shared=$save_ext_shared
29082 -    unset ac_cv_lib_ib_util_isc_detach_database
29083 -
29084 -        { echo "configure: error: libfbclient, libgds or libib_util not found! Check config.log for more information." 1>&2; exit 1; }
29085 -
29086 -
29087 -fi
29088 -
29089 -
29090 -
29091 -fi
29092 -
29093 -
29094 -
29095 -fi
29096 -
29097 -
29098 -
29099 -  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
29100 -echo "configure:67840: checking for PDO includes" >&5
29101 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
29102 -  echo $ac_n "(cached) $ac_c" 1>&6
29103 -else
29104 -
29105 -    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
29106 -echo "configure:67846: checking for PDO includes" >&5
29107 -    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
29108 -      pdo_inc_path=$abs_srcdir/ext
29109 -    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
29110 -      pdo_inc_path=$abs_srcdir/ext
29111 -    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
29112 -      pdo_inc_path=$prefix/include/php/ext
29113 -    fi
29114 -
29115 -fi
29116 -
29117 -echo "$ac_t""$pdo_inc_path" 1>&6
29118 -  if test -n "$pdo_inc_path"; then
29119 -:
29120 -  else
29121 -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
29122 -  fi
29123 -
29124 -
29125 -
29126 -
29127 -  if test "$ext_shared" = "yes"; then
29128 -    PDO_FIREBIRD_SHARED_LIBADD="-l$FIREBIRD_LIBNAME $PDO_FIREBIRD_SHARED_LIBADD"
29129 -    if test -n "$FIREBIRD_LIBDIR"; then
29130 -
29131 -  if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then
29132 -
29133 -  if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then
29134 -    ai_p=$FIREBIRD_LIBDIR
29135 -  else
29136 -
29137 -    ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
29138 -
29139 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29140 -    ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`"
29141 -  fi
29142 -
29143 -
29144 -      if test "$ext_shared" = "yes"; then
29145 -        PDO_FIREBIRD_SHARED_LIBADD="-L$ai_p $PDO_FIREBIRD_SHARED_LIBADD"
29146 -        test -n "$ld_runpath_switch" && PDO_FIREBIRD_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_FIREBIRD_SHARED_LIBADD"
29147 -      else
29148 -
29149 -
29150 -
29151 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
29152 -
29153 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
29154 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
29155 -    eval "LIBPATH$unique=set"
29156 -
29157 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
29158 -    LDFLAGS="$LDFLAGS -L$ai_p"
29159 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
29160 -
29161 -  fi
29162 -
29163 -
29164 -      fi
29165 -
29166 -  fi
29167 -
29168 -    fi
29169 -  else
29170 -
29171 -
29172 -  if test -n "$FIREBIRD_LIBDIR"; then
29173 -
29174 -  if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then
29175 -
29176 -  if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then
29177 -    ai_p=$FIREBIRD_LIBDIR
29178 -  else
29179 -
29180 -    ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
29181 -
29182 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29183 -    ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`"
29184 -  fi
29185 -
29186 -
29187 -
29188 -
29189 -
29190 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
29191 -
29192 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
29193 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
29194 -    eval "LIBPATH$unique=set"
29195 -
29196 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
29197 -    LDFLAGS="$LDFLAGS -L$ai_p"
29198 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
29199 -
29200 -  fi
29201 -
29202 -
29203 -
29204 -  fi
29205 -
29206 -  fi
29207 -
29208 -
29209 -  case $FIREBIRD_LIBNAME in
29210 -  c|c_r|pthread*) ;;
29211 -  *)
29212 -      LIBS="-l$FIREBIRD_LIBNAME $LIBS"
29213 -   ;;
29214 -  esac
29215 -
29216 -
29217 -
29218 -
29219 -  fi
29220 -
29221 -
29222 -
29223 -  if test "$FIREBIRD_INCDIR" != "/usr/include"; then
29224 -
29225 -  if test -z "$FIREBIRD_INCDIR" || echo "$FIREBIRD_INCDIR" | grep '^/' >/dev/null ; then
29226 -    ai_p=$FIREBIRD_INCDIR
29227 -  else
29228 -
29229 -    ep_dir="`echo $FIREBIRD_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
29230 -
29231 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29232 -    ai_p="$ep_realdir/`basename \"$FIREBIRD_INCDIR\"`"
29233 -  fi
29234 -
29235 -
29236 -
29237 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
29238 -
29239 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
29240 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
29241 -    eval "INCLUDEPATH$unique=set"
29242 -
29243 -      if test ""; then
29244 -        INCLUDES="-I$ai_p $INCLUDES"
29245 -      else
29246 -        INCLUDES="$INCLUDES -I$ai_p"
29247 -      fi
29248 -
29249 -  fi
29250 -
29251 -  fi
29252 -
29253 -  cat >> confdefs.h <<\EOF
29254 -#define HAVE_PDO_FIREBIRD 1
29255 -EOF
29256 -
29257 -
29258 -  ext_builddir=ext/pdo_firebird
29259 -  ext_srcdir=$abs_srcdir/ext/pdo_firebird
29260 -
29261 -  ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
29262 -
29263 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
29264 -    PHP_PDO_FIREBIRD_SHARED=no
29265 -
29266 -
29267 -  case ext/pdo_firebird in
29268 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
29269 -  /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29270 -  *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29271 -  esac
29272 -
29273 -
29274 -
29275 -  b_c_pre=$php_c_pre
29276 -  b_cxx_pre=$php_cxx_pre
29277 -  b_c_meta=$php_c_meta
29278 -  b_cxx_meta=$php_cxx_meta
29279 -  b_c_post=$php_c_post
29280 -  b_cxx_post=$php_cxx_post
29281 -  b_lo=$php_lo
29282 -
29283 -
29284 -  old_IFS=$IFS
29285 -  for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
29286 -
29287 -      IFS=.
29288 -      set $ac_src
29289 -      ac_obj=$1
29290 -      IFS=$old_IFS
29291 -
29292 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
29293 -
29294 -      case $ac_src in
29295 -        *.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" ;;
29296 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
29297 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
29298 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
29299 -      esac
29300 -
29301 -    cat >>Makefile.objects<<EOF
29302 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
29303 -       $ac_comp
29304 -EOF
29305 -  done
29306 -
29307 -
29308 -    EXT_STATIC="$EXT_STATIC pdo_firebird"
29309 -    if test "$ext_shared" != "nocli"; then
29310 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
29311 -    fi
29312 -  else
29313 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
29314 -      PHP_PDO_FIREBIRD_SHARED=yes
29315 -
29316 -  case ext/pdo_firebird in
29317 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
29318 -  /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29319 -  *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29320 -  esac
29321 -
29322 -
29323 -
29324 -  b_c_pre=$shared_c_pre
29325 -  b_cxx_pre=$shared_cxx_pre
29326 -  b_c_meta=$shared_c_meta
29327 -  b_cxx_meta=$shared_cxx_meta
29328 -  b_c_post=$shared_c_post
29329 -  b_cxx_post=$shared_cxx_post
29330 -  b_lo=$shared_lo
29331 -
29332 -
29333 -  old_IFS=$IFS
29334 -  for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
29335 -
29336 -      IFS=.
29337 -      set $ac_src
29338 -      ac_obj=$1
29339 -      IFS=$old_IFS
29340 -
29341 -      shared_objects_pdo_firebird="$shared_objects_pdo_firebird $ac_bdir$ac_obj.lo"
29342 -
29343 -      case $ac_src in
29344 -        *.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" ;;
29345 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
29346 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
29347 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
29348 -      esac
29349 -
29350 -    cat >>Makefile.objects<<EOF
29351 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
29352 -       $ac_comp
29353 -EOF
29354 -  done
29355 -
29356 -      case $host_alias in
29357 -        *netware*)
29358 -
29359 -  install_modules="install-modules"
29360 -
29361 -  case $host_alias in
29362 -    *aix*)
29363 -      suffix=so
29364 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_firebird.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PHPPDO_FIREBIRD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_firebird.so '$ext_builddir'/phppdo_firebird.so'
29365 -      ;;
29366 -    *netware*)
29367 -      suffix=nlm
29368 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_FIREBIRD, 3)_SHARED_LIBADD)'
29369 -      ;;
29370 -    *)
29371 -      suffix=la
29372 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PHPPDO_FIREBIRD_SHARED_LIBADD)'
29373 -      ;;
29374 -  esac
29375 -
29376 -  if test "x" = "xyes"; then
29377 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_firebird.$suffix"
29378 -  else
29379 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_firebird.$suffix"
29380 -  fi
29381 -
29382 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
29383 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
29384
29385    cat >>Makefile.objects<<EOF
29386 -\$(phplibdir)/phppdo_firebird.$suffix: $ext_builddir/phppdo_firebird.$suffix
29387 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_firebird.$suffix \$(phplibdir)
29388 +\$(phplibdir)/phpodbc.$suffix: $ext_builddir/phpodbc.$suffix
29389 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpodbc.$suffix \$(phplibdir)
29390
29391 -$ext_builddir/phppdo_firebird.$suffix: \$(shared_objects_pdo_firebird) \$(PHPPDO_FIREBIRD_SHARED_DEPENDENCIES)
29392 +$ext_builddir/phpodbc.$suffix: \$(shared_objects_odbc) \$(PHPODBC_SHARED_DEPENDENCIES)
29393         $link_cmd
29394
29395  EOF
29396 @@ -68137,31 +67463,31 @@ EOF
29397    case $host_alias in
29398      *aix*)
29399        suffix=so
29400 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_firebird.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PDO_FIREBIRD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_firebird.so '$ext_builddir'/pdo_firebird.so'
29401 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/odbc.so '$ext_builddir'/odbc.so'
29402        ;;
29403      *netware*)
29404        suffix=nlm
29405 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_FIREBIRD, 3)_SHARED_LIBADD)'
29406 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ODBC, 3)_SHARED_LIBADD)'
29407        ;;
29408      *)
29409        suffix=la
29410 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PDO_FIREBIRD_SHARED_LIBADD)'
29411 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD)'
29412        ;;
29413    esac
29414
29415    if test "x" = "xyes"; then
29416 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_firebird.$suffix"
29417 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/odbc.$suffix"
29418    else
29419 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_firebird.$suffix"
29420 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/odbc.$suffix"
29421    fi
29422
29423 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
29424 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc"
29425
29426    cat >>Makefile.objects<<EOF
29427 -\$(phplibdir)/pdo_firebird.$suffix: $ext_builddir/pdo_firebird.$suffix
29428 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_firebird.$suffix \$(phplibdir)
29429 +\$(phplibdir)/odbc.$suffix: $ext_builddir/odbc.$suffix
29430 +       \$(LIBTOOL) --mode=install cp $ext_builddir/odbc.$suffix \$(phplibdir)
29431
29432 -$ext_builddir/pdo_firebird.$suffix: \$(shared_objects_pdo_firebird) \$(PDO_FIREBIRD_SHARED_DEPENDENCIES)
29433 +$ext_builddir/odbc.$suffix: \$(shared_objects_odbc) \$(ODBC_SHARED_DEPENDENCIES)
29434         $link_cmd
29435
29436  EOF
29437 @@ -68169,22 +67495,22 @@ EOF
29438            ;;
29439        esac
29440        cat >> confdefs.h <<EOF
29441 -#define COMPILE_DL_PDO_FIREBIRD 1
29442 +#define COMPILE_DL_ODBC 1
29443  EOF
29444
29445      fi
29446    fi
29447
29448    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
29449 -    PHP_PDO_FIREBIRD_SHARED=no
29450 +    PHP_ODBC_SHARED=no
29451      case "$PHP_SAPI" in
29452        cgi|embed)
29453
29454
29455 -  case ext/pdo_firebird in
29456 +  case ext/odbc in
29457    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
29458 -  /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29459 -  *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29460 +  /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29461 +  *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29462    esac
29463
29464
29465 @@ -68199,7 +67525,7 @@ EOF
29466
29467
29468    old_IFS=$IFS
29469 -  for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
29470 +  for ac_src in php_odbc.c; do
29471
29472        IFS=.
29473        set $ac_src
29474 @@ -68222,15 +67548,15 @@ EOF
29475    done
29476
29477
29478 -        EXT_STATIC="$EXT_STATIC pdo_firebird"
29479 +        EXT_STATIC="$EXT_STATIC odbc"
29480          ;;
29481        *)
29482
29483
29484 -  case ext/pdo_firebird in
29485 +  case ext/odbc in
29486    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
29487 -  /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29488 -  *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29489 +  /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29490 +  *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29491    esac
29492
29493
29494 @@ -68245,7 +67571,7 @@ EOF
29495
29496
29497    old_IFS=$IFS
29498 -  for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
29499 +  for ac_src in php_odbc.c; do
29500
29501        IFS=.
29502        set $ac_src
29503 @@ -68270,7 +67596,7 @@ EOF
29504
29505          ;;
29506      esac
29507 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
29508 +    EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
29509    fi
29510
29511
29512 @@ -68279,50 +67605,28 @@ EOF
29513
29514
29515    if test "$ext_builddir" = "."; then
29516 -    PHP_PECL_EXTENSION=pdo_firebird
29517 +    PHP_PECL_EXTENSION=odbc
29518
29519    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
29520
29521    fi
29522
29523 -
29524 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_FIREBIRD_SHARED_LIBADD"
29525 -
29526 -
29527 -  am_i_shared=$PHP_PDO_FIREBIRD_SHARED
29528 -  is_it_shared=$PHP_PDO_SHARED
29529 -  is_it_enabled=$PHP_PDO
29530 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
29531 -    { echo "configure: error:
29532 -You've configured extension pdo_firebird to build statically, but it
29533 -depends on extension pdo, which you've configured to build shared.
29534 -You either need to build pdo_firebird shared or build pdo statically for the
29535 -build to be successful.
29536 -" 1>&2; exit 1; }
29537 -  fi
29538 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
29539 -    { echo "configure: error:
29540 -You've configured extension pdo_firebird, which depends on extension pdo,
29541 -but you've either not enabled pdo, or have disabled it.
29542 -" 1>&2; exit 1; }
29543 -  fi
29544 -
29545  fi
29546
29547
29548
29549 -php_with_pdo_mysql=no
29550 +php_enable_pcntl=no
29551
29552 -echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
29553 -echo "configure:68318: checking for MySQL support for PDO" >&5
29554 -# Check whether --with-pdo-mysql or --without-pdo-mysql was given.
29555 -if test "${with_pdo_mysql+set}" = set; then
29556 -  withval="$with_pdo_mysql"
29557 -  PHP_PDO_MYSQL=$withval
29558 +echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
29559 +echo "configure:67622: checking whether to enable pcntl support" >&5
29560 +# Check whether --enable-pcntl or --disable-pcntl was given.
29561 +if test "${enable_pcntl+set}" = set; then
29562 +  enableval="$enable_pcntl"
29563 +  PHP_PCNTL=$enableval
29564  else
29565
29566 -  PHP_PDO_MYSQL=no
29567 -  test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL
29568 +  PHP_PCNTL=no
29569 +  test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL
29570
29571  fi
29572
29573 @@ -68330,12 +67634,12 @@ fi
29574
29575  ext_output="yes, shared"
29576  ext_shared=yes
29577 -case $PHP_PDO_MYSQL in
29578 +case $PHP_PCNTL in
29579  shared,*)
29580 -  PHP_PDO_MYSQL=`echo "$PHP_PDO_MYSQL"|$SED 's/^shared,//'`
29581 +  PHP_PCNTL=`echo "$PHP_PCNTL"|$SED 's/^shared,//'`
29582    ;;
29583  shared)
29584 -  PHP_PDO_MYSQL=yes
29585 +  PHP_PCNTL=yes
29586    ;;
29587  no)
29588    ext_output=no
29589 @@ -68354,1125 +67658,637 @@ echo "$ac_t""$ext_output" 1>&6
29590
29591
29592
29593 -if test -z "$PHP_ZLIB_DIR"; then
29594 -
29595 -php_with_zlib_dir=no
29596 -
29597 -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
29598 -echo "configure:68363: checking for the location of libz" >&5
29599 -# Check whether --with-zlib-dir or --without-zlib-dir was given.
29600 -if test "${with_zlib_dir+set}" = set; then
29601 -  withval="$with_zlib_dir"
29602 -  PHP_ZLIB_DIR=$withval
29603 +if test "$PHP_PCNTL" != "no"; then
29604 +  for ac_func in fork
29605 +do
29606 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
29607 +echo "configure:67666: checking for $ac_func" >&5
29608 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
29609 +  echo $ac_n "(cached) $ac_c" 1>&6
29610  else
29611 -
29612 -  PHP_ZLIB_DIR=no
29613 -
29614 -
29615 -fi
29616 -
29617 -
29618 -ext_output=$PHP_ZLIB_DIR
29619 -echo "$ac_t""$ext_output" 1>&6
29620 +  cat > conftest.$ac_ext <<EOF
29621 +#line 67671 "configure"
29622 +#include "confdefs.h"
29623 +/* System header to define __stub macros and hopefully few prototypes,
29624 +    which can conflict with char $ac_func(); below.  */
29625 +#include <assert.h>
29626 +/* Override any gcc2 internal prototype to avoid an error.  */
29627 +/* We use char because int might match the return type of a gcc2
29628 +    builtin and then its argument prototype would still apply.  */
29629 +char $ac_func();
29630
29631 +int main() {
29632
29633 +/* The GNU C library defines this for functions which it implements
29634 +    to always fail with ENOSYS.  Some functions are actually named
29635 +    something starting with __ and the normal name is an alias.  */
29636 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
29637 +choke me
29638 +#else
29639 +$ac_func();
29640 +#endif
29641
29642 +; return 0; }
29643 +EOF
29644 +if { (eval echo configure:67694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
29645 +  rm -rf conftest*
29646 +  eval "ac_cv_func_$ac_func=yes"
29647 +else
29648 +  echo "configure: failed program was:" >&5
29649 +  cat conftest.$ac_ext >&5
29650 +  rm -rf conftest*
29651 +  eval "ac_cv_func_$ac_func=no"
29652 +fi
29653 +rm -f conftest*
29654  fi
29655
29656 -if test "$PHP_PDO_MYSQL" != "no"; then
29657 -
29658 -  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
29659 -    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
29660 -  fi
29661 -
29662 -
29663 -
29664 -  if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then
29665 -    PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL
29666 -  elif test "$PHP_PDO_MYSQL" != "yes"; then
29667 -    if test -d "$PHP_PDO_MYSQL" ; then
29668 -      if test -x "$PHP_PDO_MYSQL/bin/mysql_config" ; then
29669 -        PDO_MYSQL_CONFIG="$PHP_PDO_MYSQL/bin/mysql_config"
29670 -      else
29671 -        PDO_MYSQL_DIR="$PHP_PDO_MYSQL"
29672 -      fi
29673 -    fi
29674 -  else
29675 -    for i in /usr/local /usr ; do
29676 -      if test -x "$i/bin/mysql_config" ; then
29677 -        PDO_MYSQL_CONFIG="$i/bin/mysql_config"
29678 -        break;
29679 -      fi
29680 -      if test -r $i/include/mysql/mysql.h || test -r $i/include/mysql.h ; then
29681 -        PDO_MYSQL_DIR="$i"
29682 -        break;
29683 -      fi
29684 -    done
29685 -  fi
29686 -
29687 -  if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
29688 -        PHP_MYSQLND_ENABLED=yes
29689 -    cat >> confdefs.h <<\EOF
29690 -#define PDO_USE_MYSQLND 1
29691 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
29692 +  echo "$ac_t""yes" 1>&6
29693 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
29694 +  cat >> confdefs.h <<EOF
29695 +#define $ac_tr_func 1
29696  EOF
29697 -
29698 -  else
29699 -    cat >> confdefs.h <<\EOF
29700 -#define HAVE_MYSQL 1
29701 +  cat >> confdefs.h <<\EOF
29702 +#define HAVE_FORK 1
29703  EOF
29704 -
29705 -
29706 -    echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
29707 -echo "configure:68427: checking for mysql_config" >&5
29708 -    if test -n "$PDO_MYSQL_CONFIG"; then
29709 -      echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6
29710 -      if test "x$SED" = "x"; then
29711 -        # Extract the first word of "sed", so it can be a program name with args.
29712 -set dummy sed; ac_word=$2
29713 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
29714 -echo "configure:68434: checking for $ac_word" >&5
29715 -if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
29716 -  echo $ac_n "(cached) $ac_c" 1>&6
29717 -else
29718 -  case "$SED" in
29719 -  /*)
29720 -  ac_cv_path_SED="$SED" # Let the user override the test with a path.
29721 -  ;;
29722 -  ?:/*)
29723 -  ac_cv_path_SED="$SED" # Let the user override the test with a dos path.
29724 -  ;;
29725 -  *)
29726 -  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
29727 -  ac_dummy="$PATH"
29728 -  for ac_dir in $ac_dummy; do
29729 -    test -z "$ac_dir" && ac_dir=.
29730 -    if test -f $ac_dir/$ac_word; then
29731 -      ac_cv_path_SED="$ac_dir/$ac_word"
29732 -      break
29733 -    fi
29734 -  done
29735 -  IFS="$ac_save_ifs"
29736 -  ;;
29737 -esac
29738 -fi
29739 -SED="$ac_cv_path_SED"
29740 -if test -n "$SED"; then
29741 -  echo "$ac_t""$SED" 1>&6
29742 +
29743  else
29744    echo "$ac_t""no" 1>&6
29745 +{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; }
29746  fi
29747 +done
29748
29749 -      fi
29750 -      if test "$enable_maintainer_zts" = "yes"; then
29751 -        PDO_MYSQL_LIBNAME=mysqlclient_r
29752 -        PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
29753 -      else
29754 -        PDO_MYSQL_LIBNAME=mysqlclient
29755 -        PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
29756 -      fi
29757 -      PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
29758 -    elif test -n "$PDO_MYSQL_DIR"; then
29759 -      echo "$ac_t""not found" 1>&6
29760 -      echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
29761 -echo "configure:68478: checking for mysql install under $PDO_MYSQL_DIR" >&5
29762 -      if test -r $PDO_MYSQL_DIR/include/mysql; then
29763 -        PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
29764 -      else
29765 -        PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include
29766 -      fi
29767 -      if test -r $PDO_MYSQL_DIR/$PHP_LIBDIR/mysql; then
29768 -        PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR/mysql
29769 -      else
29770 -        PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR
29771 -      fi
29772 -
29773 -      if test -r "$PDO_MYSQL_LIB_DIR"; then
29774 -        echo "$ac_t""libs under $PDO_MYSQL_LIB_DIR; seems promising" 1>&6
29775 -      else
29776 -        echo "$ac_t""can not find it" 1>&6
29777 -        { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; }
29778 -      fi
29779 -
29780 -
29781 -  if test "$PDO_MYSQL_INC_DIR" != "/usr/include"; then
29782 -
29783 -  if test -z "$PDO_MYSQL_INC_DIR" || echo "$PDO_MYSQL_INC_DIR" | grep '^/' >/dev/null ; then
29784 -    ai_p=$PDO_MYSQL_INC_DIR
29785 -  else
29786 -
29787 -    ep_dir="`echo $PDO_MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
29788 -
29789 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29790 -    ai_p="$ep_realdir/`basename \"$PDO_MYSQL_INC_DIR\"`"
29791 -  fi
29792 -
29793 -
29794 -
29795 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
29796 -
29797 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
29798 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
29799 -    eval "INCLUDEPATH$unique=set"
29800 -
29801 -      if test ""; then
29802 -        INCLUDES="-I$ai_p $INCLUDES"
29803 -      else
29804 -        INCLUDES="$INCLUDES -I$ai_p"
29805 -      fi
29806 -
29807 -  fi
29808 -
29809 -  fi
29810 -
29811 -      PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
29812 -    else
29813 -      echo "$ac_t""not found" 1>&6
29814 -      { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; }
29815 -    fi
29816 -
29817 -
29818 -  save_old_LDFLAGS=$LDFLAGS
29819 -  ac_stuff="
29820 -      $PDO_MYSQL_LIBS
29821 -    "
29822 -
29823 -  save_ext_shared=$ext_shared
29824 -  ext_shared=yes
29825 -
29826 -  for ac_i in $ac_stuff; do
29827 -    case $ac_i in
29828 -    -pthread)
29829 -      if test "$ext_shared" = "yes"; then
29830 -        LDFLAGS="$LDFLAGS -pthread"
29831 -      else
29832 -
29833 -
29834 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
29835 -
29836 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
29837 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
29838 -    eval "EXTRA_LDFLAGS$unique=set"
29839 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
29840 -  fi
29841 +  for ac_func in waitpid
29842 +do
29843 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
29844 +echo "configure:67725: checking for $ac_func" >&5
29845 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
29846 +  echo $ac_n "(cached) $ac_c" 1>&6
29847 +else
29848 +  cat > conftest.$ac_ext <<EOF
29849 +#line 67730 "configure"
29850 +#include "confdefs.h"
29851 +/* System header to define __stub macros and hopefully few prototypes,
29852 +    which can conflict with char $ac_func(); below.  */
29853 +#include <assert.h>
29854 +/* Override any gcc2 internal prototype to avoid an error.  */
29855 +/* We use char because int might match the return type of a gcc2
29856 +    builtin and then its argument prototype would still apply.  */
29857 +char $ac_func();
29858
29859 -      fi
29860 -    ;;
29861 -    -l*)
29862 -      ac_ii=`echo $ac_i|cut -c 3-`
29863 -
29864 -
29865 -  case $ac_ii in
29866 -  c|c_r|pthread*) ;;
29867 -  *)
29868 -    if test "$ext_shared" = "yes"; then
29869 -        LDFLAGS="$LDFLAGS -l$ac_ii"
29870 -    else
29871 -
29872 -
29873 -  case $ac_ii in
29874 -  c|c_r|pthread*) ;;
29875 -  *)
29876 -      LIBS="$LIBS -l$ac_ii"
29877 -   ;;
29878 -  esac
29879 +int main() {
29880
29881 +/* The GNU C library defines this for functions which it implements
29882 +    to always fail with ENOSYS.  Some functions are actually named
29883 +    something starting with __ and the normal name is an alias.  */
29884 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
29885 +choke me
29886 +#else
29887 +$ac_func();
29888 +#endif
29889
29890 -    fi
29891 -   ;;
29892 -  esac
29893 +; return 0; }
29894 +EOF
29895 +if { (eval echo configure:67753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
29896 +  rm -rf conftest*
29897 +  eval "ac_cv_func_$ac_func=yes"
29898 +else
29899 +  echo "configure: failed program was:" >&5
29900 +  cat conftest.$ac_ext >&5
29901 +  rm -rf conftest*
29902 +  eval "ac_cv_func_$ac_func=no"
29903 +fi
29904 +rm -f conftest*
29905 +fi
29906
29907 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
29908 +  echo "$ac_t""yes" 1>&6
29909 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
29910 +  cat >> confdefs.h <<EOF
29911 +#define $ac_tr_func 1
29912 +EOF
29913 +  cat >> confdefs.h <<\EOF
29914 +#define HAVE_WAITPID 1
29915 +EOF
29916 +
29917 +else
29918 +  echo "$ac_t""no" 1>&6
29919 +{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; }
29920 +fi
29921 +done
29922
29923 -    ;;
29924 -    -L*)
29925 -      ac_ii=`echo $ac_i|cut -c 3-`
29926 -
29927 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
29928 -
29929 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
29930 -    ai_p=$ac_ii
29931 -  else
29932 -
29933 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
29934 -
29935 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29936 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
29937 -  fi
29938 +  for ac_func in sigaction
29939 +do
29940 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
29941 +echo "configure:67784: checking for $ac_func" >&5
29942 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
29943 +  echo $ac_n "(cached) $ac_c" 1>&6
29944 +else
29945 +  cat > conftest.$ac_ext <<EOF
29946 +#line 67789 "configure"
29947 +#include "confdefs.h"
29948 +/* System header to define __stub macros and hopefully few prototypes,
29949 +    which can conflict with char $ac_func(); below.  */
29950 +#include <assert.h>
29951 +/* Override any gcc2 internal prototype to avoid an error.  */
29952 +/* We use char because int might match the return type of a gcc2
29953 +    builtin and then its argument prototype would still apply.  */
29954 +char $ac_func();
29955
29956 -
29957 -      if test "$ext_shared" = "yes"; then
29958 -        LDFLAGS="-L$ai_p $LDFLAGS"
29959 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
29960 -      else
29961 -
29962 -
29963 -
29964 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
29965 -
29966 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
29967 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
29968 -    eval "LIBPATH$unique=set"
29969 -
29970 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
29971 -    LDFLAGS="$LDFLAGS -L$ai_p"
29972 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
29973 -
29974 -  fi
29975 +int main() {
29976
29977 +/* The GNU C library defines this for functions which it implements
29978 +    to always fail with ENOSYS.  Some functions are actually named
29979 +    something starting with __ and the normal name is an alias.  */
29980 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
29981 +choke me
29982 +#else
29983 +$ac_func();
29984 +#endif
29985
29986 -      fi
29987 -
29988 -  fi
29989 +; return 0; }
29990 +EOF
29991 +if { (eval echo configure:67812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
29992 +  rm -rf conftest*
29993 +  eval "ac_cv_func_$ac_func=yes"
29994 +else
29995 +  echo "configure: failed program was:" >&5
29996 +  cat conftest.$ac_ext >&5
29997 +  rm -rf conftest*
29998 +  eval "ac_cv_func_$ac_func=no"
29999 +fi
30000 +rm -f conftest*
30001 +fi
30002
30003 -    ;;
30004 -    esac
30005 -  done
30006 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
30007 +  echo "$ac_t""yes" 1>&6
30008 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
30009 +  cat >> confdefs.h <<EOF
30010 +#define $ac_tr_func 1
30011 +EOF
30012 +  cat >> confdefs.h <<\EOF
30013 +#define HAVE_SIGACTION 1
30014 +EOF
30015 +
30016 +else
30017 +  echo "$ac_t""no" 1>&6
30018 +{ echo "configure: error: pcntl: sigaction() not supported by this platform" 1>&2; exit 1; }
30019 +fi
30020 +done
30021
30022 -  echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
30023 -echo "configure:68632: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
30024 -ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
30025 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
30026 +  for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
30027 +do
30028 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
30029 +echo "configure:67843: checking for $ac_func" >&5
30030 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
30031    echo $ac_n "(cached) $ac_c" 1>&6
30032  else
30033 -  ac_save_LIBS="$LIBS"
30034 -LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
30035 -cat > conftest.$ac_ext <<EOF
30036 -#line 68640 "configure"
30037 +  cat > conftest.$ac_ext <<EOF
30038 +#line 67848 "configure"
30039  #include "confdefs.h"
30040 +/* System header to define __stub macros and hopefully few prototypes,
30041 +    which can conflict with char $ac_func(); below.  */
30042 +#include <assert.h>
30043  /* Override any gcc2 internal prototype to avoid an error.  */
30044  /* We use char because int might match the return type of a gcc2
30045      builtin and then its argument prototype would still apply.  */
30046 -char mysql_query();
30047 +char $ac_func();
30048
30049  int main() {
30050 -mysql_query()
30051 +
30052 +/* The GNU C library defines this for functions which it implements
30053 +    to always fail with ENOSYS.  Some functions are actually named
30054 +    something starting with __ and the normal name is an alias.  */
30055 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
30056 +choke me
30057 +#else
30058 +$ac_func();
30059 +#endif
30060 +
30061  ; return 0; }
30062  EOF
30063 -if { (eval echo configure:68651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
30064 +if { (eval echo configure:67871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
30065    rm -rf conftest*
30066 -  eval "ac_cv_lib_$ac_lib_var=yes"
30067 +  eval "ac_cv_func_$ac_func=yes"
30068  else
30069    echo "configure: failed program was:" >&5
30070    cat conftest.$ac_ext >&5
30071    rm -rf conftest*
30072 -  eval "ac_cv_lib_$ac_lib_var=no"
30073 +  eval "ac_cv_func_$ac_func=no"
30074  fi
30075  rm -f conftest*
30076 -LIBS="$ac_save_LIBS"
30077 -
30078  fi
30079 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
30080 +
30081 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
30082    echo "$ac_t""yes" 1>&6
30083 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
30084 +  cat >> confdefs.h <<EOF
30085 +#define $ac_tr_func 1
30086 +EOF
30087 +
30088 +else
30089 +  echo "$ac_t""no" 1>&6
30090 +fi
30091 +done
30092 +
30093
30094 -    LDFLAGS=$save_old_LDFLAGS
30095 -    ext_shared=$save_ext_shared
30096 -
30097 -
30098 -  for ac_i in $PDO_MYSQL_INCLUDE; do
30099 -    case $ac_i in
30100 -    -I*)
30101 -      ac_ii=`echo $ac_i|cut -c 3-`
30102 -
30103 -  if test "$ac_ii" != "/usr/include"; then
30104 -
30105 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
30106 -    ai_p=$ac_ii
30107 -  else
30108 -
30109 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
30110 -
30111 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
30112 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
30113 -  fi
30114 +  ext_builddir=ext/pcntl
30115 +  ext_srcdir=$abs_srcdir/ext/pcntl
30116 +
30117 +  ac_extra=
30118
30119 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then
30120 +    PHP_PCNTL_SHARED=no
30121
30122
30123 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
30124 +  case ext/pcntl in
30125 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30126 +  /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30127 +  *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30128 +  esac
30129 +
30130
30131 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
30132 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30133 -    eval "INCLUDEPATH$unique=set"
30134 -
30135 -      if test ""; then
30136 -        INCLUDES="-I$ai_p $INCLUDES"
30137 -      else
30138 -        INCLUDES="$INCLUDES -I$ai_p"
30139 -      fi
30140 -
30141 -  fi
30142 -
30143 -  fi
30144
30145 -    ;;
30146 -    esac
30147 -  done
30148 +  b_c_pre=$php_c_pre
30149 +  b_cxx_pre=$php_cxx_pre
30150 +  b_c_meta=$php_c_meta
30151 +  b_cxx_meta=$php_cxx_meta
30152 +  b_c_post=$php_c_post
30153 +  b_cxx_post=$php_cxx_post
30154 +  b_lo=$php_lo
30155
30156 -
30157 -  for ac_i in $PDO_MYSQL_LIBS; do
30158 -    case $ac_i in
30159 -    -pthread)
30160 -      if test "$ext_shared" = "yes"; then
30161 -        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread"
30162 -      else
30163 -
30164 -
30165 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
30166 -
30167 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
30168 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30169 -    eval "EXTRA_LDFLAGS$unique=set"
30170 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
30171 -  fi
30172
30173 -      fi
30174 -    ;;
30175 -    -l*)
30176 -      ac_ii=`echo $ac_i|cut -c 3-`
30177 -
30178 +  old_IFS=$IFS
30179 +  for ac_src in pcntl.c php_signal.c; do
30180
30181 -  case $ac_ii in
30182 -  c|c_r|pthread*) ;;
30183 -  *)
30184 -    if test "$ext_shared" = "yes"; then
30185 -        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii"
30186 -    else
30187 +      IFS=.
30188 +      set $ac_src
30189 +      ac_obj=$1
30190 +      IFS=$old_IFS
30191
30192 -
30193 -  case $ac_ii in
30194 -  c|c_r|pthread*) ;;
30195 -  *)
30196 -      LIBS="$LIBS -l$ac_ii"
30197 -   ;;
30198 -  esac
30199 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
30200
30201 +      case $ac_src in
30202 +        *.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" ;;
30203 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30204 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30205 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
30206 +      esac
30207
30208 -    fi
30209 -   ;;
30210 -  esac
30211 +    cat >>Makefile.objects<<EOF
30212 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
30213 +       $ac_comp
30214 +EOF
30215 +  done
30216
30217
30218 -    ;;
30219 -    -L*)
30220 -      ac_ii=`echo $ac_i|cut -c 3-`
30221 -
30222 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
30223 -
30224 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
30225 -    ai_p=$ac_ii
30226 +    EXT_STATIC="$EXT_STATIC pcntl"
30227 +    if test "$ext_shared" != "nocli"; then
30228 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
30229 +    fi
30230    else
30231 -
30232 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
30233 -
30234 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
30235 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
30236 -  fi
30237 -
30238 -
30239 -      if test "$ext_shared" = "yes"; then
30240 -        PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD"
30241 -        test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD"
30242 -      else
30243 -
30244 -
30245 -
30246 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
30247 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
30248 +      PHP_PCNTL_SHARED=yes
30249 +
30250 +  case ext/pcntl in
30251 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30252 +  /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30253 +  *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30254 +  esac
30255
30256 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
30257 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30258 -    eval "LIBPATH$unique=set"
30259 -
30260 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
30261 -    LDFLAGS="$LDFLAGS -L$ai_p"
30262 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
30263
30264 -  fi
30265 +
30266 +  b_c_pre=$shared_c_pre
30267 +  b_cxx_pre=$shared_cxx_pre
30268 +  b_c_meta=$shared_c_meta
30269 +  b_cxx_meta=$shared_cxx_meta
30270 +  b_c_post=$shared_c_post
30271 +  b_cxx_post=$shared_cxx_post
30272 +  b_lo=$shared_lo
30273
30274
30275 -      fi
30276 -
30277 -  fi
30278 +  old_IFS=$IFS
30279 +  for ac_src in pcntl.c php_signal.c; do
30280 +
30281 +      IFS=.
30282 +      set $ac_src
30283 +      ac_obj=$1
30284 +      IFS=$old_IFS
30285 +
30286 +      shared_objects_pcntl="$shared_objects_pcntl $ac_bdir$ac_obj.lo"
30287
30288 -    ;;
30289 -    esac
30290 +      case $ac_src in
30291 +        *.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" ;;
30292 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30293 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30294 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
30295 +      esac
30296 +
30297 +    cat >>Makefile.objects<<EOF
30298 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
30299 +       $ac_comp
30300 +EOF
30301    done
30302
30303 -
30304 -
30305 -else
30306 -  echo "$ac_t""no" 1>&6
30307 +      case $host_alias in
30308 +        *netware*)
30309 +
30310 +  install_modules="install-modules"
30311
30312 -    LDFLAGS=$save_old_LDFLAGS
30313 -    ext_shared=$save_ext_shared
30314 -    unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
30315 -
30316 -      if test "$PHP_ZLIB_DIR" != "no"; then
30317 -
30318 +  case $host_alias in
30319 +    *aix*)
30320 +      suffix=so
30321 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppcntl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PHPPCNTL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppcntl.so '$ext_builddir'/phppcntl.so'
30322 +      ;;
30323 +    *netware*)
30324 +      suffix=nlm
30325 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCNTL, 3)_SHARED_LIBADD)'
30326 +      ;;
30327 +    *)
30328 +      suffix=la
30329 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PHPPCNTL_SHARED_LIBADD)'
30330 +      ;;
30331 +  esac
30332
30333 -  if test "$ext_shared" = "yes"; then
30334 -    PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD"
30335 -    if test -n "$PHP_ZLIB_DIR"; then
30336 -
30337 -  if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
30338 -
30339 -  if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
30340 -    ai_p=$PHP_ZLIB_DIR
30341 +  if test "x" = "xyes"; then
30342 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppcntl.$suffix"
30343    else
30344 -
30345 -    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
30346 -
30347 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
30348 -    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
30349 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcntl.$suffix"
30350    fi
30351 -
30352 -
30353 -      if test "$ext_shared" = "yes"; then
30354 -        PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD"
30355 -        test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD"
30356 -      else
30357 -
30358 -
30359 -
30360 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
30361 -
30362 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
30363 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30364 -    eval "LIBPATH$unique=set"
30365 -
30366 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
30367 -    LDFLAGS="$LDFLAGS -L$ai_p"
30368 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
30369
30370 -  fi
30371 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
30372 +
30373 +  cat >>Makefile.objects<<EOF
30374 +\$(phplibdir)/phppcntl.$suffix: $ext_builddir/phppcntl.$suffix
30375 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppcntl.$suffix \$(phplibdir)
30376
30377 +$ext_builddir/phppcntl.$suffix: \$(shared_objects_pcntl) \$(PHPPCNTL_SHARED_DEPENDENCIES)
30378 +       $link_cmd
30379
30380 -      fi
30381 -
30382 -  fi
30383 +EOF
30384
30385 -    fi
30386 -  else
30387 -
30388 +          ;;
30389 +        *)
30390 +
30391 +  install_modules="install-modules"
30392
30393 -  if test -n "$PHP_ZLIB_DIR"; then
30394 -
30395 -  if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
30396 -
30397 -  if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
30398 -    ai_p=$PHP_ZLIB_DIR
30399 +  case $host_alias in
30400 +    *aix*)
30401 +      suffix=so
30402 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pcntl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PCNTL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pcntl.so '$ext_builddir'/pcntl.so'
30403 +      ;;
30404 +    *netware*)
30405 +      suffix=nlm
30406 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCNTL, 3)_SHARED_LIBADD)'
30407 +      ;;
30408 +    *)
30409 +      suffix=la
30410 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) $(PCNTL_SHARED_LIBADD)'
30411 +      ;;
30412 +  esac
30413 +
30414 +  if test "x" = "xyes"; then
30415 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pcntl.$suffix"
30416    else
30417 -
30418 -    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
30419 -
30420 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
30421 -    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
30422 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcntl.$suffix"
30423    fi
30424 -
30425 -
30426 -
30427
30428 -
30429 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
30430 -
30431 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
30432 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30433 -    eval "LIBPATH$unique=set"
30434 -
30435 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
30436 -    LDFLAGS="$LDFLAGS -L$ai_p"
30437 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
30438 -
30439 -  fi
30440 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl"
30441 +
30442 +  cat >>Makefile.objects<<EOF
30443 +\$(phplibdir)/pcntl.$suffix: $ext_builddir/pcntl.$suffix
30444 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pcntl.$suffix \$(phplibdir)
30445
30446 +$ext_builddir/pcntl.$suffix: \$(shared_objects_pcntl) \$(PCNTL_SHARED_DEPENDENCIES)
30447 +       $link_cmd
30448
30449 -
30450 -  fi
30451 +EOF
30452 +
30453 +          ;;
30454 +      esac
30455 +      cat >> confdefs.h <<EOF
30456 +#define COMPILE_DL_PCNTL 1
30457 +EOF
30458
30459 +    fi
30460    fi
30461 +
30462 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
30463 +    PHP_PCNTL_SHARED=no
30464 +    case "$PHP_SAPI" in
30465 +      cgi|embed)
30466 +
30467
30468 -
30469 -  case z in
30470 -  c|c_r|pthread*) ;;
30471 -  *)
30472 -      LIBS="-lz $LIBS"
30473 -   ;;
30474 +  case ext/pcntl in
30475 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30476 +  /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30477 +  *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30478    esac
30479 +
30480 +
30481 +
30482 +  b_c_pre=$php_c_pre
30483 +  b_cxx_pre=$php_cxx_pre
30484 +  b_c_meta=$php_c_meta
30485 +  b_cxx_meta=$php_cxx_meta
30486 +  b_c_post=$php_c_post
30487 +  b_cxx_post=$php_cxx_post
30488 +  b_lo=$php_lo
30489
30490
30491 +  old_IFS=$IFS
30492 +  for ac_src in pcntl.c php_signal.c; do
30493 +
30494 +      IFS=.
30495 +      set $ac_src
30496 +      ac_obj=$1
30497 +      IFS=$old_IFS
30498 +
30499 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
30500
30501 +      case $ac_src in
30502 +        *.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" ;;
30503 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30504 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30505 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
30506 +      esac
30507
30508 -  fi
30509 +    cat >>Makefile.objects<<EOF
30510 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
30511 +       $ac_comp
30512 +EOF
30513 +  done
30514
30515
30516 +        EXT_STATIC="$EXT_STATIC pcntl"
30517 +        ;;
30518 +      *)
30519
30520 -  save_old_LDFLAGS=$LDFLAGS
30521 -  ac_stuff="
30522 -          -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR
30523 -        "
30524 -
30525 -  save_ext_shared=$ext_shared
30526 -  ext_shared=yes
30527
30528 -  for ac_i in $ac_stuff; do
30529 -    case $ac_i in
30530 -    -pthread)
30531 -      if test "$ext_shared" = "yes"; then
30532 -        LDFLAGS="$LDFLAGS -pthread"
30533 -      else
30534 -
30535 +  case ext/pcntl in
30536 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30537 +  /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30538 +  *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30539 +  esac
30540
30541 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
30542
30543 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
30544 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30545 -    eval "EXTRA_LDFLAGS$unique=set"
30546 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
30547 -  fi
30548
30549 -      fi
30550 -    ;;
30551 -    -l*)
30552 -      ac_ii=`echo $ac_i|cut -c 3-`
30553 -
30554 +  b_c_pre=$php_c_pre
30555 +  b_cxx_pre=$php_cxx_pre
30556 +  b_c_meta=$php_c_meta
30557 +  b_cxx_meta=$php_cxx_meta
30558 +  b_c_post=$php_c_post
30559 +  b_cxx_post=$php_cxx_post
30560 +  b_lo=$php_lo
30561 +
30562 +
30563 +  old_IFS=$IFS
30564 +  for ac_src in pcntl.c php_signal.c; do
30565
30566 -  case $ac_ii in
30567 -  c|c_r|pthread*) ;;
30568 -  *)
30569 -    if test "$ext_shared" = "yes"; then
30570 -        LDFLAGS="$LDFLAGS -l$ac_ii"
30571 -    else
30572 +      IFS=.
30573 +      set $ac_src
30574 +      ac_obj=$1
30575 +      IFS=$old_IFS
30576
30577 -
30578 -  case $ac_ii in
30579 -  c|c_r|pthread*) ;;
30580 -  *)
30581 -      LIBS="$LIBS -l$ac_ii"
30582 -   ;;
30583 -  esac
30584 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
30585
30586 +      case $ac_src in
30587 +        *.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" ;;
30588 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30589 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30590 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
30591 +      esac
30592
30593 -    fi
30594 -   ;;
30595 -  esac
30596 +    cat >>Makefile.objects<<EOF
30597 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
30598 +       $ac_comp
30599 +EOF
30600 +  done
30601
30602
30603 -    ;;
30604 -    -L*)
30605 -      ac_ii=`echo $ac_i|cut -c 3-`
30606 -
30607 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
30608 -
30609 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
30610 -    ai_p=$ac_ii
30611 -  else
30612 -
30613 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
30614 -
30615 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
30616 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
30617 +        ;;
30618 +    esac
30619 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
30620    fi
30621 -
30622 -
30623 -      if test "$ext_shared" = "yes"; then
30624 -        LDFLAGS="-L$ai_p $LDFLAGS"
30625 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
30626 -      else
30627 -
30628
30629
30630 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
30631 -
30632 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
30633 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30634 -    eval "LIBPATH$unique=set"
30635 -
30636 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
30637 -    LDFLAGS="$LDFLAGS -L$ai_p"
30638 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
30639 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
30640
30641 -  fi
30642
30643
30644 -      fi
30645 +  if test "$ext_builddir" = "."; then
30646 +    PHP_PECL_EXTENSION=pcntl
30647
30648 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
30649 +
30650    fi
30651
30652 -    ;;
30653 -    esac
30654 -  done
30655 +fi
30656
30657 -  echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
30658 -echo "configure:69004: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
30659 -ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
30660 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
30661 -  echo $ac_n "(cached) $ac_c" 1>&6
30662 -else
30663 -  ac_save_LIBS="$LIBS"
30664 -LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
30665 -cat > conftest.$ac_ext <<EOF
30666 -#line 69012 "configure"
30667 -#include "confdefs.h"
30668 -/* Override any gcc2 internal prototype to avoid an error.  */
30669 -/* We use char because int might match the return type of a gcc2
30670 -    builtin and then its argument prototype would still apply.  */
30671 -char mysql_query();
30672
30673 -int main() {
30674 -mysql_query()
30675 -; return 0; }
30676 -EOF
30677 -if { (eval echo configure:69023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
30678 -  rm -rf conftest*
30679 -  eval "ac_cv_lib_$ac_lib_var=yes"
30680 -else
30681 -  echo "configure: failed program was:" >&5
30682 -  cat conftest.$ac_ext >&5
30683 -  rm -rf conftest*
30684 -  eval "ac_cv_lib_$ac_lib_var=no"
30685 -fi
30686 -rm -f conftest*
30687 -LIBS="$ac_save_LIBS"
30688
30689 -fi
30690 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
30691 -  echo "$ac_t""yes" 1>&6
30692 -
30693 -    LDFLAGS=$save_old_LDFLAGS
30694 -    ext_shared=$save_ext_shared
30695 -
30696 -
30697 -else
30698 -  echo "$ac_t""no" 1>&6
30699
30700 -    LDFLAGS=$save_old_LDFLAGS
30701 -    ext_shared=$save_ext_shared
30702 -    unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
30703 -
30704 -          { echo "configure: error: PDO_MYSQL configure failed. Please check config.log for more information." 1>&2; exit 1; }
30705 -
30706 +
30707 +php_enable_pdo=yes
30708 +
30709 +echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
30710 +echo "configure:68196: checking whether to enable PDO support" >&5
30711 +# Check whether --enable-pdo or --disable-pdo was given.
30712 +if test "${enable_pdo+set}" = set; then
30713 +  enableval="$enable_pdo"
30714 +  PHP_PDO=$enableval
30715 +else
30716
30717 +  PHP_PDO=yes
30718 +  test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL
30719 +
30720  fi
30721 -
30722 -        PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
30723 -      else
30724 -
30725 -
30726 -  case z in
30727 -  c|c_r|pthread*) ;;
30728 -  *)
30729 -    if test "$ext_shared" = "yes"; then
30730 -        PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD"
30731 -    else
30732 -
30733 -
30734 -  case z in
30735 -  c|c_r|pthread*) ;;
30736 -  *)
30737 -      LIBS="-lz $LIBS"
30738 -   ;;
30739 -  esac
30740
30741
30742 -    fi
30743 -   ;;
30744 -  esac
30745
30746 +ext_output="yes, shared"
30747 +ext_shared=yes
30748 +case $PHP_PDO in
30749 +shared,*)
30750 +  PHP_PDO=`echo "$PHP_PDO"|$SED 's/^shared,//'`
30751 +  ;;
30752 +shared)
30753 +  PHP_PDO=yes
30754 +  ;;
30755 +no)
30756 +  ext_output=no
30757 +  ext_shared=no
30758 +  ;;
30759 +*)
30760 +  ext_output=yes
30761 +  ext_shared=no
30762 +  ;;
30763 +esac
30764
30765 -
30766 -  save_old_LDFLAGS=$LDFLAGS
30767 -  ac_stuff="
30768 -          -L$PDO_MYSQL_LIB_DIR
30769 -        "
30770 -
30771 -  save_ext_shared=$ext_shared
30772 -  ext_shared=yes
30773 -
30774 -  for ac_i in $ac_stuff; do
30775 -    case $ac_i in
30776 -    -pthread)
30777 -      if test "$ext_shared" = "yes"; then
30778 -        LDFLAGS="$LDFLAGS -pthread"
30779 -      else
30780 -
30781 -
30782 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
30783 -
30784 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
30785 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30786 -    eval "EXTRA_LDFLAGS$unique=set"
30787 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
30788 -  fi
30789
30790 -      fi
30791 -    ;;
30792 -    -l*)
30793 -      ac_ii=`echo $ac_i|cut -c 3-`
30794 -
30795 -
30796 -  case $ac_ii in
30797 -  c|c_r|pthread*) ;;
30798 -  *)
30799 -    if test "$ext_shared" = "yes"; then
30800 -        LDFLAGS="$LDFLAGS -l$ac_ii"
30801 -    else
30802 -
30803 -
30804 -  case $ac_ii in
30805 -  c|c_r|pthread*) ;;
30806 -  *)
30807 -      LIBS="$LIBS -l$ac_ii"
30808 -   ;;
30809 -  esac
30810
30811 +echo "$ac_t""$ext_output" 1>&6
30812
30813 -    fi
30814 -   ;;
30815 -  esac
30816 -
30817 -
30818 -    ;;
30819 -    -L*)
30820 -      ac_ii=`echo $ac_i|cut -c 3-`
30821 -
30822 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
30823 -
30824 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
30825 -    ai_p=$ac_ii
30826 -  else
30827 -
30828 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
30829 -
30830 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
30831 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
30832 -  fi
30833 -
30834 -
30835 -      if test "$ext_shared" = "yes"; then
30836 -        LDFLAGS="-L$ai_p $LDFLAGS"
30837 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
30838 -      else
30839 -
30840 -
30841 -
30842 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
30843 -
30844 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
30845 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30846 -    eval "LIBPATH$unique=set"
30847 -
30848 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
30849 -    LDFLAGS="$LDFLAGS -L$ai_p"
30850 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
30851 -
30852 -  fi
30853 -
30854 -
30855 -      fi
30856 -
30857 -  fi
30858 -
30859 -    ;;
30860 -    esac
30861 -  done
30862 -
30863 -  echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
30864 -echo "configure:69178: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
30865 -ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
30866 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
30867 -  echo $ac_n "(cached) $ac_c" 1>&6
30868 -else
30869 -  ac_save_LIBS="$LIBS"
30870 -LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
30871 -cat > conftest.$ac_ext <<EOF
30872 -#line 69186 "configure"
30873 -#include "confdefs.h"
30874 -/* Override any gcc2 internal prototype to avoid an error.  */
30875 -/* We use char because int might match the return type of a gcc2
30876 -    builtin and then its argument prototype would still apply.  */
30877 -char mysql_query();
30878 -
30879 -int main() {
30880 -mysql_query()
30881 -; return 0; }
30882 -EOF
30883 -if { (eval echo configure:69197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
30884 -  rm -rf conftest*
30885 -  eval "ac_cv_lib_$ac_lib_var=yes"
30886 -else
30887 -  echo "configure: failed program was:" >&5
30888 -  cat conftest.$ac_ext >&5
30889 -  rm -rf conftest*
30890 -  eval "ac_cv_lib_$ac_lib_var=no"
30891 -fi
30892 -rm -f conftest*
30893 -LIBS="$ac_save_LIBS"
30894 -
30895 -fi
30896 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
30897 -  echo "$ac_t""yes" 1>&6
30898 -
30899 -    LDFLAGS=$save_old_LDFLAGS
30900 -    ext_shared=$save_ext_shared
30901 -
30902 -
30903 -else
30904 -  echo "$ac_t""no" 1>&6
30905 -
30906 -    LDFLAGS=$save_old_LDFLAGS
30907 -    ext_shared=$save_ext_shared
30908 -    unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
30909 -
30910 -          { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; }
30911 -
30912 -
30913 -fi
30914 -
30915 -        PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz"
30916 -      fi
30917 -
30918 -
30919 -  for ac_i in $PDO_MYSQL_INCLUDE; do
30920 -    case $ac_i in
30921 -    -I*)
30922 -      ac_ii=`echo $ac_i|cut -c 3-`
30923 -
30924 -  if test "$ac_ii" != "/usr/include"; then
30925 -
30926 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
30927 -    ai_p=$ac_ii
30928 -  else
30929 -
30930 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
30931 -
30932 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
30933 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
30934 -  fi
30935
30936 -
30937 -
30938 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
30939 -
30940 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
30941 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30942 -    eval "INCLUDEPATH$unique=set"
30943 -
30944 -      if test ""; then
30945 -        INCLUDES="-I$ai_p $INCLUDES"
30946 -      else
30947 -        INCLUDES="$INCLUDES -I$ai_p"
30948 -      fi
30949 -
30950 -  fi
30951
30952 -  fi
30953
30954 -    ;;
30955 -    esac
30956 -  done
30957 +if test "$PHP_PDO" != "no"; then
30958
30959 -
30960 -  for ac_i in $PDO_MYSQL_LIBS; do
30961 -    case $ac_i in
30962 -    -pthread)
30963 -      if test "$ext_shared" = "yes"; then
30964 -        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread"
30965 -      else
30966 -
30967 -
30968 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
30969 -
30970 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
30971 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
30972 -    eval "EXTRA_LDFLAGS$unique=set"
30973 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
30974 -  fi
30975 +    PHP_PDO=yes
30976
30977 -      fi
30978 -    ;;
30979 -    -l*)
30980 -      ac_ii=`echo $ac_i|cut -c 3-`
30981 -
30982 -
30983 -  case $ac_ii in
30984 -  c|c_r|pthread*) ;;
30985 -  *)
30986 -    if test "$ext_shared" = "yes"; then
30987 -        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii"
30988 -    else
30989 -
30990
30991 -  case $ac_ii in
30992 -  c|c_r|pthread*) ;;
30993 -  *)
30994 -      LIBS="$LIBS -l$ac_ii"
30995 -   ;;
30996 +  pdo_running_under_pear=0
30997 +  case `pwd` in
30998 +    /var/tmp/pear-build-*)
30999 +      pdo_running_under_pear=1
31000 +      ;;
31001    esac
31002
31003 +  if test "$pdo_running_under_pear$PHP_PEAR_VERSION" = "1"; then
31004 +    # we're running in an environment that smells like pear,
31005 +    # and the PHP_PEAR_VERSION env var is not set.  That implies
31006 +    # that we're running under a slightly broken pear installer
31007 +    { echo "configure: error:
31008 +PDO requires that you upgrade your PEAR installer tools. Please
31009 +do so now by running:
31010
31011 -    fi
31012 -   ;;
31013 -  esac
31014 -
31015 +  % sudo pear upgrade pear
31016
31017 -    ;;
31018 -    -L*)
31019 -      ac_ii=`echo $ac_i|cut -c 3-`
31020 -
31021 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
31022 -
31023 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
31024 -    ai_p=$ac_ii
31025 -  else
31026 -
31027 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
31028 -
31029 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31030 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
31031 -  fi
31032 +or by manually downloading and installing PEAR version 1.3.5 or higher.
31033
31034 -
31035 -      if test "$ext_shared" = "yes"; then
31036 -        PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD"
31037 -        test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD"
31038 -      else
31039 -
31040 -
31041 -
31042 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
31043 -
31044 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
31045 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
31046 -    eval "LIBPATH$unique=set"
31047 -
31048 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
31049 -    LDFLAGS="$LDFLAGS -L$ai_p"
31050 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
31051 -
31052 +Once you've upgraded, please re-try your PDO install.
31053 +    " 1>&2; exit 1; }
31054    fi
31055
31056
31057 -      fi
31058 -
31059 -  fi
31060 +  if test "$ext_shared" = "yes" ; then
31061 +    case $host_alias in
31062 +      *darwin*)
31063 +          { echo "configure: error:
31064 +Due to the way that loadable modules work on OSX/Darwin, you need to
31065 +compile the PDO package statically into the PHP core.
31066
31067 -    ;;
31068 +Please follow the instructions at: http://netevil.org/node.php?nid=202
31069 +for more detail on this issue.
31070 +          " 1>&2; exit 1; }
31071 +        ext_shared=no
31072 +        ;;
31073      esac
31074 -  done
31075 -
31076 -
31077 -
31078 -fi
31079 -
31080 -
31081 -    _SAVE_LIBS=$LIBS
31082 -    LIBS="$LIBS $PDO_MYSQL_LIBS"
31083 -    for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate
31084 -do
31085 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
31086 -echo "configure:69371: checking for $ac_func" >&5
31087 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
31088 -  echo $ac_n "(cached) $ac_c" 1>&6
31089 -else
31090 -  cat > conftest.$ac_ext <<EOF
31091 -#line 69376 "configure"
31092 -#include "confdefs.h"
31093 -/* System header to define __stub macros and hopefully few prototypes,
31094 -    which can conflict with char $ac_func(); below.  */
31095 -#include <assert.h>
31096 -/* Override any gcc2 internal prototype to avoid an error.  */
31097 -/* We use char because int might match the return type of a gcc2
31098 -    builtin and then its argument prototype would still apply.  */
31099 -char $ac_func();
31100 -
31101 -int main() {
31102 -
31103 -/* The GNU C library defines this for functions which it implements
31104 -    to always fail with ENOSYS.  Some functions are actually named
31105 -    something starting with __ and the normal name is an alias.  */
31106 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
31107 -choke me
31108 -#else
31109 -$ac_func();
31110 -#endif
31111 -
31112 -; return 0; }
31113 -EOF
31114 -if { (eval echo configure:69399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
31115 -  rm -rf conftest*
31116 -  eval "ac_cv_func_$ac_func=yes"
31117 -else
31118 -  echo "configure: failed program was:" >&5
31119 -  cat conftest.$ac_ext >&5
31120 -  rm -rf conftest*
31121 -  eval "ac_cv_func_$ac_func=no"
31122 -fi
31123 -rm -f conftest*
31124 -fi
31125 -
31126 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
31127 -  echo "$ac_t""yes" 1>&6
31128 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
31129 -  cat >> confdefs.h <<EOF
31130 -#define $ac_tr_func 1
31131 -EOF
31132 -
31133 -else
31134 -  echo "$ac_t""no" 1>&6
31135 -fi
31136 -done
31137 -
31138 -    LIBS=$_SAVE_LIBS
31139 -  fi
31140 -
31141 -
31142 -
31143 -  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
31144 -echo "configure:69429: checking for PDO includes" >&5
31145 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
31146 -  echo $ac_n "(cached) $ac_c" 1>&6
31147 -else
31148 -
31149 -    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
31150 -echo "configure:69435: checking for PDO includes" >&5
31151 -    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
31152 -      pdo_inc_path=$abs_srcdir/ext
31153 -    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
31154 -      pdo_inc_path=$abs_srcdir/ext
31155 -    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
31156 -      pdo_inc_path=$prefix/include/php/ext
31157 -    fi
31158 -
31159 -fi
31160 -
31161 -echo "$ac_t""$pdo_inc_path" 1>&6
31162 -  if test -n "$pdo_inc_path"; then
31163 -:
31164 -  else
31165 -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
31166    fi
31167 -
31168
31169 +  ext_builddir=ext/pdo
31170 +  ext_srcdir=$abs_srcdir/ext/pdo
31171
31172 -  if test -n "$PDO_MYSQL_CONFIG"; then
31173 -    PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
31174 -    cat >> confdefs.h <<EOF
31175 -#define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET"
31176 -EOF
31177 -
31178 -  fi
31179 -
31180 -
31181 -  ext_builddir=ext/pdo_mysql
31182 -  ext_srcdir=$abs_srcdir/ext/pdo_mysql
31183 -
31184 -  ac_extra=`echo "-I$pdo_inc_path -I"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
31185 +  ac_extra=
31186
31187    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
31188 -    PHP_PDO_MYSQL_SHARED=no
31189 +    PHP_PDO_SHARED=no
31190
31191
31192 -  case ext/pdo_mysql in
31193 +  case ext/pdo in
31194    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
31195 -  /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31196 -  *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31197 +  /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31198 +  *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31199    esac
31200
31201
31202 @@ -69487,7 +68303,7 @@ EOF
31203
31204
31205    old_IFS=$IFS
31206 -  for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
31207 +  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
31208
31209        IFS=.
31210        set $ac_src
31211 @@ -69510,18 +68326,18 @@ EOF
31212    done
31213
31214
31215 -    EXT_STATIC="$EXT_STATIC pdo_mysql"
31216 +    EXT_STATIC="$EXT_STATIC pdo"
31217      if test "$ext_shared" != "nocli"; then
31218 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
31219 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo"
31220      fi
31221    else
31222      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
31223 -      PHP_PDO_MYSQL_SHARED=yes
31224 +      PHP_PDO_SHARED=yes
31225
31226 -  case ext/pdo_mysql in
31227 +  case ext/pdo in
31228    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
31229 -  /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31230 -  *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31231 +  /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31232 +  *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31233    esac
31234
31235
31236 @@ -69536,14 +68352,14 @@ EOF
31237
31238
31239    old_IFS=$IFS
31240 -  for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
31241 +  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
31242
31243        IFS=.
31244        set $ac_src
31245        ac_obj=$1
31246        IFS=$old_IFS
31247
31248 -      shared_objects_pdo_mysql="$shared_objects_pdo_mysql $ac_bdir$ac_obj.lo"
31249 +      shared_objects_pdo="$shared_objects_pdo $ac_bdir$ac_obj.lo"
31250
31251        case $ac_src in
31252          *.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" ;;
31253 @@ -69566,31 +68382,31 @@ EOF
31254    case $host_alias in
31255      *aix*)
31256        suffix=so
31257 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PHPPDO_MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_mysql.so '$ext_builddir'/phppdo_mysql.so'
31258 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PHPPDO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo.so '$ext_builddir'/phppdo.so'
31259        ;;
31260      *netware*)
31261        suffix=nlm
31262 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_MYSQL, 3)_SHARED_LIBADD)'
31263 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO, 3)_SHARED_LIBADD)'
31264        ;;
31265      *)
31266        suffix=la
31267 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PHPPDO_MYSQL_SHARED_LIBADD)'
31268 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PHPPDO_SHARED_LIBADD)'
31269        ;;
31270    esac
31271
31272    if test "x" = "xyes"; then
31273 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_mysql.$suffix"
31274 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo.$suffix"
31275    else
31276 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_mysql.$suffix"
31277 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo.$suffix"
31278    fi
31279
31280 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
31281 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
31282
31283    cat >>Makefile.objects<<EOF
31284 -\$(phplibdir)/phppdo_mysql.$suffix: $ext_builddir/phppdo_mysql.$suffix
31285 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_mysql.$suffix \$(phplibdir)
31286 +\$(phplibdir)/phppdo.$suffix: $ext_builddir/phppdo.$suffix
31287 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo.$suffix \$(phplibdir)
31288
31289 -$ext_builddir/phppdo_mysql.$suffix: \$(shared_objects_pdo_mysql) \$(PHPPDO_MYSQL_SHARED_DEPENDENCIES)
31290 +$ext_builddir/phppdo.$suffix: \$(shared_objects_pdo) \$(PHPPDO_SHARED_DEPENDENCIES)
31291         $link_cmd
31292
31293  EOF
31294 @@ -69603,31 +68419,31 @@ EOF
31295    case $host_alias in
31296      *aix*)
31297        suffix=so
31298 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PDO_MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_mysql.so '$ext_builddir'/pdo_mysql.so'
31299 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PDO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo.so '$ext_builddir'/pdo.so'
31300        ;;
31301      *netware*)
31302        suffix=nlm
31303 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_MYSQL, 3)_SHARED_LIBADD)'
31304 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO, 3)_SHARED_LIBADD)'
31305        ;;
31306      *)
31307        suffix=la
31308 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PDO_MYSQL_SHARED_LIBADD)'
31309 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) $(PDO_SHARED_LIBADD)'
31310        ;;
31311    esac
31312
31313    if test "x" = "xyes"; then
31314 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_mysql.$suffix"
31315 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo.$suffix"
31316    else
31317 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_mysql.$suffix"
31318 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo.$suffix"
31319    fi
31320
31321 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
31322 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
31323
31324    cat >>Makefile.objects<<EOF
31325 -\$(phplibdir)/pdo_mysql.$suffix: $ext_builddir/pdo_mysql.$suffix
31326 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_mysql.$suffix \$(phplibdir)
31327 +\$(phplibdir)/pdo.$suffix: $ext_builddir/pdo.$suffix
31328 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo.$suffix \$(phplibdir)
31329
31330 -$ext_builddir/pdo_mysql.$suffix: \$(shared_objects_pdo_mysql) \$(PDO_MYSQL_SHARED_DEPENDENCIES)
31331 +$ext_builddir/pdo.$suffix: \$(shared_objects_pdo) \$(PDO_SHARED_DEPENDENCIES)
31332         $link_cmd
31333
31334  EOF
31335 @@ -69635,22 +68451,22 @@ EOF
31336            ;;
31337        esac
31338        cat >> confdefs.h <<EOF
31339 -#define COMPILE_DL_PDO_MYSQL 1
31340 +#define COMPILE_DL_PDO 1
31341  EOF
31342
31343      fi
31344    fi
31345
31346    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
31347 -    PHP_PDO_MYSQL_SHARED=no
31348 +    PHP_PDO_SHARED=no
31349      case "$PHP_SAPI" in
31350        cgi|embed)
31351
31352
31353 -  case ext/pdo_mysql in
31354 +  case ext/pdo in
31355    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
31356 -  /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31357 -  *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31358 +  /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31359 +  *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31360    esac
31361
31362
31363 @@ -69665,7 +68481,7 @@ EOF
31364
31365
31366    old_IFS=$IFS
31367 -  for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
31368 +  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
31369
31370        IFS=.
31371        set $ac_src
31372 @@ -69688,15 +68504,15 @@ EOF
31373    done
31374
31375
31376 -        EXT_STATIC="$EXT_STATIC pdo_mysql"
31377 +        EXT_STATIC="$EXT_STATIC pdo"
31378          ;;
31379        *)
31380
31381
31382 -  case ext/pdo_mysql in
31383 +  case ext/pdo in
31384    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
31385 -  /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31386 -  *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31387 +  /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31388 +  *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31389    esac
31390
31391
31392 @@ -69711,7 +68527,7 @@ EOF
31393
31394
31395    old_IFS=$IFS
31396 -  for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
31397 +  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
31398
31399        IFS=.
31400        set $ac_src
31401 @@ -69736,7 +68552,7 @@ EOF
31402
31403          ;;
31404      esac
31405 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
31406 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo"
31407    fi
31408
31409
31410 @@ -69745,7 +68561,7 @@ EOF
31411
31412
31413    if test "$ext_builddir" = "."; then
31414 -    PHP_PECL_EXTENSION=pdo_mysql
31415 +    PHP_PECL_EXTENSION=pdo
31416
31417    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
31418
31419 @@ -69753,91 +68569,85 @@ EOF
31420
31421
31422
31423 -  am_i_shared=$PHP_PDO_MYSQL_SHARED
31424 -  is_it_shared=$PHP_PDO_SHARED
31425 -  is_it_enabled=$PHP_PDO
31426 +  am_i_shared=$PHP_PDO_SHARED
31427 +  is_it_shared=$PHP_SPL_SHARED
31428 +  is_it_enabled=$PHP_SPL
31429    if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
31430      { echo "configure: error:
31431 -You've configured extension pdo_mysql to build statically, but it
31432 -depends on extension pdo, which you've configured to build shared.
31433 -You either need to build pdo_mysql shared or build pdo statically for the
31434 +You've configured extension pdo to build statically, but it
31435 +depends on extension spl, which you've configured to build shared.
31436 +You either need to build pdo shared or build spl statically for the
31437  build to be successful.
31438  " 1>&2; exit 1; }
31439    fi
31440 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
31441 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
31442      { echo "configure: error:
31443 -You've configured extension pdo_mysql, which depends on extension pdo,
31444 -but you've either not enabled pdo, or have disabled it.
31445 +You've configured extension pdo, which depends on extension spl,
31446 +but you've either not enabled spl, or have disabled it.
31447  " 1>&2; exit 1; }
31448    fi
31449
31450 -    if test "$PHP_MYSQL" = "mysqlnd"; then
31451 +
31452 +
31453 +
31454 +
31455 +
31456 +    header_path=ext/pdo
31457 +    for header_file in php_pdo.h php_pdo_driver.h; do
31458 +      hp_hf="$header_path/$header_file"
31459
31460 -  am_i_shared=$PHP_PDO_MYSQL_SHARED
31461 -  is_it_shared=$PHP_MYSQLND_SHARED
31462 -  is_it_enabled=$PHP_MYSQLND
31463 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
31464 -    { echo "configure: error:
31465 -You've configured extension pdo_mysql to build statically, but it
31466 -depends on extension mysqlnd, which you've configured to build shared.
31467 -You either need to build pdo_mysql shared or build mysqlnd statically for the
31468 -build to be successful.
31469 -" 1>&2; exit 1; }
31470 -  fi
31471 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
31472 -    { echo "configure: error:
31473 -You've configured extension pdo_mysql, which depends on extension mysqlnd,
31474 -but you've either not enabled mysqlnd, or have disabled it.
31475 -" 1>&2; exit 1; }
31476 -  fi
31477
31478 -    fi
31479 +  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
31480
31481 -  PDO_MYSQL_MODULE_TYPE=external
31482 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
31483 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
31484 +    eval "INSTALLHEADERS$unique=set"
31485 +
31486 +        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
31487 +
31488 +  fi
31489
31490 +    done
31491
31492 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_SHARED_LIBADD"
31493
31494
31495 -
31496 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_MODULE_TYPE"
31497
31498 -
31499 +
31500 +  src=$ext_srcdir/Makefile.frag
31501 +  ac_srcdir=$ext_srcdir
31502 +  ac_builddir=$ext_builddir
31503 +  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
31504
31505  fi
31506
31507
31508 -SUPPORTED_LIB_VERS="9.0 10.1 11.1"  # This caters for all Oracle 9.x, 10.x and 11.1 installs
31509 -
31510
31511
31512 +php_with_pdo_dblib=no
31513
31514 +echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
31515 +echo "configure:68630: checking for PDO_DBLIB support via FreeTDS" >&5
31516 +# Check whether --with-pdo-dblib or --without-pdo-dblib was given.
31517 +if test "${with_pdo_dblib+set}" = set; then
31518 +  withval="$with_pdo_dblib"
31519 +  PHP_PDO_DBLIB=$withval
31520 +else
31521 +
31522 +  PHP_PDO_DBLIB=no
31523 +  test "$PHP_ENABLE_ALL" && PHP_PDO_DBLIB=$PHP_ENABLE_ALL
31524
31525 -php_with_pdo_oci=no
31526 -
31527 -echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
31528 -echo "configure:69820: checking Oracle OCI support for PDO" >&5
31529 -# Check whether --with-pdo-oci or --without-pdo-oci was given.
31530 -if test "${with_pdo_oci+set}" = set; then
31531 -  withval="$with_pdo_oci"
31532 -  PHP_PDO_OCI=$withval
31533 -else
31534 -
31535 -  PHP_PDO_OCI=no
31536 -  test "$PHP_ENABLE_ALL" && PHP_PDO_OCI=$PHP_ENABLE_ALL
31537 -
31538 -fi
31539 +fi
31540
31541
31542
31543  ext_output="yes, shared"
31544  ext_shared=yes
31545 -case $PHP_PDO_OCI in
31546 +case $PHP_PDO_DBLIB in
31547  shared,*)
31548 -  PHP_PDO_OCI=`echo "$PHP_PDO_OCI"|$SED 's/^shared,//'`
31549 +  PHP_PDO_DBLIB=`echo "$PHP_PDO_DBLIB"|$SED 's/^shared,//'`
31550    ;;
31551  shared)
31552 -  PHP_PDO_OCI=yes
31553 +  PHP_PDO_DBLIB=yes
31554    ;;
31555  no)
31556    ext_output=no
31557 @@ -69856,81 +68666,62 @@ echo "$ac_t""$ext_output" 1>&6
31558
31559
31560
31561 -if test "$PHP_PDO_OCI" != "no"; then
31562 +if test "$PHP_PDO_DBLIB" != "no"; then
31563
31564    if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
31565      { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
31566    fi
31567
31568 -  echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
31569 -echo "configure:69867: checking Oracle Install-Dir" >&5
31570 -  if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
31571 -    PDO_OCI_DIR=$ORACLE_HOME
31572 -  else
31573 -    PDO_OCI_DIR=$PHP_PDO_OCI
31574 -  fi
31575 -  echo "$ac_t""$PHP_PDO_OCI" 1>&6
31576 +  if test "$PHP_PDO_DBLIB" = "yes"; then
31577
31578 -  echo $ac_n "checking if that is sane""... $ac_c" 1>&6
31579 -echo "configure:69876: checking if that is sane" >&5
31580 -  if test -z "$PDO_OCI_DIR"; then
31581 -    { echo "configure: error:
31582 -You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
31583 -" 1>&2; exit 1; }
31584 -  else
31585 -    echo "$ac_t""yes" 1>&6
31586 -  fi
31587 +    for i in /usr/local /usr; do
31588 +      if test -f $i/include/sybdb.h; then
31589 +        PDO_FREETDS_INSTALLATION_DIR=$i
31590 +        PDO_FREETDS_INCLUDE_DIR=$i/include
31591 +        break
31592 +      elif test -f $i/include/freetds/sybdb.h; then
31593 +        PDO_FREETDS_INSTALLATION_DIR=$i
31594 +        PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
31595 +        break;
31596 +      fi
31597 +    done
31598
31599 -  if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
31600 -    PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
31601 -    PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
31602 -    echo $ac_n "checking for oci.h""... $ac_c" 1>&6
31603 -echo "configure:69889: checking for oci.h" >&5
31604 -    if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then
31605 -
31606 -  if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then
31607 -
31608 -  if test -z "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" || echo "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" | grep '^/' >/dev/null ; then
31609 -    ai_p=$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client
31610 -  else
31611 -
31612 -    ep_dir="`echo $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client|$SED 's%/*[^/][^/]*/*$%%'`"
31613 -
31614 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31615 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client\"`"
31616 -  fi
31617 +    if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then
31618 +      { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; }
31619 +    fi
31620
31621 -
31622 -
31623 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
31624 -
31625 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
31626 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
31627 -    eval "INCLUDEPATH$unique=set"
31628 -
31629 -      if test ""; then
31630 -        INCLUDES="-I$ai_p $INCLUDES"
31631 -      else
31632 -        INCLUDES="$INCLUDES -I$ai_p"
31633 -      fi
31634 -
31635 +  elif test "$PHP_PDO_DBLIB" != "no"; then
31636 +
31637 +    if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
31638 +      PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
31639 +      PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
31640 +    elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
31641 +      PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
31642 +      PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
31643 +    else
31644 +      { echo "configure: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" 1>&2; exit 1; }
31645 +    fi
31646 +  fi
31647 +
31648 +  if test "x$PHP_LIBDIR" = "x" ; then
31649 +    PHP_LIBDIR=lib
31650    fi
31651
31652 +  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
31653 +     { echo "configure: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; }
31654    fi
31655
31656 -      echo "$ac_t""$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" 1>&6
31657 -    elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then
31658 -
31659 -  if test "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" != "/usr/include"; then
31660 +
31661 +  if test "$PDO_FREETDS_INCLUDE_DIR" != "/usr/include"; then
31662
31663 -  if test -z "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" || echo "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" | grep '^/' >/dev/null ; then
31664 -    ai_p=$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include
31665 +  if test -z "$PDO_FREETDS_INCLUDE_DIR" || echo "$PDO_FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then
31666 +    ai_p=$PDO_FREETDS_INCLUDE_DIR
31667    else
31668
31669 -    ep_dir="`echo $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include|$SED 's%/*[^/][^/]*/*$%%'`"
31670 +    ep_dir="`echo $PDO_FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
31671
31672      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31673 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include\"`"
31674 +    ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INCLUDE_DIR\"`"
31675    fi
31676
31677
31678 @@ -69951,387 +68742,483 @@ echo "configure:69889: checking for oci.
31679
31680    fi
31681
31682 -      echo "$ac_t""$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" 1>&6
31683 -    elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then
31684 +
31685 +
31686 +  if test "$ext_shared" = "yes"; then
31687 +    PDO_DBLIB_SHARED_LIBADD="-lsybdb $PDO_DBLIB_SHARED_LIBADD"
31688 +    if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
31689
31690 -  if test "$PDO_OCI_IC_PREFIX/sdk/include" != "/usr/include"; then
31691 +  if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
31692
31693 -  if test -z "$PDO_OCI_IC_PREFIX/sdk/include" || echo "$PDO_OCI_IC_PREFIX/sdk/include" | grep '^/' >/dev/null ; then
31694 -    ai_p=$PDO_OCI_IC_PREFIX/sdk/include
31695 +  if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
31696 +    ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
31697    else
31698
31699 -    ep_dir="`echo $PDO_OCI_IC_PREFIX/sdk/include|$SED 's%/*[^/][^/]*/*$%%'`"
31700 +    ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
31701
31702      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31703 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/sdk/include\"`"
31704 +    ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
31705    fi
31706
31707
31708 +      if test "$ext_shared" = "yes"; then
31709 +        PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD"
31710 +        test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_SHARED_LIBADD"
31711 +      else
31712 +
31713 +
31714
31715    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
31716
31717 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
31718 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
31719    if test -n "$unique" && test "`eval $cmd`" = "" ; then
31720 -    eval "INCLUDEPATH$unique=set"
31721 -
31722 -      if test ""; then
31723 -        INCLUDES="-I$ai_p $INCLUDES"
31724 -      else
31725 -        INCLUDES="$INCLUDES -I$ai_p"
31726 -      fi
31727 +    eval "LIBPATH$unique=set"
31728
31729 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
31730 +    LDFLAGS="$LDFLAGS -L$ai_p"
31731 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
31732 +
31733    fi
31734
31735 -  fi
31736 -
31737 -      echo "$ac_t""$PDO_OCI_IC_PREFIX/sdk/include" 1>&6
31738 -    elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then
31739 -
31740 -  if test "$PDO_OCI_IC_PREFIX/client/include" != "/usr/include"; then
31741 -
31742 -  if test -z "$PDO_OCI_IC_PREFIX/client/include" || echo "$PDO_OCI_IC_PREFIX/client/include" | grep '^/' >/dev/null ; then
31743 -    ai_p=$PDO_OCI_IC_PREFIX/client/include
31744 -  else
31745 -
31746 -    ep_dir="`echo $PDO_OCI_IC_PREFIX/client/include|$SED 's%/*[^/][^/]*/*$%%'`"
31747 -
31748 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31749 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/client/include\"`"
31750 -  fi
31751
31752 -
31753 -
31754 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
31755 -
31756 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
31757 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
31758 -    eval "INCLUDEPATH$unique=set"
31759 -
31760 -      if test ""; then
31761 -        INCLUDES="-I$ai_p $INCLUDES"
31762 -      else
31763 -        INCLUDES="$INCLUDES -I$ai_p"
31764        fi
31765
31766    fi
31767
31768 -  fi
31769 -
31770 -      echo "$ac_t""$PDO_OCI_IC_PREFIX/client/include" 1>&6
31771 -    else
31772 -      { echo "configure: error: I'm too dumb to figure out where the include dir is in your Instant Client install" 1>&2; exit 1; }
31773 -    fi
31774 -    if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then
31775 -    PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
31776 -    elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
31777 -      PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib"
31778 -    elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then
31779 -      PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
31780 -    else
31781 -      { echo "configure: error: I'm too dumb to figure out where the libraries are in your Instant Client install" 1>&2; exit 1; }
31782      fi
31783 -    PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
31784    else
31785
31786 -  echo $ac_n "checking size of long int""... $ac_c" 1>&6
31787 -echo "configure:70038: checking size of long int" >&5
31788 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
31789 -  echo $ac_n "(cached) $ac_c" 1>&6
31790 -else
31791 -  if test "$cross_compiling" = yes; then
31792 -  ac_cv_sizeof_long_int=4
31793 -else
31794 -  cat > conftest.$ac_ext <<EOF
31795 -#line 70046 "configure"
31796 -#include "confdefs.h"
31797 -#include <stdio.h>
31798 -int main()
31799 -{
31800 -  FILE *f=fopen("conftestval", "w");
31801 -  if (!f) return(1);
31802 -  fprintf(f, "%d\n", sizeof(long int));
31803 -  return(0);
31804 -}
31805 -EOF
31806 -if { (eval echo configure:70057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
31807 -then
31808 -  ac_cv_sizeof_long_int=`cat conftestval`
31809 -else
31810 -  echo "configure: failed program was:" >&5
31811 -  cat conftest.$ac_ext >&5
31812 -  rm -fr conftest*
31813 -  ac_cv_sizeof_long_int=0
31814 -fi
31815 -rm -fr conftest*
31816 -fi
31817 -
31818 -fi
31819 -echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
31820 -cat >> confdefs.h <<EOF
31821 -#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
31822 -EOF
31823
31824 -
31825 -  echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
31826 -echo "configure:70077: checking if we're on a 64-bit platform" >&5
31827 -  if test "$ac_cv_sizeof_long_int" = "4" ; then
31828 -    echo "$ac_t""no" 1>&6
31829 -    TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
31830 -  else
31831 -    echo "$ac_t""yes" 1>&6
31832 -    TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
31833 -  fi
31834 -
31835 -  echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
31836 -echo "configure:70087: checking OCI8 libraries dir" >&5
31837 -  if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then
31838 -    PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
31839 -  elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
31840 -    PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
31841 -  elif test -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
31842 -    PDO_OCI_LIB_DIR=$TMP_PDO_OCI_LIB_DIR
31843 -  else
31844 -    { echo "configure: error: Oracle required OCI8 libraries not found" 1>&2; exit 1; }
31845 -  fi
31846 -  echo "$ac_t""$PDO_OCI_LIB_DIR" 1>&6
31847 -
31848 -
31849 -    if test -d "$PDO_OCI_DIR/rdbms/public"; then
31850 -
31851 -  if test "$PDO_OCI_DIR/rdbms/public" != "/usr/include"; then
31852 +  if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then
31853
31854 -  if test -z "$PDO_OCI_DIR/rdbms/public" || echo "$PDO_OCI_DIR/rdbms/public" | grep '^/' >/dev/null ; then
31855 -    ai_p=$PDO_OCI_DIR/rdbms/public
31856 +  if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then
31857 +
31858 +  if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
31859 +    ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
31860    else
31861
31862 -    ep_dir="`echo $PDO_OCI_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
31863 +    ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
31864
31865      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31866 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/public\"`"
31867 +    ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
31868    fi
31869
31870
31871 +
31872 +
31873
31874    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
31875
31876 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
31877 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
31878    if test -n "$unique" && test "`eval $cmd`" = "" ; then
31879 -    eval "INCLUDEPATH$unique=set"
31880 -
31881 -      if test ""; then
31882 -        INCLUDES="-I$ai_p $INCLUDES"
31883 -      else
31884 -        INCLUDES="$INCLUDES -I$ai_p"
31885 -      fi
31886 +    eval "LIBPATH$unique=set"
31887
31888 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
31889 +    LDFLAGS="$LDFLAGS -L$ai_p"
31890 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
31891 +
31892    fi
31893
31894 -  fi
31895
31896 -      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/public"
31897 -    fi
31898 -    if test -d "$PDO_OCI_DIR/rdbms/demo"; then
31899 -
31900 -  if test "$PDO_OCI_DIR/rdbms/demo" != "/usr/include"; then
31901 -
31902 -  if test -z "$PDO_OCI_DIR/rdbms/demo" || echo "$PDO_OCI_DIR/rdbms/demo" | grep '^/' >/dev/null ; then
31903 -    ai_p=$PDO_OCI_DIR/rdbms/demo
31904 -  else
31905 -
31906 -    ep_dir="`echo $PDO_OCI_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
31907
31908 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31909 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/demo\"`"
31910    fi
31911
31912 -
31913 +  fi
31914
31915 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
31916
31917 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
31918 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
31919 -    eval "INCLUDEPATH$unique=set"
31920 -
31921 -      if test ""; then
31922 -        INCLUDES="-I$ai_p $INCLUDES"
31923 -      else
31924 -        INCLUDES="$INCLUDES -I$ai_p"
31925 -      fi
31926 -
31927 -  fi
31928 +  case sybdb in
31929 +  c|c_r|pthread*) ;;
31930 +  *)
31931 +      LIBS="-lsybdb $LIBS"
31932 +   ;;
31933 +  esac
31934
31935 -  fi
31936
31937 -      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/demo"
31938 -    fi
31939 -    if test -d "$PDO_OCI_DIR/network/public"; then
31940 -
31941 -  if test "$PDO_OCI_DIR/network/public" != "/usr/include"; then
31942 -
31943 -  if test -z "$PDO_OCI_DIR/network/public" || echo "$PDO_OCI_DIR/network/public" | grep '^/' >/dev/null ; then
31944 -    ai_p=$PDO_OCI_DIR/network/public
31945 -  else
31946 -
31947 -    ep_dir="`echo $PDO_OCI_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`"
31948 -
31949 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31950 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/network/public\"`"
31951 -  fi
31952
31953 -
31954 -
31955 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
31956 -
31957 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
31958 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
31959 -    eval "INCLUDEPATH$unique=set"
31960 -
31961 -      if test ""; then
31962 -        INCLUDES="-I$ai_p $INCLUDES"
31963 -      else
31964 -        INCLUDES="$INCLUDES -I$ai_p"
31965 -      fi
31966 -
31967 -  fi
31968
31969    fi
31970
31971 -      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/network/public"
31972 -    fi
31973 -    if test -d "$PDO_OCI_DIR/plsql/public"; then
31974 -
31975 -  if test "$PDO_OCI_DIR/plsql/public" != "/usr/include"; then
31976 -
31977 -  if test -z "$PDO_OCI_DIR/plsql/public" || echo "$PDO_OCI_DIR/plsql/public" | grep '^/' >/dev/null ; then
31978 -    ai_p=$PDO_OCI_DIR/plsql/public
31979 -  else
31980 -
31981 -    ep_dir="`echo $PDO_OCI_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
31982 -
31983 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31984 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/plsql/public\"`"
31985 -  fi
31986
31987 +
31988 +
31989
31990 +  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
31991 +echo "configure:68847: checking for PDO includes" >&5
31992 +if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
31993 +  echo $ac_n "(cached) $ac_c" 1>&6
31994 +else
31995
31996 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
31997 +    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
31998 +echo "configure:68853: checking for PDO includes" >&5
31999 +    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
32000 +      pdo_inc_path=$abs_srcdir/ext
32001 +    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
32002 +      pdo_inc_path=$abs_srcdir/ext
32003 +    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
32004 +      pdo_inc_path=$prefix/include/php/ext
32005 +    fi
32006
32007 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
32008 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
32009 -    eval "INCLUDEPATH$unique=set"
32010 -
32011 -      if test ""; then
32012 -        INCLUDES="-I$ai_p $INCLUDES"
32013 -      else
32014 -        INCLUDES="$INCLUDES -I$ai_p"
32015 -      fi
32016 -
32017 -  fi
32018 -
32019 -  fi
32020 +fi
32021
32022 -      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/plsql/public"
32023 -    fi
32024 -    if test -d "$PDO_OCI_DIR/include"; then
32025 -
32026 -  if test "$PDO_OCI_DIR/include" != "/usr/include"; then
32027 -
32028 -  if test -z "$PDO_OCI_DIR/include" || echo "$PDO_OCI_DIR/include" | grep '^/' >/dev/null ; then
32029 -    ai_p=$PDO_OCI_DIR/include
32030 +echo "$ac_t""$pdo_inc_path" 1>&6
32031 +  if test -n "$pdo_inc_path"; then
32032 +:
32033    else
32034 -
32035 -    ep_dir="`echo $PDO_OCI_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
32036 -
32037 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32038 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/include\"`"
32039 +{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
32040    fi
32041
32042 -
32043
32044 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
32045 -
32046 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
32047 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
32048 -    eval "INCLUDEPATH$unique=set"
32049 -
32050 -      if test ""; then
32051 -        INCLUDES="-I$ai_p $INCLUDES"
32052 -      else
32053 -        INCLUDES="$INCLUDES -I$ai_p"
32054 -      fi
32055 -
32056 -  fi
32057
32058 -  fi
32059 +  PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
32060 +
32061 +  ext_builddir=ext/pdo_dblib
32062 +  ext_srcdir=$abs_srcdir/ext/pdo_dblib
32063
32064 -      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/include"
32065 -    fi
32066 +  ac_extra=`echo "-I$pdo_inc_path $PDO_DBLIB_DEFS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
32067
32068 -    if test -f "$PDO_OCI_LIB_DIR/sysliblist"; then
32069 -
32070 -  for ac_i in `cat $PDO_OCI_LIB_DIR/sysliblist`; do
32071 -    case $ac_i in
32072 -    -pthread)
32073 -      if test "$ext_shared" = "yes"; then
32074 -        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -pthread"
32075 -      else
32076 -
32077 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
32078 +    PHP_PDO_DBLIB_SHARED=no
32079 +
32080 +
32081 +  case ext/pdo_dblib in
32082 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
32083 +  /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
32084 +  *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
32085 +  esac
32086
32087 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
32088
32089 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
32090 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
32091 -    eval "EXTRA_LDFLAGS$unique=set"
32092 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
32093 -  fi
32094
32095 -      fi
32096 -    ;;
32097 -    -l*)
32098 -      ac_ii=`echo $ac_i|cut -c 3-`
32099 -
32100 +  b_c_pre=$php_c_pre
32101 +  b_cxx_pre=$php_cxx_pre
32102 +  b_c_meta=$php_c_meta
32103 +  b_cxx_meta=$php_cxx_meta
32104 +  b_c_post=$php_c_post
32105 +  b_cxx_post=$php_cxx_post
32106 +  b_lo=$php_lo
32107 +
32108 +
32109 +  old_IFS=$IFS
32110 +  for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
32111
32112 -  case $ac_ii in
32113 -  c|c_r|pthread*) ;;
32114 -  *)
32115 -    if test "$ext_shared" = "yes"; then
32116 -        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
32117 -    else
32118 +      IFS=.
32119 +      set $ac_src
32120 +      ac_obj=$1
32121 +      IFS=$old_IFS
32122
32123 -
32124 -  case $ac_ii in
32125 -  c|c_r|pthread*) ;;
32126 -  *)
32127 -      LIBS="$LIBS -l$ac_ii"
32128 -   ;;
32129 -  esac
32130 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
32131
32132 +      case $ac_src in
32133 +        *.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" ;;
32134 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
32135 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
32136 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
32137 +      esac
32138
32139 -    fi
32140 -   ;;
32141 -  esac
32142 +    cat >>Makefile.objects<<EOF
32143 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
32144 +       $ac_comp
32145 +EOF
32146 +  done
32147
32148
32149 -    ;;
32150 -    -L*)
32151 -      ac_ii=`echo $ac_i|cut -c 3-`
32152 -
32153 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
32154 -
32155 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
32156 -    ai_p=$ac_ii
32157 +    EXT_STATIC="$EXT_STATIC pdo_dblib"
32158 +    if test "$ext_shared" != "nocli"; then
32159 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib"
32160 +    fi
32161    else
32162 -
32163 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
32164 -
32165 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
32166 +      PHP_PDO_DBLIB_SHARED=yes
32167 +
32168 +  case ext/pdo_dblib in
32169 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
32170 +  /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
32171 +  *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
32172 +  esac
32173 +
32174 +
32175 +
32176 +  b_c_pre=$shared_c_pre
32177 +  b_cxx_pre=$shared_cxx_pre
32178 +  b_c_meta=$shared_c_meta
32179 +  b_cxx_meta=$shared_cxx_meta
32180 +  b_c_post=$shared_c_post
32181 +  b_cxx_post=$shared_cxx_post
32182 +  b_lo=$shared_lo
32183 +
32184 +
32185 +  old_IFS=$IFS
32186 +  for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
32187 +
32188 +      IFS=.
32189 +      set $ac_src
32190 +      ac_obj=$1
32191 +      IFS=$old_IFS
32192 +
32193 +      shared_objects_pdo_dblib="$shared_objects_pdo_dblib $ac_bdir$ac_obj.lo"
32194 +
32195 +      case $ac_src in
32196 +        *.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" ;;
32197 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
32198 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
32199 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
32200 +      esac
32201 +
32202 +    cat >>Makefile.objects<<EOF
32203 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
32204 +       $ac_comp
32205 +EOF
32206 +  done
32207 +
32208 +      case $host_alias in
32209 +        *netware*)
32210 +
32211 +  install_modules="install-modules"
32212 +
32213 +  case $host_alias in
32214 +    *aix*)
32215 +      suffix=so
32216 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_dblib.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PHPPDO_DBLIB_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_dblib.so '$ext_builddir'/phppdo_dblib.so'
32217 +      ;;
32218 +    *netware*)
32219 +      suffix=nlm
32220 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_DBLIB, 3)_SHARED_LIBADD)'
32221 +      ;;
32222 +    *)
32223 +      suffix=la
32224 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PHPPDO_DBLIB_SHARED_LIBADD)'
32225 +      ;;
32226 +  esac
32227 +
32228 +  if test "x" = "xyes"; then
32229 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_dblib.$suffix"
32230 +  else
32231 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_dblib.$suffix"
32232 +  fi
32233 +
32234 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
32235 +
32236 +  cat >>Makefile.objects<<EOF
32237 +\$(phplibdir)/phppdo_dblib.$suffix: $ext_builddir/phppdo_dblib.$suffix
32238 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_dblib.$suffix \$(phplibdir)
32239 +
32240 +$ext_builddir/phppdo_dblib.$suffix: \$(shared_objects_pdo_dblib) \$(PHPPDO_DBLIB_SHARED_DEPENDENCIES)
32241 +       $link_cmd
32242 +
32243 +EOF
32244 +
32245 +          ;;
32246 +        *)
32247 +
32248 +  install_modules="install-modules"
32249 +
32250 +  case $host_alias in
32251 +    *aix*)
32252 +      suffix=so
32253 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_dblib.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PDO_DBLIB_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_dblib.so '$ext_builddir'/pdo_dblib.so'
32254 +      ;;
32255 +    *netware*)
32256 +      suffix=nlm
32257 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_DBLIB, 3)_SHARED_LIBADD)'
32258 +      ;;
32259 +    *)
32260 +      suffix=la
32261 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) $(PDO_DBLIB_SHARED_LIBADD)'
32262 +      ;;
32263 +  esac
32264 +
32265 +  if test "x" = "xyes"; then
32266 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_dblib.$suffix"
32267 +  else
32268 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_dblib.$suffix"
32269 +  fi
32270 +
32271 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib"
32272 +
32273 +  cat >>Makefile.objects<<EOF
32274 +\$(phplibdir)/pdo_dblib.$suffix: $ext_builddir/pdo_dblib.$suffix
32275 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_dblib.$suffix \$(phplibdir)
32276 +
32277 +$ext_builddir/pdo_dblib.$suffix: \$(shared_objects_pdo_dblib) \$(PDO_DBLIB_SHARED_DEPENDENCIES)
32278 +       $link_cmd
32279 +
32280 +EOF
32281 +
32282 +          ;;
32283 +      esac
32284 +      cat >> confdefs.h <<EOF
32285 +#define COMPILE_DL_PDO_DBLIB 1
32286 +EOF
32287 +
32288 +    fi
32289 +  fi
32290 +
32291 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
32292 +    PHP_PDO_DBLIB_SHARED=no
32293 +    case "$PHP_SAPI" in
32294 +      cgi|embed)
32295 +
32296 +
32297 +  case ext/pdo_dblib in
32298 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
32299 +  /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
32300 +  *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
32301 +  esac
32302 +
32303 +
32304 +
32305 +  b_c_pre=$php_c_pre
32306 +  b_cxx_pre=$php_cxx_pre
32307 +  b_c_meta=$php_c_meta
32308 +  b_cxx_meta=$php_cxx_meta
32309 +  b_c_post=$php_c_post
32310 +  b_cxx_post=$php_cxx_post
32311 +  b_lo=$php_lo
32312 +
32313 +
32314 +  old_IFS=$IFS
32315 +  for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
32316 +
32317 +      IFS=.
32318 +      set $ac_src
32319 +      ac_obj=$1
32320 +      IFS=$old_IFS
32321 +
32322 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
32323 +
32324 +      case $ac_src in
32325 +        *.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" ;;
32326 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
32327 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
32328 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
32329 +      esac
32330 +
32331 +    cat >>Makefile.objects<<EOF
32332 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
32333 +       $ac_comp
32334 +EOF
32335 +  done
32336 +
32337 +
32338 +        EXT_STATIC="$EXT_STATIC pdo_dblib"
32339 +        ;;
32340 +      *)
32341 +
32342 +
32343 +  case ext/pdo_dblib in
32344 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
32345 +  /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
32346 +  *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
32347 +  esac
32348 +
32349 +
32350 +
32351 +  b_c_pre=$php_c_pre
32352 +  b_cxx_pre=$php_cxx_pre
32353 +  b_c_meta=$php_c_meta
32354 +  b_cxx_meta=$php_cxx_meta
32355 +  b_c_post=$php_c_post
32356 +  b_cxx_post=$php_cxx_post
32357 +  b_lo=$php_lo
32358 +
32359 +
32360 +  old_IFS=$IFS
32361 +  for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do
32362 +
32363 +      IFS=.
32364 +      set $ac_src
32365 +      ac_obj=$1
32366 +      IFS=$old_IFS
32367 +
32368 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
32369 +
32370 +      case $ac_src in
32371 +        *.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" ;;
32372 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
32373 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
32374 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
32375 +      esac
32376 +
32377 +    cat >>Makefile.objects<<EOF
32378 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
32379 +       $ac_comp
32380 +EOF
32381 +  done
32382 +
32383 +
32384 +        ;;
32385 +    esac
32386 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib"
32387 +  fi
32388 +
32389 +
32390 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
32391 +
32392 +
32393 +
32394 +  if test "$ext_builddir" = "."; then
32395 +    PHP_PECL_EXTENSION=pdo_dblib
32396 +
32397 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
32398 +
32399 +  fi
32400 +
32401 +  echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
32402 +echo "configure:69167: checking for dnet_addr in -ldnet_stub" >&5
32403 +ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
32404 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32405 +  echo $ac_n "(cached) $ac_c" 1>&6
32406 +else
32407 +  ac_save_LIBS="$LIBS"
32408 +LIBS="-ldnet_stub  $LIBS"
32409 +cat > conftest.$ac_ext <<EOF
32410 +#line 69175 "configure"
32411 +#include "confdefs.h"
32412 +/* Override any gcc2 internal prototype to avoid an error.  */
32413 +/* We use char because int might match the return type of a gcc2
32414 +    builtin and then its argument prototype would still apply.  */
32415 +char dnet_addr();
32416 +
32417 +int main() {
32418 +dnet_addr()
32419 +; return 0; }
32420 +EOF
32421 +if { (eval echo configure:69186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32422 +  rm -rf conftest*
32423 +  eval "ac_cv_lib_$ac_lib_var=yes"
32424 +else
32425 +  echo "configure: failed program was:" >&5
32426 +  cat conftest.$ac_ext >&5
32427 +  rm -rf conftest*
32428 +  eval "ac_cv_lib_$ac_lib_var=no"
32429 +fi
32430 +rm -f conftest*
32431 +LIBS="$ac_save_LIBS"
32432 +
32433 +fi
32434 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
32435 +  echo "$ac_t""yes" 1>&6
32436 +
32437 +
32438 +  if test "$ext_shared" = "yes"; then
32439 +    PDO_DBLIB_SHARED_LIBADD="-ldnet_stub $PDO_DBLIB_SHARED_LIBADD"
32440 +    if test -n ""; then
32441 +
32442 +  if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
32443 +
32444 +  if test -z "" || echo "" | grep '^/' >/dev/null ; then
32445 +    ai_p=
32446 +  else
32447 +
32448 +    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
32449 +
32450      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32451 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
32452 +    ai_p="$ep_realdir/`basename \"\"`"
32453    fi
32454
32455
32456        if test "$ext_shared" = "yes"; then
32457 -        PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB"
32458 -        test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB"
32459 +        PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD"
32460 +        test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_SHARED_LIBADD"
32461        else
32462
32463
32464 @@ -70353,17 +69240,179 @@ echo "configure:70087: checking OCI8 lib
32465
32466    fi
32467
32468 -    ;;
32469 -    esac
32470 -  done
32471 +    fi
32472 +  else
32473 +
32474
32475 -    elif test -f "$PDO_OCI_DIR/rdbms/lib/sysliblist"; then
32476 +  if test -n ""; then
32477 +
32478 +  if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then
32479 +
32480 +  if test -z "" || echo "" | grep '^/' >/dev/null ; then
32481 +    ai_p=
32482 +  else
32483 +
32484 +    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
32485 +
32486 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32487 +    ai_p="$ep_realdir/`basename \"\"`"
32488 +  fi
32489 +
32490 +
32491
32492 -  for ac_i in `cat $PDO_OCI_DIR/rdbms/lib/sysliblist`; do
32493 +
32494 +
32495 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
32496 +
32497 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
32498 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
32499 +    eval "LIBPATH$unique=set"
32500 +
32501 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
32502 +    LDFLAGS="$LDFLAGS -L$ai_p"
32503 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
32504 +
32505 +  fi
32506 +
32507 +
32508 +
32509 +  fi
32510 +
32511 +  fi
32512 +
32513 +
32514 +  case dnet_stub in
32515 +  c|c_r|pthread*) ;;
32516 +  *)
32517 +      LIBS="-ldnet_stub $LIBS"
32518 +   ;;
32519 +  esac
32520 +
32521 +
32522 +
32523 +
32524 +  fi
32525 +
32526 +
32527 +        cat >> confdefs.h <<\EOF
32528 +#define HAVE_LIBDNET_STUB 1
32529 +EOF
32530 +
32531 +
32532 +else
32533 +  echo "$ac_t""no" 1>&6
32534 +fi
32535 +
32536 +  cat >> confdefs.h <<\EOF
32537 +#define HAVE_PDO_DBLIB 1
32538 +EOF
32539 +
32540 +  cat >> confdefs.h <<\EOF
32541 +#define HAVE_FREETDS 1
32542 +EOF
32543 +
32544 +
32545 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_DBLIB_SHARED_LIBADD"
32546 +
32547 +
32548 +
32549 +
32550 +  am_i_shared=$PHP_PDO_DBLIB_SHARED
32551 +  is_it_shared=$PHP_PDO_SHARED
32552 +  is_it_enabled=$PHP_PDO
32553 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
32554 +    { echo "configure: error:
32555 +You've configured extension pdo_dblib to build statically, but it
32556 +depends on extension pdo, which you've configured to build shared.
32557 +You either need to build pdo_dblib shared or build pdo statically for the
32558 +build to be successful.
32559 +" 1>&2; exit 1; }
32560 +  fi
32561 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
32562 +    { echo "configure: error:
32563 +You've configured extension pdo_dblib, which depends on extension pdo,
32564 +but you've either not enabled pdo, or have disabled it.
32565 +" 1>&2; exit 1; }
32566 +  fi
32567 +
32568 +
32569 +fi
32570 +
32571 +
32572 +
32573 +php_with_pdo_firebird=no
32574 +
32575 +echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
32576 +echo "configure:69347: checking for Firebird support for PDO" >&5
32577 +# Check whether --with-pdo-firebird or --without-pdo-firebird was given.
32578 +if test "${with_pdo_firebird+set}" = set; then
32579 +  withval="$with_pdo_firebird"
32580 +  PHP_PDO_FIREBIRD=$withval
32581 +else
32582 +
32583 +  PHP_PDO_FIREBIRD=no
32584 +  test "$PHP_ENABLE_ALL" && PHP_PDO_FIREBIRD=$PHP_ENABLE_ALL
32585 +
32586 +fi
32587 +
32588 +
32589 +
32590 +ext_output="yes, shared"
32591 +ext_shared=yes
32592 +case $PHP_PDO_FIREBIRD in
32593 +shared,*)
32594 +  PHP_PDO_FIREBIRD=`echo "$PHP_PDO_FIREBIRD"|$SED 's/^shared,//'`
32595 +  ;;
32596 +shared)
32597 +  PHP_PDO_FIREBIRD=yes
32598 +  ;;
32599 +no)
32600 +  ext_output=no
32601 +  ext_shared=no
32602 +  ;;
32603 +*)
32604 +  ext_output=yes
32605 +  ext_shared=no
32606 +  ;;
32607 +esac
32608 +
32609 +
32610 +
32611 +echo "$ac_t""$ext_output" 1>&6
32612 +
32613 +
32614 +
32615 +
32616 +if test "$PHP_PDO_FIREBIRD" != "no"; then
32617 +
32618 +  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
32619 +    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
32620 +  fi
32621 +
32622 +  if test "$PHP_PDO_FIREBIRD" = "yes"; then
32623 +    FIREBIRD_INCDIR=
32624 +    FIREBIRD_LIBDIR=
32625 +    FIREBIRD_LIBDIR_FLAG=
32626 +  else
32627 +    FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
32628 +    FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
32629 +    FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR
32630 +  fi
32631 +
32632 +
32633 +  save_old_LDFLAGS=$LDFLAGS
32634 +  ac_stuff="
32635 +    $FIREBIRD_LIBDIR_FLAG
32636 +  "
32637 +
32638 +  save_ext_shared=$ext_shared
32639 +  ext_shared=yes
32640 +
32641 +  for ac_i in $ac_stuff; do
32642      case $ac_i in
32643      -pthread)
32644        if test "$ext_shared" = "yes"; then
32645 -        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -pthread"
32646 +        LDFLAGS="$LDFLAGS -pthread"
32647        else
32648
32649
32650 @@ -70385,7 +69434,7 @@ echo "configure:70087: checking OCI8 lib
32651    c|c_r|pthread*) ;;
32652    *)
32653      if test "$ext_shared" = "yes"; then
32654 -        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
32655 +        LDFLAGS="$LDFLAGS -l$ac_ii"
32656      else
32657
32658
32659 @@ -70420,8 +69469,8 @@ echo "configure:70087: checking OCI8 lib
32660
32661
32662        if test "$ext_shared" = "yes"; then
32663 -        PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB"
32664 -        test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB"
32665 +        LDFLAGS="-L$ai_p $LDFLAGS"
32666 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
32667        else
32668
32669
32670 @@ -70447,98 +69496,60 @@ echo "configure:70087: checking OCI8 lib
32671      esac
32672    done
32673
32674 -    fi
32675 -
32676 -  echo $ac_n "checking Oracle version""... $ac_c" 1>&6
32677 -echo "configure:70454: checking Oracle version" >&5
32678 -  for OCI_VER in $SUPPORTED_LIB_VERS; do
32679 -    if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
32680 -      PDO_OCI_VERSION="$OCI_VER"
32681 -    fi
32682 -  done
32683 -  if test -z "$PDO_OCI_VERSION"; then
32684 -    { echo "configure: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" 1>&2; exit 1; }
32685 -  fi
32686 -  echo "$ac_t""$PDO_OCI_VERSION" 1>&6
32687 +  echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
32688 +echo "configure:69501: checking for isc_detach_database in -lfbclient" >&5
32689 +ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
32690 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32691 +  echo $ac_n "(cached) $ac_c" 1>&6
32692 +else
32693 +  ac_save_LIBS="$LIBS"
32694 +LIBS="-lfbclient  $LIBS"
32695 +cat > conftest.$ac_ext <<EOF
32696 +#line 69509 "configure"
32697 +#include "confdefs.h"
32698 +/* Override any gcc2 internal prototype to avoid an error.  */
32699 +/* We use char because int might match the return type of a gcc2
32700 +    builtin and then its argument prototype would still apply.  */
32701 +char isc_detach_database();
32702
32703 -  fi
32704 -
32705 -  case $PDO_OCI_VERSION in
32706 -    9.0|10.1|10.2|11.1|11.2)
32707 -
32708 -
32709 -  case clntsh in
32710 -  c|c_r|pthread*) ;;
32711 -  *)
32712 -    if test "$ext_shared" = "yes"; then
32713 -        PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -lclntsh"
32714 -    else
32715 -
32716 -
32717 -  case clntsh in
32718 -  c|c_r|pthread*) ;;
32719 -  *)
32720 -      LIBS="$LIBS -lclntsh"
32721 -   ;;
32722 -  esac
32723 -
32724 -
32725 -    fi
32726 -   ;;
32727 -  esac
32728 -
32729 -
32730 -      ;;
32731 -
32732 -    *)
32733 -      { echo "configure: error: Unsupported Oracle version $PDO_OCI_VERSION" 1>&2; exit 1; }
32734 -      ;;
32735 -  esac
32736 +int main() {
32737 +isc_detach_database()
32738 +; return 0; }
32739 +EOF
32740 +if { (eval echo configure:69520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32741 +  rm -rf conftest*
32742 +  eval "ac_cv_lib_$ac_lib_var=yes"
32743 +else
32744 +  echo "configure: failed program was:" >&5
32745 +  cat conftest.$ac_ext >&5
32746 +  rm -rf conftest*
32747 +  eval "ac_cv_lib_$ac_lib_var=no"
32748 +fi
32749 +rm -f conftest*
32750 +LIBS="$ac_save_LIBS"
32751
32752 +fi
32753 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
32754 +  echo "$ac_t""yes" 1>&6
32755
32756 -  if test "$PDO_OCI_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PDO_OCI_LIB_DIR" != "/usr/lib"; then
32757 -
32758 -  if test -z "$PDO_OCI_LIB_DIR" || echo "$PDO_OCI_LIB_DIR" | grep '^/' >/dev/null ; then
32759 -    ai_p=$PDO_OCI_LIB_DIR
32760 -  else
32761 -
32762 -    ep_dir="`echo $PDO_OCI_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
32763 -
32764 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32765 -    ai_p="$ep_realdir/`basename \"$PDO_OCI_LIB_DIR\"`"
32766 -  fi
32767 -
32768 +    LDFLAGS=$save_old_LDFLAGS
32769 +    ext_shared=$save_ext_shared
32770
32771 -      if test "$ext_shared" = "yes"; then
32772 -        PDO_OCI_SHARED_LIBADD="-L$ai_p $PDO_OCI_SHARED_LIBADD"
32773 -        test -n "$ld_runpath_switch" && PDO_OCI_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_OCI_SHARED_LIBADD"
32774 -      else
32775 -
32776 -
32777 -
32778 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
32779 +    FIREBIRD_LIBNAME=fbclient
32780
32781 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
32782 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
32783 -    eval "LIBPATH$unique=set"
32784 -
32785 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
32786 -    LDFLAGS="$LDFLAGS -L$ai_p"
32787 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
32788
32789 -  fi
32790 -
32791 +else
32792 +  echo "$ac_t""no" 1>&6
32793
32794 -      fi
32795 +    LDFLAGS=$save_old_LDFLAGS
32796 +    ext_shared=$save_ext_shared
32797 +    unset ac_cv_lib_fbclient_isc_detach_database
32798 +
32799
32800 -  fi
32801 -
32802 -
32803 -
32804    save_old_LDFLAGS=$LDFLAGS
32805    ac_stuff="
32806 -    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
32807 -  "
32808 +      $FIREBIRD_LIBDIR_FLAG
32809 +    "
32810
32811    save_ext_shared=$ext_shared
32812    ext_shared=yes
32813 @@ -70631,27 +69642,27 @@ echo "configure:70454: checking Oracle v
32814      esac
32815    done
32816
32817 -  echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
32818 -echo "configure:70636: checking for OCIEnvCreate in -lclntsh" >&5
32819 -ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'`
32820 +  echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
32821 +echo "configure:69647: checking for isc_detach_database in -lgds" >&5
32822 +ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
32823  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32824    echo $ac_n "(cached) $ac_c" 1>&6
32825  else
32826    ac_save_LIBS="$LIBS"
32827 -LIBS="-lclntsh  $LIBS"
32828 +LIBS="-lgds  $LIBS"
32829  cat > conftest.$ac_ext <<EOF
32830 -#line 70644 "configure"
32831 +#line 69655 "configure"
32832  #include "confdefs.h"
32833  /* Override any gcc2 internal prototype to avoid an error.  */
32834  /* We use char because int might match the return type of a gcc2
32835      builtin and then its argument prototype would still apply.  */
32836 -char OCIEnvCreate();
32837 +char isc_detach_database();
32838
32839  int main() {
32840 -OCIEnvCreate()
32841 +isc_detach_database()
32842  ; return 0; }
32843  EOF
32844 -if { (eval echo configure:70655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32845 +if { (eval echo configure:69666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32846    rm -rf conftest*
32847    eval "ac_cv_lib_$ac_lib_var=yes"
32848  else
32849 @@ -70670,28 +69681,21 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
32850      LDFLAGS=$save_old_LDFLAGS
32851      ext_shared=$save_ext_shared
32852
32853 -    cat >> confdefs.h <<\EOF
32854 -#define HAVE_OCIENVCREATE 1
32855 -EOF
32856 -
32857 -
32858 +      FIREBIRD_LIBNAME=gds
32859 +
32860
32861  else
32862    echo "$ac_t""no" 1>&6
32863
32864      LDFLAGS=$save_old_LDFLAGS
32865      ext_shared=$save_ext_shared
32866 -    unset ac_cv_lib_clntsh_OCIEnvCreate
32867 +    unset ac_cv_lib_gds_isc_detach_database
32868
32869 -
32870 -fi
32871 -
32872 -
32873 -
32874 +
32875    save_old_LDFLAGS=$LDFLAGS
32876    ac_stuff="
32877 -    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
32878 -  "
32879 +        $FIREBIRD_LIBDIR_FLAG
32880 +      "
32881
32882    save_ext_shared=$ext_shared
32883    ext_shared=yes
32884 @@ -70784,27 +69788,27 @@ fi
32885      esac
32886    done
32887
32888 -  echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
32889 -echo "configure:70789: checking for OCIEnvNlsCreate in -lclntsh" >&5
32890 -ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
32891 +  echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
32892 +echo "configure:69793: checking for isc_detach_database in -lib_util" >&5
32893 +ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
32894  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32895    echo $ac_n "(cached) $ac_c" 1>&6
32896  else
32897    ac_save_LIBS="$LIBS"
32898 -LIBS="-lclntsh  $LIBS"
32899 +LIBS="-lib_util  $LIBS"
32900  cat > conftest.$ac_ext <<EOF
32901 -#line 70797 "configure"
32902 +#line 69801 "configure"
32903  #include "confdefs.h"
32904  /* Override any gcc2 internal prototype to avoid an error.  */
32905  /* We use char because int might match the return type of a gcc2
32906      builtin and then its argument prototype would still apply.  */
32907 -char OCIEnvNlsCreate();
32908 +char isc_detach_database();
32909
32910  int main() {
32911 -OCIEnvNlsCreate()
32912 +isc_detach_database()
32913  ; return 0; }
32914  EOF
32915 -if { (eval echo configure:70808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32916 +if { (eval echo configure:69812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32917    rm -rf conftest*
32918    eval "ac_cv_lib_$ac_lib_var=yes"
32919  else
32920 @@ -70823,95 +69827,79 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
32921      LDFLAGS=$save_old_LDFLAGS
32922      ext_shared=$save_ext_shared
32923
32924 -    cat >> confdefs.h <<\EOF
32925 -#define HAVE_OCIENVNLSCREATE 1
32926 -EOF
32927 -
32928 -
32929 +        FIREBIRD_LIBNAME=ib_util
32930 +
32931
32932  else
32933    echo "$ac_t""no" 1>&6
32934
32935      LDFLAGS=$save_old_LDFLAGS
32936      ext_shared=$save_ext_shared
32937 -    unset ac_cv_lib_clntsh_OCIEnvNlsCreate
32938 +    unset ac_cv_lib_ib_util_isc_detach_database
32939
32940 +        { echo "configure: error: libfbclient, libgds or libib_util not found! Check config.log for more information." 1>&2; exit 1; }
32941 +
32942
32943  fi
32944
32945 -
32946 -
32947 -  save_old_LDFLAGS=$LDFLAGS
32948 -  ac_stuff="
32949 -    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
32950 -  "
32951 -
32952 -  save_ext_shared=$ext_shared
32953 -  ext_shared=yes
32954 +
32955
32956 -  for ac_i in $ac_stuff; do
32957 -    case $ac_i in
32958 -    -pthread)
32959 -      if test "$ext_shared" = "yes"; then
32960 -        LDFLAGS="$LDFLAGS -pthread"
32961 -      else
32962 -
32963 +fi
32964 +
32965
32966 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
32967
32968 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
32969 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
32970 -    eval "EXTRA_LDFLAGS$unique=set"
32971 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
32972 -  fi
32973 +fi
32974
32975 -      fi
32976 -    ;;
32977 -    -l*)
32978 -      ac_ii=`echo $ac_i|cut -c 3-`
32979 -
32980 +
32981
32982 -  case $ac_ii in
32983 -  c|c_r|pthread*) ;;
32984 -  *)
32985 -    if test "$ext_shared" = "yes"; then
32986 -        LDFLAGS="$LDFLAGS -l$ac_ii"
32987 -    else
32988 -
32989 +  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
32990 +echo "configure:69857: checking for PDO includes" >&5
32991 +if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
32992 +  echo $ac_n "(cached) $ac_c" 1>&6
32993 +else
32994
32995 -  case $ac_ii in
32996 -  c|c_r|pthread*) ;;
32997 -  *)
32998 -      LIBS="$LIBS -l$ac_ii"
32999 -   ;;
33000 -  esac
33001 +    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
33002 +echo "configure:69863: checking for PDO includes" >&5
33003 +    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
33004 +      pdo_inc_path=$abs_srcdir/ext
33005 +    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
33006 +      pdo_inc_path=$abs_srcdir/ext
33007 +    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
33008 +      pdo_inc_path=$prefix/include/php/ext
33009 +    fi
33010 +
33011 +fi
33012
33013 +echo "$ac_t""$pdo_inc_path" 1>&6
33014 +  if test -n "$pdo_inc_path"; then
33015 +:
33016 +  else
33017 +{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
33018 +  fi
33019
33020 -    fi
33021 -   ;;
33022 -  esac
33023
33024 +
33025
33026 -    ;;
33027 -    -L*)
33028 -      ac_ii=`echo $ac_i|cut -c 3-`
33029 +  if test "$ext_shared" = "yes"; then
33030 +    PDO_FIREBIRD_SHARED_LIBADD="-l$FIREBIRD_LIBNAME $PDO_FIREBIRD_SHARED_LIBADD"
33031 +    if test -n "$FIREBIRD_LIBDIR"; then
33032
33033 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
33034 +  if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then
33035
33036 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
33037 -    ai_p=$ac_ii
33038 +  if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then
33039 +    ai_p=$FIREBIRD_LIBDIR
33040    else
33041
33042 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
33043 +    ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
33044
33045      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33046 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
33047 +    ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`"
33048    fi
33049
33050
33051        if test "$ext_shared" = "yes"; then
33052 -        LDFLAGS="-L$ai_p $LDFLAGS"
33053 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
33054 +        PDO_FIREBIRD_SHARED_LIBADD="-L$ai_p $PDO_FIREBIRD_SHARED_LIBADD"
33055 +        test -n "$ld_runpath_switch" && PDO_FIREBIRD_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_FIREBIRD_SHARED_LIBADD"
33056        else
33057
33058
33059 @@ -70933,136 +69921,26 @@ fi
33060
33061    fi
33062
33063 -    ;;
33064 -    esac
33065 -  done
33066 -
33067 -  echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
33068 -echo "configure:70942: checking for OCILobIsTemporary in -lclntsh" >&5
33069 -ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
33070 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33071 -  echo $ac_n "(cached) $ac_c" 1>&6
33072 -else
33073 -  ac_save_LIBS="$LIBS"
33074 -LIBS="-lclntsh  $LIBS"
33075 -cat > conftest.$ac_ext <<EOF
33076 -#line 70950 "configure"
33077 -#include "confdefs.h"
33078 -/* Override any gcc2 internal prototype to avoid an error.  */
33079 -/* We use char because int might match the return type of a gcc2
33080 -    builtin and then its argument prototype would still apply.  */
33081 -char OCILobIsTemporary();
33082 -
33083 -int main() {
33084 -OCILobIsTemporary()
33085 -; return 0; }
33086 -EOF
33087 -if { (eval echo configure:70961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33088 -  rm -rf conftest*
33089 -  eval "ac_cv_lib_$ac_lib_var=yes"
33090 -else
33091 -  echo "configure: failed program was:" >&5
33092 -  cat conftest.$ac_ext >&5
33093 -  rm -rf conftest*
33094 -  eval "ac_cv_lib_$ac_lib_var=no"
33095 -fi
33096 -rm -f conftest*
33097 -LIBS="$ac_save_LIBS"
33098 -
33099 -fi
33100 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33101 -  echo "$ac_t""yes" 1>&6
33102 -
33103 -    LDFLAGS=$save_old_LDFLAGS
33104 -    ext_shared=$save_ext_shared
33105 +    fi
33106 +  else
33107
33108 -    cat >> confdefs.h <<\EOF
33109 -#define HAVE_OCILOBISTEMPORARY 1
33110 -EOF
33111 -
33112 -
33113 -
33114 -else
33115 -  echo "$ac_t""no" 1>&6
33116
33117 -    LDFLAGS=$save_old_LDFLAGS
33118 -    ext_shared=$save_ext_shared
33119 -    unset ac_cv_lib_clntsh_OCILobIsTemporary
33120 -
33121 +  if test -n "$FIREBIRD_LIBDIR"; then
33122
33123 -  save_old_LDFLAGS=$LDFLAGS
33124 -  ac_stuff="
33125 -      -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
33126 -    "
33127 -
33128 -  save_ext_shared=$ext_shared
33129 -  ext_shared=yes
33130 -
33131 -  for ac_i in $ac_stuff; do
33132 -    case $ac_i in
33133 -    -pthread)
33134 -      if test "$ext_shared" = "yes"; then
33135 -        LDFLAGS="$LDFLAGS -pthread"
33136 -      else
33137 -
33138 -
33139 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
33140 -
33141 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
33142 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
33143 -    eval "EXTRA_LDFLAGS$unique=set"
33144 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
33145 -  fi
33146 -
33147 -      fi
33148 -    ;;
33149 -    -l*)
33150 -      ac_ii=`echo $ac_i|cut -c 3-`
33151 -
33152 -
33153 -  case $ac_ii in
33154 -  c|c_r|pthread*) ;;
33155 -  *)
33156 -    if test "$ext_shared" = "yes"; then
33157 -        LDFLAGS="$LDFLAGS -l$ac_ii"
33158 -    else
33159 -
33160 -
33161 -  case $ac_ii in
33162 -  c|c_r|pthread*) ;;
33163 -  *)
33164 -      LIBS="$LIBS -l$ac_ii"
33165 -   ;;
33166 -  esac
33167 -
33168 -
33169 -    fi
33170 -   ;;
33171 -  esac
33172 -
33173 -
33174 -    ;;
33175 -    -L*)
33176 -      ac_ii=`echo $ac_i|cut -c 3-`
33177 -
33178 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
33179 +  if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then
33180
33181 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
33182 -    ai_p=$ac_ii
33183 +  if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then
33184 +    ai_p=$FIREBIRD_LIBDIR
33185    else
33186
33187 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
33188 +    ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
33189
33190      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33191 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
33192 +    ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`"
33193    fi
33194
33195
33196 -      if test "$ext_shared" = "yes"; then
33197 -        LDFLAGS="-L$ai_p $LDFLAGS"
33198 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
33199 -      else
33200 -
33201 +
33202
33203
33204    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
33205 @@ -71078,446 +69956,74 @@ else
33206    fi
33207
33208
33209 -      fi
33210
33211    fi
33212
33213 -    ;;
33214 -    esac
33215 -  done
33216 -
33217 -  echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
33218 -echo "configure:71091: checking for OCILobIsTemporary in -locijdbc8" >&5
33219 -ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
33220 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33221 -  echo $ac_n "(cached) $ac_c" 1>&6
33222 -else
33223 -  ac_save_LIBS="$LIBS"
33224 -LIBS="-locijdbc8  $LIBS"
33225 -cat > conftest.$ac_ext <<EOF
33226 -#line 71099 "configure"
33227 -#include "confdefs.h"
33228 -/* Override any gcc2 internal prototype to avoid an error.  */
33229 -/* We use char because int might match the return type of a gcc2
33230 -    builtin and then its argument prototype would still apply.  */
33231 -char OCILobIsTemporary();
33232 -
33233 -int main() {
33234 -OCILobIsTemporary()
33235 -; return 0; }
33236 -EOF
33237 -if { (eval echo configure:71110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33238 -  rm -rf conftest*
33239 -  eval "ac_cv_lib_$ac_lib_var=yes"
33240 -else
33241 -  echo "configure: failed program was:" >&5
33242 -  cat conftest.$ac_ext >&5
33243 -  rm -rf conftest*
33244 -  eval "ac_cv_lib_$ac_lib_var=no"
33245 -fi
33246 -rm -f conftest*
33247 -LIBS="$ac_save_LIBS"
33248 -
33249 -fi
33250 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33251 -  echo "$ac_t""yes" 1>&6
33252 -
33253 -    LDFLAGS=$save_old_LDFLAGS
33254 -    ext_shared=$save_ext_shared
33255 -
33256 -
33257 +  fi
33258
33259 -  case ocijdbc8 in
33260 -  c|c_r|pthread*) ;;
33261 -  *)
33262 -    if test "$ext_shared" = "yes"; then
33263 -        PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8"
33264 -    else
33265 -
33266
33267 -  case ocijdbc8 in
33268 +  case $FIREBIRD_LIBNAME in
33269    c|c_r|pthread*) ;;
33270    *)
33271 -      LIBS="$LIBS -locijdbc8"
33272 -   ;;
33273 -  esac
33274 -
33275 -
33276 -    fi
33277 +      LIBS="-l$FIREBIRD_LIBNAME $LIBS"
33278     ;;
33279    esac
33280
33281
33282 -      cat >> confdefs.h <<\EOF
33283 -#define HAVE_OCILOBISTEMPORARY 1
33284 -EOF
33285 -
33286 -
33287 -
33288 -else
33289 -  echo "$ac_t""no" 1>&6
33290 -
33291 -    LDFLAGS=$save_old_LDFLAGS
33292 -    ext_shared=$save_ext_shared
33293 -    unset ac_cv_lib_ocijdbc8_OCILobIsTemporary
33294 -
33295 -
33296 -fi
33297 -
33298 -
33299 -
33300 -fi
33301
33302
33303 -
33304 -  save_old_LDFLAGS=$LDFLAGS
33305 -  ac_stuff="
33306 -    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
33307 -  "
33308 -
33309 -  save_ext_shared=$ext_shared
33310 -  ext_shared=yes
33311 -
33312 -  for ac_i in $ac_stuff; do
33313 -    case $ac_i in
33314 -    -pthread)
33315 -      if test "$ext_shared" = "yes"; then
33316 -        LDFLAGS="$LDFLAGS -pthread"
33317 -      else
33318 -
33319 -
33320 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
33321 -
33322 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
33323 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
33324 -    eval "EXTRA_LDFLAGS$unique=set"
33325 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
33326    fi
33327
33328 -      fi
33329 -    ;;
33330 -    -l*)
33331 -      ac_ii=`echo $ac_i|cut -c 3-`
33332 -
33333 -
33334 -  case $ac_ii in
33335 -  c|c_r|pthread*) ;;
33336 -  *)
33337 -    if test "$ext_shared" = "yes"; then
33338 -        LDFLAGS="$LDFLAGS -l$ac_ii"
33339 -    else
33340 -
33341 -
33342 -  case $ac_ii in
33343 -  c|c_r|pthread*) ;;
33344 -  *)
33345 -      LIBS="$LIBS -l$ac_ii"
33346 -   ;;
33347 -  esac
33348 -
33349 -
33350 -    fi
33351 -   ;;
33352 -  esac
33353 -
33354
33355 -    ;;
33356 -    -L*)
33357 -      ac_ii=`echo $ac_i|cut -c 3-`
33358 -
33359 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
33360 +
33361 +  if test "$FIREBIRD_INCDIR" != "/usr/include"; then
33362
33363 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
33364 -    ai_p=$ac_ii
33365 +  if test -z "$FIREBIRD_INCDIR" || echo "$FIREBIRD_INCDIR" | grep '^/' >/dev/null ; then
33366 +    ai_p=$FIREBIRD_INCDIR
33367    else
33368
33369 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
33370 +    ep_dir="`echo $FIREBIRD_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
33371
33372      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33373 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
33374 +    ai_p="$ep_realdir/`basename \"$FIREBIRD_INCDIR\"`"
33375    fi
33376
33377
33378 -      if test "$ext_shared" = "yes"; then
33379 -        LDFLAGS="-L$ai_p $LDFLAGS"
33380 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
33381 -      else
33382 -
33383 -
33384
33385    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
33386
33387 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
33388 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
33389    if test -n "$unique" && test "`eval $cmd`" = "" ; then
33390 -    eval "LIBPATH$unique=set"
33391 +    eval "INCLUDEPATH$unique=set"
33392
33393 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
33394 -    LDFLAGS="$LDFLAGS -L$ai_p"
33395 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
33396 -
33397 -  fi
33398 -
33399 -
33400 +      if test ""; then
33401 +        INCLUDES="-I$ai_p $INCLUDES"
33402 +      else
33403 +        INCLUDES="$INCLUDES -I$ai_p"
33404        fi
33405
33406    fi
33407
33408 -    ;;
33409 -    esac
33410 -  done
33411 +  fi
33412
33413 -  echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
33414 -echo "configure:71271: checking for OCICollAssign in -lclntsh" >&5
33415 -ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'`
33416 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33417 -  echo $ac_n "(cached) $ac_c" 1>&6
33418 -else
33419 -  ac_save_LIBS="$LIBS"
33420 -LIBS="-lclntsh  $LIBS"
33421 -cat > conftest.$ac_ext <<EOF
33422 -#line 71279 "configure"
33423 -#include "confdefs.h"
33424 -/* Override any gcc2 internal prototype to avoid an error.  */
33425 -/* We use char because int might match the return type of a gcc2
33426 -    builtin and then its argument prototype would still apply.  */
33427 -char OCICollAssign();
33428 -
33429 -int main() {
33430 -OCICollAssign()
33431 -; return 0; }
33432 -EOF
33433 -if { (eval echo configure:71290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33434 -  rm -rf conftest*
33435 -  eval "ac_cv_lib_$ac_lib_var=yes"
33436 -else
33437 -  echo "configure: failed program was:" >&5
33438 -  cat conftest.$ac_ext >&5
33439 -  rm -rf conftest*
33440 -  eval "ac_cv_lib_$ac_lib_var=no"
33441 -fi
33442 -rm -f conftest*
33443 -LIBS="$ac_save_LIBS"
33444 -
33445 -fi
33446 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33447 -  echo "$ac_t""yes" 1>&6
33448 -
33449 -    LDFLAGS=$save_old_LDFLAGS
33450 -    ext_shared=$save_ext_shared
33451 -
33452 -    cat >> confdefs.h <<\EOF
33453 -#define HAVE_OCICOLLASSIGN 1
33454 -EOF
33455 -
33456 -
33457 -
33458 -else
33459 -  echo "$ac_t""no" 1>&6
33460 -
33461 -    LDFLAGS=$save_old_LDFLAGS
33462 -    ext_shared=$save_ext_shared
33463 -    unset ac_cv_lib_clntsh_OCICollAssign
33464 -
33465 -
33466 -fi
33467 -
33468 -
33469 -
33470 -  save_old_LDFLAGS=$LDFLAGS
33471 -  ac_stuff="
33472 -    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
33473 -  "
33474 -
33475 -  save_ext_shared=$ext_shared
33476 -  ext_shared=yes
33477 -
33478 -  for ac_i in $ac_stuff; do
33479 -    case $ac_i in
33480 -    -pthread)
33481 -      if test "$ext_shared" = "yes"; then
33482 -        LDFLAGS="$LDFLAGS -pthread"
33483 -      else
33484 -
33485 -
33486 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
33487 -
33488 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
33489 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
33490 -    eval "EXTRA_LDFLAGS$unique=set"
33491 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
33492 -  fi
33493 -
33494 -      fi
33495 -    ;;
33496 -    -l*)
33497 -      ac_ii=`echo $ac_i|cut -c 3-`
33498 -
33499 -
33500 -  case $ac_ii in
33501 -  c|c_r|pthread*) ;;
33502 -  *)
33503 -    if test "$ext_shared" = "yes"; then
33504 -        LDFLAGS="$LDFLAGS -l$ac_ii"
33505 -    else
33506 -
33507 -
33508 -  case $ac_ii in
33509 -  c|c_r|pthread*) ;;
33510 -  *)
33511 -      LIBS="$LIBS -l$ac_ii"
33512 -   ;;
33513 -  esac
33514 -
33515 -
33516 -    fi
33517 -   ;;
33518 -  esac
33519 -
33520 -
33521 -    ;;
33522 -    -L*)
33523 -      ac_ii=`echo $ac_i|cut -c 3-`
33524 -
33525 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
33526 -
33527 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
33528 -    ai_p=$ac_ii
33529 -  else
33530 -
33531 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
33532 -
33533 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33534 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
33535 -  fi
33536 -
33537 -
33538 -      if test "$ext_shared" = "yes"; then
33539 -        LDFLAGS="-L$ai_p $LDFLAGS"
33540 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
33541 -      else
33542 -
33543 -
33544 -
33545 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
33546 -
33547 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
33548 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
33549 -    eval "LIBPATH$unique=set"
33550 -
33551 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
33552 -    LDFLAGS="$LDFLAGS -L$ai_p"
33553 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
33554 -
33555 -  fi
33556 -
33557 -
33558 -      fi
33559 -
33560 -  fi
33561 -
33562 -    ;;
33563 -    esac
33564 -  done
33565 -
33566 -  echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
33567 -echo "configure:71424: checking for OCIStmtFetch2 in -lclntsh" >&5
33568 -ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'`
33569 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33570 -  echo $ac_n "(cached) $ac_c" 1>&6
33571 -else
33572 -  ac_save_LIBS="$LIBS"
33573 -LIBS="-lclntsh  $LIBS"
33574 -cat > conftest.$ac_ext <<EOF
33575 -#line 71432 "configure"
33576 -#include "confdefs.h"
33577 -/* Override any gcc2 internal prototype to avoid an error.  */
33578 -/* We use char because int might match the return type of a gcc2
33579 -    builtin and then its argument prototype would still apply.  */
33580 -char OCIStmtFetch2();
33581 -
33582 -int main() {
33583 -OCIStmtFetch2()
33584 -; return 0; }
33585 -EOF
33586 -if { (eval echo configure:71443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33587 -  rm -rf conftest*
33588 -  eval "ac_cv_lib_$ac_lib_var=yes"
33589 -else
33590 -  echo "configure: failed program was:" >&5
33591 -  cat conftest.$ac_ext >&5
33592 -  rm -rf conftest*
33593 -  eval "ac_cv_lib_$ac_lib_var=no"
33594 -fi
33595 -rm -f conftest*
33596 -LIBS="$ac_save_LIBS"
33597 -
33598 -fi
33599 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33600 -  echo "$ac_t""yes" 1>&6
33601 -
33602 -    LDFLAGS=$save_old_LDFLAGS
33603 -    ext_shared=$save_ext_shared
33604 -
33605 -     cat >> confdefs.h <<\EOF
33606 -#define HAVE_OCISTMTFETCH2 1
33607 +  cat >> confdefs.h <<\EOF
33608 +#define HAVE_PDO_FIREBIRD 1
33609  EOF
33610
33611
33612 -
33613 -else
33614 -  echo "$ac_t""no" 1>&6
33615 -
33616 -    LDFLAGS=$save_old_LDFLAGS
33617 -    ext_shared=$save_ext_shared
33618 -    unset ac_cv_lib_clntsh_OCIStmtFetch2
33619 -
33620 -
33621 -fi
33622 -
33623 -
33624 -
33625 -
33626 -  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
33627 -echo "configure:71482: checking for PDO includes" >&5
33628 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
33629 -  echo $ac_n "(cached) $ac_c" 1>&6
33630 -else
33631 -
33632 -    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
33633 -echo "configure:71488: checking for PDO includes" >&5
33634 -    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
33635 -      pdo_inc_path=$abs_srcdir/ext
33636 -    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
33637 -      pdo_inc_path=$abs_srcdir/ext
33638 -    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
33639 -      pdo_inc_path=$prefix/include/php/ext
33640 -    fi
33641 -
33642 -fi
33643 -
33644 -echo "$ac_t""$pdo_inc_path" 1>&6
33645 -  if test -n "$pdo_inc_path"; then
33646 -:
33647 -  else
33648 -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
33649 -  fi
33650 -
33651 -
33652 -
33653 -
33654 -  ext_builddir=ext/pdo_oci
33655 -  ext_srcdir=$abs_srcdir/ext/pdo_oci
33656 +  ext_builddir=ext/pdo_firebird
33657 +  ext_srcdir=$abs_srcdir/ext/pdo_firebird
33658
33659    ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
33660
33661    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
33662 -    PHP_PDO_OCI_SHARED=no
33663 +    PHP_PDO_FIREBIRD_SHARED=no
33664
33665
33666 -  case ext/pdo_oci in
33667 +  case ext/pdo_firebird in
33668    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
33669 -  /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
33670 -  *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
33671 +  /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
33672 +  *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
33673    esac
33674
33675
33676 @@ -71532,7 +70038,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
33677
33678
33679    old_IFS=$IFS
33680 -  for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
33681 +  for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
33682
33683        IFS=.
33684        set $ac_src
33685 @@ -71555,18 +70061,18 @@ EOF
33686    done
33687
33688
33689 -    EXT_STATIC="$EXT_STATIC pdo_oci"
33690 +    EXT_STATIC="$EXT_STATIC pdo_firebird"
33691      if test "$ext_shared" != "nocli"; then
33692 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci"
33693 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
33694      fi
33695    else
33696      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
33697 -      PHP_PDO_OCI_SHARED=yes
33698 +      PHP_PDO_FIREBIRD_SHARED=yes
33699
33700 -  case ext/pdo_oci in
33701 +  case ext/pdo_firebird in
33702    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
33703 -  /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
33704 -  *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
33705 +  /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
33706 +  *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
33707    esac
33708
33709
33710 @@ -71581,14 +70087,14 @@ EOF
33711
33712
33713    old_IFS=$IFS
33714 -  for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
33715 +  for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
33716
33717        IFS=.
33718        set $ac_src
33719        ac_obj=$1
33720        IFS=$old_IFS
33721
33722 -      shared_objects_pdo_oci="$shared_objects_pdo_oci $ac_bdir$ac_obj.lo"
33723 +      shared_objects_pdo_firebird="$shared_objects_pdo_firebird $ac_bdir$ac_obj.lo"
33724
33725        case $ac_src in
33726          *.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" ;;
33727 @@ -71611,31 +70117,31 @@ EOF
33728    case $host_alias in
33729      *aix*)
33730        suffix=so
33731 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_oci.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PHPPDO_OCI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_oci.so '$ext_builddir'/phppdo_oci.so'
33732 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_firebird.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PHPPDO_FIREBIRD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_firebird.so '$ext_builddir'/phppdo_firebird.so'
33733        ;;
33734      *netware*)
33735        suffix=nlm
33736 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_OCI, 3)_SHARED_LIBADD)'
33737 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_FIREBIRD, 3)_SHARED_LIBADD)'
33738        ;;
33739      *)
33740        suffix=la
33741 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PHPPDO_OCI_SHARED_LIBADD)'
33742 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PHPPDO_FIREBIRD_SHARED_LIBADD)'
33743        ;;
33744    esac
33745
33746    if test "x" = "xyes"; then
33747 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_oci.$suffix"
33748 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_firebird.$suffix"
33749    else
33750 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_oci.$suffix"
33751 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_firebird.$suffix"
33752    fi
33753
33754 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
33755 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
33756
33757    cat >>Makefile.objects<<EOF
33758 -\$(phplibdir)/phppdo_oci.$suffix: $ext_builddir/phppdo_oci.$suffix
33759 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_oci.$suffix \$(phplibdir)
33760 +\$(phplibdir)/phppdo_firebird.$suffix: $ext_builddir/phppdo_firebird.$suffix
33761 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_firebird.$suffix \$(phplibdir)
33762
33763 -$ext_builddir/phppdo_oci.$suffix: \$(shared_objects_pdo_oci) \$(PHPPDO_OCI_SHARED_DEPENDENCIES)
33764 +$ext_builddir/phppdo_firebird.$suffix: \$(shared_objects_pdo_firebird) \$(PHPPDO_FIREBIRD_SHARED_DEPENDENCIES)
33765         $link_cmd
33766
33767  EOF
33768 @@ -71648,31 +70154,31 @@ EOF
33769    case $host_alias in
33770      *aix*)
33771        suffix=so
33772 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_oci.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PDO_OCI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_oci.so '$ext_builddir'/pdo_oci.so'
33773 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_firebird.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PDO_FIREBIRD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_firebird.so '$ext_builddir'/pdo_firebird.so'
33774        ;;
33775      *netware*)
33776        suffix=nlm
33777 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_OCI, 3)_SHARED_LIBADD)'
33778 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_FIREBIRD, 3)_SHARED_LIBADD)'
33779        ;;
33780      *)
33781        suffix=la
33782 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PDO_OCI_SHARED_LIBADD)'
33783 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) $(PDO_FIREBIRD_SHARED_LIBADD)'
33784        ;;
33785    esac
33786
33787    if test "x" = "xyes"; then
33788 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_oci.$suffix"
33789 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_firebird.$suffix"
33790    else
33791 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_oci.$suffix"
33792 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_firebird.$suffix"
33793    fi
33794
33795 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
33796 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird"
33797
33798    cat >>Makefile.objects<<EOF
33799 -\$(phplibdir)/pdo_oci.$suffix: $ext_builddir/pdo_oci.$suffix
33800 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_oci.$suffix \$(phplibdir)
33801 +\$(phplibdir)/pdo_firebird.$suffix: $ext_builddir/pdo_firebird.$suffix
33802 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_firebird.$suffix \$(phplibdir)
33803
33804 -$ext_builddir/pdo_oci.$suffix: \$(shared_objects_pdo_oci) \$(PDO_OCI_SHARED_DEPENDENCIES)
33805 +$ext_builddir/pdo_firebird.$suffix: \$(shared_objects_pdo_firebird) \$(PDO_FIREBIRD_SHARED_DEPENDENCIES)
33806         $link_cmd
33807
33808  EOF
33809 @@ -71680,22 +70186,22 @@ EOF
33810            ;;
33811        esac
33812        cat >> confdefs.h <<EOF
33813 -#define COMPILE_DL_PDO_OCI 1
33814 +#define COMPILE_DL_PDO_FIREBIRD 1
33815  EOF
33816
33817      fi
33818    fi
33819
33820    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
33821 -    PHP_PDO_OCI_SHARED=no
33822 +    PHP_PDO_FIREBIRD_SHARED=no
33823      case "$PHP_SAPI" in
33824        cgi|embed)
33825
33826
33827 -  case ext/pdo_oci in
33828 +  case ext/pdo_firebird in
33829    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
33830 -  /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
33831 -  *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
33832 +  /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
33833 +  *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
33834    esac
33835
33836
33837 @@ -71710,7 +70216,7 @@ EOF
33838
33839
33840    old_IFS=$IFS
33841 -  for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
33842 +  for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
33843
33844        IFS=.
33845        set $ac_src
33846 @@ -71733,15 +70239,15 @@ EOF
33847    done
33848
33849
33850 -        EXT_STATIC="$EXT_STATIC pdo_oci"
33851 +        EXT_STATIC="$EXT_STATIC pdo_firebird"
33852          ;;
33853        *)
33854
33855
33856 -  case ext/pdo_oci in
33857 +  case ext/pdo_firebird in
33858    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
33859 -  /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
33860 -  *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
33861 +  /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
33862 +  *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
33863    esac
33864
33865
33866 @@ -71756,7 +70262,7 @@ EOF
33867
33868
33869    old_IFS=$IFS
33870 -  for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
33871 +  for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do
33872
33873        IFS=.
33874        set $ac_src
33875 @@ -71781,7 +70287,7 @@ EOF
33876
33877          ;;
33878      esac
33879 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci"
33880 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
33881    fi
33882
33883
33884 @@ -71790,77 +70296,50 @@ EOF
33885
33886
33887    if test "$ext_builddir" = "."; then
33888 -    PHP_PECL_EXTENSION=pdo_oci
33889 +    PHP_PECL_EXTENSION=pdo_firebird
33890
33891    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
33892
33893    fi
33894
33895 -
33896 -
33897 -
33898 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_SHARED_LIBADD"
33899 -
33900 -
33901 -
33902 -
33903 -
33904 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_DIR"
33905 -
33906 -
33907 -
33908 -
33909 -
33910 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_VERSION"
33911 -
33912
33913 -
33914 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_FIREBIRD_SHARED_LIBADD"
33915
33916
33917 -
33918 -  am_i_shared=$PHP_PDO_OCI_SHARED
33919 +  am_i_shared=$PHP_PDO_FIREBIRD_SHARED
33920    is_it_shared=$PHP_PDO_SHARED
33921    is_it_enabled=$PHP_PDO
33922    if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
33923      { echo "configure: error:
33924 -You've configured extension pdo_oci to build statically, but it
33925 +You've configured extension pdo_firebird to build statically, but it
33926  depends on extension pdo, which you've configured to build shared.
33927 -You either need to build pdo_oci shared or build pdo statically for the
33928 +You either need to build pdo_firebird shared or build pdo statically for the
33929  build to be successful.
33930  " 1>&2; exit 1; }
33931    fi
33932    if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
33933      { echo "configure: error:
33934 -You've configured extension pdo_oci, which depends on extension pdo,
33935 +You've configured extension pdo_firebird, which depends on extension pdo,
33936  but you've either not enabled pdo, or have disabled it.
33937  " 1>&2; exit 1; }
33938    fi
33939
33940 -
33941 -
33942 -  cat >> confdefs.h <<EOF
33943 -#define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION"
33944 -EOF
33945 -
33946  fi
33947
33948
33949
33950 +php_with_pdo_mysql=no
33951
33952 -
33953 -
33954 -php_with_pdo_odbc=no
33955 -
33956 -echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
33957 -echo "configure:71856: checking for ODBC v3 support for PDO" >&5
33958 -# Check whether --with-pdo-odbc or --without-pdo-odbc was given.
33959 -if test "${with_pdo_odbc+set}" = set; then
33960 -  withval="$with_pdo_odbc"
33961 -  PHP_PDO_ODBC=$withval
33962 +echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
33963 +echo "configure:70335: checking for MySQL support for PDO" >&5
33964 +# Check whether --with-pdo-mysql or --without-pdo-mysql was given.
33965 +if test "${with_pdo_mysql+set}" = set; then
33966 +  withval="$with_pdo_mysql"
33967 +  PHP_PDO_MYSQL=$withval
33968  else
33969
33970 -  PHP_PDO_ODBC=no
33971 -  test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL
33972 +  PHP_PDO_MYSQL=no
33973 +  test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL
33974
33975  fi
33976
33977 @@ -71868,12 +70347,12 @@ fi
33978
33979  ext_output="yes, shared"
33980  ext_shared=yes
33981 -case $PHP_PDO_ODBC in
33982 +case $PHP_PDO_MYSQL in
33983  shared,*)
33984 -  PHP_PDO_ODBC=`echo "$PHP_PDO_ODBC"|$SED 's/^shared,//'`
33985 +  PHP_PDO_MYSQL=`echo "$PHP_PDO_MYSQL"|$SED 's/^shared,//'`
33986    ;;
33987  shared)
33988 -  PHP_PDO_ODBC=yes
33989 +  PHP_PDO_MYSQL=yes
33990    ;;
33991  no)
33992    ext_output=no
33993 @@ -71892,475 +70371,187 @@ echo "$ac_t""$ext_output" 1>&6
33994
33995
33996
33997 -
33998 -
33999 -
34000 -if test "$PHP_PDO_ODBC" != "no"; then
34001 -
34002 -  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
34003 -    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
34004 -  fi
34005 -
34006 +if test -z "$PHP_ZLIB_DIR"; then
34007
34008 -
34009 -  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
34010 -echo "configure:71908: checking for PDO includes" >&5
34011 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
34012 -  echo $ac_n "(cached) $ac_c" 1>&6
34013 +php_with_zlib_dir=no
34014 +
34015 +echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
34016 +echo "configure:70380: checking for the location of libz" >&5
34017 +# Check whether --with-zlib-dir or --without-zlib-dir was given.
34018 +if test "${with_zlib_dir+set}" = set; then
34019 +  withval="$with_zlib_dir"
34020 +  PHP_ZLIB_DIR=$withval
34021  else
34022
34023 -    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
34024 -echo "configure:71914: checking for PDO includes" >&5
34025 -    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
34026 -      pdo_inc_path=$abs_srcdir/ext
34027 -    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
34028 -      pdo_inc_path=$abs_srcdir/ext
34029 -    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
34030 -      pdo_inc_path=$prefix/include/php/ext
34031 -    fi
34032 +  PHP_ZLIB_DIR=no
34033
34034 +
34035  fi
34036
34037 -echo "$ac_t""$pdo_inc_path" 1>&6
34038 -  if test -n "$pdo_inc_path"; then
34039 -:
34040 -  else
34041 -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
34042 -  fi
34043
34044 -
34045 +ext_output=$PHP_ZLIB_DIR
34046 +echo "$ac_t""$ext_output" 1>&6
34047
34048 -  echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
34049 -echo "configure:71935: checking for selected PDO ODBC flavour" >&5
34050
34051 -  pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
34052 -  pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
34053
34054 -  if test "$pdo_odbc_dir" = "$PHP_PDO_ODBC" ; then
34055 -    pdo_odbc_dir=
34056 -  fi
34057 +fi
34058
34059 -  case $pdo_odbc_flavour in
34060 -    ibm-db2)
34061 -        pdo_odbc_def_libdir=/home/db2inst1/sqllib/lib
34062 -        pdo_odbc_def_incdir=/home/db2inst1/sqllib/include
34063 -        pdo_odbc_def_lib=db2
34064 -        ;;
34065 +if test "$PHP_PDO_MYSQL" != "no"; then
34066
34067 -    iODBC|iodbc)
34068 -        pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
34069 -        pdo_odbc_def_incdir=/usr/local/include
34070 -        pdo_odbc_def_lib=iodbc
34071 -        ;;
34072 +  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
34073 +    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
34074 +  fi
34075
34076 -    unixODBC|unixodbc)
34077 -        pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
34078 -        pdo_odbc_def_incdir=/usr/local/include
34079 -        pdo_odbc_def_lib=odbc
34080 -        ;;
34081 +
34082
34083 -    ODBCRouter|odbcrouter)
34084 -        pdo_odbc_def_libdir=/usr/$PHP_LIBDIR
34085 -        pdo_odbc_def_incdir=/usr/include
34086 -        pdo_odbc_def_lib=odbcsdk
34087 -        ;;
34088 +  if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then
34089 +    PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL
34090 +  elif test "$PHP_PDO_MYSQL" != "yes"; then
34091 +    if test -d "$PHP_PDO_MYSQL" ; then
34092 +      if test -x "$PHP_PDO_MYSQL/bin/mysql_config" ; then
34093 +        PDO_MYSQL_CONFIG="$PHP_PDO_MYSQL/bin/mysql_config"
34094 +      else
34095 +        PDO_MYSQL_DIR="$PHP_PDO_MYSQL"
34096 +      fi
34097 +    fi
34098 +  else
34099 +    for i in /usr/local /usr ; do
34100 +      if test -x "$i/bin/mysql_config" ; then
34101 +        PDO_MYSQL_CONFIG="$i/bin/mysql_config"
34102 +        break;
34103 +      fi
34104 +      if test -r $i/include/mysql/mysql.h || test -r $i/include/mysql.h ; then
34105 +        PDO_MYSQL_DIR="$i"
34106 +        break;
34107 +      fi
34108 +    done
34109 +  fi
34110
34111 -    generic)
34112 -        pdo_odbc_def_lib="`echo $PHP_PDO_ODBC | cut -d, -f3`"
34113 -        pdo_odbc_def_ldflags="`echo $PHP_PDO_ODBC | cut -d, -f4`"
34114 -        pdo_odbc_def_cflags="`echo $PHP_PDO_ODBC | cut -d, -f5`"
34115 -        pdo_odbc_flavour="generic-$pdo_odbc_def_lib"
34116 -        ;;
34117 +  if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
34118 +        PHP_MYSQLND_ENABLED=yes
34119 +    cat >> confdefs.h <<\EOF
34120 +#define PDO_USE_MYSQLND 1
34121 +EOF
34122
34123 -      *)
34124 -        { echo "configure: error: Unknown ODBC flavour $pdo_odbc_flavour
34125 -                            include and lib dirs are looked for under 'dir'.
34126 -
34127 -                            'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
34128 -                            If ',dir' part is omitted, default for the flavour
34129 -                            you have selected will used. e.g.:
34130 -
34131 -                              --with-pdo-odbc=unixODBC
34132 -
34133 -                            will check for unixODBC under /usr/local. You may attempt
34134 -                            to use an otherwise unsupported driver using the \"generic\"
34135 -                            flavour.  The syntax for generic ODBC support is:
34136 -
34137 -                              --with-pdo-odbc=generic,dir,libname,ldflags,cflags
34138 +  else
34139 +    cat >> confdefs.h <<\EOF
34140 +#define HAVE_MYSQL 1
34141 +EOF
34142
34143 -                            When build as shared the extension filename is always pdo_odbc.so" 1>&2; exit 1; }
34144 -        ;;
34145 -  esac
34146
34147 -  if test -n "$pdo_odbc_dir"; then
34148 -    PDO_ODBC_INCDIR="$pdo_odbc_dir/include"
34149 -    PDO_ODBC_LIBDIR="$pdo_odbc_dir/$PHP_LIBDIR"
34150 -  else
34151 -    PDO_ODBC_INCDIR="$pdo_odbc_def_incdir"
34152 -    PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
34153 -  fi
34154 -
34155 -  echo "$ac_t""$pdo_odbc_flavour
34156 -          libs       $PDO_ODBC_LIBDIR,
34157 -          headers    $PDO_ODBC_INCDIR" 1>&6
34158 -
34159 -  if test ! -d "$PDO_ODBC_LIBDIR" ; then
34160 -    echo "configure: warning: library dir $PDO_ODBC_LIBDIR does not exist" 1>&2
34161 -  fi
34162 -
34163 -
34164 -  echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34165 -echo "configure:72014: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
34166 -  if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
34167 -    php_pdo_have_header=yes
34168 -    cat >> confdefs.h <<\EOF
34169 -#define HAVE_ODBC_H 1
34170 -EOF
34171 -
34172 -    echo "$ac_t""yes" 1>&6
34173 -  else
34174 -    echo "$ac_t""no" 1>&6
34175 -  fi
34176 -
34177 -
34178 -  echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34179 -echo "configure:72028: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
34180 -  if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
34181 -    php_pdo_have_header=yes
34182 -    cat >> confdefs.h <<\EOF
34183 -#define HAVE_ODBCSDK_H 1
34184 -EOF
34185 -
34186 -    echo "$ac_t""yes" 1>&6
34187 -  else
34188 -    echo "$ac_t""no" 1>&6
34189 -  fi
34190 -
34191 -
34192 -  echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34193 -echo "configure:72042: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
34194 -  if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
34195 -    php_pdo_have_header=yes
34196 -    cat >> confdefs.h <<\EOF
34197 -#define HAVE_IODBC_H 1
34198 -EOF
34199 -
34200 -    echo "$ac_t""yes" 1>&6
34201 -  else
34202 -    echo "$ac_t""no" 1>&6
34203 -  fi
34204 -
34205 -
34206 -  echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34207 -echo "configure:72056: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
34208 -  if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
34209 -    php_pdo_have_header=yes
34210 -    cat >> confdefs.h <<\EOF
34211 -#define HAVE_SQLUNIX_H 1
34212 -EOF
34213 -
34214 -    echo "$ac_t""yes" 1>&6
34215 -  else
34216 -    echo "$ac_t""no" 1>&6
34217 -  fi
34218 -
34219 -
34220 -  echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34221 -echo "configure:72070: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
34222 -  if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
34223 -    php_pdo_have_header=yes
34224 -    cat >> confdefs.h <<\EOF
34225 -#define HAVE_SQLTYPES_H 1
34226 -EOF
34227 -
34228 -    echo "$ac_t""yes" 1>&6
34229 -  else
34230 -    echo "$ac_t""no" 1>&6
34231 -  fi
34232 -
34233 -
34234 -  echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34235 -echo "configure:72084: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
34236 -  if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
34237 -    php_pdo_have_header=yes
34238 -    cat >> confdefs.h <<\EOF
34239 -#define HAVE_SQLUCODE_H 1
34240 -EOF
34241 -
34242 -    echo "$ac_t""yes" 1>&6
34243 -  else
34244 -    echo "$ac_t""no" 1>&6
34245 -  fi
34246 -
34247 -
34248 -  echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34249 -echo "configure:72098: checking for sql.h in $PDO_ODBC_INCDIR" >&5
34250 -  if test -f "$PDO_ODBC_INCDIR/sql.h"; then
34251 -    php_pdo_have_header=yes
34252 -    cat >> confdefs.h <<\EOF
34253 -#define HAVE_SQL_H 1
34254 -EOF
34255 -
34256 -    echo "$ac_t""yes" 1>&6
34257 -  else
34258 -    echo "$ac_t""no" 1>&6
34259 -  fi
34260 -
34261 -
34262 -  echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34263 -echo "configure:72112: checking for isql.h in $PDO_ODBC_INCDIR" >&5
34264 -  if test -f "$PDO_ODBC_INCDIR/isql.h"; then
34265 -    php_pdo_have_header=yes
34266 -    cat >> confdefs.h <<\EOF
34267 -#define HAVE_ISQL_H 1
34268 -EOF
34269 -
34270 -    echo "$ac_t""yes" 1>&6
34271 -  else
34272 -    echo "$ac_t""no" 1>&6
34273 -  fi
34274 -
34275 -
34276 -  echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34277 -echo "configure:72126: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
34278 -  if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
34279 -    php_pdo_have_header=yes
34280 -    cat >> confdefs.h <<\EOF
34281 -#define HAVE_SQLEXT_H 1
34282 -EOF
34283 -
34284 -    echo "$ac_t""yes" 1>&6
34285 -  else
34286 -    echo "$ac_t""no" 1>&6
34287 -  fi
34288 -
34289 -
34290 -  echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34291 -echo "configure:72140: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
34292 -  if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
34293 -    php_pdo_have_header=yes
34294 -    cat >> confdefs.h <<\EOF
34295 -#define HAVE_ISQLEXT_H 1
34296 -EOF
34297 -
34298 -    echo "$ac_t""yes" 1>&6
34299 -  else
34300 -    echo "$ac_t""no" 1>&6
34301 -  fi
34302 -
34303 -
34304 -  echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34305 -echo "configure:72154: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
34306 -  if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
34307 -    php_pdo_have_header=yes
34308 -    cat >> confdefs.h <<\EOF
34309 -#define HAVE_UDBCEXT_H 1
34310 -EOF
34311 -
34312 -    echo "$ac_t""yes" 1>&6
34313 -  else
34314 -    echo "$ac_t""no" 1>&6
34315 -  fi
34316 -
34317 -
34318 -  echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34319 -echo "configure:72168: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
34320 -  if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
34321 -    php_pdo_have_header=yes
34322 -    cat >> confdefs.h <<\EOF
34323 -#define HAVE_SQLCLI1_H 1
34324 -EOF
34325 -
34326 -    echo "$ac_t""yes" 1>&6
34327 -  else
34328 -    echo "$ac_t""no" 1>&6
34329 -  fi
34330 -
34331 -
34332 -  echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34333 -echo "configure:72182: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
34334 -  if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
34335 -    php_pdo_have_header=yes
34336 -    cat >> confdefs.h <<\EOF
34337 -#define HAVE_LIBRARYMANAGER_H 1
34338 -EOF
34339 -
34340 -    echo "$ac_t""yes" 1>&6
34341 -  else
34342 -    echo "$ac_t""no" 1>&6
34343 -  fi
34344 -
34345 -
34346 -  echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34347 -echo "configure:72196: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
34348 -  if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
34349 -    php_pdo_have_header=yes
34350 -    cat >> confdefs.h <<\EOF
34351 -#define HAVE_CLI0CORE_H 1
34352 -EOF
34353 -
34354 -    echo "$ac_t""yes" 1>&6
34355 -  else
34356 -    echo "$ac_t""no" 1>&6
34357 -  fi
34358 -
34359 -
34360 -  echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34361 -echo "configure:72210: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
34362 -  if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
34363 -    php_pdo_have_header=yes
34364 -    cat >> confdefs.h <<\EOF
34365 -#define HAVE_CLI0EXT_H 1
34366 -EOF
34367 -
34368 -    echo "$ac_t""yes" 1>&6
34369 -  else
34370 -    echo "$ac_t""no" 1>&6
34371 -  fi
34372 -
34373 -
34374 -  echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34375 -echo "configure:72224: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
34376 -  if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
34377 -    php_pdo_have_header=yes
34378 -    cat >> confdefs.h <<\EOF
34379 -#define HAVE_CLI0CLI_H 1
34380 -EOF
34381 -
34382 -    echo "$ac_t""yes" 1>&6
34383 -  else
34384 -    echo "$ac_t""no" 1>&6
34385 -  fi
34386 -
34387 -
34388 -  echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34389 -echo "configure:72238: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
34390 -  if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
34391 -    php_pdo_have_header=yes
34392 -    cat >> confdefs.h <<\EOF
34393 -#define HAVE_CLI0DEFS_H 1
34394 -EOF
34395 -
34396 -    echo "$ac_t""yes" 1>&6
34397 -  else
34398 -    echo "$ac_t""no" 1>&6
34399 -  fi
34400 -
34401 -
34402 -  echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
34403 -echo "configure:72252: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
34404 -  if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
34405 -    php_pdo_have_header=yes
34406 -    cat >> confdefs.h <<\EOF
34407 -#define HAVE_CLI0ENV_H 1
34408 -EOF
34409 -
34410 -    echo "$ac_t""yes" 1>&6
34411 -  else
34412 -    echo "$ac_t""no" 1>&6
34413 -  fi
34414 -
34415 -
34416 -  if test "$php_pdo_have_header" != "yes"; then
34417 -    { echo "configure: error: Cannot find header file(s) for pdo_odbc" 1>&2; exit 1; }
34418 -  fi
34419 -
34420 -  PDO_ODBC_INCLUDE="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\"$pdo_odbc_flavour\\\""
34421 -  PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib"
34422 +    echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
34423 +echo "configure:70444: checking for mysql_config" >&5
34424 +    if test -n "$PDO_MYSQL_CONFIG"; then
34425 +      echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6
34426 +      if test "x$SED" = "x"; then
34427 +        # Extract the first word of "sed", so it can be a program name with args.
34428 +set dummy sed; ac_word=$2
34429 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
34430 +echo "configure:70451: checking for $ac_word" >&5
34431 +if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
34432 +  echo $ac_n "(cached) $ac_c" 1>&6
34433 +else
34434 +  case "$SED" in
34435 +  /*)
34436 +  ac_cv_path_SED="$SED" # Let the user override the test with a path.
34437 +  ;;
34438 +  ?:/*)
34439 +  ac_cv_path_SED="$SED" # Let the user override the test with a dos path.
34440 +  ;;
34441 +  *)
34442 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
34443 +  ac_dummy="$PATH"
34444 +  for ac_dir in $ac_dummy; do
34445 +    test -z "$ac_dir" && ac_dir=.
34446 +    if test -f $ac_dir/$ac_word; then
34447 +      ac_cv_path_SED="$ac_dir/$ac_word"
34448 +      break
34449 +    fi
34450 +  done
34451 +  IFS="$ac_save_ifs"
34452 +  ;;
34453 +esac
34454 +fi
34455 +SED="$ac_cv_path_SED"
34456 +if test -n "$SED"; then
34457 +  echo "$ac_t""$SED" 1>&6
34458 +else
34459 +  echo "$ac_t""no" 1>&6
34460 +fi
34461
34462 -
34463 -  for ac_i in $PDO_ODBC_LDFLAGS; do
34464 -    case $ac_i in
34465 -    -pthread)
34466 -      if test "$ext_shared" = "yes"; then
34467 -        PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -pthread"
34468 +      fi
34469 +      if test "$enable_maintainer_zts" = "yes"; then
34470 +        PDO_MYSQL_LIBNAME=mysqlclient_r
34471 +        PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
34472        else
34473 -
34474 -
34475 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
34476 -
34477 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
34478 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
34479 -    eval "EXTRA_LDFLAGS$unique=set"
34480 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
34481 -  fi
34482 -
34483 +        PDO_MYSQL_LIBNAME=mysqlclient
34484 +        PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
34485 +      fi
34486 +      PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
34487 +    elif test -n "$PDO_MYSQL_DIR"; then
34488 +      echo "$ac_t""not found" 1>&6
34489 +      echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
34490 +echo "configure:70495: checking for mysql install under $PDO_MYSQL_DIR" >&5
34491 +      if test -r $PDO_MYSQL_DIR/include/mysql; then
34492 +        PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
34493 +      else
34494 +        PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include
34495 +      fi
34496 +      if test -r $PDO_MYSQL_DIR/$PHP_LIBDIR/mysql; then
34497 +        PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR/mysql
34498 +      else
34499 +        PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR
34500        fi
34501 -    ;;
34502 -    -l*)
34503 -      ac_ii=`echo $ac_i|cut -c 3-`
34504 -
34505 -
34506 -  case $ac_ii in
34507 -  c|c_r|pthread*) ;;
34508 -  *)
34509 -    if test "$ext_shared" = "yes"; then
34510 -        PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -l$ac_ii"
34511 -    else
34512 -
34513 -
34514 -  case $ac_ii in
34515 -  c|c_r|pthread*) ;;
34516 -  *)
34517 -      LIBS="$LIBS -l$ac_ii"
34518 -   ;;
34519 -  esac
34520 -
34521 -
34522 -    fi
34523 -   ;;
34524 -  esac
34525
34526 +      if test -r "$PDO_MYSQL_LIB_DIR"; then
34527 +        echo "$ac_t""libs under $PDO_MYSQL_LIB_DIR; seems promising" 1>&6
34528 +      else
34529 +        echo "$ac_t""can not find it" 1>&6
34530 +        { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; }
34531 +      fi
34532
34533 -    ;;
34534 -    -L*)
34535 -      ac_ii=`echo $ac_i|cut -c 3-`
34536
34537 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
34538 +  if test "$PDO_MYSQL_INC_DIR" != "/usr/include"; then
34539
34540 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
34541 -    ai_p=$ac_ii
34542 +  if test -z "$PDO_MYSQL_INC_DIR" || echo "$PDO_MYSQL_INC_DIR" | grep '^/' >/dev/null ; then
34543 +    ai_p=$PDO_MYSQL_INC_DIR
34544    else
34545
34546 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
34547 +    ep_dir="`echo $PDO_MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
34548
34549      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
34550 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
34551 +    ai_p="$ep_realdir/`basename \"$PDO_MYSQL_INC_DIR\"`"
34552    fi
34553
34554
34555 -      if test "$ext_shared" = "yes"; then
34556 -        PDO_ODBC_SHARED_LIBADD="-L$ai_p $PDO_ODBC_SHARED_LIBADD"
34557 -        test -n "$ld_runpath_switch" && PDO_ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_ODBC_SHARED_LIBADD"
34558 -      else
34559 -
34560 -
34561
34562    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
34563
34564 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
34565 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
34566    if test -n "$unique" && test "`eval $cmd`" = "" ; then
34567 -    eval "LIBPATH$unique=set"
34568 +    eval "INCLUDEPATH$unique=set"
34569
34570 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
34571 -    LDFLAGS="$LDFLAGS -L$ai_p"
34572 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
34573 -
34574 -  fi
34575 -
34576 -
34577 +      if test ""; then
34578 +        INCLUDES="-I$ai_p $INCLUDES"
34579 +      else
34580 +        INCLUDES="$INCLUDES -I$ai_p"
34581        fi
34582
34583    fi
34584
34585 -    ;;
34586 -    esac
34587 -  done
34588 +  fi
34589
34590 +      PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
34591 +    else
34592 +      echo "$ac_t""not found" 1>&6
34593 +      { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; }
34594 +    fi
34595
34596
34597    save_old_LDFLAGS=$LDFLAGS
34598 -  ac_stuff="$PDO_ODBC_LDFLAGS"
34599 +  ac_stuff="
34600 +      $PDO_MYSQL_LIBS
34601 +    "
34602
34603    save_ext_shared=$ext_shared
34604    ext_shared=yes
34605 @@ -72453,27 +70644,27 @@ EOF
34606      esac
34607    done
34608
34609 -  echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
34610 -echo "configure:72458: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
34611 -ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'`
34612 +  echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
34613 +echo "configure:70649: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
34614 +ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
34615  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34616    echo $ac_n "(cached) $ac_c" 1>&6
34617  else
34618    ac_save_LIBS="$LIBS"
34619 -LIBS="-l$pdo_odbc_def_lib  $LIBS"
34620 +LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
34621  cat > conftest.$ac_ext <<EOF
34622 -#line 72466 "configure"
34623 +#line 70657 "configure"
34624  #include "confdefs.h"
34625  /* Override any gcc2 internal prototype to avoid an error.  */
34626  /* We use char because int might match the return type of a gcc2
34627      builtin and then its argument prototype would still apply.  */
34628 -char SQLBindCol();
34629 +char mysql_query();
34630
34631  int main() {
34632 -SQLBindCol()
34633 +mysql_query()
34634  ; return 0; }
34635  EOF
34636 -if { (eval echo configure:72477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34637 +if { (eval echo configure:70668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34638    rm -rf conftest*
34639    eval "ac_cv_lib_$ac_lib_var=yes"
34640  else
34641 @@ -72492,18 +70683,52 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
34642      LDFLAGS=$save_old_LDFLAGS
34643      ext_shared=$save_ext_shared
34644
34645 -
34646 -  save_old_LDFLAGS=$LDFLAGS
34647 -  ac_stuff="$PDO_ODBC_LDFLAGS"
34648 +
34649 +  for ac_i in $PDO_MYSQL_INCLUDE; do
34650 +    case $ac_i in
34651 +    -I*)
34652 +      ac_ii=`echo $ac_i|cut -c 3-`
34653 +
34654 +  if test "$ac_ii" != "/usr/include"; then
34655 +
34656 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
34657 +    ai_p=$ac_ii
34658 +  else
34659 +
34660 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
34661 +
34662 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
34663 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
34664 +  fi
34665 +
34666 +
34667
34668 -  save_ext_shared=$ext_shared
34669 -  ext_shared=yes
34670 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
34671
34672 -  for ac_i in $ac_stuff; do
34673 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
34674 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
34675 +    eval "INCLUDEPATH$unique=set"
34676 +
34677 +      if test ""; then
34678 +        INCLUDES="-I$ai_p $INCLUDES"
34679 +      else
34680 +        INCLUDES="$INCLUDES -I$ai_p"
34681 +      fi
34682 +
34683 +  fi
34684 +
34685 +  fi
34686 +
34687 +    ;;
34688 +    esac
34689 +  done
34690 +
34691 +
34692 +  for ac_i in $PDO_MYSQL_LIBS; do
34693      case $ac_i in
34694      -pthread)
34695        if test "$ext_shared" = "yes"; then
34696 -        LDFLAGS="$LDFLAGS -pthread"
34697 +        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread"
34698        else
34699
34700
34701 @@ -72525,7 +70750,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
34702    c|c_r|pthread*) ;;
34703    *)
34704      if test "$ext_shared" = "yes"; then
34705 -        LDFLAGS="$LDFLAGS -l$ac_ii"
34706 +        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii"
34707      else
34708
34709
34710 @@ -72560,8 +70785,8 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
34711
34712
34713        if test "$ext_shared" = "yes"; then
34714 -        LDFLAGS="-L$ai_p $LDFLAGS"
34715 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
34716 +        PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD"
34717 +        test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD"
34718        else
34719
34720
34721 @@ -72587,44 +70812,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
34722      esac
34723    done
34724
34725 -  echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
34726 -echo "configure:72592: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
34727 -ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'`
34728 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34729 -  echo $ac_n "(cached) $ac_c" 1>&6
34730 -else
34731 -  ac_save_LIBS="$LIBS"
34732 -LIBS="-l$pdo_odbc_def_lib  $LIBS"
34733 -cat > conftest.$ac_ext <<EOF
34734 -#line 72600 "configure"
34735 -#include "confdefs.h"
34736 -/* Override any gcc2 internal prototype to avoid an error.  */
34737 -/* We use char because int might match the return type of a gcc2
34738 -    builtin and then its argument prototype would still apply.  */
34739 -char SQLAllocHandle();
34740 -
34741 -int main() {
34742 -SQLAllocHandle()
34743 -; return 0; }
34744 -EOF
34745 -if { (eval echo configure:72611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34746 -  rm -rf conftest*
34747 -  eval "ac_cv_lib_$ac_lib_var=yes"
34748 -else
34749 -  echo "configure: failed program was:" >&5
34750 -  cat conftest.$ac_ext >&5
34751 -  rm -rf conftest*
34752 -  eval "ac_cv_lib_$ac_lib_var=no"
34753 -fi
34754 -rm -f conftest*
34755 -LIBS="$ac_save_LIBS"
34756 -
34757 -fi
34758 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
34759 -  echo "$ac_t""yes" 1>&6
34760 -
34761 -    LDFLAGS=$save_old_LDFLAGS
34762 -    ext_shared=$save_ext_shared
34763
34764
34765  else
34766 @@ -72632,548 +70819,398 @@ else
34767
34768      LDFLAGS=$save_old_LDFLAGS
34769      ext_shared=$save_ext_shared
34770 -    unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle
34771 +    unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
34772
34773 -      { echo "configure: error:
34774 -Your ODBC library does not appear to be ODBC 3 compatible.
34775 -You should consider using iODBC or unixODBC instead, and loading your
34776 -libraries as a driver in that environment; it will emulate the
34777 -functions required for PDO support.
34778 -" 1>&2; exit 1; }
34779 -
34780 -fi
34781 +      if test "$PHP_ZLIB_DIR" != "no"; then
34782 +
34783
34784 -
34785 -
34786 -else
34787 -  echo "$ac_t""no" 1>&6
34788 -
34789 -    LDFLAGS=$save_old_LDFLAGS
34790 -    ext_shared=$save_ext_shared
34791 -    unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol
34792 +  if test "$ext_shared" = "yes"; then
34793 +    PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD"
34794 +    if test -n "$PHP_ZLIB_DIR"; then
34795 +
34796 +  if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
34797
34798 -    { echo "configure: error: Your ODBC library does not exist or there was an error. Check config.log for more information" 1>&2; exit 1; }
34799 -
34800 -
34801 -fi
34802 -
34803 -
34804 -
34805 -  ext_builddir=ext/pdo_odbc
34806 -  ext_srcdir=$abs_srcdir/ext/pdo_odbc
34807 -
34808 -  ac_extra=`echo "-I$pdo_inc_path $PDO_ODBC_INCLUDE"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
34809 +  if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
34810 +    ai_p=$PHP_ZLIB_DIR
34811 +  else
34812 +
34813 +    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
34814 +
34815 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
34816 +    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
34817 +  fi
34818
34819 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
34820 -    PHP_PDO_ODBC_SHARED=no
34821
34822 +      if test "$ext_shared" = "yes"; then
34823 +        PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD"
34824 +        test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD"
34825 +      else
34826 +
34827
34828 -  case ext/pdo_odbc in
34829 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
34830 -  /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
34831 -  *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
34832 -  esac
34833
34834 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
34835
34836 -
34837 -  b_c_pre=$php_c_pre
34838 -  b_cxx_pre=$php_cxx_pre
34839 -  b_c_meta=$php_c_meta
34840 -  b_cxx_meta=$php_cxx_meta
34841 -  b_c_post=$php_c_post
34842 -  b_cxx_post=$php_cxx_post
34843 -  b_lo=$php_lo
34844 -
34845 -
34846 -  old_IFS=$IFS
34847 -  for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
34848 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
34849 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
34850 +    eval "LIBPATH$unique=set"
34851 +
34852 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
34853 +    LDFLAGS="$LDFLAGS -L$ai_p"
34854 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
34855
34856 -      IFS=.
34857 -      set $ac_src
34858 -      ac_obj=$1
34859 -      IFS=$old_IFS
34860 -
34861 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
34862 -
34863 -      case $ac_src in
34864 -        *.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" ;;
34865 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34866 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34867 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
34868 -      esac
34869 +  fi
34870
34871 -    cat >>Makefile.objects<<EOF
34872 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
34873 -       $ac_comp
34874 -EOF
34875 -  done
34876
34877 +      fi
34878 +
34879 +  fi
34880
34881 -    EXT_STATIC="$EXT_STATIC pdo_odbc"
34882 -    if test "$ext_shared" != "nocli"; then
34883 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc"
34884      fi
34885    else
34886 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
34887 -      PHP_PDO_ODBC_SHARED=yes
34888 +
34889 +
34890 +  if test -n "$PHP_ZLIB_DIR"; then
34891 +
34892 +  if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then
34893 +
34894 +  if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
34895 +    ai_p=$PHP_ZLIB_DIR
34896 +  else
34897 +
34898 +    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
34899 +
34900 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
34901 +    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
34902 +  fi
34903 +
34904 +
34905
34906 -  case ext/pdo_odbc in
34907 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
34908 -  /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
34909 -  *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
34910 -  esac
34911
34912
34913 -
34914 -  b_c_pre=$shared_c_pre
34915 -  b_cxx_pre=$shared_cxx_pre
34916 -  b_c_meta=$shared_c_meta
34917 -  b_cxx_meta=$shared_cxx_meta
34918 -  b_c_post=$shared_c_post
34919 -  b_cxx_post=$shared_cxx_post
34920 -  b_lo=$shared_lo
34921 -
34922 -
34923 -  old_IFS=$IFS
34924 -  for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
34925 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
34926
34927 -      IFS=.
34928 -      set $ac_src
34929 -      ac_obj=$1
34930 -      IFS=$old_IFS
34931 -
34932 -      shared_objects_pdo_odbc="$shared_objects_pdo_odbc $ac_bdir$ac_obj.lo"
34933 -
34934 -      case $ac_src in
34935 -        *.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" ;;
34936 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34937 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34938 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
34939 -      esac
34940 -
34941 -    cat >>Makefile.objects<<EOF
34942 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
34943 -       $ac_comp
34944 -EOF
34945 -  done
34946 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
34947 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
34948 +    eval "LIBPATH$unique=set"
34949 +
34950 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
34951 +    LDFLAGS="$LDFLAGS -L$ai_p"
34952 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
34953 +
34954 +  fi
34955
34956 -      case $host_alias in
34957 -        *netware*)
34958 -
34959 -  install_modules="install-modules"
34960
34961 -  case $host_alias in
34962 -    *aix*)
34963 -      suffix=so
34964 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PHPPDO_ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_odbc.so '$ext_builddir'/phppdo_odbc.so'
34965 -      ;;
34966 -    *netware*)
34967 -      suffix=nlm
34968 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_ODBC, 3)_SHARED_LIBADD)'
34969 -      ;;
34970 -    *)
34971 -      suffix=la
34972 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PHPPDO_ODBC_SHARED_LIBADD)'
34973 -      ;;
34974 -  esac
34975 +
34976 +  fi
34977
34978 -  if test "x" = "xyes"; then
34979 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_odbc.$suffix"
34980 -  else
34981 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_odbc.$suffix"
34982    fi
34983
34984 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
34985 +
34986 +  case z in
34987 +  c|c_r|pthread*) ;;
34988 +  *)
34989 +      LIBS="-lz $LIBS"
34990 +   ;;
34991 +  esac
34992
34993 -  cat >>Makefile.objects<<EOF
34994 -\$(phplibdir)/phppdo_odbc.$suffix: $ext_builddir/phppdo_odbc.$suffix
34995 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_odbc.$suffix \$(phplibdir)
34996
34997 -$ext_builddir/phppdo_odbc.$suffix: \$(shared_objects_pdo_odbc) \$(PHPPDO_ODBC_SHARED_DEPENDENCIES)
34998 -       $link_cmd
34999
35000 -EOF
35001
35002 -          ;;
35003 -        *)
35004 -
35005 -  install_modules="install-modules"
35006 +  fi
35007
35008 -  case $host_alias in
35009 -    *aix*)
35010 -      suffix=so
35011 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PDO_ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_odbc.so '$ext_builddir'/pdo_odbc.so'
35012 -      ;;
35013 -    *netware*)
35014 -      suffix=nlm
35015 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_ODBC, 3)_SHARED_LIBADD)'
35016 -      ;;
35017 -    *)
35018 -      suffix=la
35019 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PDO_ODBC_SHARED_LIBADD)'
35020 -      ;;
35021 -  esac
35022
35023 -  if test "x" = "xyes"; then
35024 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_odbc.$suffix"
35025 -  else
35026 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_odbc.$suffix"
35027 -  fi
35028 +
35029 +  save_old_LDFLAGS=$LDFLAGS
35030 +  ac_stuff="
35031 +          -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR
35032 +        "
35033
35034 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
35035 +  save_ext_shared=$ext_shared
35036 +  ext_shared=yes
35037 +
35038 +  for ac_i in $ac_stuff; do
35039 +    case $ac_i in
35040 +    -pthread)
35041 +      if test "$ext_shared" = "yes"; then
35042 +        LDFLAGS="$LDFLAGS -pthread"
35043 +      else
35044 +
35045 +
35046 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
35047 +
35048 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
35049 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
35050 +    eval "EXTRA_LDFLAGS$unique=set"
35051 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
35052 +  fi
35053
35054 -  cat >>Makefile.objects<<EOF
35055 -\$(phplibdir)/pdo_odbc.$suffix: $ext_builddir/pdo_odbc.$suffix
35056 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_odbc.$suffix \$(phplibdir)
35057 +      fi
35058 +    ;;
35059 +    -l*)
35060 +      ac_ii=`echo $ac_i|cut -c 3-`
35061 +
35062 +
35063 +  case $ac_ii in
35064 +  c|c_r|pthread*) ;;
35065 +  *)
35066 +    if test "$ext_shared" = "yes"; then
35067 +        LDFLAGS="$LDFLAGS -l$ac_ii"
35068 +    else
35069 +
35070 +
35071 +  case $ac_ii in
35072 +  c|c_r|pthread*) ;;
35073 +  *)
35074 +      LIBS="$LIBS -l$ac_ii"
35075 +   ;;
35076 +  esac
35077
35078 -$ext_builddir/pdo_odbc.$suffix: \$(shared_objects_pdo_odbc) \$(PDO_ODBC_SHARED_DEPENDENCIES)
35079 -       $link_cmd
35080
35081 -EOF
35082 +    fi
35083 +   ;;
35084 +  esac
35085
35086 -          ;;
35087 -      esac
35088 -      cat >> confdefs.h <<EOF
35089 -#define COMPILE_DL_PDO_ODBC 1
35090 -EOF
35091
35092 -    fi
35093 +    ;;
35094 +    -L*)
35095 +      ac_ii=`echo $ac_i|cut -c 3-`
35096 +
35097 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
35098 +
35099 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
35100 +    ai_p=$ac_ii
35101 +  else
35102 +
35103 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
35104 +
35105 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
35106 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
35107    fi
35108
35109 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
35110 -    PHP_PDO_ODBC_SHARED=no
35111 -    case "$PHP_SAPI" in
35112 -      cgi|embed)
35113 +
35114 +      if test "$ext_shared" = "yes"; then
35115 +        LDFLAGS="-L$ai_p $LDFLAGS"
35116 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
35117 +      else
35118
35119
35120 -  case ext/pdo_odbc in
35121 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
35122 -  /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
35123 -  *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
35124 -  esac
35125
35126 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
35127 +
35128 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
35129 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
35130 +    eval "LIBPATH$unique=set"
35131 +
35132 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
35133 +    LDFLAGS="$LDFLAGS -L$ai_p"
35134 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
35135
35136 +  fi
35137
35138 -  b_c_pre=$php_c_pre
35139 -  b_cxx_pre=$php_cxx_pre
35140 -  b_c_meta=$php_c_meta
35141 -  b_cxx_meta=$php_cxx_meta
35142 -  b_c_post=$php_c_post
35143 -  b_cxx_post=$php_cxx_post
35144 -  b_lo=$php_lo
35145
35146 +      fi
35147 +
35148 +  fi
35149
35150 -  old_IFS=$IFS
35151 -  for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
35152 -
35153 -      IFS=.
35154 -      set $ac_src
35155 -      ac_obj=$1
35156 -      IFS=$old_IFS
35157 -
35158 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
35159 +    ;;
35160 +    esac
35161 +  done
35162
35163 -      case $ac_src in
35164 -        *.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" ;;
35165 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35166 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35167 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
35168 -      esac
35169 +  echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
35170 +echo "configure:71021: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
35171 +ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
35172 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35173 +  echo $ac_n "(cached) $ac_c" 1>&6
35174 +else
35175 +  ac_save_LIBS="$LIBS"
35176 +LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
35177 +cat > conftest.$ac_ext <<EOF
35178 +#line 71029 "configure"
35179 +#include "confdefs.h"
35180 +/* Override any gcc2 internal prototype to avoid an error.  */
35181 +/* We use char because int might match the return type of a gcc2
35182 +    builtin and then its argument prototype would still apply.  */
35183 +char mysql_query();
35184
35185 -    cat >>Makefile.objects<<EOF
35186 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
35187 -       $ac_comp
35188 +int main() {
35189 +mysql_query()
35190 +; return 0; }
35191  EOF
35192 -  done
35193 +if { (eval echo configure:71040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35194 +  rm -rf conftest*
35195 +  eval "ac_cv_lib_$ac_lib_var=yes"
35196 +else
35197 +  echo "configure: failed program was:" >&5
35198 +  cat conftest.$ac_ext >&5
35199 +  rm -rf conftest*
35200 +  eval "ac_cv_lib_$ac_lib_var=no"
35201 +fi
35202 +rm -f conftest*
35203 +LIBS="$ac_save_LIBS"
35204
35205 +fi
35206 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35207 +  echo "$ac_t""yes" 1>&6
35208 +
35209 +    LDFLAGS=$save_old_LDFLAGS
35210 +    ext_shared=$save_ext_shared
35211 +
35212 +
35213 +else
35214 +  echo "$ac_t""no" 1>&6
35215
35216 -        EXT_STATIC="$EXT_STATIC pdo_odbc"
35217 -        ;;
35218 -      *)
35219 +    LDFLAGS=$save_old_LDFLAGS
35220 +    ext_shared=$save_ext_shared
35221 +    unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
35222 +
35223 +          { echo "configure: error: PDO_MYSQL configure failed. Please check config.log for more information." 1>&2; exit 1; }
35224
35225
35226 -  case ext/pdo_odbc in
35227 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
35228 -  /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
35229 -  *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
35230 -  esac
35231 -
35232 +fi
35233
35234 -
35235 -  b_c_pre=$php_c_pre
35236 -  b_cxx_pre=$php_cxx_pre
35237 -  b_c_meta=$php_c_meta
35238 -  b_cxx_meta=$php_cxx_meta
35239 -  b_c_post=$php_c_post
35240 -  b_cxx_post=$php_cxx_post
35241 -  b_lo=$php_lo
35242 -
35243 -
35244 -  old_IFS=$IFS
35245 -  for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
35246 +        PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
35247 +      else
35248 +
35249
35250 -      IFS=.
35251 -      set $ac_src
35252 -      ac_obj=$1
35253 -      IFS=$old_IFS
35254 +  case z in
35255 +  c|c_r|pthread*) ;;
35256 +  *)
35257 +    if test "$ext_shared" = "yes"; then
35258 +        PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD"
35259 +    else
35260
35261 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
35262 +
35263 +  case z in
35264 +  c|c_r|pthread*) ;;
35265 +  *)
35266 +      LIBS="-lz $LIBS"
35267 +   ;;
35268 +  esac
35269
35270 -      case $ac_src in
35271 -        *.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" ;;
35272 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35273 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35274 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
35275 -      esac
35276
35277 -    cat >>Makefile.objects<<EOF
35278 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
35279 -       $ac_comp
35280 -EOF
35281 -  done
35282 +    fi
35283 +   ;;
35284 +  esac
35285
35286
35287 -        ;;
35288 -    esac
35289 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc"
35290 -  fi
35291 +
35292 +  save_old_LDFLAGS=$LDFLAGS
35293 +  ac_stuff="
35294 +          -L$PDO_MYSQL_LIB_DIR
35295 +        "
35296
35297 +  save_ext_shared=$ext_shared
35298 +  ext_shared=yes
35299
35300 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
35301 +  for ac_i in $ac_stuff; do
35302 +    case $ac_i in
35303 +    -pthread)
35304 +      if test "$ext_shared" = "yes"; then
35305 +        LDFLAGS="$LDFLAGS -pthread"
35306 +      else
35307 +
35308 +
35309 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
35310
35311 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
35312 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
35313 +    eval "EXTRA_LDFLAGS$unique=set"
35314 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
35315 +  fi
35316
35317 +      fi
35318 +    ;;
35319 +    -l*)
35320 +      ac_ii=`echo $ac_i|cut -c 3-`
35321 +
35322 +
35323 +  case $ac_ii in
35324 +  c|c_r|pthread*) ;;
35325 +  *)
35326 +    if test "$ext_shared" = "yes"; then
35327 +        LDFLAGS="$LDFLAGS -l$ac_ii"
35328 +    else
35329 +
35330 +
35331 +  case $ac_ii in
35332 +  c|c_r|pthread*) ;;
35333 +  *)
35334 +      LIBS="$LIBS -l$ac_ii"
35335 +   ;;
35336 +  esac
35337
35338 -  if test "$ext_builddir" = "."; then
35339 -    PHP_PECL_EXTENSION=pdo_odbc
35340 -
35341 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
35342
35343 -  fi
35344 +    fi
35345 +   ;;
35346 +  esac
35347
35348 -
35349 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_ODBC_SHARED_LIBADD"
35350
35351 -
35352 +    ;;
35353 +    -L*)
35354 +      ac_ii=`echo $ac_i|cut -c 3-`
35355 +
35356 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
35357
35358 -  am_i_shared=$PHP_PDO_ODBC_SHARED
35359 -  is_it_shared=$PHP_PDO_SHARED
35360 -  is_it_enabled=$PHP_PDO
35361 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
35362 -    { echo "configure: error:
35363 -You've configured extension pdo_odbc to build statically, but it
35364 -depends on extension pdo, which you've configured to build shared.
35365 -You either need to build pdo_odbc shared or build pdo statically for the
35366 -build to be successful.
35367 -" 1>&2; exit 1; }
35368 -  fi
35369 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
35370 -    { echo "configure: error:
35371 -You've configured extension pdo_odbc, which depends on extension pdo,
35372 -but you've either not enabled pdo, or have disabled it.
35373 -" 1>&2; exit 1; }
35374 -  fi
35375 -
35376 -
35377 -fi
35378 -
35379 -
35380 -
35381 -php_with_pdo_pgsql=no
35382 -
35383 -echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
35384 -echo "configure:72985: checking for PostgreSQL support for PDO" >&5
35385 -# Check whether --with-pdo-pgsql or --without-pdo-pgsql was given.
35386 -if test "${with_pdo_pgsql+set}" = set; then
35387 -  withval="$with_pdo_pgsql"
35388 -  PHP_PDO_PGSQL=$withval
35389 -else
35390 -
35391 -  PHP_PDO_PGSQL=no
35392 -  test "$PHP_ENABLE_ALL" && PHP_PDO_PGSQL=$PHP_ENABLE_ALL
35393 -
35394 -fi
35395 -
35396 -
35397 -
35398 -ext_output="yes, shared"
35399 -ext_shared=yes
35400 -case $PHP_PDO_PGSQL in
35401 -shared,*)
35402 -  PHP_PDO_PGSQL=`echo "$PHP_PDO_PGSQL"|$SED 's/^shared,//'`
35403 -  ;;
35404 -shared)
35405 -  PHP_PDO_PGSQL=yes
35406 -  ;;
35407 -no)
35408 -  ext_output=no
35409 -  ext_shared=no
35410 -  ;;
35411 -*)
35412 -  ext_output=yes
35413 -  ext_shared=no
35414 -  ;;
35415 -esac
35416 -
35417 -
35418 -
35419 -echo "$ac_t""$ext_output" 1>&6
35420 -
35421 -
35422 -
35423 -
35424 -if test "$PHP_PDO_PGSQL" != "no"; then
35425 -
35426 -  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
35427 -    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
35428 -  fi
35429 -
35430 -
35431 -  if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
35432 -    PGSQL_INCLUDE=$PGSQL_INCLUDE
35433 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
35434 +    ai_p=$ac_ii
35435    else
35436
35437 -    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
35438 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
35439
35440      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
35441 -    PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
35442 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
35443    fi
35444
35445 -
35446 -  echo $ac_n "checking for pg_config""... $ac_c" 1>&6
35447 -echo "configure:73044: checking for pg_config" >&5
35448 -  for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
35449 -    if test -x $i/pg_config; then
35450 -      PG_CONFIG="$i/pg_config"
35451 -      break;
35452 -    fi
35453 -  done
35454 -
35455 -  if test -n "$PG_CONFIG"; then
35456 -    echo "$ac_t""$PG_CONFIG" 1>&6
35457 -    PGSQL_INCLUDE=`$PG_CONFIG --includedir`
35458 -    PGSQL_LIBDIR=`$PG_CONFIG --libdir`
35459 -    cat >> confdefs.h <<\EOF
35460 -#define HAVE_PG_CONFIG_H 1
35461 -EOF
35462 -
35463 -  else
35464 -    echo "$ac_t""not found" 1>&6
35465 -    if test "$PHP_PDO_PGSQL" = "yes"; then
35466 -      PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
35467 -    else
35468 -      PGSQL_SEARCH_PATHS=$PHP_PDO_PGSQL
35469 -    fi
35470 +
35471 +      if test "$ext_shared" = "yes"; then
35472 +        LDFLAGS="-L$ai_p $LDFLAGS"
35473 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
35474 +      else
35475 +
35476 +
35477 +
35478 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
35479 +
35480 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
35481 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
35482 +    eval "LIBPATH$unique=set"
35483 +
35484 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
35485 +    LDFLAGS="$LDFLAGS -L$ai_p"
35486 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
35487
35488 -    for i in $PGSQL_SEARCH_PATHS; do
35489 -      for j in include include/pgsql include/postgres include/postgresql ""; do
35490 -        if test -r "$i/$j/libpq-fe.h"; then
35491 -          PGSQL_INC_BASE=$i
35492 -          PGSQL_INCLUDE=$i/$j
35493 -          if test -r "$i/$j/pg_config.h"; then
35494 -            cat >> confdefs.h <<\EOF
35495 -#define HAVE_PG_CONFIG_H 1
35496 -EOF
35497 -
35498 -          fi
35499 -        fi
35500 -      done
35501 -
35502 -      for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
35503 -        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
35504 -          PGSQL_LIBDIR=$i/$j
35505 -        fi
35506 -      done
35507 -    done
35508 -  fi
35509 -
35510 -  if test -z "$PGSQL_INCLUDE"; then
35511 -    { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
35512    fi
35513
35514 -  if test -z "$PGSQL_LIBDIR"; then
35515 -    { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
35516 -  fi
35517
35518 -  if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
35519 -    { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
35520 +      fi
35521 +
35522    fi
35523
35524 -  cat >> confdefs.h <<\EOF
35525 -#define HAVE_PDO_PGSQL 1
35526 -EOF
35527 -
35528 -
35529 -  echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
35530 -echo "configure:73108: checking for openssl dependencies" >&5
35531 -  if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then
35532 -    echo "$ac_t""yes" 1>&6
35533 -        # Extract the first word of "pkg-config", so it can be a program name with args.
35534 -set dummy pkg-config; ac_word=$2
35535 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
35536 -echo "configure:73114: checking for $ac_word" >&5
35537 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
35538 -  echo $ac_n "(cached) $ac_c" 1>&6
35539 -else
35540 -  case "$PKG_CONFIG" in
35541 -  /*)
35542 -  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
35543 -  ;;
35544 -  ?:/*)
35545 -  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
35546 -  ;;
35547 -  *)
35548 -  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
35549 -  ac_dummy="$PATH"
35550 -  for ac_dir in $ac_dummy; do
35551 -    test -z "$ac_dir" && ac_dir=.
35552 -    if test -f $ac_dir/$ac_word; then
35553 -      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
35554 -      break
35555 -    fi
35556 +    ;;
35557 +    esac
35558    done
35559 -  IFS="$ac_save_ifs"
35560 -  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
35561 -  ;;
35562 -esac
35563 -fi
35564 -PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
35565 -if test -n "$PKG_CONFIG"; then
35566 -  echo "$ac_t""$PKG_CONFIG" 1>&6
35567 -else
35568 -  echo "$ac_t""no" 1>&6
35569 -fi
35570 -
35571 -    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
35572 -      PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags`
35573 -    fi
35574 -  else
35575 -    echo "$ac_t""no" 1>&6
35576 -  fi
35577
35578 -  old_LIBS=$LIBS
35579 -  old_LDFLAGS=$LDFLAGS
35580 -  LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
35581 -  echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
35582 -echo "configure:73158: checking for PQparameterStatus in -lpq" >&5
35583 -ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
35584 +  echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
35585 +echo "configure:71195: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
35586 +ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
35587  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35588    echo $ac_n "(cached) $ac_c" 1>&6
35589  else
35590    ac_save_LIBS="$LIBS"
35591 -LIBS="-lpq  $LIBS"
35592 +LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
35593  cat > conftest.$ac_ext <<EOF
35594 -#line 73166 "configure"
35595 +#line 71203 "configure"
35596  #include "confdefs.h"
35597  /* Override any gcc2 internal prototype to avoid an error.  */
35598  /* We use char because int might match the return type of a gcc2
35599      builtin and then its argument prototype would still apply.  */
35600 -char PQparameterStatus();
35601 +char mysql_query();
35602
35603  int main() {
35604 -PQparameterStatus()
35605 +mysql_query()
35606  ; return 0; }
35607  EOF
35608 -if { (eval echo configure:73177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35609 +if { (eval echo configure:71214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35610    rm -rf conftest*
35611    eval "ac_cv_lib_$ac_lib_var=yes"
35612  else
35613 @@ -73188,260 +71225,132 @@ LIBS="$ac_save_LIBS"
35614  fi
35615  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35616    echo "$ac_t""yes" 1>&6
35617 -  cat >> confdefs.h <<\EOF
35618 -#define HAVE_PQPARAMETERSTATUS 1
35619 -EOF
35620 -
35621 -else
35622 -  echo "$ac_t""no" 1>&6
35623 -
35624 -    echo "Unable to build the PDO PostgreSQL driver: libpq 7.4+ is required"
35625 -    exit 1
35626
35627 -fi
35628 -
35629 -
35630 -  echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
35631 -echo "configure:73206: checking for PQprepare in -lpq" >&5
35632 -ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
35633 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35634 -  echo $ac_n "(cached) $ac_c" 1>&6
35635 -else
35636 -  ac_save_LIBS="$LIBS"
35637 -LIBS="-lpq  $LIBS"
35638 -cat > conftest.$ac_ext <<EOF
35639 -#line 73214 "configure"
35640 -#include "confdefs.h"
35641 -/* Override any gcc2 internal prototype to avoid an error.  */
35642 -/* We use char because int might match the return type of a gcc2
35643 -    builtin and then its argument prototype would still apply.  */
35644 -char PQprepare();
35645 -
35646 -int main() {
35647 -PQprepare()
35648 -; return 0; }
35649 -EOF
35650 -if { (eval echo configure:73225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35651 -  rm -rf conftest*
35652 -  eval "ac_cv_lib_$ac_lib_var=yes"
35653 -else
35654 -  echo "configure: failed program was:" >&5
35655 -  cat conftest.$ac_ext >&5
35656 -  rm -rf conftest*
35657 -  eval "ac_cv_lib_$ac_lib_var=no"
35658 -fi
35659 -rm -f conftest*
35660 -LIBS="$ac_save_LIBS"
35661 -
35662 -fi
35663 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35664 -  echo "$ac_t""yes" 1>&6
35665 -  cat >> confdefs.h <<\EOF
35666 -#define HAVE_PQPREPARE 1
35667 -EOF
35668 -
35669 -else
35670 -  echo "$ac_t""no" 1>&6
35671 -fi
35672 -
35673 -  echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
35674 -echo "configure:73249: checking for PQescapeStringConn in -lpq" >&5
35675 -ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
35676 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35677 -  echo $ac_n "(cached) $ac_c" 1>&6
35678 -else
35679 -  ac_save_LIBS="$LIBS"
35680 -LIBS="-lpq  $LIBS"
35681 -cat > conftest.$ac_ext <<EOF
35682 -#line 73257 "configure"
35683 -#include "confdefs.h"
35684 -/* Override any gcc2 internal prototype to avoid an error.  */
35685 -/* We use char because int might match the return type of a gcc2
35686 -    builtin and then its argument prototype would still apply.  */
35687 -char PQescapeStringConn();
35688 -
35689 -int main() {
35690 -PQescapeStringConn()
35691 -; return 0; }
35692 -EOF
35693 -if { (eval echo configure:73268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35694 -  rm -rf conftest*
35695 -  eval "ac_cv_lib_$ac_lib_var=yes"
35696 -else
35697 -  echo "configure: failed program was:" >&5
35698 -  cat conftest.$ac_ext >&5
35699 -  rm -rf conftest*
35700 -  eval "ac_cv_lib_$ac_lib_var=no"
35701 -fi
35702 -rm -f conftest*
35703 -LIBS="$ac_save_LIBS"
35704 -
35705 -fi
35706 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35707 -  echo "$ac_t""yes" 1>&6
35708 -  cat >> confdefs.h <<\EOF
35709 -#define HAVE_PQESCAPE_CONN 1
35710 -EOF
35711 -
35712 -else
35713 -  echo "$ac_t""no" 1>&6
35714 -fi
35715 -
35716 -  echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
35717 -echo "configure:73292: checking for PQescapeByteaConn in -lpq" >&5
35718 -ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
35719 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35720 -  echo $ac_n "(cached) $ac_c" 1>&6
35721 -else
35722 -  ac_save_LIBS="$LIBS"
35723 -LIBS="-lpq  $LIBS"
35724 -cat > conftest.$ac_ext <<EOF
35725 -#line 73300 "configure"
35726 -#include "confdefs.h"
35727 -/* Override any gcc2 internal prototype to avoid an error.  */
35728 -/* We use char because int might match the return type of a gcc2
35729 -    builtin and then its argument prototype would still apply.  */
35730 -char PQescapeByteaConn();
35731 -
35732 -int main() {
35733 -PQescapeByteaConn()
35734 -; return 0; }
35735 -EOF
35736 -if { (eval echo configure:73311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35737 -  rm -rf conftest*
35738 -  eval "ac_cv_lib_$ac_lib_var=yes"
35739 -else
35740 -  echo "configure: failed program was:" >&5
35741 -  cat conftest.$ac_ext >&5
35742 -  rm -rf conftest*
35743 -  eval "ac_cv_lib_$ac_lib_var=no"
35744 -fi
35745 -rm -f conftest*
35746 -LIBS="$ac_save_LIBS"
35747 -
35748 -fi
35749 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35750 -  echo "$ac_t""yes" 1>&6
35751 -  cat >> confdefs.h <<\EOF
35752 -#define HAVE_PQESCAPE_BYTEA_CONN 1
35753 -EOF
35754 -
35755 -else
35756 -  echo "$ac_t""no" 1>&6
35757 -fi
35758 -
35759 -
35760 -  echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
35761 -echo "configure:73336: checking for pg_encoding_to_char in -lpq" >&5
35762 -ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
35763 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35764 -  echo $ac_n "(cached) $ac_c" 1>&6
35765 -else
35766 -  ac_save_LIBS="$LIBS"
35767 -LIBS="-lpq  $LIBS"
35768 -cat > conftest.$ac_ext <<EOF
35769 -#line 73344 "configure"
35770 -#include "confdefs.h"
35771 -/* Override any gcc2 internal prototype to avoid an error.  */
35772 -/* We use char because int might match the return type of a gcc2
35773 -    builtin and then its argument prototype would still apply.  */
35774 -char pg_encoding_to_char();
35775 -
35776 -int main() {
35777 -pg_encoding_to_char()
35778 -; return 0; }
35779 -EOF
35780 -if { (eval echo configure:73355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35781 -  rm -rf conftest*
35782 -  eval "ac_cv_lib_$ac_lib_var=yes"
35783 -else
35784 -  echo "configure: failed program was:" >&5
35785 -  cat conftest.$ac_ext >&5
35786 -  rm -rf conftest*
35787 -  eval "ac_cv_lib_$ac_lib_var=no"
35788 -fi
35789 -rm -f conftest*
35790 -LIBS="$ac_save_LIBS"
35791 -
35792 -fi
35793 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35794 -  echo "$ac_t""yes" 1>&6
35795 -  cat >> confdefs.h <<\EOF
35796 -#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
35797 -EOF
35798 -
35799 +    LDFLAGS=$save_old_LDFLAGS
35800 +    ext_shared=$save_ext_shared
35801 +
35802 +
35803  else
35804    echo "$ac_t""no" 1>&6
35805 -fi
35806 -
35807 -
35808 -
35809 -  LIBS=$old_LIBS
35810 -  LDFLAGS=$old_LDFLAGS
35811
35812 +    LDFLAGS=$save_old_LDFLAGS
35813 +    ext_shared=$save_ext_shared
35814 +    unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
35815 +
35816 +          { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; }
35817 +
35818
35819 +fi
35820 +
35821 +        PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz"
35822 +      fi
35823
35824 -  if test "$ext_shared" = "yes"; then
35825 -    PDO_PGSQL_SHARED_LIBADD="-lpq $PDO_PGSQL_SHARED_LIBADD"
35826 -    if test -n "$PGSQL_LIBDIR"; then
35827
35828 -  if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
35829 +  for ac_i in $PDO_MYSQL_INCLUDE; do
35830 +    case $ac_i in
35831 +    -I*)
35832 +      ac_ii=`echo $ac_i|cut -c 3-`
35833 +
35834 +  if test "$ac_ii" != "/usr/include"; then
35835
35836 -  if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
35837 -    ai_p=$PGSQL_LIBDIR
35838 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
35839 +    ai_p=$ac_ii
35840    else
35841
35842 -    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
35843 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
35844
35845      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
35846 -    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
35847 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
35848    fi
35849
35850
35851 -      if test "$ext_shared" = "yes"; then
35852 -        PDO_PGSQL_SHARED_LIBADD="-L$ai_p $PDO_PGSQL_SHARED_LIBADD"
35853 -        test -n "$ld_runpath_switch" && PDO_PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_PGSQL_SHARED_LIBADD"
35854 -      else
35855 -
35856 -
35857
35858    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
35859
35860 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
35861 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
35862    if test -n "$unique" && test "`eval $cmd`" = "" ; then
35863 -    eval "LIBPATH$unique=set"
35864 +    eval "INCLUDEPATH$unique=set"
35865 +
35866 +      if test ""; then
35867 +        INCLUDES="-I$ai_p $INCLUDES"
35868 +      else
35869 +        INCLUDES="$INCLUDES -I$ai_p"
35870 +      fi
35871
35872 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
35873 -    LDFLAGS="$LDFLAGS -L$ai_p"
35874 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
35875 -
35876    fi
35877
35878 +  fi
35879
35880 -      fi
35881 -
35882 +    ;;
35883 +    esac
35884 +  done
35885 +
35886 +
35887 +  for ac_i in $PDO_MYSQL_LIBS; do
35888 +    case $ac_i in
35889 +    -pthread)
35890 +      if test "$ext_shared" = "yes"; then
35891 +        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread"
35892 +      else
35893 +
35894 +
35895 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
35896 +
35897 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
35898 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
35899 +    eval "EXTRA_LDFLAGS$unique=set"
35900 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
35901    fi
35902
35903 +      fi
35904 +    ;;
35905 +    -l*)
35906 +      ac_ii=`echo $ac_i|cut -c 3-`
35907 +
35908 +
35909 +  case $ac_ii in
35910 +  c|c_r|pthread*) ;;
35911 +  *)
35912 +    if test "$ext_shared" = "yes"; then
35913 +        PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii"
35914 +    else
35915 +
35916 +
35917 +  case $ac_ii in
35918 +  c|c_r|pthread*) ;;
35919 +  *)
35920 +      LIBS="$LIBS -l$ac_ii"
35921 +   ;;
35922 +  esac
35923 +
35924 +
35925      fi
35926 -  else
35927 -
35928 +   ;;
35929 +  esac
35930
35931 -  if test -n "$PGSQL_LIBDIR"; then
35932 -
35933 -  if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
35934 +
35935 +    ;;
35936 +    -L*)
35937 +      ac_ii=`echo $ac_i|cut -c 3-`
35938 +
35939 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
35940
35941 -  if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
35942 -    ai_p=$PGSQL_LIBDIR
35943 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
35944 +    ai_p=$ac_ii
35945    else
35946
35947 -    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
35948 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
35949
35950      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
35951 -    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
35952 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
35953    fi
35954
35955
35956 -
35957 +      if test "$ext_shared" = "yes"; then
35958 +        PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD"
35959 +        test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD"
35960 +      else
35961 +
35962
35963
35964    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
35965 @@ -73457,71 +71366,89 @@ fi
35966    fi
35967
35968
35969 +      fi
35970
35971    fi
35972
35973 -  fi
35974 -
35975 -
35976 -  case pq in
35977 -  c|c_r|pthread*) ;;
35978 -  *)
35979 -      LIBS="-lpq $LIBS"
35980 -   ;;
35981 -  esac
35982 -
35983 -
35984 -
35985 +    ;;
35986 +    esac
35987 +  done
35988
35989 -  fi
35990 +
35991 +
35992 +fi
35993
35994
35995 -
35996 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_PGSQL_SHARED_LIBADD"
35997 +    _SAVE_LIBS=$LIBS
35998 +    LIBS="$LIBS $PDO_MYSQL_LIBS"
35999 +    for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate
36000 +do
36001 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
36002 +echo "configure:71388: checking for $ac_func" >&5
36003 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
36004 +  echo $ac_n "(cached) $ac_c" 1>&6
36005 +else
36006 +  cat > conftest.$ac_ext <<EOF
36007 +#line 71393 "configure"
36008 +#include "confdefs.h"
36009 +/* System header to define __stub macros and hopefully few prototypes,
36010 +    which can conflict with char $ac_func(); below.  */
36011 +#include <assert.h>
36012 +/* Override any gcc2 internal prototype to avoid an error.  */
36013 +/* We use char because int might match the return type of a gcc2
36014 +    builtin and then its argument prototype would still apply.  */
36015 +char $ac_func();
36016
36017 +int main() {
36018
36019 -
36020 -  if test "$PGSQL_INCLUDE" != "/usr/include"; then
36021 -
36022 -  if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
36023 -    ai_p=$PGSQL_INCLUDE
36024 -  else
36025 -
36026 -    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
36027 -
36028 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
36029 -    ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
36030 -  fi
36031 +/* The GNU C library defines this for functions which it implements
36032 +    to always fail with ENOSYS.  Some functions are actually named
36033 +    something starting with __ and the normal name is an alias.  */
36034 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
36035 +choke me
36036 +#else
36037 +$ac_func();
36038 +#endif
36039
36040 -
36041 -
36042 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
36043 -
36044 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
36045 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
36046 -    eval "INCLUDEPATH$unique=set"
36047 -
36048 -      if test ""; then
36049 -        INCLUDES="-I$ai_p $INCLUDES"
36050 -      else
36051 -        INCLUDES="$INCLUDES -I$ai_p"
36052 -      fi
36053 -
36054 -  fi
36055 +; return 0; }
36056 +EOF
36057 +if { (eval echo configure:71416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36058 +  rm -rf conftest*
36059 +  eval "ac_cv_func_$ac_func=yes"
36060 +else
36061 +  echo "configure: failed program was:" >&5
36062 +  cat conftest.$ac_ext >&5
36063 +  rm -rf conftest*
36064 +  eval "ac_cv_func_$ac_func=no"
36065 +fi
36066 +rm -f conftest*
36067 +fi
36068
36069 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
36070 +  echo "$ac_t""yes" 1>&6
36071 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
36072 +  cat >> confdefs.h <<EOF
36073 +#define $ac_tr_func 1
36074 +EOF
36075 +
36076 +else
36077 +  echo "$ac_t""no" 1>&6
36078 +fi
36079 +done
36080 +
36081 +    LIBS=$_SAVE_LIBS
36082    fi
36083
36084 -
36085
36086
36087    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
36088 -echo "configure:73519: checking for PDO includes" >&5
36089 +echo "configure:71446: checking for PDO includes" >&5
36090  if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
36091    echo $ac_n "(cached) $ac_c" 1>&6
36092  else
36093
36094      echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
36095 -echo "configure:73525: checking for PDO includes" >&5
36096 +echo "configure:71452: checking for PDO includes" >&5
36097      if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
36098        pdo_inc_path=$abs_srcdir/ext
36099      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
36100 @@ -73541,20 +71468,28 @@ echo "$ac_t""$pdo_inc_path" 1>&6
36101
36102
36103
36104 -
36105 -  ext_builddir=ext/pdo_pgsql
36106 -  ext_srcdir=$abs_srcdir/ext/pdo_pgsql
36107 +  if test -n "$PDO_MYSQL_CONFIG"; then
36108 +    PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
36109 +    cat >> confdefs.h <<EOF
36110 +#define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET"
36111 +EOF
36112
36113 -  ac_extra=`echo "-I$pdo_inc_path $PDO_PGSQL_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
36114 +  fi
36115 +
36116 +
36117 +  ext_builddir=ext/pdo_mysql
36118 +  ext_srcdir=$abs_srcdir/ext/pdo_mysql
36119 +
36120 +  ac_extra=`echo "-I$pdo_inc_path -I"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
36121
36122    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
36123 -    PHP_PDO_PGSQL_SHARED=no
36124 +    PHP_PDO_MYSQL_SHARED=no
36125
36126
36127 -  case ext/pdo_pgsql in
36128 +  case ext/pdo_mysql in
36129    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36130 -  /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36131 -  *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36132 +  /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36133 +  *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36134    esac
36135
36136
36137 @@ -73569,7 +71504,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
36138
36139
36140    old_IFS=$IFS
36141 -  for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
36142 +  for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
36143
36144        IFS=.
36145        set $ac_src
36146 @@ -73592,18 +71527,18 @@ EOF
36147    done
36148
36149
36150 -    EXT_STATIC="$EXT_STATIC pdo_pgsql"
36151 +    EXT_STATIC="$EXT_STATIC pdo_mysql"
36152      if test "$ext_shared" != "nocli"; then
36153 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql"
36154 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
36155      fi
36156    else
36157      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
36158 -      PHP_PDO_PGSQL_SHARED=yes
36159 +      PHP_PDO_MYSQL_SHARED=yes
36160
36161 -  case ext/pdo_pgsql in
36162 +  case ext/pdo_mysql in
36163    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36164 -  /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36165 -  *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36166 +  /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36167 +  *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36168    esac
36169
36170
36171 @@ -73618,14 +71553,14 @@ EOF
36172
36173
36174    old_IFS=$IFS
36175 -  for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
36176 +  for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
36177
36178        IFS=.
36179        set $ac_src
36180        ac_obj=$1
36181        IFS=$old_IFS
36182
36183 -      shared_objects_pdo_pgsql="$shared_objects_pdo_pgsql $ac_bdir$ac_obj.lo"
36184 +      shared_objects_pdo_mysql="$shared_objects_pdo_mysql $ac_bdir$ac_obj.lo"
36185
36186        case $ac_src in
36187          *.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" ;;
36188 @@ -73648,31 +71583,31 @@ EOF
36189    case $host_alias in
36190      *aix*)
36191        suffix=so
36192 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PHPPDO_PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_pgsql.so '$ext_builddir'/phppdo_pgsql.so'
36193 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PHPPDO_MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_mysql.so '$ext_builddir'/phppdo_mysql.so'
36194        ;;
36195      *netware*)
36196        suffix=nlm
36197 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_PGSQL, 3)_SHARED_LIBADD)'
36198 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_MYSQL, 3)_SHARED_LIBADD)'
36199        ;;
36200      *)
36201        suffix=la
36202 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PHPPDO_PGSQL_SHARED_LIBADD)'
36203 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PHPPDO_MYSQL_SHARED_LIBADD)'
36204        ;;
36205    esac
36206
36207    if test "x" = "xyes"; then
36208 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_pgsql.$suffix"
36209 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_mysql.$suffix"
36210    else
36211 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_pgsql.$suffix"
36212 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_mysql.$suffix"
36213    fi
36214
36215 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
36216 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
36217
36218    cat >>Makefile.objects<<EOF
36219 -\$(phplibdir)/phppdo_pgsql.$suffix: $ext_builddir/phppdo_pgsql.$suffix
36220 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_pgsql.$suffix \$(phplibdir)
36221 +\$(phplibdir)/phppdo_mysql.$suffix: $ext_builddir/phppdo_mysql.$suffix
36222 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_mysql.$suffix \$(phplibdir)
36223
36224 -$ext_builddir/phppdo_pgsql.$suffix: \$(shared_objects_pdo_pgsql) \$(PHPPDO_PGSQL_SHARED_DEPENDENCIES)
36225 +$ext_builddir/phppdo_mysql.$suffix: \$(shared_objects_pdo_mysql) \$(PHPPDO_MYSQL_SHARED_DEPENDENCIES)
36226         $link_cmd
36227
36228  EOF
36229 @@ -73685,31 +71620,31 @@ EOF
36230    case $host_alias in
36231      *aix*)
36232        suffix=so
36233 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PDO_PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_pgsql.so '$ext_builddir'/pdo_pgsql.so'
36234 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_mysql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PDO_MYSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_mysql.so '$ext_builddir'/pdo_mysql.so'
36235        ;;
36236      *netware*)
36237        suffix=nlm
36238 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_PGSQL, 3)_SHARED_LIBADD)'
36239 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_MYSQL, 3)_SHARED_LIBADD)'
36240        ;;
36241      *)
36242        suffix=la
36243 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PDO_PGSQL_SHARED_LIBADD)'
36244 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) $(PDO_MYSQL_SHARED_LIBADD)'
36245        ;;
36246    esac
36247
36248    if test "x" = "xyes"; then
36249 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_pgsql.$suffix"
36250 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_mysql.$suffix"
36251    else
36252 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_pgsql.$suffix"
36253 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_mysql.$suffix"
36254    fi
36255
36256 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
36257 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql"
36258
36259    cat >>Makefile.objects<<EOF
36260 -\$(phplibdir)/pdo_pgsql.$suffix: $ext_builddir/pdo_pgsql.$suffix
36261 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_pgsql.$suffix \$(phplibdir)
36262 +\$(phplibdir)/pdo_mysql.$suffix: $ext_builddir/pdo_mysql.$suffix
36263 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_mysql.$suffix \$(phplibdir)
36264
36265 -$ext_builddir/pdo_pgsql.$suffix: \$(shared_objects_pdo_pgsql) \$(PDO_PGSQL_SHARED_DEPENDENCIES)
36266 +$ext_builddir/pdo_mysql.$suffix: \$(shared_objects_pdo_mysql) \$(PDO_MYSQL_SHARED_DEPENDENCIES)
36267         $link_cmd
36268
36269  EOF
36270 @@ -73717,22 +71652,22 @@ EOF
36271            ;;
36272        esac
36273        cat >> confdefs.h <<EOF
36274 -#define COMPILE_DL_PDO_PGSQL 1
36275 +#define COMPILE_DL_PDO_MYSQL 1
36276  EOF
36277
36278      fi
36279    fi
36280
36281    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
36282 -    PHP_PDO_PGSQL_SHARED=no
36283 +    PHP_PDO_MYSQL_SHARED=no
36284      case "$PHP_SAPI" in
36285        cgi|embed)
36286
36287
36288 -  case ext/pdo_pgsql in
36289 +  case ext/pdo_mysql in
36290    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36291 -  /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36292 -  *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36293 +  /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36294 +  *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36295    esac
36296
36297
36298 @@ -73747,7 +71682,7 @@ EOF
36299
36300
36301    old_IFS=$IFS
36302 -  for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
36303 +  for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
36304
36305        IFS=.
36306        set $ac_src
36307 @@ -73770,15 +71705,15 @@ EOF
36308    done
36309
36310
36311 -        EXT_STATIC="$EXT_STATIC pdo_pgsql"
36312 +        EXT_STATIC="$EXT_STATIC pdo_mysql"
36313          ;;
36314        *)
36315
36316
36317 -  case ext/pdo_pgsql in
36318 +  case ext/pdo_mysql in
36319    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36320 -  /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36321 -  *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36322 +  /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36323 +  *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36324    esac
36325
36326
36327 @@ -73793,7 +71728,7 @@ EOF
36328
36329
36330    old_IFS=$IFS
36331 -  for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
36332 +  for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do
36333
36334        IFS=.
36335        set $ac_src
36336 @@ -73818,7 +71753,7 @@ EOF
36337
36338          ;;
36339      esac
36340 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql"
36341 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
36342    fi
36343
36344
36345 @@ -73827,7 +71762,7 @@ EOF
36346
36347
36348    if test "$ext_builddir" = "."; then
36349 -    PHP_PECL_EXTENSION=pdo_pgsql
36350 +    PHP_PECL_EXTENSION=pdo_mysql
36351
36352    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
36353
36354 @@ -73835,41 +71770,78 @@ EOF
36355
36356
36357
36358 -  am_i_shared=$PHP_PDO_PGSQL_SHARED
36359 +  am_i_shared=$PHP_PDO_MYSQL_SHARED
36360    is_it_shared=$PHP_PDO_SHARED
36361    is_it_enabled=$PHP_PDO
36362    if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
36363      { echo "configure: error:
36364 -You've configured extension pdo_pgsql to build statically, but it
36365 +You've configured extension pdo_mysql to build statically, but it
36366  depends on extension pdo, which you've configured to build shared.
36367 -You either need to build pdo_pgsql shared or build pdo statically for the
36368 +You either need to build pdo_mysql shared or build pdo statically for the
36369  build to be successful.
36370  " 1>&2; exit 1; }
36371    fi
36372    if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
36373      { echo "configure: error:
36374 -You've configured extension pdo_pgsql, which depends on extension pdo,
36375 +You've configured extension pdo_mysql, which depends on extension pdo,
36376  but you've either not enabled pdo, or have disabled it.
36377  " 1>&2; exit 1; }
36378    fi
36379 -
36380
36381 +    if test "$PHP_MYSQL" = "mysqlnd"; then
36382 +
36383 +  am_i_shared=$PHP_PDO_MYSQL_SHARED
36384 +  is_it_shared=$PHP_MYSQLND_SHARED
36385 +  is_it_enabled=$PHP_MYSQLND
36386 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
36387 +    { echo "configure: error:
36388 +You've configured extension pdo_mysql to build statically, but it
36389 +depends on extension mysqlnd, which you've configured to build shared.
36390 +You either need to build pdo_mysql shared or build mysqlnd statically for the
36391 +build to be successful.
36392 +" 1>&2; exit 1; }
36393 +  fi
36394 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
36395 +    { echo "configure: error:
36396 +You've configured extension pdo_mysql, which depends on extension mysqlnd,
36397 +but you've either not enabled mysqlnd, or have disabled it.
36398 +" 1>&2; exit 1; }
36399 +  fi
36400 +
36401 +    fi
36402 +
36403 +  PDO_MYSQL_MODULE_TYPE=external
36404 +
36405 +
36406 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_SHARED_LIBADD"
36407 +
36408 +
36409 +
36410 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_MODULE_TYPE"
36411 +
36412 +
36413 +
36414  fi
36415
36416
36417 +SUPPORTED_LIB_VERS="9.0 10.1 11.1"  # This caters for all Oracle 9.x, 10.x and 11.1 installs
36418 +
36419
36420 -php_with_pdo_sqlite=$PHP_PDO
36421
36422 -echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
36423 -echo "configure:73865: checking for sqlite 3 support for PDO" >&5
36424 -# Check whether --with-pdo-sqlite or --without-pdo-sqlite was given.
36425 -if test "${with_pdo_sqlite+set}" = set; then
36426 -  withval="$with_pdo_sqlite"
36427 -  PHP_PDO_SQLITE=$withval
36428 +
36429 +
36430 +php_with_pdo_oci=no
36431 +
36432 +echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
36433 +echo "configure:71837: checking Oracle OCI support for PDO" >&5
36434 +# Check whether --with-pdo-oci or --without-pdo-oci was given.
36435 +if test "${with_pdo_oci+set}" = set; then
36436 +  withval="$with_pdo_oci"
36437 +  PHP_PDO_OCI=$withval
36438  else
36439
36440 -  PHP_PDO_SQLITE=$PHP_PDO
36441 -  test "$PHP_ENABLE_ALL" && PHP_PDO_SQLITE=$PHP_ENABLE_ALL
36442 +  PHP_PDO_OCI=no
36443 +  test "$PHP_ENABLE_ALL" && PHP_PDO_OCI=$PHP_ENABLE_ALL
36444
36445  fi
36446
36447 @@ -73877,12 +71849,12 @@ fi
36448
36449  ext_output="yes, shared"
36450  ext_shared=yes
36451 -case $PHP_PDO_SQLITE in
36452 +case $PHP_PDO_OCI in
36453  shared,*)
36454 -  PHP_PDO_SQLITE=`echo "$PHP_PDO_SQLITE"|$SED 's/^shared,//'`
36455 +  PHP_PDO_OCI=`echo "$PHP_PDO_OCI"|$SED 's/^shared,//'`
36456    ;;
36457  shared)
36458 -  PHP_PDO_SQLITE=yes
36459 +  PHP_PDO_OCI=yes
36460    ;;
36461  no)
36462    ext_output=no
36463 @@ -73901,74 +71873,48 @@ echo "$ac_t""$ext_output" 1>&6
36464
36465
36466
36467 -if test "$PHP_PDO_SQLITE" != "no"; then
36468 +if test "$PHP_PDO_OCI" != "no"; then
36469
36470    if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
36471      { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
36472    fi
36473
36474 -
36475 -
36476 -  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
36477 -echo "configure:73914: checking for PDO includes" >&5
36478 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
36479 -  echo $ac_n "(cached) $ac_c" 1>&6
36480 -else
36481 -
36482 -    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
36483 -echo "configure:73920: checking for PDO includes" >&5
36484 -    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
36485 -      pdo_inc_path=$abs_srcdir/ext
36486 -    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
36487 -      pdo_inc_path=$abs_srcdir/ext
36488 -    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
36489 -      pdo_inc_path=$prefix/include/php/ext
36490 -    fi
36491 -
36492 -fi
36493 -
36494 -echo "$ac_t""$pdo_inc_path" 1>&6
36495 -  if test -n "$pdo_inc_path"; then
36496 -:
36497 +  echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
36498 +echo "configure:71884: checking Oracle Install-Dir" >&5
36499 +  if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
36500 +    PDO_OCI_DIR=$ORACLE_HOME
36501    else
36502 -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
36503 +    PDO_OCI_DIR=$PHP_PDO_OCI
36504    fi
36505 +  echo "$ac_t""$PHP_PDO_OCI" 1>&6
36506
36507 -
36508 -
36509 -  php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
36510 -
36511 -  if test "$PHP_PDO_SQLITE" != "yes"; then
36512 -    SEARCH_PATH="$PHP_PDO_SQLITE /usr/local /usr"     # you might want to change this
36513 -    SEARCH_FOR="/include/sqlite3.h"  # you most likely want to change this
36514 -    if test -r $PHP_PDO_SQLITE/$SEARCH_FOR; then # path given as parameter
36515 -      PDO_SQLITE_DIR=$PHP_PDO_SQLITE
36516 -    else # search default path list
36517 -      echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
36518 -echo "configure:73949: checking for sqlite3 files in default path" >&5
36519 -      for i in $SEARCH_PATH ; do
36520 -        if test -r $i/$SEARCH_FOR; then
36521 -          PDO_SQLITE_DIR=$i
36522 -          echo "$ac_t""found in $i" 1>&6
36523 -        fi
36524 -      done
36525 -    fi
36526 -    if test -z "$PDO_SQLITE_DIR"; then
36527 -      echo "$ac_t""not found" 1>&6
36528 -      { echo "configure: error: Please reinstall the sqlite3 distribution" 1>&2; exit 1; }
36529 -    fi
36530 +  echo $ac_n "checking if that is sane""... $ac_c" 1>&6
36531 +echo "configure:71893: checking if that is sane" >&5
36532 +  if test -z "$PDO_OCI_DIR"; then
36533 +    { echo "configure: error:
36534 +You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
36535 +" 1>&2; exit 1; }
36536 +  else
36537 +    echo "$ac_t""yes" 1>&6
36538 +  fi
36539
36540 +  if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
36541 +    PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
36542 +    PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
36543 +    echo $ac_n "checking for oci.h""... $ac_c" 1>&6
36544 +echo "configure:71906: checking for oci.h" >&5
36545 +    if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then
36546 +
36547 +  if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then
36548
36549 -  if test "$PDO_SQLITE_DIR/include" != "/usr/include"; then
36550 -
36551 -  if test -z "$PDO_SQLITE_DIR/include" || echo "$PDO_SQLITE_DIR/include" | grep '^/' >/dev/null ; then
36552 -    ai_p=$PDO_SQLITE_DIR/include
36553 +  if test -z "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" || echo "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" | grep '^/' >/dev/null ; then
36554 +    ai_p=$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client
36555    else
36556
36557 -    ep_dir="`echo $PDO_SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
36558 +    ep_dir="`echo $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client|$SED 's%/*[^/][^/]*/*$%%'`"
36559
36560      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
36561 -    ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/include\"`"
36562 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client\"`"
36563    fi
36564
36565
36566 @@ -73989,209 +71935,423 @@ echo "configure:73949: checking for sqli
36567
36568    fi
36569
36570 -
36571 -    LIBNAME=sqlite3
36572 -    LIBSYMBOL=sqlite3_open
36573 +      echo "$ac_t""$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" 1>&6
36574 +    elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then
36575 +
36576 +  if test "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" != "/usr/include"; then
36577 +
36578 +  if test -z "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" || echo "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" | grep '^/' >/dev/null ; then
36579 +    ai_p=$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include
36580 +  else
36581 +
36582 +    ep_dir="`echo $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include|$SED 's%/*[^/][^/]*/*$%%'`"
36583 +
36584 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
36585 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include\"`"
36586 +  fi
36587
36588
36589 -  save_old_LDFLAGS=$LDFLAGS
36590 -  ac_stuff="
36591 -      -L$PDO_SQLITE_DIR/$PHP_LIBDIR -lm
36592 -    "
36593 -
36594 -  save_ext_shared=$ext_shared
36595 -  ext_shared=yes
36596
36597 -  for ac_i in $ac_stuff; do
36598 -    case $ac_i in
36599 -    -pthread)
36600 -      if test "$ext_shared" = "yes"; then
36601 -        LDFLAGS="$LDFLAGS -pthread"
36602 -      else
36603 -
36604 -
36605 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
36606 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
36607
36608 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
36609 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
36610    if test -n "$unique" && test "`eval $cmd`" = "" ; then
36611 -    eval "EXTRA_LDFLAGS$unique=set"
36612 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
36613 -  fi
36614 -
36615 +    eval "INCLUDEPATH$unique=set"
36616 +
36617 +      if test ""; then
36618 +        INCLUDES="-I$ai_p $INCLUDES"
36619 +      else
36620 +        INCLUDES="$INCLUDES -I$ai_p"
36621        fi
36622 -    ;;
36623 -    -l*)
36624 -      ac_ii=`echo $ac_i|cut -c 3-`
36625 -
36626 -
36627 -  case $ac_ii in
36628 -  c|c_r|pthread*) ;;
36629 -  *)
36630 -    if test "$ext_shared" = "yes"; then
36631 -        LDFLAGS="$LDFLAGS -l$ac_ii"
36632 -    else
36633 -
36634 -
36635 -  case $ac_ii in
36636 -  c|c_r|pthread*) ;;
36637 -  *)
36638 -      LIBS="$LIBS -l$ac_ii"
36639 -   ;;
36640 -  esac
36641 -
36642 -
36643 -    fi
36644 -   ;;
36645 -  esac
36646 +
36647 +  fi
36648
36649 +  fi
36650
36651 -    ;;
36652 -    -L*)
36653 -      ac_ii=`echo $ac_i|cut -c 3-`
36654 +      echo "$ac_t""$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" 1>&6
36655 +    elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then
36656
36657 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
36658 +  if test "$PDO_OCI_IC_PREFIX/sdk/include" != "/usr/include"; then
36659
36660 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
36661 -    ai_p=$ac_ii
36662 +  if test -z "$PDO_OCI_IC_PREFIX/sdk/include" || echo "$PDO_OCI_IC_PREFIX/sdk/include" | grep '^/' >/dev/null ; then
36663 +    ai_p=$PDO_OCI_IC_PREFIX/sdk/include
36664    else
36665
36666 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
36667 +    ep_dir="`echo $PDO_OCI_IC_PREFIX/sdk/include|$SED 's%/*[^/][^/]*/*$%%'`"
36668
36669      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
36670 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
36671 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/sdk/include\"`"
36672    fi
36673
36674
36675 -      if test "$ext_shared" = "yes"; then
36676 -        LDFLAGS="-L$ai_p $LDFLAGS"
36677 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
36678 -      else
36679 -
36680 -
36681
36682    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
36683
36684 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
36685 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
36686    if test -n "$unique" && test "`eval $cmd`" = "" ; then
36687 -    eval "LIBPATH$unique=set"
36688 +    eval "INCLUDEPATH$unique=set"
36689
36690 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
36691 -    LDFLAGS="$LDFLAGS -L$ai_p"
36692 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
36693 -
36694 -  fi
36695 -
36696 -
36697 +      if test ""; then
36698 +        INCLUDES="-I$ai_p $INCLUDES"
36699 +      else
36700 +        INCLUDES="$INCLUDES -I$ai_p"
36701        fi
36702
36703    fi
36704
36705 -    ;;
36706 -    esac
36707 -  done
36708 -
36709 -  echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
36710 -echo "configure:74095: checking for $LIBSYMBOL in -l$LIBNAME" >&5
36711 -ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
36712 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
36713 -  echo $ac_n "(cached) $ac_c" 1>&6
36714 -else
36715 -  ac_save_LIBS="$LIBS"
36716 -LIBS="-l$LIBNAME  $LIBS"
36717 -cat > conftest.$ac_ext <<EOF
36718 -#line 74103 "configure"
36719 -#include "confdefs.h"
36720 -/* Override any gcc2 internal prototype to avoid an error.  */
36721 -/* We use char because int might match the return type of a gcc2
36722 -    builtin and then its argument prototype would still apply.  */
36723 -char $LIBSYMBOL();
36724 -
36725 -int main() {
36726 -$LIBSYMBOL()
36727 -; return 0; }
36728 -EOF
36729 -if { (eval echo configure:74114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36730 -  rm -rf conftest*
36731 -  eval "ac_cv_lib_$ac_lib_var=yes"
36732 -else
36733 -  echo "configure: failed program was:" >&5
36734 -  cat conftest.$ac_ext >&5
36735 -  rm -rf conftest*
36736 -  eval "ac_cv_lib_$ac_lib_var=no"
36737 -fi
36738 -rm -f conftest*
36739 -LIBS="$ac_save_LIBS"
36740 -
36741 -fi
36742 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
36743 -  echo "$ac_t""yes" 1>&6
36744 -
36745 -    LDFLAGS=$save_old_LDFLAGS
36746 -    ext_shared=$save_ext_shared
36747 -
36748 -
36749 +  fi
36750
36751 -  if test "$ext_shared" = "yes"; then
36752 -    PDO_SQLITE_SHARED_LIBADD="-l$LIBNAME $PDO_SQLITE_SHARED_LIBADD"
36753 -    if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then
36754 +      echo "$ac_t""$PDO_OCI_IC_PREFIX/sdk/include" 1>&6
36755 +    elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then
36756
36757 -  if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
36758 +  if test "$PDO_OCI_IC_PREFIX/client/include" != "/usr/include"; then
36759
36760 -  if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
36761 -    ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR
36762 +  if test -z "$PDO_OCI_IC_PREFIX/client/include" || echo "$PDO_OCI_IC_PREFIX/client/include" | grep '^/' >/dev/null ; then
36763 +    ai_p=$PDO_OCI_IC_PREFIX/client/include
36764    else
36765
36766 -    ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
36767 +    ep_dir="`echo $PDO_OCI_IC_PREFIX/client/include|$SED 's%/*[^/][^/]*/*$%%'`"
36768
36769      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
36770 -    ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
36771 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/client/include\"`"
36772    fi
36773
36774
36775 -      if test "$ext_shared" = "yes"; then
36776 -        PDO_SQLITE_SHARED_LIBADD="-L$ai_p $PDO_SQLITE_SHARED_LIBADD"
36777 -        test -n "$ld_runpath_switch" && PDO_SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_SQLITE_SHARED_LIBADD"
36778 -      else
36779 -
36780
36781 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
36782 +
36783 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
36784 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
36785 +    eval "INCLUDEPATH$unique=set"
36786 +
36787 +      if test ""; then
36788 +        INCLUDES="-I$ai_p $INCLUDES"
36789 +      else
36790 +        INCLUDES="$INCLUDES -I$ai_p"
36791 +      fi
36792 +
36793 +  fi
36794 +
36795 +  fi
36796 +
36797 +      echo "$ac_t""$PDO_OCI_IC_PREFIX/client/include" 1>&6
36798 +    else
36799 +      { echo "configure: error: I'm too dumb to figure out where the include dir is in your Instant Client install" 1>&2; exit 1; }
36800 +    fi
36801 +    if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then
36802 +    PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
36803 +    elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
36804 +      PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib"
36805 +    elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then
36806 +      PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
36807 +    else
36808 +      { echo "configure: error: I'm too dumb to figure out where the libraries are in your Instant Client install" 1>&2; exit 1; }
36809 +    fi
36810 +    PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
36811 +  else
36812 +
36813 +  echo $ac_n "checking size of long int""... $ac_c" 1>&6
36814 +echo "configure:72055: checking size of long int" >&5
36815 +if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
36816 +  echo $ac_n "(cached) $ac_c" 1>&6
36817 +else
36818 +  if test "$cross_compiling" = yes; then
36819 +  ac_cv_sizeof_long_int=4
36820 +else
36821 +  cat > conftest.$ac_ext <<EOF
36822 +#line 72063 "configure"
36823 +#include "confdefs.h"
36824 +#include <stdio.h>
36825 +#include <sys/types.h>
36826 +main()
36827 +{
36828 +  FILE *f=fopen("conftestval", "w");
36829 +  if (!f) exit(1);
36830 +  fprintf(f, "%d\n", sizeof(long int));
36831 +  exit(0);
36832 +}
36833 +EOF
36834 +if { (eval echo configure:72075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
36835 +then
36836 +  ac_cv_sizeof_long_int=`cat conftestval`
36837 +else
36838 +  echo "configure: failed program was:" >&5
36839 +  cat conftest.$ac_ext >&5
36840 +  rm -fr conftest*
36841 +  ac_cv_sizeof_long_int=0
36842 +fi
36843 +rm -fr conftest*
36844 +fi
36845 +
36846 +fi
36847 +echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
36848 +cat >> confdefs.h <<EOF
36849 +#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
36850 +EOF
36851 +
36852 +
36853 +  echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
36854 +echo "configure:72095: checking if we're on a 64-bit platform" >&5
36855 +  if test "$ac_cv_sizeof_long_int" = "4" ; then
36856 +    echo "$ac_t""no" 1>&6
36857 +    TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
36858 +  else
36859 +    echo "$ac_t""yes" 1>&6
36860 +    TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
36861 +  fi
36862 +
36863 +  echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
36864 +echo "configure:72105: checking OCI8 libraries dir" >&5
36865 +  if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then
36866 +    PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
36867 +  elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
36868 +    PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
36869 +  elif test -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
36870 +    PDO_OCI_LIB_DIR=$TMP_PDO_OCI_LIB_DIR
36871 +  else
36872 +    { echo "configure: error: Oracle required OCI8 libraries not found" 1>&2; exit 1; }
36873 +  fi
36874 +  echo "$ac_t""$PDO_OCI_LIB_DIR" 1>&6
36875 +
36876 +
36877 +    if test -d "$PDO_OCI_DIR/rdbms/public"; then
36878 +
36879 +  if test "$PDO_OCI_DIR/rdbms/public" != "/usr/include"; then
36880 +
36881 +  if test -z "$PDO_OCI_DIR/rdbms/public" || echo "$PDO_OCI_DIR/rdbms/public" | grep '^/' >/dev/null ; then
36882 +    ai_p=$PDO_OCI_DIR/rdbms/public
36883 +  else
36884 +
36885 +    ep_dir="`echo $PDO_OCI_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
36886 +
36887 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
36888 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/public\"`"
36889 +  fi
36890 +
36891 +
36892
36893    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
36894
36895 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
36896 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
36897    if test -n "$unique" && test "`eval $cmd`" = "" ; then
36898 -    eval "LIBPATH$unique=set"
36899 +    eval "INCLUDEPATH$unique=set"
36900
36901 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
36902 -    LDFLAGS="$LDFLAGS -L$ai_p"
36903 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
36904 +      if test ""; then
36905 +        INCLUDES="-I$ai_p $INCLUDES"
36906 +      else
36907 +        INCLUDES="$INCLUDES -I$ai_p"
36908 +      fi
36909 +
36910 +  fi
36911 +
36912 +  fi
36913 +
36914 +      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/public"
36915 +    fi
36916 +    if test -d "$PDO_OCI_DIR/rdbms/demo"; then
36917 +
36918 +  if test "$PDO_OCI_DIR/rdbms/demo" != "/usr/include"; then
36919 +
36920 +  if test -z "$PDO_OCI_DIR/rdbms/demo" || echo "$PDO_OCI_DIR/rdbms/demo" | grep '^/' >/dev/null ; then
36921 +    ai_p=$PDO_OCI_DIR/rdbms/demo
36922 +  else
36923 +
36924 +    ep_dir="`echo $PDO_OCI_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
36925 +
36926 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
36927 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/demo\"`"
36928 +  fi
36929 +
36930 +
36931 +
36932 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
36933
36934 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
36935 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
36936 +    eval "INCLUDEPATH$unique=set"
36937 +
36938 +      if test ""; then
36939 +        INCLUDES="-I$ai_p $INCLUDES"
36940 +      else
36941 +        INCLUDES="$INCLUDES -I$ai_p"
36942 +      fi
36943 +
36944 +  fi
36945 +
36946    fi
36947
36948 +      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/demo"
36949 +    fi
36950 +    if test -d "$PDO_OCI_DIR/network/public"; then
36951 +
36952 +  if test "$PDO_OCI_DIR/network/public" != "/usr/include"; then
36953 +
36954 +  if test -z "$PDO_OCI_DIR/network/public" || echo "$PDO_OCI_DIR/network/public" | grep '^/' >/dev/null ; then
36955 +    ai_p=$PDO_OCI_DIR/network/public
36956 +  else
36957 +
36958 +    ep_dir="`echo $PDO_OCI_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`"
36959 +
36960 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
36961 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/network/public\"`"
36962 +  fi
36963
36964 +
36965 +
36966 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
36967 +
36968 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
36969 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
36970 +    eval "INCLUDEPATH$unique=set"
36971 +
36972 +      if test ""; then
36973 +        INCLUDES="-I$ai_p $INCLUDES"
36974 +      else
36975 +        INCLUDES="$INCLUDES -I$ai_p"
36976        fi
36977
36978    fi
36979
36980 +  fi
36981 +
36982 +      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/network/public"
36983      fi
36984 +    if test -d "$PDO_OCI_DIR/plsql/public"; then
36985 +
36986 +  if test "$PDO_OCI_DIR/plsql/public" != "/usr/include"; then
36987 +
36988 +  if test -z "$PDO_OCI_DIR/plsql/public" || echo "$PDO_OCI_DIR/plsql/public" | grep '^/' >/dev/null ; then
36989 +    ai_p=$PDO_OCI_DIR/plsql/public
36990    else
36991
36992 +    ep_dir="`echo $PDO_OCI_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
36993 +
36994 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
36995 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/plsql/public\"`"
36996 +  fi
36997
36998 -  if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then
36999
37000 -  if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
37001 +
37002 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37003 +
37004 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
37005 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37006 +    eval "INCLUDEPATH$unique=set"
37007
37008 -  if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
37009 -    ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR
37010 +      if test ""; then
37011 +        INCLUDES="-I$ai_p $INCLUDES"
37012 +      else
37013 +        INCLUDES="$INCLUDES -I$ai_p"
37014 +      fi
37015 +
37016 +  fi
37017 +
37018 +  fi
37019 +
37020 +      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/plsql/public"
37021 +    fi
37022 +    if test -d "$PDO_OCI_DIR/include"; then
37023 +
37024 +  if test "$PDO_OCI_DIR/include" != "/usr/include"; then
37025 +
37026 +  if test -z "$PDO_OCI_DIR/include" || echo "$PDO_OCI_DIR/include" | grep '^/' >/dev/null ; then
37027 +    ai_p=$PDO_OCI_DIR/include
37028    else
37029
37030 -    ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
37031 +    ep_dir="`echo $PDO_OCI_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
37032
37033      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
37034 -    ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
37035 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/include\"`"
37036    fi
37037
37038
37039 +
37040 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37041 +
37042 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
37043 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37044 +    eval "INCLUDEPATH$unique=set"
37045 +
37046 +      if test ""; then
37047 +        INCLUDES="-I$ai_p $INCLUDES"
37048 +      else
37049 +        INCLUDES="$INCLUDES -I$ai_p"
37050 +      fi
37051 +
37052 +  fi
37053 +
37054 +  fi
37055 +
37056 +      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/include"
37057 +    fi
37058 +
37059 +    if test -f "$PDO_OCI_LIB_DIR/sysliblist"; then
37060 +
37061 +  for ac_i in `cat $PDO_OCI_LIB_DIR/sysliblist`; do
37062 +    case $ac_i in
37063 +    -pthread)
37064 +      if test "$ext_shared" = "yes"; then
37065 +        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -pthread"
37066 +      else
37067 +
37068 +
37069 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
37070 +
37071 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
37072 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37073 +    eval "EXTRA_LDFLAGS$unique=set"
37074 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
37075 +  fi
37076 +
37077 +      fi
37078 +    ;;
37079 +    -l*)
37080 +      ac_ii=`echo $ac_i|cut -c 3-`
37081 +
37082 +
37083 +  case $ac_ii in
37084 +  c|c_r|pthread*) ;;
37085 +  *)
37086 +    if test "$ext_shared" = "yes"; then
37087 +        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
37088 +    else
37089 +
37090 +
37091 +  case $ac_ii in
37092 +  c|c_r|pthread*) ;;
37093 +  *)
37094 +      LIBS="$LIBS -l$ac_ii"
37095 +   ;;
37096 +  esac
37097 +
37098 +
37099 +    fi
37100 +   ;;
37101 +  esac
37102 +
37103 +
37104 +    ;;
37105 +    -L*)
37106 +      ac_ii=`echo $ac_i|cut -c 3-`
37107
37108 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
37109 +
37110 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
37111 +    ai_p=$ac_ii
37112 +  else
37113 +
37114 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
37115 +
37116 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
37117 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
37118 +  fi
37119 +
37120 +
37121 +      if test "$ext_shared" = "yes"; then
37122 +        PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB"
37123 +        test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB"
37124 +      else
37125 +
37126
37127
37128    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37129 @@ -74207,46 +72367,196 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
37130    fi
37131
37132
37133 +      fi
37134
37135    fi
37136
37137 +    ;;
37138 +    esac
37139 +  done
37140 +
37141 +    elif test -f "$PDO_OCI_DIR/rdbms/lib/sysliblist"; then
37142 +
37143 +  for ac_i in `cat $PDO_OCI_DIR/rdbms/lib/sysliblist`; do
37144 +    case $ac_i in
37145 +    -pthread)
37146 +      if test "$ext_shared" = "yes"; then
37147 +        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -pthread"
37148 +      else
37149 +
37150 +
37151 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
37152 +
37153 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
37154 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37155 +    eval "EXTRA_LDFLAGS$unique=set"
37156 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
37157    fi
37158 +
37159 +      fi
37160 +    ;;
37161 +    -l*)
37162 +      ac_ii=`echo $ac_i|cut -c 3-`
37163 +
37164
37165 +  case $ac_ii in
37166 +  c|c_r|pthread*) ;;
37167 +  *)
37168 +    if test "$ext_shared" = "yes"; then
37169 +        PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii"
37170 +    else
37171 +
37172
37173 -  case $LIBNAME in
37174 +  case $ac_ii in
37175    c|c_r|pthread*) ;;
37176    *)
37177 -      LIBS="-l$LIBNAME $LIBS"
37178 +      LIBS="$LIBS -l$ac_ii"
37179     ;;
37180    esac
37181
37182
37183 +    fi
37184 +   ;;
37185 +  esac
37186 +
37187
37188 +    ;;
37189 +    -L*)
37190 +      ac_ii=`echo $ac_i|cut -c 3-`
37191 +
37192 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
37193 +
37194 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
37195 +    ai_p=$ac_ii
37196 +  else
37197 +
37198 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
37199 +
37200 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
37201 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
37202 +  fi
37203
37204 +
37205 +      if test "$ext_shared" = "yes"; then
37206 +        PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB"
37207 +        test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB"
37208 +      else
37209 +
37210 +
37211 +
37212 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37213 +
37214 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
37215 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37216 +    eval "LIBPATH$unique=set"
37217 +
37218 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
37219 +    LDFLAGS="$LDFLAGS -L$ai_p"
37220 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
37221 +
37222    fi
37223
37224
37225 -      cat >> confdefs.h <<\EOF
37226 -#define HAVE_PDO_SQLITELIB 1
37227 -EOF
37228 +      fi
37229 +
37230 +  fi
37231 +
37232 +    ;;
37233 +    esac
37234 +  done
37235
37236 +    fi
37237
37238 +  echo $ac_n "checking Oracle version""... $ac_c" 1>&6
37239 +echo "configure:72472: checking Oracle version" >&5
37240 +  for OCI_VER in $SUPPORTED_LIB_VERS; do
37241 +    if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
37242 +      PDO_OCI_VERSION="$OCI_VER"
37243 +    fi
37244 +  done
37245 +  if test -z "$PDO_OCI_VERSION"; then
37246 +    { echo "configure: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" 1>&2; exit 1; }
37247 +  fi
37248 +  echo "$ac_t""$PDO_OCI_VERSION" 1>&6
37249 +
37250 +  fi
37251 +
37252 +  case $PDO_OCI_VERSION in
37253 +    9.0|10.1|10.2|11.1|11.2)
37254 +
37255
37256 -else
37257 -  echo "$ac_t""no" 1>&6
37258 +  case clntsh in
37259 +  c|c_r|pthread*) ;;
37260 +  *)
37261 +    if test "$ext_shared" = "yes"; then
37262 +        PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -lclntsh"
37263 +    else
37264 +
37265 +
37266 +  case clntsh in
37267 +  c|c_r|pthread*) ;;
37268 +  *)
37269 +      LIBS="$LIBS -lclntsh"
37270 +   ;;
37271 +  esac
37272
37273 -    LDFLAGS=$save_old_LDFLAGS
37274 -    ext_shared=$save_ext_shared
37275 -    unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
37276 +
37277 +    fi
37278 +   ;;
37279 +  esac
37280 +
37281 +
37282 +      ;;
37283 +
37284 +    *)
37285 +      { echo "configure: error: Unsupported Oracle version $PDO_OCI_VERSION" 1>&2; exit 1; }
37286 +      ;;
37287 +  esac
37288 +
37289 +
37290 +  if test "$PDO_OCI_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PDO_OCI_LIB_DIR" != "/usr/lib"; then
37291
37292 -      { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
37293 +  if test -z "$PDO_OCI_LIB_DIR" || echo "$PDO_OCI_LIB_DIR" | grep '^/' >/dev/null ; then
37294 +    ai_p=$PDO_OCI_LIB_DIR
37295 +  else
37296 +
37297 +    ep_dir="`echo $PDO_OCI_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
37298 +
37299 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
37300 +    ai_p="$ep_realdir/`basename \"$PDO_OCI_LIB_DIR\"`"
37301 +  fi
37302 +
37303 +
37304 +      if test "$ext_shared" = "yes"; then
37305 +        PDO_OCI_SHARED_LIBADD="-L$ai_p $PDO_OCI_SHARED_LIBADD"
37306 +        test -n "$ld_runpath_switch" && PDO_OCI_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_OCI_SHARED_LIBADD"
37307 +      else
37308 +
37309 +
37310 +
37311 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37312 +
37313 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
37314 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37315 +    eval "LIBPATH$unique=set"
37316
37317 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
37318 +    LDFLAGS="$LDFLAGS -L$ai_p"
37319 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
37320
37321 -fi
37322 +  fi
37323
37324 +
37325 +      fi
37326
37327 +  fi
37328 +
37329 +
37330 +
37331    save_old_LDFLAGS=$LDFLAGS
37332 -  ac_stuff=""
37333 +  ac_stuff="
37334 +    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
37335 +  "
37336
37337    save_ext_shared=$ext_shared
37338    ext_shared=yes
37339 @@ -74339,27 +72649,27 @@ fi
37340      esac
37341    done
37342
37343 -  echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
37344 -echo "configure:74344: checking for sqlite3_key in -lsqlite3" >&5
37345 -ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
37346 +  echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
37347 +echo "configure:72654: checking for OCIEnvCreate in -lclntsh" >&5
37348 +ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'`
37349  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37350    echo $ac_n "(cached) $ac_c" 1>&6
37351  else
37352    ac_save_LIBS="$LIBS"
37353 -LIBS="-lsqlite3  $LIBS"
37354 +LIBS="-lclntsh  $LIBS"
37355  cat > conftest.$ac_ext <<EOF
37356 -#line 74352 "configure"
37357 +#line 72662 "configure"
37358  #include "confdefs.h"
37359  /* Override any gcc2 internal prototype to avoid an error.  */
37360  /* We use char because int might match the return type of a gcc2
37361      builtin and then its argument prototype would still apply.  */
37362 -char sqlite3_key();
37363 +char OCIEnvCreate();
37364
37365  int main() {
37366 -sqlite3_key()
37367 +OCIEnvCreate()
37368  ; return 0; }
37369  EOF
37370 -if { (eval echo configure:74363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
37371 +if { (eval echo configure:72673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
37372    rm -rf conftest*
37373    eval "ac_cv_lib_$ac_lib_var=yes"
37374  else
37375 @@ -74378,825 +72688,330 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
37376      LDFLAGS=$save_old_LDFLAGS
37377      ext_shared=$save_ext_shared
37378
37379 -      cat >> confdefs.h <<\EOF
37380 -#define HAVE_SQLITE3_KEY 1
37381 +    cat >> confdefs.h <<\EOF
37382 +#define HAVE_OCIENVCREATE 1
37383  EOF
37384
37385 -
37386 +
37387
37388  else
37389    echo "$ac_t""no" 1>&6
37390
37391      LDFLAGS=$save_old_LDFLAGS
37392      ext_shared=$save_ext_shared
37393 -    unset ac_cv_lib_sqlite3_sqlite3_key
37394 +    unset ac_cv_lib_clntsh_OCIEnvCreate
37395
37396
37397  fi
37398
37399
37400 -
37401 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD"
37402 -
37403 -
37404 -  ext_builddir=ext/pdo_sqlite
37405 -  ext_srcdir=$abs_srcdir/ext/pdo_sqlite
37406 -
37407 -  ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
37408 -
37409 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
37410 -    PHP_PDO_SQLITE_SHARED=no
37411 -
37412
37413 -  case ext/pdo_sqlite in
37414 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
37415 -  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
37416 -  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
37417 -  esac
37418 +  save_old_LDFLAGS=$LDFLAGS
37419 +  ac_stuff="
37420 +    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
37421 +  "
37422
37423 +  save_ext_shared=$ext_shared
37424 +  ext_shared=yes
37425
37426 +  for ac_i in $ac_stuff; do
37427 +    case $ac_i in
37428 +    -pthread)
37429 +      if test "$ext_shared" = "yes"; then
37430 +        LDFLAGS="$LDFLAGS -pthread"
37431 +      else
37432 +
37433 +
37434 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
37435 +
37436 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
37437 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37438 +    eval "EXTRA_LDFLAGS$unique=set"
37439 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
37440 +  fi
37441
37442 -  b_c_pre=$php_c_pre
37443 -  b_cxx_pre=$php_cxx_pre
37444 -  b_c_meta=$php_c_meta
37445 -  b_cxx_meta=$php_cxx_meta
37446 -  b_c_post=$php_c_post
37447 -  b_cxx_post=$php_cxx_post
37448 -  b_lo=$php_lo
37449 -
37450 -
37451 -  old_IFS=$IFS
37452 -  for ac_src in $php_pdo_sqlite_sources_core; do
37453 +      fi
37454 +    ;;
37455 +    -l*)
37456 +      ac_ii=`echo $ac_i|cut -c 3-`
37457 +
37458
37459 -      IFS=.
37460 -      set $ac_src
37461 -      ac_obj=$1
37462 -      IFS=$old_IFS
37463 +  case $ac_ii in
37464 +  c|c_r|pthread*) ;;
37465 +  *)
37466 +    if test "$ext_shared" = "yes"; then
37467 +        LDFLAGS="$LDFLAGS -l$ac_ii"
37468 +    else
37469
37470 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
37471 -
37472 -      case $ac_src in
37473 -        *.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" ;;
37474 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37475 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37476 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
37477 -      esac
37478 -
37479 -    cat >>Makefile.objects<<EOF
37480 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
37481 -       $ac_comp
37482 -EOF
37483 -  done
37484 +
37485 +  case $ac_ii in
37486 +  c|c_r|pthread*) ;;
37487 +  *)
37488 +      LIBS="$LIBS -l$ac_ii"
37489 +   ;;
37490 +  esac
37491
37492
37493 -    EXT_STATIC="$EXT_STATIC pdo_sqlite"
37494 -    if test "$ext_shared" != "nocli"; then
37495 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
37496      fi
37497 -  else
37498 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
37499 -      PHP_PDO_SQLITE_SHARED=yes
37500 -
37501 -  case ext/pdo_sqlite in
37502 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
37503 -  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
37504 -  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
37505 +   ;;
37506    esac
37507 -
37508 -
37509 -
37510 -  b_c_pre=$shared_c_pre
37511 -  b_cxx_pre=$shared_cxx_pre
37512 -  b_c_meta=$shared_c_meta
37513 -  b_cxx_meta=$shared_cxx_meta
37514 -  b_c_post=$shared_c_post
37515 -  b_cxx_post=$shared_cxx_post
37516 -  b_lo=$shared_lo
37517
37518
37519 -  old_IFS=$IFS
37520 -  for ac_src in $php_pdo_sqlite_sources_core; do
37521 -
37522 -      IFS=.
37523 -      set $ac_src
37524 -      ac_obj=$1
37525 -      IFS=$old_IFS
37526 +    ;;
37527 +    -L*)
37528 +      ac_ii=`echo $ac_i|cut -c 3-`
37529
37530 -      shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo"
37531 -
37532 -      case $ac_src in
37533 -        *.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" ;;
37534 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37535 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37536 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
37537 -      esac
37538 -
37539 -    cat >>Makefile.objects<<EOF
37540 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
37541 -       $ac_comp
37542 -EOF
37543 -  done
37544 -
37545 -      case $host_alias in
37546 -        *netware*)
37547 -
37548 -  install_modules="install-modules"
37549 -
37550 -  case $host_alias in
37551 -    *aix*)
37552 -      suffix=so
37553 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_sqlite.so '$ext_builddir'/phppdo_sqlite.so'
37554 -      ;;
37555 -    *netware*)
37556 -      suffix=nlm
37557 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
37558 -      ;;
37559 -    *)
37560 -      suffix=la
37561 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD)'
37562 -      ;;
37563 -  esac
37564 -
37565 -  if test "x" = "xyes"; then
37566 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_sqlite.$suffix"
37567 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
37568 +
37569 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
37570 +    ai_p=$ac_ii
37571    else
37572 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
37573 +
37574 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
37575 +
37576 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
37577 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
37578    fi
37579 -
37580 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
37581 -
37582 -  cat >>Makefile.objects<<EOF
37583 -\$(phplibdir)/phppdo_sqlite.$suffix: $ext_builddir/phppdo_sqlite.$suffix
37584 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_sqlite.$suffix \$(phplibdir)
37585 -
37586 -$ext_builddir/phppdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PHPPDO_SQLITE_SHARED_DEPENDENCIES)
37587 -       $link_cmd
37588 -
37589 -EOF
37590
37591 -          ;;
37592 -        *)
37593 -
37594 -  install_modules="install-modules"
37595 +
37596 +      if test "$ext_shared" = "yes"; then
37597 +        LDFLAGS="-L$ai_p $LDFLAGS"
37598 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
37599 +      else
37600 +
37601 +
37602 +
37603 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37604 +
37605 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
37606 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37607 +    eval "LIBPATH$unique=set"
37608 +
37609 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
37610 +    LDFLAGS="$LDFLAGS -L$ai_p"
37611 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
37612 +
37613 +  fi
37614
37615 -  case $host_alias in
37616 -    *aix*)
37617 -      suffix=so
37618 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_sqlite.so '$ext_builddir'/pdo_sqlite.so'
37619 -      ;;
37620 -    *netware*)
37621 -      suffix=nlm
37622 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
37623 -      ;;
37624 -    *)
37625 -      suffix=la
37626 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD)'
37627 -      ;;
37628 -  esac
37629
37630 -  if test "x" = "xyes"; then
37631 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_sqlite.$suffix"
37632 -  else
37633 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
37634 +      fi
37635 +
37636    fi
37637 -
37638 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
37639
37640 -  cat >>Makefile.objects<<EOF
37641 -\$(phplibdir)/pdo_sqlite.$suffix: $ext_builddir/pdo_sqlite.$suffix
37642 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_sqlite.$suffix \$(phplibdir)
37643 +    ;;
37644 +    esac
37645 +  done
37646
37647 -$ext_builddir/pdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PDO_SQLITE_SHARED_DEPENDENCIES)
37648 -       $link_cmd
37649 +  echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
37650 +echo "configure:72807: checking for OCIEnvNlsCreate in -lclntsh" >&5
37651 +ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
37652 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37653 +  echo $ac_n "(cached) $ac_c" 1>&6
37654 +else
37655 +  ac_save_LIBS="$LIBS"
37656 +LIBS="-lclntsh  $LIBS"
37657 +cat > conftest.$ac_ext <<EOF
37658 +#line 72815 "configure"
37659 +#include "confdefs.h"
37660 +/* Override any gcc2 internal prototype to avoid an error.  */
37661 +/* We use char because int might match the return type of a gcc2
37662 +    builtin and then its argument prototype would still apply.  */
37663 +char OCIEnvNlsCreate();
37664
37665 +int main() {
37666 +OCIEnvNlsCreate()
37667 +; return 0; }
37668  EOF
37669 +if { (eval echo configure:72826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
37670 +  rm -rf conftest*
37671 +  eval "ac_cv_lib_$ac_lib_var=yes"
37672 +else
37673 +  echo "configure: failed program was:" >&5
37674 +  cat conftest.$ac_ext >&5
37675 +  rm -rf conftest*
37676 +  eval "ac_cv_lib_$ac_lib_var=no"
37677 +fi
37678 +rm -f conftest*
37679 +LIBS="$ac_save_LIBS"
37680
37681 -          ;;
37682 -      esac
37683 -      cat >> confdefs.h <<EOF
37684 -#define COMPILE_DL_PDO_SQLITE 1
37685 +fi
37686 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
37687 +  echo "$ac_t""yes" 1>&6
37688 +
37689 +    LDFLAGS=$save_old_LDFLAGS
37690 +    ext_shared=$save_ext_shared
37691 +
37692 +    cat >> confdefs.h <<\EOF
37693 +#define HAVE_OCIENVNLSCREATE 1
37694  EOF
37695
37696 -    fi
37697 -  fi
37698 -
37699 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
37700 -    PHP_PDO_SQLITE_SHARED=no
37701 -    case "$PHP_SAPI" in
37702 -      cgi|embed)
37703 -
37704 -
37705 -  case ext/pdo_sqlite in
37706 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
37707 -  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
37708 -  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
37709 -  esac
37710
37711
37712 +else
37713 +  echo "$ac_t""no" 1>&6
37714
37715 -  b_c_pre=$php_c_pre
37716 -  b_cxx_pre=$php_cxx_pre
37717 -  b_c_meta=$php_c_meta
37718 -  b_cxx_meta=$php_cxx_meta
37719 -  b_c_post=$php_c_post
37720 -  b_cxx_post=$php_cxx_post
37721 -  b_lo=$php_lo
37722 -
37723 -
37724 -  old_IFS=$IFS
37725 -  for ac_src in $php_pdo_sqlite_sources_core; do
37726 +    LDFLAGS=$save_old_LDFLAGS
37727 +    ext_shared=$save_ext_shared
37728 +    unset ac_cv_lib_clntsh_OCIEnvNlsCreate
37729 +
37730
37731 -      IFS=.
37732 -      set $ac_src
37733 -      ac_obj=$1
37734 -      IFS=$old_IFS
37735 -
37736 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
37737 -
37738 -      case $ac_src in
37739 -        *.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" ;;
37740 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37741 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37742 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
37743 -      esac
37744 -
37745 -    cat >>Makefile.objects<<EOF
37746 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
37747 -       $ac_comp
37748 -EOF
37749 -  done
37750 +fi
37751
37752
37753 -        EXT_STATIC="$EXT_STATIC pdo_sqlite"
37754 -        ;;
37755 -      *)
37756
37757 +  save_old_LDFLAGS=$LDFLAGS
37758 +  ac_stuff="
37759 +    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
37760 +  "
37761
37762 -  case ext/pdo_sqlite in
37763 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
37764 -  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
37765 -  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
37766 -  esac
37767 +  save_ext_shared=$ext_shared
37768 +  ext_shared=yes
37769
37770 +  for ac_i in $ac_stuff; do
37771 +    case $ac_i in
37772 +    -pthread)
37773 +      if test "$ext_shared" = "yes"; then
37774 +        LDFLAGS="$LDFLAGS -pthread"
37775 +      else
37776 +
37777
37778 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
37779 +
37780 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
37781 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37782 +    eval "EXTRA_LDFLAGS$unique=set"
37783 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
37784 +  fi
37785
37786 -  b_c_pre=$php_c_pre
37787 -  b_cxx_pre=$php_cxx_pre
37788 -  b_c_meta=$php_c_meta
37789 -  b_cxx_meta=$php_cxx_meta
37790 -  b_c_post=$php_c_post
37791 -  b_cxx_post=$php_cxx_post
37792 -  b_lo=$php_lo
37793 -
37794 -
37795 -  old_IFS=$IFS
37796 -  for ac_src in $php_pdo_sqlite_sources_core; do
37797 +      fi
37798 +    ;;
37799 +    -l*)
37800 +      ac_ii=`echo $ac_i|cut -c 3-`
37801 +
37802
37803 -      IFS=.
37804 -      set $ac_src
37805 -      ac_obj=$1
37806 -      IFS=$old_IFS
37807 +  case $ac_ii in
37808 +  c|c_r|pthread*) ;;
37809 +  *)
37810 +    if test "$ext_shared" = "yes"; then
37811 +        LDFLAGS="$LDFLAGS -l$ac_ii"
37812 +    else
37813
37814 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
37815 +
37816 +  case $ac_ii in
37817 +  c|c_r|pthread*) ;;
37818 +  *)
37819 +      LIBS="$LIBS -l$ac_ii"
37820 +   ;;
37821 +  esac
37822
37823 -      case $ac_src in
37824 -        *.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" ;;
37825 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37826 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37827 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
37828 -      esac
37829
37830 -    cat >>Makefile.objects<<EOF
37831 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
37832 -       $ac_comp
37833 -EOF
37834 -  done
37835 +    fi
37836 +   ;;
37837 +  esac
37838
37839
37840 -        ;;
37841 -    esac
37842 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
37843 +    ;;
37844 +    -L*)
37845 +      ac_ii=`echo $ac_i|cut -c 3-`
37846 +
37847 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
37848 +
37849 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
37850 +    ai_p=$ac_ii
37851 +  else
37852 +
37853 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
37854 +
37855 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
37856 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
37857    fi
37858 +
37859 +
37860 +      if test "$ext_shared" = "yes"; then
37861 +        LDFLAGS="-L$ai_p $LDFLAGS"
37862 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
37863 +      else
37864 +
37865
37866
37867 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
37868 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37869
37870 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
37871 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
37872 +    eval "LIBPATH$unique=set"
37873 +
37874 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
37875 +    LDFLAGS="$LDFLAGS -L$ai_p"
37876 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
37877 +
37878 +  fi
37879
37880
37881 -  if test "$ext_builddir" = "."; then
37882 -    PHP_PECL_EXTENSION=pdo_sqlite
37883 +      fi
37884
37885 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
37886 -
37887    fi
37888
37889 -  else
37890 -      # use bundled libs
37891 -      if test "$enable_maintainer_zts" = "yes"; then
37892 -        threadsafe_flags="-DSQLITE_THREADSAFE=1"
37893 -      else
37894 -        threadsafe_flags="-DSQLITE_THREADSAFE=0"
37895 -      fi
37896 +    ;;
37897 +    esac
37898 +  done
37899
37900 -      other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
37901 +  echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
37902 +echo "configure:72960: checking for OCILobIsTemporary in -lclntsh" >&5
37903 +ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
37904 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37905 +  echo $ac_n "(cached) $ac_c" 1>&6
37906 +else
37907 +  ac_save_LIBS="$LIBS"
37908 +LIBS="-lclntsh  $LIBS"
37909 +cat > conftest.$ac_ext <<EOF
37910 +#line 72968 "configure"
37911 +#include "confdefs.h"
37912 +/* Override any gcc2 internal prototype to avoid an error.  */
37913 +/* We use char because int might match the return type of a gcc2
37914 +    builtin and then its argument prototype would still apply.  */
37915 +char OCILobIsTemporary();
37916
37917 -               if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then
37918 -        other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
37919 -      fi
37920 +int main() {
37921 +OCILobIsTemporary()
37922 +; return 0; }
37923 +EOF
37924 +if { (eval echo configure:72979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
37925 +  rm -rf conftest*
37926 +  eval "ac_cv_lib_$ac_lib_var=yes"
37927 +else
37928 +  echo "configure: failed program was:" >&5
37929 +  cat conftest.$ac_ext >&5
37930 +  rm -rf conftest*
37931 +  eval "ac_cv_lib_$ac_lib_var=no"
37932 +fi
37933 +rm -f conftest*
37934 +LIBS="$ac_save_LIBS"
37935
37936 -      if test "$PHP_SQLITE3" != "yes"; then
37937 -
37938 +fi
37939 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
37940 +  echo "$ac_t""yes" 1>&6
37941
37942 -  case ext/sqlite3 in
37943 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
37944 -  /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
37945 -  *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
37946 -  esac
37947 +    LDFLAGS=$save_old_LDFLAGS
37948 +    ext_shared=$save_ext_shared
37949 +
37950 +    cat >> confdefs.h <<\EOF
37951 +#define HAVE_OCILOBISTEMPORARY 1
37952 +EOF
37953 +
37954
37955
37956 +else
37957 +  echo "$ac_t""no" 1>&6
37958
37959 -  b_c_pre=$php_c_pre
37960 -  b_cxx_pre=$php_cxx_pre
37961 -  b_c_meta=$php_c_meta
37962 -  b_cxx_meta=$php_cxx_meta
37963 -  b_c_post=$php_c_post
37964 -  b_cxx_post=$php_cxx_post
37965 -  b_lo=$php_lo
37966 -
37967 -
37968 -  old_IFS=$IFS
37969 -  for ac_src in libsqlite/sqlite3.c; do
37970 -
37971 -      IFS=.
37972 -      set $ac_src
37973 -      ac_obj=$1
37974 -      IFS=$old_IFS
37975 -
37976 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
37977 -
37978 -      case $ac_src in
37979 -        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37980 -        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37981 -        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37982 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
37983 -      esac
37984 -
37985 -    cat >>Makefile.objects<<EOF
37986 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
37987 -       $ac_comp
37988 -EOF
37989 -  done
37990 -
37991 -
37992 -      fi
37993 -
37994 -
37995 -  ext_builddir=ext/pdo_sqlite
37996 -  ext_srcdir=$abs_srcdir/ext/pdo_sqlite
37997 -
37998 -  ac_extra=`echo "-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
37999 -
38000 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
38001 -    PHP_PDO_SQLITE_SHARED=no
38002 -
38003 -
38004 -  case ext/pdo_sqlite in
38005 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
38006 -  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38007 -  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38008 -  esac
38009 -
38010 -
38011 -
38012 -  b_c_pre=$php_c_pre
38013 -  b_cxx_pre=$php_cxx_pre
38014 -  b_c_meta=$php_c_meta
38015 -  b_cxx_meta=$php_cxx_meta
38016 -  b_c_post=$php_c_post
38017 -  b_cxx_post=$php_cxx_post
38018 -  b_lo=$php_lo
38019 -
38020 -
38021 -  old_IFS=$IFS
38022 -  for ac_src in $php_pdo_sqlite_sources_core; do
38023 -
38024 -      IFS=.
38025 -      set $ac_src
38026 -      ac_obj=$1
38027 -      IFS=$old_IFS
38028 -
38029 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
38030 -
38031 -      case $ac_src in
38032 -        *.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" ;;
38033 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
38034 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
38035 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
38036 -      esac
38037 -
38038 -    cat >>Makefile.objects<<EOF
38039 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
38040 -       $ac_comp
38041 -EOF
38042 -  done
38043 -
38044 -
38045 -    EXT_STATIC="$EXT_STATIC pdo_sqlite"
38046 -    if test "$ext_shared" != "nocli"; then
38047 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
38048 -    fi
38049 -  else
38050 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
38051 -      PHP_PDO_SQLITE_SHARED=yes
38052 -
38053 -  case ext/pdo_sqlite in
38054 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
38055 -  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38056 -  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38057 -  esac
38058 -
38059 -
38060 -
38061 -  b_c_pre=$shared_c_pre
38062 -  b_cxx_pre=$shared_cxx_pre
38063 -  b_c_meta=$shared_c_meta
38064 -  b_cxx_meta=$shared_cxx_meta
38065 -  b_c_post=$shared_c_post
38066 -  b_cxx_post=$shared_cxx_post
38067 -  b_lo=$shared_lo
38068 -
38069 -
38070 -  old_IFS=$IFS
38071 -  for ac_src in $php_pdo_sqlite_sources_core; do
38072 -
38073 -      IFS=.
38074 -      set $ac_src
38075 -      ac_obj=$1
38076 -      IFS=$old_IFS
38077 -
38078 -      shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo"
38079 -
38080 -      case $ac_src in
38081 -        *.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" ;;
38082 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
38083 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
38084 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
38085 -      esac
38086 -
38087 -    cat >>Makefile.objects<<EOF
38088 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
38089 -       $ac_comp
38090 -EOF
38091 -  done
38092 -
38093 -      case $host_alias in
38094 -        *netware*)
38095 -
38096 -  install_modules="install-modules"
38097 -
38098 -  case $host_alias in
38099 -    *aix*)
38100 -      suffix=so
38101 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_sqlite.so '$ext_builddir'/phppdo_sqlite.so'
38102 -      ;;
38103 -    *netware*)
38104 -      suffix=nlm
38105 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
38106 -      ;;
38107 -    *)
38108 -      suffix=la
38109 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD)'
38110 -      ;;
38111 -  esac
38112 -
38113 -  if test "x" = "xyes"; then
38114 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_sqlite.$suffix"
38115 -  else
38116 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
38117 -  fi
38118 -
38119 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
38120 -
38121 -  cat >>Makefile.objects<<EOF
38122 -\$(phplibdir)/phppdo_sqlite.$suffix: $ext_builddir/phppdo_sqlite.$suffix
38123 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_sqlite.$suffix \$(phplibdir)
38124 -
38125 -$ext_builddir/phppdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PHPPDO_SQLITE_SHARED_DEPENDENCIES)
38126 -       $link_cmd
38127 -
38128 -EOF
38129 -
38130 -          ;;
38131 -        *)
38132 -
38133 -  install_modules="install-modules"
38134 -
38135 -  case $host_alias in
38136 -    *aix*)
38137 -      suffix=so
38138 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_sqlite.so '$ext_builddir'/pdo_sqlite.so'
38139 -      ;;
38140 -    *netware*)
38141 -      suffix=nlm
38142 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
38143 -      ;;
38144 -    *)
38145 -      suffix=la
38146 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD)'
38147 -      ;;
38148 -  esac
38149 -
38150 -  if test "x" = "xyes"; then
38151 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_sqlite.$suffix"
38152 -  else
38153 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
38154 -  fi
38155 -
38156 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
38157 -
38158 -  cat >>Makefile.objects<<EOF
38159 -\$(phplibdir)/pdo_sqlite.$suffix: $ext_builddir/pdo_sqlite.$suffix
38160 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_sqlite.$suffix \$(phplibdir)
38161 -
38162 -$ext_builddir/pdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PDO_SQLITE_SHARED_DEPENDENCIES)
38163 -       $link_cmd
38164 -
38165 -EOF
38166 -
38167 -          ;;
38168 -      esac
38169 -      cat >> confdefs.h <<EOF
38170 -#define COMPILE_DL_PDO_SQLITE 1
38171 -EOF
38172 -
38173 -    fi
38174 -  fi
38175 -
38176 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
38177 -    PHP_PDO_SQLITE_SHARED=no
38178 -    case "$PHP_SAPI" in
38179 -      cgi|embed)
38180 -
38181 -
38182 -  case ext/pdo_sqlite in
38183 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
38184 -  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38185 -  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38186 -  esac
38187 -
38188 -
38189 -
38190 -  b_c_pre=$php_c_pre
38191 -  b_cxx_pre=$php_cxx_pre
38192 -  b_c_meta=$php_c_meta
38193 -  b_cxx_meta=$php_cxx_meta
38194 -  b_c_post=$php_c_post
38195 -  b_cxx_post=$php_cxx_post
38196 -  b_lo=$php_lo
38197 -
38198 -
38199 -  old_IFS=$IFS
38200 -  for ac_src in $php_pdo_sqlite_sources_core; do
38201 -
38202 -      IFS=.
38203 -      set $ac_src
38204 -      ac_obj=$1
38205 -      IFS=$old_IFS
38206 -
38207 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
38208 -
38209 -      case $ac_src in
38210 -        *.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" ;;
38211 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
38212 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
38213 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
38214 -      esac
38215 -
38216 -    cat >>Makefile.objects<<EOF
38217 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
38218 -       $ac_comp
38219 -EOF
38220 -  done
38221 -
38222 -
38223 -        EXT_STATIC="$EXT_STATIC pdo_sqlite"
38224 -        ;;
38225 -      *)
38226 -
38227 -
38228 -  case ext/pdo_sqlite in
38229 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
38230 -  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38231 -  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38232 -  esac
38233 -
38234 -
38235 -
38236 -  b_c_pre=$php_c_pre
38237 -  b_cxx_pre=$php_cxx_pre
38238 -  b_c_meta=$php_c_meta
38239 -  b_cxx_meta=$php_cxx_meta
38240 -  b_c_post=$php_c_post
38241 -  b_cxx_post=$php_cxx_post
38242 -  b_lo=$php_lo
38243 -
38244 -
38245 -  old_IFS=$IFS
38246 -  for ac_src in $php_pdo_sqlite_sources_core; do
38247 -
38248 -      IFS=.
38249 -      set $ac_src
38250 -      ac_obj=$1
38251 -      IFS=$old_IFS
38252 -
38253 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
38254 -
38255 -      case $ac_src in
38256 -        *.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" ;;
38257 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
38258 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
38259 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
38260 -      esac
38261 -
38262 -    cat >>Makefile.objects<<EOF
38263 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
38264 -       $ac_comp
38265 -EOF
38266 -  done
38267 -
38268 -
38269 -        ;;
38270 -    esac
38271 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
38272 -  fi
38273 -
38274 -
38275 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
38276 -
38277 -
38278 -
38279 -  if test "$ext_builddir" = "."; then
38280 -    PHP_PECL_EXTENSION=pdo_sqlite
38281 -
38282 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
38283 -
38284 -  fi
38285 -
38286 -
38287 -
38288 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD"
38289 -
38290 -
38291 -  am_i_shared=$PHP_PDO_SQLITE_SHARED
38292 -  is_it_shared=$PHP_SQLITE3_SHARED
38293 -  is_it_enabled=$PHP_SQLITE3
38294 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
38295 -    { echo "configure: error:
38296 -You've configured extension pdo_sqlite to build statically, but it
38297 -depends on extension sqlite3, which you've configured to build shared.
38298 -You either need to build pdo_sqlite shared or build sqlite3 statically for the
38299 -build to be successful.
38300 -" 1>&2; exit 1; }
38301 -  fi
38302 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
38303 -    { echo "configure: error:
38304 -You've configured extension pdo_sqlite, which depends on extension sqlite3,
38305 -but you've either not enabled sqlite3, or have disabled it.
38306 -" 1>&2; exit 1; }
38307 -  fi
38308 -
38309 -
38310 -  if test "$abs_srcdir/ext/sqlite3/libsqlite" != "/usr/include"; then
38311 -
38312 -  if test -z "$abs_srcdir/ext/sqlite3/libsqlite" || echo "$abs_srcdir/ext/sqlite3/libsqlite" | grep '^/' >/dev/null ; then
38313 -    ai_p=$abs_srcdir/ext/sqlite3/libsqlite
38314 -  else
38315 -
38316 -    ep_dir="`echo $abs_srcdir/ext/sqlite3/libsqlite|$SED 's%/*[^/][^/]*/*$%%'`"
38317 -
38318 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
38319 -    ai_p="$ep_realdir/`basename \"$abs_srcdir/ext/sqlite3/libsqlite\"`"
38320 -  fi
38321 -
38322 -
38323 -
38324 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
38325 -
38326 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
38327 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
38328 -    eval "INCLUDEPATH$unique=set"
38329 -
38330 -      if test ""; then
38331 -        INCLUDES="-I$ai_p $INCLUDES"
38332 -      else
38333 -        INCLUDES="$INCLUDES -I$ai_p"
38334 -      fi
38335 -
38336 -  fi
38337 -
38338 -  fi
38339 -
38340 -
38341 -      for ac_func in usleep nanosleep
38342 -do
38343 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
38344 -echo "configure:75104: checking for $ac_func" >&5
38345 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
38346 -  echo $ac_n "(cached) $ac_c" 1>&6
38347 -else
38348 -  cat > conftest.$ac_ext <<EOF
38349 -#line 75109 "configure"
38350 -#include "confdefs.h"
38351 -/* System header to define __stub macros and hopefully few prototypes,
38352 -    which can conflict with char $ac_func(); below.  */
38353 -#include <assert.h>
38354 -/* Override any gcc2 internal prototype to avoid an error.  */
38355 -/* We use char because int might match the return type of a gcc2
38356 -    builtin and then its argument prototype would still apply.  */
38357 -char $ac_func();
38358 -
38359 -int main() {
38360 -
38361 -/* The GNU C library defines this for functions which it implements
38362 -    to always fail with ENOSYS.  Some functions are actually named
38363 -    something starting with __ and the normal name is an alias.  */
38364 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
38365 -choke me
38366 -#else
38367 -$ac_func();
38368 -#endif
38369 -
38370 -; return 0; }
38371 -EOF
38372 -if { (eval echo configure:75132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38373 -  rm -rf conftest*
38374 -  eval "ac_cv_func_$ac_func=yes"
38375 -else
38376 -  echo "configure: failed program was:" >&5
38377 -  cat conftest.$ac_ext >&5
38378 -  rm -rf conftest*
38379 -  eval "ac_cv_func_$ac_func=no"
38380 -fi
38381 -rm -f conftest*
38382 -fi
38383 -
38384 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
38385 -  echo "$ac_t""yes" 1>&6
38386 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
38387 -  cat >> confdefs.h <<EOF
38388 -#define $ac_tr_func 1
38389 -EOF
38390 -
38391 -else
38392 -  echo "$ac_t""no" 1>&6
38393 -fi
38394 -done
38395 -
38396 -      for ac_hdr in time.h
38397 -do
38398 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
38399 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
38400 -echo "configure:75160: checking for $ac_hdr" >&5
38401 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
38402 -  echo $ac_n "(cached) $ac_c" 1>&6
38403 -else
38404 -  cat > conftest.$ac_ext <<EOF
38405 -#line 75165 "configure"
38406 -#include "confdefs.h"
38407 -#include <$ac_hdr>
38408 -EOF
38409 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
38410 -{ (eval echo configure:75170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
38411 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
38412 -if test -z "$ac_err"; then
38413 -  rm -rf conftest*
38414 -  eval "ac_cv_header_$ac_safe=yes"
38415 -else
38416 -  echo "$ac_err" >&5
38417 -  echo "configure: failed program was:" >&5
38418 -  cat conftest.$ac_ext >&5
38419 -  rm -rf conftest*
38420 -  eval "ac_cv_header_$ac_safe=no"
38421 -fi
38422 -rm -f conftest*
38423 -fi
38424 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
38425 -  echo "$ac_t""yes" 1>&6
38426 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
38427 -  cat >> confdefs.h <<EOF
38428 -#define $ac_tr_hdr 1
38429 -EOF
38430 -
38431 -else
38432 -  echo "$ac_t""no" 1>&6
38433 -fi
38434 -done
38435 -
38436 -  fi
38437 -
38438 -
38439 -  save_old_LDFLAGS=$LDFLAGS
38440 -  ac_stuff=""
38441 +    LDFLAGS=$save_old_LDFLAGS
38442 +    ext_shared=$save_ext_shared
38443 +    unset ac_cv_lib_clntsh_OCILobIsTemporary
38444 +
38445 +
38446 +  save_old_LDFLAGS=$LDFLAGS
38447 +  ac_stuff="
38448 +      -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
38449 +    "
38450
38451    save_ext_shared=$ext_shared
38452    ext_shared=yes
38453 @@ -75289,27 +73104,27 @@ done
38454      esac
38455    done
38456
38457 -  echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
38458 -echo "configure:75294: checking for fdatasync in -lrt" >&5
38459 -ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'`
38460 +  echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
38461 +echo "configure:73109: checking for OCILobIsTemporary in -locijdbc8" >&5
38462 +ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
38463  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
38464    echo $ac_n "(cached) $ac_c" 1>&6
38465  else
38466    ac_save_LIBS="$LIBS"
38467 -LIBS="-lrt  $LIBS"
38468 +LIBS="-locijdbc8  $LIBS"
38469  cat > conftest.$ac_ext <<EOF
38470 -#line 75302 "configure"
38471 +#line 73117 "configure"
38472  #include "confdefs.h"
38473  /* Override any gcc2 internal prototype to avoid an error.  */
38474  /* We use char because int might match the return type of a gcc2
38475      builtin and then its argument prototype would still apply.  */
38476 -char fdatasync();
38477 +char OCILobIsTemporary();
38478
38479  int main() {
38480 -fdatasync()
38481 +OCILobIsTemporary()
38482  ; return 0; }
38483  EOF
38484 -if { (eval echo configure:75313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38485 +if { (eval echo configure:73128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38486    rm -rf conftest*
38487    eval "ac_cv_lib_$ac_lib_var=yes"
38488  else
38489 @@ -75328,19 +73143,20 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
38490      LDFLAGS=$save_old_LDFLAGS
38491      ext_shared=$save_ext_shared
38492
38493 +
38494
38495 -  case rt in
38496 +  case ocijdbc8 in
38497    c|c_r|pthread*) ;;
38498    *)
38499      if test "$ext_shared" = "yes"; then
38500 -        PDO_SQLITE_SHARED_LIBADD="-lrt $PDO_SQLITE_SHARED_LIBADD"
38501 +        PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8"
38502      else
38503
38504
38505 -  case rt in
38506 +  case ocijdbc8 in
38507    c|c_r|pthread*) ;;
38508    *)
38509 -      LIBS="-lrt $LIBS"
38510 +      LIBS="$LIBS -locijdbc8"
38511     ;;
38512    esac
38513
38514 @@ -75350,188 +73166,145 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
38515    esac
38516
38517
38518 +      cat >> confdefs.h <<\EOF
38519 +#define HAVE_OCILOBISTEMPORARY 1
38520 +EOF
38521 +
38522 +
38523
38524  else
38525    echo "$ac_t""no" 1>&6
38526
38527      LDFLAGS=$save_old_LDFLAGS
38528      ext_shared=$save_ext_shared
38529 -    unset ac_cv_lib_rt_fdatasync
38530 +    unset ac_cv_lib_ocijdbc8_OCILobIsTemporary
38531
38532
38533  fi
38534
38535 -
38536 -
38537 -
38538 -  am_i_shared=$PHP_PDO_SQLITE_SHARED
38539 -  is_it_shared=$PHP_PDO_SHARED
38540 -  is_it_enabled=$PHP_PDO
38541 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
38542 -    { echo "configure: error:
38543 -You've configured extension pdo_sqlite to build statically, but it
38544 -depends on extension pdo, which you've configured to build shared.
38545 -You either need to build pdo_sqlite shared or build pdo statically for the
38546 -build to be successful.
38547 -" 1>&2; exit 1; }
38548 -  fi
38549 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
38550 -    { echo "configure: error:
38551 -You've configured extension pdo_sqlite, which depends on extension pdo,
38552 -but you've either not enabled pdo, or have disabled it.
38553 -" 1>&2; exit 1; }
38554 -  fi
38555
38556
38557  fi
38558
38559
38560 -
38561 -php_with_pgsql=no
38562 -
38563 -echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
38564 -echo "configure:75394: checking for PostgreSQL support" >&5
38565 -# Check whether --with-pgsql or --without-pgsql was given.
38566 -if test "${with_pgsql+set}" = set; then
38567 -  withval="$with_pgsql"
38568 -  PHP_PGSQL=$withval
38569 -else
38570 +
38571 +  save_old_LDFLAGS=$LDFLAGS
38572 +  ac_stuff="
38573 +    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
38574 +  "
38575
38576 -  PHP_PGSQL=no
38577 -  test "$PHP_ENABLE_ALL" && PHP_PGSQL=$PHP_ENABLE_ALL
38578 -
38579 -fi
38580 -
38581 -
38582 -
38583 -ext_output="yes, shared"
38584 -ext_shared=yes
38585 -case $PHP_PGSQL in
38586 -shared,*)
38587 -  PHP_PGSQL=`echo "$PHP_PGSQL"|$SED 's/^shared,//'`
38588 -  ;;
38589 -shared)
38590 -  PHP_PGSQL=yes
38591 -  ;;
38592 -no)
38593 -  ext_output=no
38594 -  ext_shared=no
38595 -  ;;
38596 -*)
38597 -  ext_output=yes
38598 -  ext_shared=no
38599 -  ;;
38600 -esac
38601 -
38602 -
38603 +  save_ext_shared=$ext_shared
38604 +  ext_shared=yes
38605 +
38606 +  for ac_i in $ac_stuff; do
38607 +    case $ac_i in
38608 +    -pthread)
38609 +      if test "$ext_shared" = "yes"; then
38610 +        LDFLAGS="$LDFLAGS -pthread"
38611 +      else
38612 +
38613 +
38614 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
38615 +
38616 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
38617 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
38618 +    eval "EXTRA_LDFLAGS$unique=set"
38619 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
38620 +  fi
38621
38622 -echo "$ac_t""$ext_output" 1>&6
38623 +      fi
38624 +    ;;
38625 +    -l*)
38626 +      ac_ii=`echo $ac_i|cut -c 3-`
38627 +
38628 +
38629 +  case $ac_ii in
38630 +  c|c_r|pthread*) ;;
38631 +  *)
38632 +    if test "$ext_shared" = "yes"; then
38633 +        LDFLAGS="$LDFLAGS -l$ac_ii"
38634 +    else
38635 +
38636 +
38637 +  case $ac_ii in
38638 +  c|c_r|pthread*) ;;
38639 +  *)
38640 +      LIBS="$LIBS -l$ac_ii"
38641 +   ;;
38642 +  esac
38643
38644
38645 +    fi
38646 +   ;;
38647 +  esac
38648
38649
38650 -if test "$PHP_PGSQL" != "no"; then
38651 -
38652 -  if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
38653 -    PGSQL_INCLUDE=$PGSQL_INCLUDE
38654 +    ;;
38655 +    -L*)
38656 +      ac_ii=`echo $ac_i|cut -c 3-`
38657 +
38658 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
38659 +
38660 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
38661 +    ai_p=$ac_ii
38662    else
38663
38664 -    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
38665 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
38666
38667      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
38668 -    PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
38669 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
38670    fi
38671
38672 -
38673 -  echo $ac_n "checking for pg_config""... $ac_c" 1>&6
38674 -echo "configure:75448: checking for pg_config" >&5
38675 -  for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
38676 -       if test -x $i/pg_config; then
38677 -      PG_CONFIG="$i/pg_config"
38678 -      break;
38679 -    fi
38680 -  done
38681 -
38682 -  if test -n "$PG_CONFIG"; then
38683 -    echo "$ac_t""$PG_CONFIG" 1>&6
38684 -    PGSQL_INCLUDE=`$PG_CONFIG --includedir`
38685 -    PGSQL_LIBDIR=`$PG_CONFIG --libdir`
38686 -    if test -r "$PGSQL_INCLUDE/pg_config.h"; then
38687 -      cat >> confdefs.h <<\EOF
38688 -#define HAVE_PG_CONFIG_H 1
38689 -EOF
38690 -
38691 -    fi
38692 -  else
38693 -    echo "$ac_t""not found" 1>&6
38694 -    if test "$PHP_PGSQL" = "yes"; then
38695 -      PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
38696 -    else
38697 -      PGSQL_SEARCH_PATHS=$PHP_PGSQL
38698 -    fi
38699 +
38700 +      if test "$ext_shared" = "yes"; then
38701 +        LDFLAGS="-L$ai_p $LDFLAGS"
38702 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
38703 +      else
38704 +
38705 +
38706 +
38707 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
38708 +
38709 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
38710 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
38711 +    eval "LIBPATH$unique=set"
38712 +
38713 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
38714 +    LDFLAGS="$LDFLAGS -L$ai_p"
38715 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
38716
38717 -    for i in $PGSQL_SEARCH_PATHS; do
38718 -      for j in include include/pgsql include/postgres include/postgresql ""; do
38719 -        if test -r "$i/$j/libpq-fe.h"; then
38720 -          PGSQL_INC_BASE=$i
38721 -          PGSQL_INCLUDE=$i/$j
38722 -          if test -r "$i/$j/pg_config.h"; then
38723 -            cat >> confdefs.h <<\EOF
38724 -#define HAVE_PG_CONFIG_H 1
38725 -EOF
38726 -
38727 -          fi
38728 -        fi
38729 -      done
38730 -
38731 -      for j in lib $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
38732 -        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
38733 -          PGSQL_LIBDIR=$i/$j
38734 -        fi
38735 -      done
38736 -    done
38737 -  fi
38738 -
38739 -  if test -z "$PGSQL_INCLUDE"; then
38740 -    { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
38741    fi
38742
38743 -  if test -z "$PGSQL_LIBDIR"; then
38744 -    { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
38745 -  fi
38746
38747 -  if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
38748 -    { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
38749 +      fi
38750 +
38751    fi
38752
38753 -  cat >> confdefs.h <<\EOF
38754 -#define HAVE_PGSQL 1
38755 -EOF
38756 +    ;;
38757 +    esac
38758 +  done
38759
38760 -  old_LIBS=$LIBS
38761 -  old_LDFLAGS=$LDFLAGS
38762 -  LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
38763 -  echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
38764 -echo "configure:75516: checking for PQescapeString in -lpq" >&5
38765 -ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'`
38766 +  echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
38767 +echo "configure:73289: checking for OCICollAssign in -lclntsh" >&5
38768 +ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'`
38769  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
38770    echo $ac_n "(cached) $ac_c" 1>&6
38771  else
38772    ac_save_LIBS="$LIBS"
38773 -LIBS="-lpq  $LIBS"
38774 +LIBS="-lclntsh  $LIBS"
38775  cat > conftest.$ac_ext <<EOF
38776 -#line 75524 "configure"
38777 +#line 73297 "configure"
38778  #include "confdefs.h"
38779  /* Override any gcc2 internal prototype to avoid an error.  */
38780  /* We use char because int might match the return type of a gcc2
38781      builtin and then its argument prototype would still apply.  */
38782 -char PQescapeString();
38783 +char OCICollAssign();
38784
38785  int main() {
38786 -PQescapeString()
38787 +OCICollAssign()
38788  ; return 0; }
38789  EOF
38790 -if { (eval echo configure:75535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38791 +if { (eval echo configure:73308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38792    rm -rf conftest*
38793    eval "ac_cv_lib_$ac_lib_var=yes"
38794  else
38795 @@ -75546,164 +73319,145 @@ LIBS="$ac_save_LIBS"
38796  fi
38797  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
38798    echo "$ac_t""yes" 1>&6
38799 -  cat >> confdefs.h <<\EOF
38800 -#define HAVE_PQESCAPE 1
38801 +
38802 +    LDFLAGS=$save_old_LDFLAGS
38803 +    ext_shared=$save_ext_shared
38804 +
38805 +    cat >> confdefs.h <<\EOF
38806 +#define HAVE_OCICOLLASSIGN 1
38807  EOF
38808
38809 +
38810 +
38811  else
38812    echo "$ac_t""no" 1>&6
38813 -fi
38814 -
38815 -  echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
38816 -echo "configure:75559: checking for PQunescapeBytea in -lpq" >&5
38817 -ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'`
38818 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
38819 -  echo $ac_n "(cached) $ac_c" 1>&6
38820 -else
38821 -  ac_save_LIBS="$LIBS"
38822 -LIBS="-lpq  $LIBS"
38823 -cat > conftest.$ac_ext <<EOF
38824 -#line 75567 "configure"
38825 -#include "confdefs.h"
38826 -/* Override any gcc2 internal prototype to avoid an error.  */
38827 -/* We use char because int might match the return type of a gcc2
38828 -    builtin and then its argument prototype would still apply.  */
38829 -char PQunescapeBytea();
38830
38831 -int main() {
38832 -PQunescapeBytea()
38833 -; return 0; }
38834 -EOF
38835 -if { (eval echo configure:75578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38836 -  rm -rf conftest*
38837 -  eval "ac_cv_lib_$ac_lib_var=yes"
38838 -else
38839 -  echo "configure: failed program was:" >&5
38840 -  cat conftest.$ac_ext >&5
38841 -  rm -rf conftest*
38842 -  eval "ac_cv_lib_$ac_lib_var=no"
38843 +    LDFLAGS=$save_old_LDFLAGS
38844 +    ext_shared=$save_ext_shared
38845 +    unset ac_cv_lib_clntsh_OCICollAssign
38846 +
38847 +
38848  fi
38849 -rm -f conftest*
38850 -LIBS="$ac_save_LIBS"
38851
38852 -fi
38853 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
38854 -  echo "$ac_t""yes" 1>&6
38855 -  cat >> confdefs.h <<\EOF
38856 -#define HAVE_PQUNESCAPEBYTEA 1
38857 -EOF
38858
38859 -else
38860 -  echo "$ac_t""no" 1>&6
38861 -fi
38862 +
38863 +  save_old_LDFLAGS=$LDFLAGS
38864 +  ac_stuff="
38865 +    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
38866 +  "
38867 +
38868 +  save_ext_shared=$ext_shared
38869 +  ext_shared=yes
38870 +
38871 +  for ac_i in $ac_stuff; do
38872 +    case $ac_i in
38873 +    -pthread)
38874 +      if test "$ext_shared" = "yes"; then
38875 +        LDFLAGS="$LDFLAGS -pthread"
38876 +      else
38877 +
38878 +
38879 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
38880 +
38881 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
38882 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
38883 +    eval "EXTRA_LDFLAGS$unique=set"
38884 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
38885 +  fi
38886
38887 -  echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
38888 -echo "configure:75602: checking for PQsetnonblocking in -lpq" >&5
38889 -ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'`
38890 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
38891 -  echo $ac_n "(cached) $ac_c" 1>&6
38892 -else
38893 -  ac_save_LIBS="$LIBS"
38894 -LIBS="-lpq  $LIBS"
38895 -cat > conftest.$ac_ext <<EOF
38896 -#line 75610 "configure"
38897 -#include "confdefs.h"
38898 -/* Override any gcc2 internal prototype to avoid an error.  */
38899 -/* We use char because int might match the return type of a gcc2
38900 -    builtin and then its argument prototype would still apply.  */
38901 -char PQsetnonblocking();
38902 +      fi
38903 +    ;;
38904 +    -l*)
38905 +      ac_ii=`echo $ac_i|cut -c 3-`
38906 +
38907 +
38908 +  case $ac_ii in
38909 +  c|c_r|pthread*) ;;
38910 +  *)
38911 +    if test "$ext_shared" = "yes"; then
38912 +        LDFLAGS="$LDFLAGS -l$ac_ii"
38913 +    else
38914 +
38915 +
38916 +  case $ac_ii in
38917 +  c|c_r|pthread*) ;;
38918 +  *)
38919 +      LIBS="$LIBS -l$ac_ii"
38920 +   ;;
38921 +  esac
38922
38923 -int main() {
38924 -PQsetnonblocking()
38925 -; return 0; }
38926 -EOF
38927 -if { (eval echo configure:75621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38928 -  rm -rf conftest*
38929 -  eval "ac_cv_lib_$ac_lib_var=yes"
38930 -else
38931 -  echo "configure: failed program was:" >&5
38932 -  cat conftest.$ac_ext >&5
38933 -  rm -rf conftest*
38934 -  eval "ac_cv_lib_$ac_lib_var=no"
38935 -fi
38936 -rm -f conftest*
38937 -LIBS="$ac_save_LIBS"
38938
38939 -fi
38940 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
38941 -  echo "$ac_t""yes" 1>&6
38942 -  cat >> confdefs.h <<\EOF
38943 -#define HAVE_PQSETNONBLOCKING 1
38944 -EOF
38945 +    fi
38946 +   ;;
38947 +  esac
38948
38949 -else
38950 -  echo "$ac_t""no" 1>&6
38951 -fi
38952
38953 -  echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
38954 -echo "configure:75645: checking for PQcmdTuples in -lpq" >&5
38955 -ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
38956 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
38957 -  echo $ac_n "(cached) $ac_c" 1>&6
38958 -else
38959 -  ac_save_LIBS="$LIBS"
38960 -LIBS="-lpq  $LIBS"
38961 -cat > conftest.$ac_ext <<EOF
38962 -#line 75653 "configure"
38963 -#include "confdefs.h"
38964 -/* Override any gcc2 internal prototype to avoid an error.  */
38965 -/* We use char because int might match the return type of a gcc2
38966 -    builtin and then its argument prototype would still apply.  */
38967 -char PQcmdTuples();
38968 +    ;;
38969 +    -L*)
38970 +      ac_ii=`echo $ac_i|cut -c 3-`
38971 +
38972 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
38973 +
38974 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
38975 +    ai_p=$ac_ii
38976 +  else
38977 +
38978 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
38979 +
38980 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
38981 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
38982 +  fi
38983
38984 -int main() {
38985 -PQcmdTuples()
38986 -; return 0; }
38987 -EOF
38988 -if { (eval echo configure:75664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38989 -  rm -rf conftest*
38990 -  eval "ac_cv_lib_$ac_lib_var=yes"
38991 -else
38992 -  echo "configure: failed program was:" >&5
38993 -  cat conftest.$ac_ext >&5
38994 -  rm -rf conftest*
38995 -  eval "ac_cv_lib_$ac_lib_var=no"
38996 -fi
38997 -rm -f conftest*
38998 -LIBS="$ac_save_LIBS"
38999 +
39000 +      if test "$ext_shared" = "yes"; then
39001 +        LDFLAGS="-L$ai_p $LDFLAGS"
39002 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
39003 +      else
39004 +
39005 +
39006 +
39007 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
39008 +
39009 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
39010 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
39011 +    eval "LIBPATH$unique=set"
39012 +
39013 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
39014 +    LDFLAGS="$LDFLAGS -L$ai_p"
39015 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
39016 +
39017 +  fi
39018
39019 -fi
39020 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
39021 -  echo "$ac_t""yes" 1>&6
39022 -  cat >> confdefs.h <<\EOF
39023 -#define HAVE_PQCMDTUPLES 1
39024 -EOF
39025
39026 -else
39027 -  echo "$ac_t""no" 1>&6
39028 -fi
39029 +      fi
39030 +
39031 +  fi
39032
39033 -  echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
39034 -echo "configure:75688: checking for PQoidValue in -lpq" >&5
39035 -ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
39036 +    ;;
39037 +    esac
39038 +  done
39039 +
39040 +  echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
39041 +echo "configure:73442: checking for OCIStmtFetch2 in -lclntsh" >&5
39042 +ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'`
39043  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
39044    echo $ac_n "(cached) $ac_c" 1>&6
39045  else
39046    ac_save_LIBS="$LIBS"
39047 -LIBS="-lpq  $LIBS"
39048 +LIBS="-lclntsh  $LIBS"
39049  cat > conftest.$ac_ext <<EOF
39050 -#line 75696 "configure"
39051 +#line 73450 "configure"
39052  #include "confdefs.h"
39053  /* Override any gcc2 internal prototype to avoid an error.  */
39054  /* We use char because int might match the return type of a gcc2
39055      builtin and then its argument prototype would still apply.  */
39056 -char PQoidValue();
39057 +char OCIStmtFetch2();
39058
39059  int main() {
39060 -PQoidValue()
39061 +OCIStmtFetch2()
39062  ; return 0; }
39063  EOF
39064 -if { (eval echo configure:75707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
39065 +if { (eval echo configure:73461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
39066    rm -rf conftest*
39067    eval "ac_cv_lib_$ac_lib_var=yes"
39068  else
39069 @@ -75718,250 +73472,7167 @@ LIBS="$ac_save_LIBS"
39070  fi
39071  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
39072    echo "$ac_t""yes" 1>&6
39073 -  cat >> confdefs.h <<\EOF
39074 -#define HAVE_PQOIDVALUE 1
39075 +
39076 +    LDFLAGS=$save_old_LDFLAGS
39077 +    ext_shared=$save_ext_shared
39078 +
39079 +     cat >> confdefs.h <<\EOF
39080 +#define HAVE_OCISTMTFETCH2 1
39081  EOF
39082
39083 +
39084 +
39085  else
39086    echo "$ac_t""no" 1>&6
39087 -fi
39088 -
39089 -  echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
39090 -echo "configure:75731: checking for PQclientEncoding in -lpq" >&5
39091 -ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
39092 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
39093 -  echo $ac_n "(cached) $ac_c" 1>&6
39094 -else
39095 -  ac_save_LIBS="$LIBS"
39096 -LIBS="-lpq  $LIBS"
39097 -cat > conftest.$ac_ext <<EOF
39098 -#line 75739 "configure"
39099 -#include "confdefs.h"
39100 -/* Override any gcc2 internal prototype to avoid an error.  */
39101 -/* We use char because int might match the return type of a gcc2
39102 -    builtin and then its argument prototype would still apply.  */
39103 -char PQclientEncoding();
39104
39105 -int main() {
39106 -PQclientEncoding()
39107 -; return 0; }
39108 -EOF
39109 -if { (eval echo configure:75750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
39110 -  rm -rf conftest*
39111 -  eval "ac_cv_lib_$ac_lib_var=yes"
39112 -else
39113 -  echo "configure: failed program was:" >&5
39114 -  cat conftest.$ac_ext >&5
39115 -  rm -rf conftest*
39116 -  eval "ac_cv_lib_$ac_lib_var=no"
39117 +    LDFLAGS=$save_old_LDFLAGS
39118 +    ext_shared=$save_ext_shared
39119 +    unset ac_cv_lib_clntsh_OCIStmtFetch2
39120 +
39121 +
39122  fi
39123 -rm -f conftest*
39124 -LIBS="$ac_save_LIBS"
39125
39126 -fi
39127 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
39128 -  echo "$ac_t""yes" 1>&6
39129 -  cat >> confdefs.h <<\EOF
39130 -#define HAVE_PQCLIENTENCODING 1
39131 -EOF
39132
39133 +
39134 +
39135 +  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
39136 +echo "configure:73500: checking for PDO includes" >&5
39137 +if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
39138 +  echo $ac_n "(cached) $ac_c" 1>&6
39139  else
39140 -  echo "$ac_t""no" 1>&6
39141 +
39142 +    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
39143 +echo "configure:73506: checking for PDO includes" >&5
39144 +    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
39145 +      pdo_inc_path=$abs_srcdir/ext
39146 +    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
39147 +      pdo_inc_path=$abs_srcdir/ext
39148 +    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
39149 +      pdo_inc_path=$prefix/include/php/ext
39150 +    fi
39151 +
39152  fi
39153
39154 -  echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
39155 -echo "configure:75774: checking for PQparameterStatus in -lpq" >&5
39156 -ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
39157 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
39158 -  echo $ac_n "(cached) $ac_c" 1>&6
39159 -else
39160 -  ac_save_LIBS="$LIBS"
39161 -LIBS="-lpq  $LIBS"
39162 -cat > conftest.$ac_ext <<EOF
39163 -#line 75782 "configure"
39164 -#include "confdefs.h"
39165 -/* Override any gcc2 internal prototype to avoid an error.  */
39166 -/* We use char because int might match the return type of a gcc2
39167 -    builtin and then its argument prototype would still apply.  */
39168 -char PQparameterStatus();
39169 +echo "$ac_t""$pdo_inc_path" 1>&6
39170 +  if test -n "$pdo_inc_path"; then
39171 +:
39172 +  else
39173 +{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
39174 +  fi
39175
39176 -int main() {
39177 -PQparameterStatus()
39178 -; return 0; }
39179 -EOF
39180 -if { (eval echo configure:75793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
39181 -  rm -rf conftest*
39182 -  eval "ac_cv_lib_$ac_lib_var=yes"
39183 -else
39184 -  echo "configure: failed program was:" >&5
39185 -  cat conftest.$ac_ext >&5
39186 -  rm -rf conftest*
39187 -  eval "ac_cv_lib_$ac_lib_var=no"
39188 -fi
39189 -rm -f conftest*
39190 -LIBS="$ac_save_LIBS"
39191 +
39192
39193 -fi
39194 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
39195 -  echo "$ac_t""yes" 1>&6
39196 -  cat >> confdefs.h <<\EOF
39197 -#define HAVE_PQPARAMETERSTATUS 1
39198 +
39199 +  ext_builddir=ext/pdo_oci
39200 +  ext_srcdir=$abs_srcdir/ext/pdo_oci
39201 +
39202 +  ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
39203 +
39204 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
39205 +    PHP_PDO_OCI_SHARED=no
39206 +
39207 +
39208 +  case ext/pdo_oci in
39209 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
39210 +  /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
39211 +  *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
39212 +  esac
39213 +
39214 +
39215 +
39216 +  b_c_pre=$php_c_pre
39217 +  b_cxx_pre=$php_cxx_pre
39218 +  b_c_meta=$php_c_meta
39219 +  b_cxx_meta=$php_cxx_meta
39220 +  b_c_post=$php_c_post
39221 +  b_cxx_post=$php_cxx_post
39222 +  b_lo=$php_lo
39223 +
39224 +
39225 +  old_IFS=$IFS
39226 +  for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
39227 +
39228 +      IFS=.
39229 +      set $ac_src
39230 +      ac_obj=$1
39231 +      IFS=$old_IFS
39232 +
39233 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
39234 +
39235 +      case $ac_src in
39236 +        *.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" ;;
39237 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39238 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39239 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
39240 +      esac
39241 +
39242 +    cat >>Makefile.objects<<EOF
39243 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
39244 +       $ac_comp
39245  EOF
39246 +  done
39247
39248 -else
39249 -  echo "$ac_t""no" 1>&6
39250 -fi
39251
39252 -  echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
39253 -echo "configure:75817: checking for PQprotocolVersion in -lpq" >&5
39254 -ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'`
39255 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
39256 -  echo $ac_n "(cached) $ac_c" 1>&6
39257 -else
39258 -  ac_save_LIBS="$LIBS"
39259 -LIBS="-lpq  $LIBS"
39260 -cat > conftest.$ac_ext <<EOF
39261 -#line 75825 "configure"
39262 -#include "confdefs.h"
39263 -/* Override any gcc2 internal prototype to avoid an error.  */
39264 -/* We use char because int might match the return type of a gcc2
39265 -    builtin and then its argument prototype would still apply.  */
39266 -char PQprotocolVersion();
39267 +    EXT_STATIC="$EXT_STATIC pdo_oci"
39268 +    if test "$ext_shared" != "nocli"; then
39269 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci"
39270 +    fi
39271 +  else
39272 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
39273 +      PHP_PDO_OCI_SHARED=yes
39274 +
39275 +  case ext/pdo_oci in
39276 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
39277 +  /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
39278 +  *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
39279 +  esac
39280 +
39281 +
39282
39283 -int main() {
39284 -PQprotocolVersion()
39285 -; return 0; }
39286 +  b_c_pre=$shared_c_pre
39287 +  b_cxx_pre=$shared_cxx_pre
39288 +  b_c_meta=$shared_c_meta
39289 +  b_cxx_meta=$shared_cxx_meta
39290 +  b_c_post=$shared_c_post
39291 +  b_cxx_post=$shared_cxx_post
39292 +  b_lo=$shared_lo
39293 +
39294 +
39295 +  old_IFS=$IFS
39296 +  for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
39297 +
39298 +      IFS=.
39299 +      set $ac_src
39300 +      ac_obj=$1
39301 +      IFS=$old_IFS
39302 +
39303 +      shared_objects_pdo_oci="$shared_objects_pdo_oci $ac_bdir$ac_obj.lo"
39304 +
39305 +      case $ac_src in
39306 +        *.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" ;;
39307 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39308 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39309 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
39310 +      esac
39311 +
39312 +    cat >>Makefile.objects<<EOF
39313 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
39314 +       $ac_comp
39315  EOF
39316 -if { (eval echo configure:75836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
39317 -  rm -rf conftest*
39318 -  eval "ac_cv_lib_$ac_lib_var=yes"
39319 -else
39320 -  echo "configure: failed program was:" >&5
39321 -  cat conftest.$ac_ext >&5
39322 -  rm -rf conftest*
39323 -  eval "ac_cv_lib_$ac_lib_var=no"
39324 -fi
39325 -rm -f conftest*
39326 -LIBS="$ac_save_LIBS"
39327 +  done
39328 +
39329 +      case $host_alias in
39330 +        *netware*)
39331 +
39332 +  install_modules="install-modules"
39333 +
39334 +  case $host_alias in
39335 +    *aix*)
39336 +      suffix=so
39337 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_oci.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PHPPDO_OCI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_oci.so '$ext_builddir'/phppdo_oci.so'
39338 +      ;;
39339 +    *netware*)
39340 +      suffix=nlm
39341 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_OCI, 3)_SHARED_LIBADD)'
39342 +      ;;
39343 +    *)
39344 +      suffix=la
39345 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PHPPDO_OCI_SHARED_LIBADD)'
39346 +      ;;
39347 +  esac
39348 +
39349 +  if test "x" = "xyes"; then
39350 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_oci.$suffix"
39351 +  else
39352 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_oci.$suffix"
39353 +  fi
39354 +
39355 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
39356 +
39357 +  cat >>Makefile.objects<<EOF
39358 +\$(phplibdir)/phppdo_oci.$suffix: $ext_builddir/phppdo_oci.$suffix
39359 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_oci.$suffix \$(phplibdir)
39360 +
39361 +$ext_builddir/phppdo_oci.$suffix: \$(shared_objects_pdo_oci) \$(PHPPDO_OCI_SHARED_DEPENDENCIES)
39362 +       $link_cmd
39363
39364 -fi
39365 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
39366 -  echo "$ac_t""yes" 1>&6
39367 -  cat >> confdefs.h <<\EOF
39368 -#define HAVE_PQPROTOCOLVERSION 1
39369  EOF
39370
39371 -else
39372 -  echo "$ac_t""no" 1>&6
39373 -fi
39374 +          ;;
39375 +        *)
39376 +
39377 +  install_modules="install-modules"
39378
39379 -  echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
39380 -echo "configure:75860: checking for PQtransactionStatus in -lpq" >&5
39381 -ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'`
39382 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
39383 -  echo $ac_n "(cached) $ac_c" 1>&6
39384 -else
39385 -  ac_save_LIBS="$LIBS"
39386 -LIBS="-lpq  $LIBS"
39387 -cat > conftest.$ac_ext <<EOF
39388 -#line 75868 "configure"
39389 -#include "confdefs.h"
39390 -/* Override any gcc2 internal prototype to avoid an error.  */
39391 -/* We use char because int might match the return type of a gcc2
39392 -    builtin and then its argument prototype would still apply.  */
39393 -char PQtransactionStatus();
39394 +  case $host_alias in
39395 +    *aix*)
39396 +      suffix=so
39397 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_oci.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PDO_OCI_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_oci.so '$ext_builddir'/pdo_oci.so'
39398 +      ;;
39399 +    *netware*)
39400 +      suffix=nlm
39401 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_OCI, 3)_SHARED_LIBADD)'
39402 +      ;;
39403 +    *)
39404 +      suffix=la
39405 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) $(PDO_OCI_SHARED_LIBADD)'
39406 +      ;;
39407 +  esac
39408 +
39409 +  if test "x" = "xyes"; then
39410 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_oci.$suffix"
39411 +  else
39412 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_oci.$suffix"
39413 +  fi
39414 +
39415 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci"
39416 +
39417 +  cat >>Makefile.objects<<EOF
39418 +\$(phplibdir)/pdo_oci.$suffix: $ext_builddir/pdo_oci.$suffix
39419 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_oci.$suffix \$(phplibdir)
39420 +
39421 +$ext_builddir/pdo_oci.$suffix: \$(shared_objects_pdo_oci) \$(PDO_OCI_SHARED_DEPENDENCIES)
39422 +       $link_cmd
39423
39424 -int main() {
39425 -PQtransactionStatus()
39426 -; return 0; }
39427  EOF
39428 -if { (eval echo configure:75879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
39429 -  rm -rf conftest*
39430 -  eval "ac_cv_lib_$ac_lib_var=yes"
39431 -else
39432 -  echo "configure: failed program was:" >&5
39433 -  cat conftest.$ac_ext >&5
39434 -  rm -rf conftest*
39435 -  eval "ac_cv_lib_$ac_lib_var=no"
39436 -fi
39437 -rm -f conftest*
39438 -LIBS="$ac_save_LIBS"
39439
39440 -fi
39441 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
39442 -  echo "$ac_t""yes" 1>&6
39443 -  cat >> confdefs.h <<\EOF
39444 -#define HAVE_PGTRANSACTIONSTATUS 1
39445 +          ;;
39446 +      esac
39447 +      cat >> confdefs.h <<EOF
39448 +#define COMPILE_DL_PDO_OCI 1
39449 +EOF
39450 +
39451 +    fi
39452 +  fi
39453 +
39454 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
39455 +    PHP_PDO_OCI_SHARED=no
39456 +    case "$PHP_SAPI" in
39457 +      cgi|embed)
39458 +
39459 +
39460 +  case ext/pdo_oci in
39461 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
39462 +  /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
39463 +  *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
39464 +  esac
39465 +
39466 +
39467 +
39468 +  b_c_pre=$php_c_pre
39469 +  b_cxx_pre=$php_cxx_pre
39470 +  b_c_meta=$php_c_meta
39471 +  b_cxx_meta=$php_cxx_meta
39472 +  b_c_post=$php_c_post
39473 +  b_cxx_post=$php_cxx_post
39474 +  b_lo=$php_lo
39475 +
39476 +
39477 +  old_IFS=$IFS
39478 +  for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
39479 +
39480 +      IFS=.
39481 +      set $ac_src
39482 +      ac_obj=$1
39483 +      IFS=$old_IFS
39484 +
39485 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
39486 +
39487 +      case $ac_src in
39488 +        *.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" ;;
39489 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39490 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39491 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
39492 +      esac
39493 +
39494 +    cat >>Makefile.objects<<EOF
39495 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
39496 +       $ac_comp
39497 +EOF
39498 +  done
39499 +
39500 +
39501 +        EXT_STATIC="$EXT_STATIC pdo_oci"
39502 +        ;;
39503 +      *)
39504 +
39505 +
39506 +  case ext/pdo_oci in
39507 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
39508 +  /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
39509 +  *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
39510 +  esac
39511 +
39512 +
39513 +
39514 +  b_c_pre=$php_c_pre
39515 +  b_cxx_pre=$php_cxx_pre
39516 +  b_c_meta=$php_c_meta
39517 +  b_cxx_meta=$php_cxx_meta
39518 +  b_c_post=$php_c_post
39519 +  b_cxx_post=$php_cxx_post
39520 +  b_lo=$php_lo
39521 +
39522 +
39523 +  old_IFS=$IFS
39524 +  for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do
39525 +
39526 +      IFS=.
39527 +      set $ac_src
39528 +      ac_obj=$1
39529 +      IFS=$old_IFS
39530 +
39531 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
39532 +
39533 +      case $ac_src in
39534 +        *.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" ;;
39535 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39536 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39537 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
39538 +      esac
39539 +
39540 +    cat >>Makefile.objects<<EOF
39541 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
39542 +       $ac_comp
39543 +EOF
39544 +  done
39545 +
39546 +
39547 +        ;;
39548 +    esac
39549 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci"
39550 +  fi
39551 +
39552 +
39553 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
39554 +
39555 +
39556 +
39557 +  if test "$ext_builddir" = "."; then
39558 +    PHP_PECL_EXTENSION=pdo_oci
39559 +
39560 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
39561 +
39562 +  fi
39563 +
39564 +
39565 +
39566 +
39567 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_SHARED_LIBADD"
39568 +
39569 +
39570 +
39571 +
39572 +
39573 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_DIR"
39574 +
39575 +
39576 +
39577 +
39578 +
39579 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_VERSION"
39580 +
39581 +
39582 +
39583 +
39584 +
39585 +
39586 +  am_i_shared=$PHP_PDO_OCI_SHARED
39587 +  is_it_shared=$PHP_PDO_SHARED
39588 +  is_it_enabled=$PHP_PDO
39589 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
39590 +    { echo "configure: error:
39591 +You've configured extension pdo_oci to build statically, but it
39592 +depends on extension pdo, which you've configured to build shared.
39593 +You either need to build pdo_oci shared or build pdo statically for the
39594 +build to be successful.
39595 +" 1>&2; exit 1; }
39596 +  fi
39597 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
39598 +    { echo "configure: error:
39599 +You've configured extension pdo_oci, which depends on extension pdo,
39600 +but you've either not enabled pdo, or have disabled it.
39601 +" 1>&2; exit 1; }
39602 +  fi
39603 +
39604 +
39605 +
39606 +  cat >> confdefs.h <<EOF
39607 +#define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION"
39608  EOF
39609
39610 -else
39611 -  echo "$ac_t""no" 1>&6
39612  fi
39613
39614 -  echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
39615 -echo "configure:75903: checking for PQexecParams in -lpq" >&5
39616 -ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'`
39617 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
39618 -  echo $ac_n "(cached) $ac_c" 1>&6
39619 +
39620 +
39621 +
39622 +
39623 +
39624 +php_with_pdo_odbc=no
39625 +
39626 +echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
39627 +echo "configure:73874: checking for ODBC v3 support for PDO" >&5
39628 +# Check whether --with-pdo-odbc or --without-pdo-odbc was given.
39629 +if test "${with_pdo_odbc+set}" = set; then
39630 +  withval="$with_pdo_odbc"
39631 +  PHP_PDO_ODBC=$withval
39632  else
39633 -  ac_save_LIBS="$LIBS"
39634 -LIBS="-lpq  $LIBS"
39635 -cat > conftest.$ac_ext <<EOF
39636 -#line 75911 "configure"
39637 -#include "confdefs.h"
39638 -/* Override any gcc2 internal prototype to avoid an error.  */
39639 -/* We use char because int might match the return type of a gcc2
39640 -    builtin and then its argument prototype would still apply.  */
39641 -char PQexecParams();
39642 +
39643 +  PHP_PDO_ODBC=no
39644 +  test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL
39645
39646 -int main() {
39647 -PQexecParams()
39648 -; return 0; }
39649 -EOF
39650 -if { (eval echo configure:75922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
39651 -  rm -rf conftest*
39652 -  eval "ac_cv_lib_$ac_lib_var=yes"
39653 +fi
39654 +
39655 +
39656 +
39657 +ext_output="yes, shared"
39658 +ext_shared=yes
39659 +case $PHP_PDO_ODBC in
39660 +shared,*)
39661 +  PHP_PDO_ODBC=`echo "$PHP_PDO_ODBC"|$SED 's/^shared,//'`
39662 +  ;;
39663 +shared)
39664 +  PHP_PDO_ODBC=yes
39665 +  ;;
39666 +no)
39667 +  ext_output=no
39668 +  ext_shared=no
39669 +  ;;
39670 +*)
39671 +  ext_output=yes
39672 +  ext_shared=no
39673 +  ;;
39674 +esac
39675 +
39676 +
39677 +
39678 +echo "$ac_t""$ext_output" 1>&6
39679 +
39680 +
39681 +
39682 +
39683 +
39684 +
39685 +
39686 +if test "$PHP_PDO_ODBC" != "no"; then
39687 +
39688 +  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
39689 +    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
39690 +  fi
39691 +
39692 +
39693 +
39694 +  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
39695 +echo "configure:73926: checking for PDO includes" >&5
39696 +if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
39697 +  echo $ac_n "(cached) $ac_c" 1>&6
39698  else
39699 -  echo "configure: failed program was:" >&5
39700 -  cat conftest.$ac_ext >&5
39701 -  rm -rf conftest*
39702 -  eval "ac_cv_lib_$ac_lib_var=no"
39703 +
39704 +    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
39705 +echo "configure:73932: checking for PDO includes" >&5
39706 +    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
39707 +      pdo_inc_path=$abs_srcdir/ext
39708 +    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
39709 +      pdo_inc_path=$abs_srcdir/ext
39710 +    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
39711 +      pdo_inc_path=$prefix/include/php/ext
39712 +    fi
39713 +
39714  fi
39715 -rm -f conftest*
39716 -LIBS="$ac_save_LIBS"
39717
39718 -fi
39719 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
39720 -  echo "$ac_t""yes" 1>&6
39721 -  cat >> confdefs.h <<\EOF
39722 -#define HAVE_PQEXECPARAMS 1
39723 -EOF
39724 +echo "$ac_t""$pdo_inc_path" 1>&6
39725 +  if test -n "$pdo_inc_path"; then
39726 +:
39727 +  else
39728 +{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
39729 +  fi
39730 +
39731 +
39732 +
39733 +  echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
39734 +echo "configure:73953: checking for selected PDO ODBC flavour" >&5
39735 +
39736 +  pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
39737 +  pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
39738 +
39739 +  if test "$pdo_odbc_dir" = "$PHP_PDO_ODBC" ; then
39740 +    pdo_odbc_dir=
39741 +  fi
39742 +
39743 +  case $pdo_odbc_flavour in
39744 +    ibm-db2)
39745 +        pdo_odbc_def_libdir=/home/db2inst1/sqllib/lib
39746 +        pdo_odbc_def_incdir=/home/db2inst1/sqllib/include
39747 +        pdo_odbc_def_lib=db2
39748 +        ;;
39749 +
39750 +    iODBC|iodbc)
39751 +        pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
39752 +        pdo_odbc_def_incdir=/usr/local/include
39753 +        pdo_odbc_def_lib=iodbc
39754 +        ;;
39755 +
39756 +    unixODBC|unixodbc)
39757 +        pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
39758 +        pdo_odbc_def_incdir=/usr/local/include
39759 +        pdo_odbc_def_lib=odbc
39760 +        ;;
39761 +
39762 +    ODBCRouter|odbcrouter)
39763 +        pdo_odbc_def_libdir=/usr/$PHP_LIBDIR
39764 +        pdo_odbc_def_incdir=/usr/include
39765 +        pdo_odbc_def_lib=odbcsdk
39766 +        ;;
39767 +
39768 +    generic)
39769 +        pdo_odbc_def_lib="`echo $PHP_PDO_ODBC | cut -d, -f3`"
39770 +        pdo_odbc_def_ldflags="`echo $PHP_PDO_ODBC | cut -d, -f4`"
39771 +        pdo_odbc_def_cflags="`echo $PHP_PDO_ODBC | cut -d, -f5`"
39772 +        pdo_odbc_flavour="generic-$pdo_odbc_def_lib"
39773 +        ;;
39774 +
39775 +      *)
39776 +        { echo "configure: error: Unknown ODBC flavour $pdo_odbc_flavour
39777 +                            include and lib dirs are looked for under 'dir'.
39778 +
39779 +                            'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
39780 +                            If ',dir' part is omitted, default for the flavour
39781 +                            you have selected will used. e.g.:
39782 +
39783 +                              --with-pdo-odbc=unixODBC
39784 +
39785 +                            will check for unixODBC under /usr/local. You may attempt
39786 +                            to use an otherwise unsupported driver using the \"generic\"
39787 +                            flavour.  The syntax for generic ODBC support is:
39788 +
39789 +                              --with-pdo-odbc=generic,dir,libname,ldflags,cflags
39790 +
39791 +                            When build as shared the extension filename is always pdo_odbc.so" 1>&2; exit 1; }
39792 +        ;;
39793 +  esac
39794 +
39795 +  if test -n "$pdo_odbc_dir"; then
39796 +    PDO_ODBC_INCDIR="$pdo_odbc_dir/include"
39797 +    PDO_ODBC_LIBDIR="$pdo_odbc_dir/$PHP_LIBDIR"
39798 +  else
39799 +    PDO_ODBC_INCDIR="$pdo_odbc_def_incdir"
39800 +    PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
39801 +  fi
39802 +
39803 +  echo "$ac_t""$pdo_odbc_flavour
39804 +          libs       $PDO_ODBC_LIBDIR,
39805 +          headers    $PDO_ODBC_INCDIR" 1>&6
39806 +
39807 +  if test ! -d "$PDO_ODBC_LIBDIR" ; then
39808 +    echo "configure: warning: library dir $PDO_ODBC_LIBDIR does not exist" 1>&2
39809 +  fi
39810 +
39811 +
39812 +  echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39813 +echo "configure:74032: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
39814 +  if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
39815 +    php_pdo_have_header=yes
39816 +    cat >> confdefs.h <<\EOF
39817 +#define HAVE_ODBC_H 1
39818 +EOF
39819 +
39820 +    echo "$ac_t""yes" 1>&6
39821 +  else
39822 +    echo "$ac_t""no" 1>&6
39823 +  fi
39824 +
39825 +
39826 +  echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39827 +echo "configure:74046: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
39828 +  if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
39829 +    php_pdo_have_header=yes
39830 +    cat >> confdefs.h <<\EOF
39831 +#define HAVE_ODBCSDK_H 1
39832 +EOF
39833 +
39834 +    echo "$ac_t""yes" 1>&6
39835 +  else
39836 +    echo "$ac_t""no" 1>&6
39837 +  fi
39838 +
39839 +
39840 +  echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39841 +echo "configure:74060: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
39842 +  if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
39843 +    php_pdo_have_header=yes
39844 +    cat >> confdefs.h <<\EOF
39845 +#define HAVE_IODBC_H 1
39846 +EOF
39847 +
39848 +    echo "$ac_t""yes" 1>&6
39849 +  else
39850 +    echo "$ac_t""no" 1>&6
39851 +  fi
39852 +
39853 +
39854 +  echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39855 +echo "configure:74074: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
39856 +  if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
39857 +    php_pdo_have_header=yes
39858 +    cat >> confdefs.h <<\EOF
39859 +#define HAVE_SQLUNIX_H 1
39860 +EOF
39861 +
39862 +    echo "$ac_t""yes" 1>&6
39863 +  else
39864 +    echo "$ac_t""no" 1>&6
39865 +  fi
39866 +
39867 +
39868 +  echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39869 +echo "configure:74088: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
39870 +  if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
39871 +    php_pdo_have_header=yes
39872 +    cat >> confdefs.h <<\EOF
39873 +#define HAVE_SQLTYPES_H 1
39874 +EOF
39875 +
39876 +    echo "$ac_t""yes" 1>&6
39877 +  else
39878 +    echo "$ac_t""no" 1>&6
39879 +  fi
39880 +
39881 +
39882 +  echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39883 +echo "configure:74102: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
39884 +  if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
39885 +    php_pdo_have_header=yes
39886 +    cat >> confdefs.h <<\EOF
39887 +#define HAVE_SQLUCODE_H 1
39888 +EOF
39889 +
39890 +    echo "$ac_t""yes" 1>&6
39891 +  else
39892 +    echo "$ac_t""no" 1>&6
39893 +  fi
39894 +
39895 +
39896 +  echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39897 +echo "configure:74116: checking for sql.h in $PDO_ODBC_INCDIR" >&5
39898 +  if test -f "$PDO_ODBC_INCDIR/sql.h"; then
39899 +    php_pdo_have_header=yes
39900 +    cat >> confdefs.h <<\EOF
39901 +#define HAVE_SQL_H 1
39902 +EOF
39903 +
39904 +    echo "$ac_t""yes" 1>&6
39905 +  else
39906 +    echo "$ac_t""no" 1>&6
39907 +  fi
39908 +
39909 +
39910 +  echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39911 +echo "configure:74130: checking for isql.h in $PDO_ODBC_INCDIR" >&5
39912 +  if test -f "$PDO_ODBC_INCDIR/isql.h"; then
39913 +    php_pdo_have_header=yes
39914 +    cat >> confdefs.h <<\EOF
39915 +#define HAVE_ISQL_H 1
39916 +EOF
39917 +
39918 +    echo "$ac_t""yes" 1>&6
39919 +  else
39920 +    echo "$ac_t""no" 1>&6
39921 +  fi
39922 +
39923 +
39924 +  echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39925 +echo "configure:74144: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
39926 +  if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
39927 +    php_pdo_have_header=yes
39928 +    cat >> confdefs.h <<\EOF
39929 +#define HAVE_SQLEXT_H 1
39930 +EOF
39931 +
39932 +    echo "$ac_t""yes" 1>&6
39933 +  else
39934 +    echo "$ac_t""no" 1>&6
39935 +  fi
39936 +
39937 +
39938 +  echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39939 +echo "configure:74158: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
39940 +  if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
39941 +    php_pdo_have_header=yes
39942 +    cat >> confdefs.h <<\EOF
39943 +#define HAVE_ISQLEXT_H 1
39944 +EOF
39945 +
39946 +    echo "$ac_t""yes" 1>&6
39947 +  else
39948 +    echo "$ac_t""no" 1>&6
39949 +  fi
39950 +
39951 +
39952 +  echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39953 +echo "configure:74172: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
39954 +  if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
39955 +    php_pdo_have_header=yes
39956 +    cat >> confdefs.h <<\EOF
39957 +#define HAVE_UDBCEXT_H 1
39958 +EOF
39959 +
39960 +    echo "$ac_t""yes" 1>&6
39961 +  else
39962 +    echo "$ac_t""no" 1>&6
39963 +  fi
39964 +
39965 +
39966 +  echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39967 +echo "configure:74186: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
39968 +  if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
39969 +    php_pdo_have_header=yes
39970 +    cat >> confdefs.h <<\EOF
39971 +#define HAVE_SQLCLI1_H 1
39972 +EOF
39973 +
39974 +    echo "$ac_t""yes" 1>&6
39975 +  else
39976 +    echo "$ac_t""no" 1>&6
39977 +  fi
39978 +
39979 +
39980 +  echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39981 +echo "configure:74200: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
39982 +  if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
39983 +    php_pdo_have_header=yes
39984 +    cat >> confdefs.h <<\EOF
39985 +#define HAVE_LIBRARYMANAGER_H 1
39986 +EOF
39987 +
39988 +    echo "$ac_t""yes" 1>&6
39989 +  else
39990 +    echo "$ac_t""no" 1>&6
39991 +  fi
39992 +
39993 +
39994 +  echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
39995 +echo "configure:74214: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
39996 +  if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
39997 +    php_pdo_have_header=yes
39998 +    cat >> confdefs.h <<\EOF
39999 +#define HAVE_CLI0CORE_H 1
40000 +EOF
40001 +
40002 +    echo "$ac_t""yes" 1>&6
40003 +  else
40004 +    echo "$ac_t""no" 1>&6
40005 +  fi
40006 +
40007 +
40008 +  echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
40009 +echo "configure:74228: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
40010 +  if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
40011 +    php_pdo_have_header=yes
40012 +    cat >> confdefs.h <<\EOF
40013 +#define HAVE_CLI0EXT_H 1
40014 +EOF
40015 +
40016 +    echo "$ac_t""yes" 1>&6
40017 +  else
40018 +    echo "$ac_t""no" 1>&6
40019 +  fi
40020 +
40021 +
40022 +  echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
40023 +echo "configure:74242: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
40024 +  if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
40025 +    php_pdo_have_header=yes
40026 +    cat >> confdefs.h <<\EOF
40027 +#define HAVE_CLI0CLI_H 1
40028 +EOF
40029 +
40030 +    echo "$ac_t""yes" 1>&6
40031 +  else
40032 +    echo "$ac_t""no" 1>&6
40033 +  fi
40034 +
40035 +
40036 +  echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
40037 +echo "configure:74256: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
40038 +  if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
40039 +    php_pdo_have_header=yes
40040 +    cat >> confdefs.h <<\EOF
40041 +#define HAVE_CLI0DEFS_H 1
40042 +EOF
40043 +
40044 +    echo "$ac_t""yes" 1>&6
40045 +  else
40046 +    echo "$ac_t""no" 1>&6
40047 +  fi
40048 +
40049 +
40050 +  echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
40051 +echo "configure:74270: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
40052 +  if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
40053 +    php_pdo_have_header=yes
40054 +    cat >> confdefs.h <<\EOF
40055 +#define HAVE_CLI0ENV_H 1
40056 +EOF
40057 +
40058 +    echo "$ac_t""yes" 1>&6
40059 +  else
40060 +    echo "$ac_t""no" 1>&6
40061 +  fi
40062 +
40063 +
40064 +  if test "$php_pdo_have_header" != "yes"; then
40065 +    { echo "configure: error: Cannot find header file(s) for pdo_odbc" 1>&2; exit 1; }
40066 +  fi
40067 +
40068 +  PDO_ODBC_INCLUDE="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\"$pdo_odbc_flavour\\\""
40069 +  PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib"
40070 +
40071 +
40072 +  for ac_i in $PDO_ODBC_LDFLAGS; do
40073 +    case $ac_i in
40074 +    -pthread)
40075 +      if test "$ext_shared" = "yes"; then
40076 +        PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -pthread"
40077 +      else
40078 +
40079 +
40080 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
40081 +
40082 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
40083 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
40084 +    eval "EXTRA_LDFLAGS$unique=set"
40085 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
40086 +  fi
40087 +
40088 +      fi
40089 +    ;;
40090 +    -l*)
40091 +      ac_ii=`echo $ac_i|cut -c 3-`
40092 +
40093 +
40094 +  case $ac_ii in
40095 +  c|c_r|pthread*) ;;
40096 +  *)
40097 +    if test "$ext_shared" = "yes"; then
40098 +        PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -l$ac_ii"
40099 +    else
40100 +
40101 +
40102 +  case $ac_ii in
40103 +  c|c_r|pthread*) ;;
40104 +  *)
40105 +      LIBS="$LIBS -l$ac_ii"
40106 +   ;;
40107 +  esac
40108 +
40109 +
40110 +    fi
40111 +   ;;
40112 +  esac
40113 +
40114 +
40115 +    ;;
40116 +    -L*)
40117 +      ac_ii=`echo $ac_i|cut -c 3-`
40118 +
40119 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
40120 +
40121 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
40122 +    ai_p=$ac_ii
40123 +  else
40124 +
40125 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
40126 +
40127 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
40128 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
40129 +  fi
40130 +
40131 +
40132 +      if test "$ext_shared" = "yes"; then
40133 +        PDO_ODBC_SHARED_LIBADD="-L$ai_p $PDO_ODBC_SHARED_LIBADD"
40134 +        test -n "$ld_runpath_switch" && PDO_ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_ODBC_SHARED_LIBADD"
40135 +      else
40136 +
40137 +
40138 +
40139 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
40140 +
40141 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
40142 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
40143 +    eval "LIBPATH$unique=set"
40144 +
40145 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
40146 +    LDFLAGS="$LDFLAGS -L$ai_p"
40147 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
40148 +
40149 +  fi
40150 +
40151 +
40152 +      fi
40153 +
40154 +  fi
40155 +
40156 +    ;;
40157 +    esac
40158 +  done
40159 +
40160 +
40161 +
40162 +  save_old_LDFLAGS=$LDFLAGS
40163 +  ac_stuff="$PDO_ODBC_LDFLAGS"
40164 +
40165 +  save_ext_shared=$ext_shared
40166 +  ext_shared=yes
40167 +
40168 +  for ac_i in $ac_stuff; do
40169 +    case $ac_i in
40170 +    -pthread)
40171 +      if test "$ext_shared" = "yes"; then
40172 +        LDFLAGS="$LDFLAGS -pthread"
40173 +      else
40174 +
40175 +
40176 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
40177 +
40178 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
40179 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
40180 +    eval "EXTRA_LDFLAGS$unique=set"
40181 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
40182 +  fi
40183 +
40184 +      fi
40185 +    ;;
40186 +    -l*)
40187 +      ac_ii=`echo $ac_i|cut -c 3-`
40188 +
40189 +
40190 +  case $ac_ii in
40191 +  c|c_r|pthread*) ;;
40192 +  *)
40193 +    if test "$ext_shared" = "yes"; then
40194 +        LDFLAGS="$LDFLAGS -l$ac_ii"
40195 +    else
40196 +
40197 +
40198 +  case $ac_ii in
40199 +  c|c_r|pthread*) ;;
40200 +  *)
40201 +      LIBS="$LIBS -l$ac_ii"
40202 +   ;;
40203 +  esac
40204 +
40205 +
40206 +    fi
40207 +   ;;
40208 +  esac
40209 +
40210 +
40211 +    ;;
40212 +    -L*)
40213 +      ac_ii=`echo $ac_i|cut -c 3-`
40214 +
40215 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
40216 +
40217 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
40218 +    ai_p=$ac_ii
40219 +  else
40220 +
40221 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
40222 +
40223 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
40224 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
40225 +  fi
40226 +
40227 +
40228 +      if test "$ext_shared" = "yes"; then
40229 +        LDFLAGS="-L$ai_p $LDFLAGS"
40230 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
40231 +      else
40232 +
40233 +
40234 +
40235 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
40236 +
40237 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
40238 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
40239 +    eval "LIBPATH$unique=set"
40240 +
40241 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
40242 +    LDFLAGS="$LDFLAGS -L$ai_p"
40243 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
40244 +
40245 +  fi
40246 +
40247 +
40248 +      fi
40249 +
40250 +  fi
40251 +
40252 +    ;;
40253 +    esac
40254 +  done
40255 +
40256 +  echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
40257 +echo "configure:74476: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
40258 +ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'`
40259 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40260 +  echo $ac_n "(cached) $ac_c" 1>&6
40261 +else
40262 +  ac_save_LIBS="$LIBS"
40263 +LIBS="-l$pdo_odbc_def_lib  $LIBS"
40264 +cat > conftest.$ac_ext <<EOF
40265 +#line 74484 "configure"
40266 +#include "confdefs.h"
40267 +/* Override any gcc2 internal prototype to avoid an error.  */
40268 +/* We use char because int might match the return type of a gcc2
40269 +    builtin and then its argument prototype would still apply.  */
40270 +char SQLBindCol();
40271 +
40272 +int main() {
40273 +SQLBindCol()
40274 +; return 0; }
40275 +EOF
40276 +if { (eval echo configure:74495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40277 +  rm -rf conftest*
40278 +  eval "ac_cv_lib_$ac_lib_var=yes"
40279 +else
40280 +  echo "configure: failed program was:" >&5
40281 +  cat conftest.$ac_ext >&5
40282 +  rm -rf conftest*
40283 +  eval "ac_cv_lib_$ac_lib_var=no"
40284 +fi
40285 +rm -f conftest*
40286 +LIBS="$ac_save_LIBS"
40287 +
40288 +fi
40289 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
40290 +  echo "$ac_t""yes" 1>&6
40291 +
40292 +    LDFLAGS=$save_old_LDFLAGS
40293 +    ext_shared=$save_ext_shared
40294 +
40295 +
40296 +  save_old_LDFLAGS=$LDFLAGS
40297 +  ac_stuff="$PDO_ODBC_LDFLAGS"
40298 +
40299 +  save_ext_shared=$ext_shared
40300 +  ext_shared=yes
40301 +
40302 +  for ac_i in $ac_stuff; do
40303 +    case $ac_i in
40304 +    -pthread)
40305 +      if test "$ext_shared" = "yes"; then
40306 +        LDFLAGS="$LDFLAGS -pthread"
40307 +      else
40308 +
40309 +
40310 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
40311 +
40312 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
40313 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
40314 +    eval "EXTRA_LDFLAGS$unique=set"
40315 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
40316 +  fi
40317 +
40318 +      fi
40319 +    ;;
40320 +    -l*)
40321 +      ac_ii=`echo $ac_i|cut -c 3-`
40322 +
40323 +
40324 +  case $ac_ii in
40325 +  c|c_r|pthread*) ;;
40326 +  *)
40327 +    if test "$ext_shared" = "yes"; then
40328 +        LDFLAGS="$LDFLAGS -l$ac_ii"
40329 +    else
40330 +
40331 +
40332 +  case $ac_ii in
40333 +  c|c_r|pthread*) ;;
40334 +  *)
40335 +      LIBS="$LIBS -l$ac_ii"
40336 +   ;;
40337 +  esac
40338 +
40339 +
40340 +    fi
40341 +   ;;
40342 +  esac
40343 +
40344 +
40345 +    ;;
40346 +    -L*)
40347 +      ac_ii=`echo $ac_i|cut -c 3-`
40348 +
40349 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
40350 +
40351 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
40352 +    ai_p=$ac_ii
40353 +  else
40354 +
40355 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
40356 +
40357 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
40358 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
40359 +  fi
40360 +
40361 +
40362 +      if test "$ext_shared" = "yes"; then
40363 +        LDFLAGS="-L$ai_p $LDFLAGS"
40364 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
40365 +      else
40366 +
40367 +
40368 +
40369 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
40370 +
40371 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
40372 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
40373 +    eval "LIBPATH$unique=set"
40374 +
40375 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
40376 +    LDFLAGS="$LDFLAGS -L$ai_p"
40377 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
40378 +
40379 +  fi
40380 +
40381 +
40382 +      fi
40383 +
40384 +  fi
40385 +
40386 +    ;;
40387 +    esac
40388 +  done
40389 +
40390 +  echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
40391 +echo "configure:74610: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
40392 +ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'`
40393 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40394 +  echo $ac_n "(cached) $ac_c" 1>&6
40395 +else
40396 +  ac_save_LIBS="$LIBS"
40397 +LIBS="-l$pdo_odbc_def_lib  $LIBS"
40398 +cat > conftest.$ac_ext <<EOF
40399 +#line 74618 "configure"
40400 +#include "confdefs.h"
40401 +/* Override any gcc2 internal prototype to avoid an error.  */
40402 +/* We use char because int might match the return type of a gcc2
40403 +    builtin and then its argument prototype would still apply.  */
40404 +char SQLAllocHandle();
40405 +
40406 +int main() {
40407 +SQLAllocHandle()
40408 +; return 0; }
40409 +EOF
40410 +if { (eval echo configure:74629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40411 +  rm -rf conftest*
40412 +  eval "ac_cv_lib_$ac_lib_var=yes"
40413 +else
40414 +  echo "configure: failed program was:" >&5
40415 +  cat conftest.$ac_ext >&5
40416 +  rm -rf conftest*
40417 +  eval "ac_cv_lib_$ac_lib_var=no"
40418 +fi
40419 +rm -f conftest*
40420 +LIBS="$ac_save_LIBS"
40421 +
40422 +fi
40423 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
40424 +  echo "$ac_t""yes" 1>&6
40425 +
40426 +    LDFLAGS=$save_old_LDFLAGS
40427 +    ext_shared=$save_ext_shared
40428 +
40429 +
40430 +else
40431 +  echo "$ac_t""no" 1>&6
40432 +
40433 +    LDFLAGS=$save_old_LDFLAGS
40434 +    ext_shared=$save_ext_shared
40435 +    unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle
40436 +
40437 +      { echo "configure: error:
40438 +Your ODBC library does not appear to be ODBC 3 compatible.
40439 +You should consider using iODBC or unixODBC instead, and loading your
40440 +libraries as a driver in that environment; it will emulate the
40441 +functions required for PDO support.
40442 +" 1>&2; exit 1; }
40443 +
40444 +fi
40445 +
40446 +
40447 +
40448 +else
40449 +  echo "$ac_t""no" 1>&6
40450 +
40451 +    LDFLAGS=$save_old_LDFLAGS
40452 +    ext_shared=$save_ext_shared
40453 +    unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol
40454 +
40455 +    { echo "configure: error: Your ODBC library does not exist or there was an error. Check config.log for more information" 1>&2; exit 1; }
40456 +
40457 +
40458 +fi
40459 +
40460 +
40461 +
40462 +  ext_builddir=ext/pdo_odbc
40463 +  ext_srcdir=$abs_srcdir/ext/pdo_odbc
40464 +
40465 +  ac_extra=`echo "-I$pdo_inc_path $PDO_ODBC_INCLUDE"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
40466 +
40467 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
40468 +    PHP_PDO_ODBC_SHARED=no
40469 +
40470 +
40471 +  case ext/pdo_odbc in
40472 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
40473 +  /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
40474 +  *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
40475 +  esac
40476 +
40477 +
40478 +
40479 +  b_c_pre=$php_c_pre
40480 +  b_cxx_pre=$php_cxx_pre
40481 +  b_c_meta=$php_c_meta
40482 +  b_cxx_meta=$php_cxx_meta
40483 +  b_c_post=$php_c_post
40484 +  b_cxx_post=$php_cxx_post
40485 +  b_lo=$php_lo
40486 +
40487 +
40488 +  old_IFS=$IFS
40489 +  for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
40490 +
40491 +      IFS=.
40492 +      set $ac_src
40493 +      ac_obj=$1
40494 +      IFS=$old_IFS
40495 +
40496 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
40497 +
40498 +      case $ac_src in
40499 +        *.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" ;;
40500 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
40501 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
40502 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
40503 +      esac
40504 +
40505 +    cat >>Makefile.objects<<EOF
40506 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
40507 +       $ac_comp
40508 +EOF
40509 +  done
40510 +
40511 +
40512 +    EXT_STATIC="$EXT_STATIC pdo_odbc"
40513 +    if test "$ext_shared" != "nocli"; then
40514 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc"
40515 +    fi
40516 +  else
40517 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
40518 +      PHP_PDO_ODBC_SHARED=yes
40519 +
40520 +  case ext/pdo_odbc in
40521 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
40522 +  /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
40523 +  *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
40524 +  esac
40525 +
40526 +
40527 +
40528 +  b_c_pre=$shared_c_pre
40529 +  b_cxx_pre=$shared_cxx_pre
40530 +  b_c_meta=$shared_c_meta
40531 +  b_cxx_meta=$shared_cxx_meta
40532 +  b_c_post=$shared_c_post
40533 +  b_cxx_post=$shared_cxx_post
40534 +  b_lo=$shared_lo
40535 +
40536 +
40537 +  old_IFS=$IFS
40538 +  for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
40539 +
40540 +      IFS=.
40541 +      set $ac_src
40542 +      ac_obj=$1
40543 +      IFS=$old_IFS
40544 +
40545 +      shared_objects_pdo_odbc="$shared_objects_pdo_odbc $ac_bdir$ac_obj.lo"
40546 +
40547 +      case $ac_src in
40548 +        *.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" ;;
40549 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
40550 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
40551 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
40552 +      esac
40553 +
40554 +    cat >>Makefile.objects<<EOF
40555 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
40556 +       $ac_comp
40557 +EOF
40558 +  done
40559 +
40560 +      case $host_alias in
40561 +        *netware*)
40562 +
40563 +  install_modules="install-modules"
40564 +
40565 +  case $host_alias in
40566 +    *aix*)
40567 +      suffix=so
40568 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PHPPDO_ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_odbc.so '$ext_builddir'/phppdo_odbc.so'
40569 +      ;;
40570 +    *netware*)
40571 +      suffix=nlm
40572 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_ODBC, 3)_SHARED_LIBADD)'
40573 +      ;;
40574 +    *)
40575 +      suffix=la
40576 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PHPPDO_ODBC_SHARED_LIBADD)'
40577 +      ;;
40578 +  esac
40579 +
40580 +  if test "x" = "xyes"; then
40581 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_odbc.$suffix"
40582 +  else
40583 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_odbc.$suffix"
40584 +  fi
40585 +
40586 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
40587 +
40588 +  cat >>Makefile.objects<<EOF
40589 +\$(phplibdir)/phppdo_odbc.$suffix: $ext_builddir/phppdo_odbc.$suffix
40590 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_odbc.$suffix \$(phplibdir)
40591 +
40592 +$ext_builddir/phppdo_odbc.$suffix: \$(shared_objects_pdo_odbc) \$(PHPPDO_ODBC_SHARED_DEPENDENCIES)
40593 +       $link_cmd
40594 +
40595 +EOF
40596 +
40597 +          ;;
40598 +        *)
40599 +
40600 +  install_modules="install-modules"
40601 +
40602 +  case $host_alias in
40603 +    *aix*)
40604 +      suffix=so
40605 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_odbc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PDO_ODBC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_odbc.so '$ext_builddir'/pdo_odbc.so'
40606 +      ;;
40607 +    *netware*)
40608 +      suffix=nlm
40609 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_ODBC, 3)_SHARED_LIBADD)'
40610 +      ;;
40611 +    *)
40612 +      suffix=la
40613 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) $(PDO_ODBC_SHARED_LIBADD)'
40614 +      ;;
40615 +  esac
40616 +
40617 +  if test "x" = "xyes"; then
40618 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_odbc.$suffix"
40619 +  else
40620 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_odbc.$suffix"
40621 +  fi
40622 +
40623 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc"
40624 +
40625 +  cat >>Makefile.objects<<EOF
40626 +\$(phplibdir)/pdo_odbc.$suffix: $ext_builddir/pdo_odbc.$suffix
40627 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_odbc.$suffix \$(phplibdir)
40628 +
40629 +$ext_builddir/pdo_odbc.$suffix: \$(shared_objects_pdo_odbc) \$(PDO_ODBC_SHARED_DEPENDENCIES)
40630 +       $link_cmd
40631 +
40632 +EOF
40633 +
40634 +          ;;
40635 +      esac
40636 +      cat >> confdefs.h <<EOF
40637 +#define COMPILE_DL_PDO_ODBC 1
40638 +EOF
40639 +
40640 +    fi
40641 +  fi
40642 +
40643 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
40644 +    PHP_PDO_ODBC_SHARED=no
40645 +    case "$PHP_SAPI" in
40646 +      cgi|embed)
40647 +
40648 +
40649 +  case ext/pdo_odbc in
40650 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
40651 +  /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
40652 +  *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
40653 +  esac
40654 +
40655 +
40656 +
40657 +  b_c_pre=$php_c_pre
40658 +  b_cxx_pre=$php_cxx_pre
40659 +  b_c_meta=$php_c_meta
40660 +  b_cxx_meta=$php_cxx_meta
40661 +  b_c_post=$php_c_post
40662 +  b_cxx_post=$php_cxx_post
40663 +  b_lo=$php_lo
40664 +
40665 +
40666 +  old_IFS=$IFS
40667 +  for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
40668 +
40669 +      IFS=.
40670 +      set $ac_src
40671 +      ac_obj=$1
40672 +      IFS=$old_IFS
40673 +
40674 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
40675 +
40676 +      case $ac_src in
40677 +        *.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" ;;
40678 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
40679 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
40680 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
40681 +      esac
40682 +
40683 +    cat >>Makefile.objects<<EOF
40684 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
40685 +       $ac_comp
40686 +EOF
40687 +  done
40688 +
40689 +
40690 +        EXT_STATIC="$EXT_STATIC pdo_odbc"
40691 +        ;;
40692 +      *)
40693 +
40694 +
40695 +  case ext/pdo_odbc in
40696 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
40697 +  /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
40698 +  *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
40699 +  esac
40700 +
40701 +
40702 +
40703 +  b_c_pre=$php_c_pre
40704 +  b_cxx_pre=$php_cxx_pre
40705 +  b_c_meta=$php_c_meta
40706 +  b_cxx_meta=$php_cxx_meta
40707 +  b_c_post=$php_c_post
40708 +  b_cxx_post=$php_cxx_post
40709 +  b_lo=$php_lo
40710 +
40711 +
40712 +  old_IFS=$IFS
40713 +  for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do
40714 +
40715 +      IFS=.
40716 +      set $ac_src
40717 +      ac_obj=$1
40718 +      IFS=$old_IFS
40719 +
40720 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
40721 +
40722 +      case $ac_src in
40723 +        *.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" ;;
40724 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
40725 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
40726 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
40727 +      esac
40728 +
40729 +    cat >>Makefile.objects<<EOF
40730 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
40731 +       $ac_comp
40732 +EOF
40733 +  done
40734 +
40735 +
40736 +        ;;
40737 +    esac
40738 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc"
40739 +  fi
40740 +
40741 +
40742 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
40743 +
40744 +
40745 +
40746 +  if test "$ext_builddir" = "."; then
40747 +    PHP_PECL_EXTENSION=pdo_odbc
40748 +
40749 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
40750 +
40751 +  fi
40752 +
40753 +
40754 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_ODBC_SHARED_LIBADD"
40755 +
40756 +
40757 +
40758 +  am_i_shared=$PHP_PDO_ODBC_SHARED
40759 +  is_it_shared=$PHP_PDO_SHARED
40760 +  is_it_enabled=$PHP_PDO
40761 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
40762 +    { echo "configure: error:
40763 +You've configured extension pdo_odbc to build statically, but it
40764 +depends on extension pdo, which you've configured to build shared.
40765 +You either need to build pdo_odbc shared or build pdo statically for the
40766 +build to be successful.
40767 +" 1>&2; exit 1; }
40768 +  fi
40769 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
40770 +    { echo "configure: error:
40771 +You've configured extension pdo_odbc, which depends on extension pdo,
40772 +but you've either not enabled pdo, or have disabled it.
40773 +" 1>&2; exit 1; }
40774 +  fi
40775 +
40776 +
40777 +fi
40778 +
40779 +
40780 +
40781 +php_with_pdo_pgsql=no
40782 +
40783 +echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
40784 +echo "configure:75003: checking for PostgreSQL support for PDO" >&5
40785 +# Check whether --with-pdo-pgsql or --without-pdo-pgsql was given.
40786 +if test "${with_pdo_pgsql+set}" = set; then
40787 +  withval="$with_pdo_pgsql"
40788 +  PHP_PDO_PGSQL=$withval
40789 +else
40790 +
40791 +  PHP_PDO_PGSQL=no
40792 +  test "$PHP_ENABLE_ALL" && PHP_PDO_PGSQL=$PHP_ENABLE_ALL
40793 +
40794 +fi
40795 +
40796 +
40797 +
40798 +ext_output="yes, shared"
40799 +ext_shared=yes
40800 +case $PHP_PDO_PGSQL in
40801 +shared,*)
40802 +  PHP_PDO_PGSQL=`echo "$PHP_PDO_PGSQL"|$SED 's/^shared,//'`
40803 +  ;;
40804 +shared)
40805 +  PHP_PDO_PGSQL=yes
40806 +  ;;
40807 +no)
40808 +  ext_output=no
40809 +  ext_shared=no
40810 +  ;;
40811 +*)
40812 +  ext_output=yes
40813 +  ext_shared=no
40814 +  ;;
40815 +esac
40816 +
40817 +
40818 +
40819 +echo "$ac_t""$ext_output" 1>&6
40820 +
40821 +
40822 +
40823 +
40824 +if test "$PHP_PDO_PGSQL" != "no"; then
40825 +
40826 +  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
40827 +    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
40828 +  fi
40829 +
40830 +
40831 +  if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
40832 +    PGSQL_INCLUDE=$PGSQL_INCLUDE
40833 +  else
40834 +
40835 +    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
40836 +
40837 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
40838 +    PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
40839 +  fi
40840 +
40841 +
40842 +  echo $ac_n "checking for pg_config""... $ac_c" 1>&6
40843 +echo "configure:75062: checking for pg_config" >&5
40844 +  for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
40845 +    if test -x $i/pg_config; then
40846 +      PG_CONFIG="$i/pg_config"
40847 +      break;
40848 +    fi
40849 +  done
40850 +
40851 +  if test -n "$PG_CONFIG"; then
40852 +    echo "$ac_t""$PG_CONFIG" 1>&6
40853 +    PGSQL_INCLUDE=`$PG_CONFIG --includedir`
40854 +    PGSQL_LIBDIR=`$PG_CONFIG --libdir`
40855 +    cat >> confdefs.h <<\EOF
40856 +#define HAVE_PG_CONFIG_H 1
40857 +EOF
40858 +
40859 +  else
40860 +    echo "$ac_t""not found" 1>&6
40861 +    if test "$PHP_PDO_PGSQL" = "yes"; then
40862 +      PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
40863 +    else
40864 +      PGSQL_SEARCH_PATHS=$PHP_PDO_PGSQL
40865 +    fi
40866 +
40867 +    for i in $PGSQL_SEARCH_PATHS; do
40868 +      for j in include include/pgsql include/postgres include/postgresql ""; do
40869 +        if test -r "$i/$j/libpq-fe.h"; then
40870 +          PGSQL_INC_BASE=$i
40871 +          PGSQL_INCLUDE=$i/$j
40872 +          if test -r "$i/$j/pg_config.h"; then
40873 +            cat >> confdefs.h <<\EOF
40874 +#define HAVE_PG_CONFIG_H 1
40875 +EOF
40876 +
40877 +          fi
40878 +        fi
40879 +      done
40880 +
40881 +      for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
40882 +        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
40883 +          PGSQL_LIBDIR=$i/$j
40884 +        fi
40885 +      done
40886 +    done
40887 +  fi
40888 +
40889 +  if test -z "$PGSQL_INCLUDE"; then
40890 +    { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
40891 +  fi
40892 +
40893 +  if test -z "$PGSQL_LIBDIR"; then
40894 +    { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
40895 +  fi
40896 +
40897 +  if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
40898 +    { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
40899 +  fi
40900 +
40901 +  cat >> confdefs.h <<\EOF
40902 +#define HAVE_PDO_PGSQL 1
40903 +EOF
40904 +
40905 +
40906 +  echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
40907 +echo "configure:75126: checking for openssl dependencies" >&5
40908 +  if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then
40909 +    echo "$ac_t""yes" 1>&6
40910 +        # Extract the first word of "pkg-config", so it can be a program name with args.
40911 +set dummy pkg-config; ac_word=$2
40912 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
40913 +echo "configure:75132: checking for $ac_word" >&5
40914 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
40915 +  echo $ac_n "(cached) $ac_c" 1>&6
40916 +else
40917 +  case "$PKG_CONFIG" in
40918 +  /*)
40919 +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
40920 +  ;;
40921 +  ?:/*)
40922 +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
40923 +  ;;
40924 +  *)
40925 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
40926 +  ac_dummy="$PATH"
40927 +  for ac_dir in $ac_dummy; do
40928 +    test -z "$ac_dir" && ac_dir=.
40929 +    if test -f $ac_dir/$ac_word; then
40930 +      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
40931 +      break
40932 +    fi
40933 +  done
40934 +  IFS="$ac_save_ifs"
40935 +  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
40936 +  ;;
40937 +esac
40938 +fi
40939 +PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
40940 +if test -n "$PKG_CONFIG"; then
40941 +  echo "$ac_t""$PKG_CONFIG" 1>&6
40942 +else
40943 +  echo "$ac_t""no" 1>&6
40944 +fi
40945 +
40946 +    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
40947 +      PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags`
40948 +    fi
40949 +  else
40950 +    echo "$ac_t""no" 1>&6
40951 +  fi
40952 +
40953 +  old_LIBS=$LIBS
40954 +  old_LDFLAGS=$LDFLAGS
40955 +  LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
40956 +  echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
40957 +echo "configure:75176: checking for PQparameterStatus in -lpq" >&5
40958 +ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
40959 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40960 +  echo $ac_n "(cached) $ac_c" 1>&6
40961 +else
40962 +  ac_save_LIBS="$LIBS"
40963 +LIBS="-lpq  $LIBS"
40964 +cat > conftest.$ac_ext <<EOF
40965 +#line 75184 "configure"
40966 +#include "confdefs.h"
40967 +/* Override any gcc2 internal prototype to avoid an error.  */
40968 +/* We use char because int might match the return type of a gcc2
40969 +    builtin and then its argument prototype would still apply.  */
40970 +char PQparameterStatus();
40971 +
40972 +int main() {
40973 +PQparameterStatus()
40974 +; return 0; }
40975 +EOF
40976 +if { (eval echo configure:75195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40977 +  rm -rf conftest*
40978 +  eval "ac_cv_lib_$ac_lib_var=yes"
40979 +else
40980 +  echo "configure: failed program was:" >&5
40981 +  cat conftest.$ac_ext >&5
40982 +  rm -rf conftest*
40983 +  eval "ac_cv_lib_$ac_lib_var=no"
40984 +fi
40985 +rm -f conftest*
40986 +LIBS="$ac_save_LIBS"
40987 +
40988 +fi
40989 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
40990 +  echo "$ac_t""yes" 1>&6
40991 +  cat >> confdefs.h <<\EOF
40992 +#define HAVE_PQPARAMETERSTATUS 1
40993 +EOF
40994 +
40995 +else
40996 +  echo "$ac_t""no" 1>&6
40997 +
40998 +    echo "Unable to build the PDO PostgreSQL driver: libpq 7.4+ is required"
40999 +    exit 1
41000 +
41001 +fi
41002 +
41003 +
41004 +  echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
41005 +echo "configure:75224: checking for PQprepare in -lpq" >&5
41006 +ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
41007 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41008 +  echo $ac_n "(cached) $ac_c" 1>&6
41009 +else
41010 +  ac_save_LIBS="$LIBS"
41011 +LIBS="-lpq  $LIBS"
41012 +cat > conftest.$ac_ext <<EOF
41013 +#line 75232 "configure"
41014 +#include "confdefs.h"
41015 +/* Override any gcc2 internal prototype to avoid an error.  */
41016 +/* We use char because int might match the return type of a gcc2
41017 +    builtin and then its argument prototype would still apply.  */
41018 +char PQprepare();
41019 +
41020 +int main() {
41021 +PQprepare()
41022 +; return 0; }
41023 +EOF
41024 +if { (eval echo configure:75243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41025 +  rm -rf conftest*
41026 +  eval "ac_cv_lib_$ac_lib_var=yes"
41027 +else
41028 +  echo "configure: failed program was:" >&5
41029 +  cat conftest.$ac_ext >&5
41030 +  rm -rf conftest*
41031 +  eval "ac_cv_lib_$ac_lib_var=no"
41032 +fi
41033 +rm -f conftest*
41034 +LIBS="$ac_save_LIBS"
41035 +
41036 +fi
41037 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41038 +  echo "$ac_t""yes" 1>&6
41039 +  cat >> confdefs.h <<\EOF
41040 +#define HAVE_PQPREPARE 1
41041 +EOF
41042 +
41043 +else
41044 +  echo "$ac_t""no" 1>&6
41045 +fi
41046 +
41047 +  echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
41048 +echo "configure:75267: checking for PQescapeStringConn in -lpq" >&5
41049 +ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
41050 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41051 +  echo $ac_n "(cached) $ac_c" 1>&6
41052 +else
41053 +  ac_save_LIBS="$LIBS"
41054 +LIBS="-lpq  $LIBS"
41055 +cat > conftest.$ac_ext <<EOF
41056 +#line 75275 "configure"
41057 +#include "confdefs.h"
41058 +/* Override any gcc2 internal prototype to avoid an error.  */
41059 +/* We use char because int might match the return type of a gcc2
41060 +    builtin and then its argument prototype would still apply.  */
41061 +char PQescapeStringConn();
41062 +
41063 +int main() {
41064 +PQescapeStringConn()
41065 +; return 0; }
41066 +EOF
41067 +if { (eval echo configure:75286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41068 +  rm -rf conftest*
41069 +  eval "ac_cv_lib_$ac_lib_var=yes"
41070 +else
41071 +  echo "configure: failed program was:" >&5
41072 +  cat conftest.$ac_ext >&5
41073 +  rm -rf conftest*
41074 +  eval "ac_cv_lib_$ac_lib_var=no"
41075 +fi
41076 +rm -f conftest*
41077 +LIBS="$ac_save_LIBS"
41078 +
41079 +fi
41080 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41081 +  echo "$ac_t""yes" 1>&6
41082 +  cat >> confdefs.h <<\EOF
41083 +#define HAVE_PQESCAPE_CONN 1
41084 +EOF
41085 +
41086 +else
41087 +  echo "$ac_t""no" 1>&6
41088 +fi
41089 +
41090 +  echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
41091 +echo "configure:75310: checking for PQescapeByteaConn in -lpq" >&5
41092 +ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
41093 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41094 +  echo $ac_n "(cached) $ac_c" 1>&6
41095 +else
41096 +  ac_save_LIBS="$LIBS"
41097 +LIBS="-lpq  $LIBS"
41098 +cat > conftest.$ac_ext <<EOF
41099 +#line 75318 "configure"
41100 +#include "confdefs.h"
41101 +/* Override any gcc2 internal prototype to avoid an error.  */
41102 +/* We use char because int might match the return type of a gcc2
41103 +    builtin and then its argument prototype would still apply.  */
41104 +char PQescapeByteaConn();
41105 +
41106 +int main() {
41107 +PQescapeByteaConn()
41108 +; return 0; }
41109 +EOF
41110 +if { (eval echo configure:75329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41111 +  rm -rf conftest*
41112 +  eval "ac_cv_lib_$ac_lib_var=yes"
41113 +else
41114 +  echo "configure: failed program was:" >&5
41115 +  cat conftest.$ac_ext >&5
41116 +  rm -rf conftest*
41117 +  eval "ac_cv_lib_$ac_lib_var=no"
41118 +fi
41119 +rm -f conftest*
41120 +LIBS="$ac_save_LIBS"
41121 +
41122 +fi
41123 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41124 +  echo "$ac_t""yes" 1>&6
41125 +  cat >> confdefs.h <<\EOF
41126 +#define HAVE_PQESCAPE_BYTEA_CONN 1
41127 +EOF
41128 +
41129 +else
41130 +  echo "$ac_t""no" 1>&6
41131 +fi
41132 +
41133 +
41134 +  echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
41135 +echo "configure:75354: checking for pg_encoding_to_char in -lpq" >&5
41136 +ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
41137 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41138 +  echo $ac_n "(cached) $ac_c" 1>&6
41139 +else
41140 +  ac_save_LIBS="$LIBS"
41141 +LIBS="-lpq  $LIBS"
41142 +cat > conftest.$ac_ext <<EOF
41143 +#line 75362 "configure"
41144 +#include "confdefs.h"
41145 +/* Override any gcc2 internal prototype to avoid an error.  */
41146 +/* We use char because int might match the return type of a gcc2
41147 +    builtin and then its argument prototype would still apply.  */
41148 +char pg_encoding_to_char();
41149 +
41150 +int main() {
41151 +pg_encoding_to_char()
41152 +; return 0; }
41153 +EOF
41154 +if { (eval echo configure:75373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41155 +  rm -rf conftest*
41156 +  eval "ac_cv_lib_$ac_lib_var=yes"
41157 +else
41158 +  echo "configure: failed program was:" >&5
41159 +  cat conftest.$ac_ext >&5
41160 +  rm -rf conftest*
41161 +  eval "ac_cv_lib_$ac_lib_var=no"
41162 +fi
41163 +rm -f conftest*
41164 +LIBS="$ac_save_LIBS"
41165 +
41166 +fi
41167 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41168 +  echo "$ac_t""yes" 1>&6
41169 +  cat >> confdefs.h <<\EOF
41170 +#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
41171 +EOF
41172 +
41173 +else
41174 +  echo "$ac_t""no" 1>&6
41175 +fi
41176 +
41177 +
41178 +
41179 +  LIBS=$old_LIBS
41180 +  LDFLAGS=$old_LDFLAGS
41181 +
41182 +
41183 +
41184 +  if test "$ext_shared" = "yes"; then
41185 +    PDO_PGSQL_SHARED_LIBADD="-lpq $PDO_PGSQL_SHARED_LIBADD"
41186 +    if test -n "$PGSQL_LIBDIR"; then
41187 +
41188 +  if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
41189 +
41190 +  if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
41191 +    ai_p=$PGSQL_LIBDIR
41192 +  else
41193 +
41194 +    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
41195 +
41196 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
41197 +    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
41198 +  fi
41199 +
41200 +
41201 +      if test "$ext_shared" = "yes"; then
41202 +        PDO_PGSQL_SHARED_LIBADD="-L$ai_p $PDO_PGSQL_SHARED_LIBADD"
41203 +        test -n "$ld_runpath_switch" && PDO_PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_PGSQL_SHARED_LIBADD"
41204 +      else
41205 +
41206 +
41207 +
41208 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
41209 +
41210 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
41211 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
41212 +    eval "LIBPATH$unique=set"
41213 +
41214 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
41215 +    LDFLAGS="$LDFLAGS -L$ai_p"
41216 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
41217 +
41218 +  fi
41219 +
41220 +
41221 +      fi
41222 +
41223 +  fi
41224 +
41225 +    fi
41226 +  else
41227 +
41228 +
41229 +  if test -n "$PGSQL_LIBDIR"; then
41230 +
41231 +  if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
41232 +
41233 +  if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
41234 +    ai_p=$PGSQL_LIBDIR
41235 +  else
41236 +
41237 +    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
41238 +
41239 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
41240 +    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
41241 +  fi
41242 +
41243 +
41244 +
41245 +
41246 +
41247 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
41248 +
41249 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
41250 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
41251 +    eval "LIBPATH$unique=set"
41252 +
41253 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
41254 +    LDFLAGS="$LDFLAGS -L$ai_p"
41255 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
41256 +
41257 +  fi
41258 +
41259 +
41260 +
41261 +  fi
41262 +
41263 +  fi
41264 +
41265 +
41266 +  case pq in
41267 +  c|c_r|pthread*) ;;
41268 +  *)
41269 +      LIBS="-lpq $LIBS"
41270 +   ;;
41271 +  esac
41272 +
41273 +
41274 +
41275 +
41276 +  fi
41277 +
41278 +
41279 +
41280 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_PGSQL_SHARED_LIBADD"
41281 +
41282 +
41283 +
41284 +  if test "$PGSQL_INCLUDE" != "/usr/include"; then
41285 +
41286 +  if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
41287 +    ai_p=$PGSQL_INCLUDE
41288 +  else
41289 +
41290 +    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
41291 +
41292 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
41293 +    ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
41294 +  fi
41295 +
41296 +
41297 +
41298 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
41299 +
41300 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
41301 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
41302 +    eval "INCLUDEPATH$unique=set"
41303 +
41304 +      if test ""; then
41305 +        INCLUDES="-I$ai_p $INCLUDES"
41306 +      else
41307 +        INCLUDES="$INCLUDES -I$ai_p"
41308 +      fi
41309 +
41310 +  fi
41311 +
41312 +  fi
41313 +
41314 +
41315 +
41316 +
41317 +  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
41318 +echo "configure:75537: checking for PDO includes" >&5
41319 +if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
41320 +  echo $ac_n "(cached) $ac_c" 1>&6
41321 +else
41322 +
41323 +    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
41324 +echo "configure:75543: checking for PDO includes" >&5
41325 +    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
41326 +      pdo_inc_path=$abs_srcdir/ext
41327 +    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
41328 +      pdo_inc_path=$abs_srcdir/ext
41329 +    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
41330 +      pdo_inc_path=$prefix/include/php/ext
41331 +    fi
41332 +
41333 +fi
41334 +
41335 +echo "$ac_t""$pdo_inc_path" 1>&6
41336 +  if test -n "$pdo_inc_path"; then
41337 +:
41338 +  else
41339 +{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
41340 +  fi
41341 +
41342 +
41343 +
41344 +
41345 +  ext_builddir=ext/pdo_pgsql
41346 +  ext_srcdir=$abs_srcdir/ext/pdo_pgsql
41347 +
41348 +  ac_extra=`echo "-I$pdo_inc_path $PDO_PGSQL_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
41349 +
41350 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
41351 +    PHP_PDO_PGSQL_SHARED=no
41352 +
41353 +
41354 +  case ext/pdo_pgsql in
41355 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
41356 +  /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
41357 +  *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
41358 +  esac
41359 +
41360 +
41361 +
41362 +  b_c_pre=$php_c_pre
41363 +  b_cxx_pre=$php_cxx_pre
41364 +  b_c_meta=$php_c_meta
41365 +  b_cxx_meta=$php_cxx_meta
41366 +  b_c_post=$php_c_post
41367 +  b_cxx_post=$php_cxx_post
41368 +  b_lo=$php_lo
41369 +
41370 +
41371 +  old_IFS=$IFS
41372 +  for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
41373 +
41374 +      IFS=.
41375 +      set $ac_src
41376 +      ac_obj=$1
41377 +      IFS=$old_IFS
41378 +
41379 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
41380 +
41381 +      case $ac_src in
41382 +        *.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" ;;
41383 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
41384 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
41385 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
41386 +      esac
41387 +
41388 +    cat >>Makefile.objects<<EOF
41389 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
41390 +       $ac_comp
41391 +EOF
41392 +  done
41393 +
41394 +
41395 +    EXT_STATIC="$EXT_STATIC pdo_pgsql"
41396 +    if test "$ext_shared" != "nocli"; then
41397 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql"
41398 +    fi
41399 +  else
41400 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
41401 +      PHP_PDO_PGSQL_SHARED=yes
41402 +
41403 +  case ext/pdo_pgsql in
41404 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
41405 +  /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
41406 +  *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
41407 +  esac
41408 +
41409 +
41410 +
41411 +  b_c_pre=$shared_c_pre
41412 +  b_cxx_pre=$shared_cxx_pre
41413 +  b_c_meta=$shared_c_meta
41414 +  b_cxx_meta=$shared_cxx_meta
41415 +  b_c_post=$shared_c_post
41416 +  b_cxx_post=$shared_cxx_post
41417 +  b_lo=$shared_lo
41418 +
41419 +
41420 +  old_IFS=$IFS
41421 +  for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
41422 +
41423 +      IFS=.
41424 +      set $ac_src
41425 +      ac_obj=$1
41426 +      IFS=$old_IFS
41427 +
41428 +      shared_objects_pdo_pgsql="$shared_objects_pdo_pgsql $ac_bdir$ac_obj.lo"
41429 +
41430 +      case $ac_src in
41431 +        *.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" ;;
41432 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
41433 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
41434 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
41435 +      esac
41436 +
41437 +    cat >>Makefile.objects<<EOF
41438 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
41439 +       $ac_comp
41440 +EOF
41441 +  done
41442 +
41443 +      case $host_alias in
41444 +        *netware*)
41445 +
41446 +  install_modules="install-modules"
41447 +
41448 +  case $host_alias in
41449 +    *aix*)
41450 +      suffix=so
41451 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PHPPDO_PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_pgsql.so '$ext_builddir'/phppdo_pgsql.so'
41452 +      ;;
41453 +    *netware*)
41454 +      suffix=nlm
41455 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_PGSQL, 3)_SHARED_LIBADD)'
41456 +      ;;
41457 +    *)
41458 +      suffix=la
41459 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PHPPDO_PGSQL_SHARED_LIBADD)'
41460 +      ;;
41461 +  esac
41462 +
41463 +  if test "x" = "xyes"; then
41464 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_pgsql.$suffix"
41465 +  else
41466 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_pgsql.$suffix"
41467 +  fi
41468 +
41469 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
41470 +
41471 +  cat >>Makefile.objects<<EOF
41472 +\$(phplibdir)/phppdo_pgsql.$suffix: $ext_builddir/phppdo_pgsql.$suffix
41473 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_pgsql.$suffix \$(phplibdir)
41474 +
41475 +$ext_builddir/phppdo_pgsql.$suffix: \$(shared_objects_pdo_pgsql) \$(PHPPDO_PGSQL_SHARED_DEPENDENCIES)
41476 +       $link_cmd
41477 +
41478 +EOF
41479 +
41480 +          ;;
41481 +        *)
41482 +
41483 +  install_modules="install-modules"
41484 +
41485 +  case $host_alias in
41486 +    *aix*)
41487 +      suffix=so
41488 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PDO_PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_pgsql.so '$ext_builddir'/pdo_pgsql.so'
41489 +      ;;
41490 +    *netware*)
41491 +      suffix=nlm
41492 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_PGSQL, 3)_SHARED_LIBADD)'
41493 +      ;;
41494 +    *)
41495 +      suffix=la
41496 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) $(PDO_PGSQL_SHARED_LIBADD)'
41497 +      ;;
41498 +  esac
41499 +
41500 +  if test "x" = "xyes"; then
41501 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_pgsql.$suffix"
41502 +  else
41503 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_pgsql.$suffix"
41504 +  fi
41505 +
41506 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql"
41507 +
41508 +  cat >>Makefile.objects<<EOF
41509 +\$(phplibdir)/pdo_pgsql.$suffix: $ext_builddir/pdo_pgsql.$suffix
41510 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_pgsql.$suffix \$(phplibdir)
41511 +
41512 +$ext_builddir/pdo_pgsql.$suffix: \$(shared_objects_pdo_pgsql) \$(PDO_PGSQL_SHARED_DEPENDENCIES)
41513 +       $link_cmd
41514 +
41515 +EOF
41516 +
41517 +          ;;
41518 +      esac
41519 +      cat >> confdefs.h <<EOF
41520 +#define COMPILE_DL_PDO_PGSQL 1
41521 +EOF
41522 +
41523 +    fi
41524 +  fi
41525 +
41526 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
41527 +    PHP_PDO_PGSQL_SHARED=no
41528 +    case "$PHP_SAPI" in
41529 +      cgi|embed)
41530 +
41531 +
41532 +  case ext/pdo_pgsql in
41533 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
41534 +  /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
41535 +  *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
41536 +  esac
41537 +
41538 +
41539 +
41540 +  b_c_pre=$php_c_pre
41541 +  b_cxx_pre=$php_cxx_pre
41542 +  b_c_meta=$php_c_meta
41543 +  b_cxx_meta=$php_cxx_meta
41544 +  b_c_post=$php_c_post
41545 +  b_cxx_post=$php_cxx_post
41546 +  b_lo=$php_lo
41547 +
41548 +
41549 +  old_IFS=$IFS
41550 +  for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
41551 +
41552 +      IFS=.
41553 +      set $ac_src
41554 +      ac_obj=$1
41555 +      IFS=$old_IFS
41556 +
41557 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
41558 +
41559 +      case $ac_src in
41560 +        *.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" ;;
41561 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
41562 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
41563 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
41564 +      esac
41565 +
41566 +    cat >>Makefile.objects<<EOF
41567 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
41568 +       $ac_comp
41569 +EOF
41570 +  done
41571 +
41572 +
41573 +        EXT_STATIC="$EXT_STATIC pdo_pgsql"
41574 +        ;;
41575 +      *)
41576 +
41577 +
41578 +  case ext/pdo_pgsql in
41579 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
41580 +  /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
41581 +  *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
41582 +  esac
41583 +
41584 +
41585 +
41586 +  b_c_pre=$php_c_pre
41587 +  b_cxx_pre=$php_cxx_pre
41588 +  b_c_meta=$php_c_meta
41589 +  b_cxx_meta=$php_cxx_meta
41590 +  b_c_post=$php_c_post
41591 +  b_cxx_post=$php_cxx_post
41592 +  b_lo=$php_lo
41593 +
41594 +
41595 +  old_IFS=$IFS
41596 +  for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do
41597 +
41598 +      IFS=.
41599 +      set $ac_src
41600 +      ac_obj=$1
41601 +      IFS=$old_IFS
41602 +
41603 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
41604 +
41605 +      case $ac_src in
41606 +        *.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" ;;
41607 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
41608 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
41609 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
41610 +      esac
41611 +
41612 +    cat >>Makefile.objects<<EOF
41613 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
41614 +       $ac_comp
41615 +EOF
41616 +  done
41617 +
41618 +
41619 +        ;;
41620 +    esac
41621 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql"
41622 +  fi
41623 +
41624 +
41625 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
41626 +
41627 +
41628 +
41629 +  if test "$ext_builddir" = "."; then
41630 +    PHP_PECL_EXTENSION=pdo_pgsql
41631 +
41632 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
41633 +
41634 +  fi
41635 +
41636 +
41637 +
41638 +  am_i_shared=$PHP_PDO_PGSQL_SHARED
41639 +  is_it_shared=$PHP_PDO_SHARED
41640 +  is_it_enabled=$PHP_PDO
41641 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
41642 +    { echo "configure: error:
41643 +You've configured extension pdo_pgsql to build statically, but it
41644 +depends on extension pdo, which you've configured to build shared.
41645 +You either need to build pdo_pgsql shared or build pdo statically for the
41646 +build to be successful.
41647 +" 1>&2; exit 1; }
41648 +  fi
41649 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
41650 +    { echo "configure: error:
41651 +You've configured extension pdo_pgsql, which depends on extension pdo,
41652 +but you've either not enabled pdo, or have disabled it.
41653 +" 1>&2; exit 1; }
41654 +  fi
41655 +
41656 +
41657 +fi
41658 +
41659 +
41660 +
41661 +php_with_pdo_sqlite=$PHP_PDO
41662 +
41663 +echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
41664 +echo "configure:75883: checking for sqlite 3 support for PDO" >&5
41665 +# Check whether --with-pdo-sqlite or --without-pdo-sqlite was given.
41666 +if test "${with_pdo_sqlite+set}" = set; then
41667 +  withval="$with_pdo_sqlite"
41668 +  PHP_PDO_SQLITE=$withval
41669 +else
41670 +
41671 +  PHP_PDO_SQLITE=$PHP_PDO
41672 +  test "$PHP_ENABLE_ALL" && PHP_PDO_SQLITE=$PHP_ENABLE_ALL
41673 +
41674 +fi
41675 +
41676 +
41677 +
41678 +ext_output="yes, shared"
41679 +ext_shared=yes
41680 +case $PHP_PDO_SQLITE in
41681 +shared,*)
41682 +  PHP_PDO_SQLITE=`echo "$PHP_PDO_SQLITE"|$SED 's/^shared,//'`
41683 +  ;;
41684 +shared)
41685 +  PHP_PDO_SQLITE=yes
41686 +  ;;
41687 +no)
41688 +  ext_output=no
41689 +  ext_shared=no
41690 +  ;;
41691 +*)
41692 +  ext_output=yes
41693 +  ext_shared=no
41694 +  ;;
41695 +esac
41696 +
41697 +
41698 +
41699 +echo "$ac_t""$ext_output" 1>&6
41700 +
41701 +
41702 +
41703 +
41704 +if test "$PHP_PDO_SQLITE" != "no"; then
41705 +
41706 +  if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
41707 +    { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; }
41708 +  fi
41709 +
41710 +
41711 +
41712 +  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
41713 +echo "configure:75932: checking for PDO includes" >&5
41714 +if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
41715 +  echo $ac_n "(cached) $ac_c" 1>&6
41716 +else
41717 +
41718 +    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
41719 +echo "configure:75938: checking for PDO includes" >&5
41720 +    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
41721 +      pdo_inc_path=$abs_srcdir/ext
41722 +    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
41723 +      pdo_inc_path=$abs_srcdir/ext
41724 +    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
41725 +      pdo_inc_path=$prefix/include/php/ext
41726 +    fi
41727 +
41728 +fi
41729 +
41730 +echo "$ac_t""$pdo_inc_path" 1>&6
41731 +  if test -n "$pdo_inc_path"; then
41732 +:
41733 +  else
41734 +{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; }
41735 +  fi
41736 +
41737 +
41738 +
41739 +  php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
41740 +
41741 +  if test "$PHP_PDO_SQLITE" != "yes"; then
41742 +    SEARCH_PATH="$PHP_PDO_SQLITE /usr/local /usr"     # you might want to change this
41743 +    SEARCH_FOR="/include/sqlite3.h"  # you most likely want to change this
41744 +    if test -r $PHP_PDO_SQLITE/$SEARCH_FOR; then # path given as parameter
41745 +      PDO_SQLITE_DIR=$PHP_PDO_SQLITE
41746 +    else # search default path list
41747 +      echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
41748 +echo "configure:75967: checking for sqlite3 files in default path" >&5
41749 +      for i in $SEARCH_PATH ; do
41750 +        if test -r $i/$SEARCH_FOR; then
41751 +          PDO_SQLITE_DIR=$i
41752 +          echo "$ac_t""found in $i" 1>&6
41753 +        fi
41754 +      done
41755 +    fi
41756 +    if test -z "$PDO_SQLITE_DIR"; then
41757 +      echo "$ac_t""not found" 1>&6
41758 +      { echo "configure: error: Please reinstall the sqlite3 distribution" 1>&2; exit 1; }
41759 +    fi
41760 +
41761 +
41762 +  if test "$PDO_SQLITE_DIR/include" != "/usr/include"; then
41763 +
41764 +  if test -z "$PDO_SQLITE_DIR/include" || echo "$PDO_SQLITE_DIR/include" | grep '^/' >/dev/null ; then
41765 +    ai_p=$PDO_SQLITE_DIR/include
41766 +  else
41767 +
41768 +    ep_dir="`echo $PDO_SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
41769 +
41770 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
41771 +    ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/include\"`"
41772 +  fi
41773 +
41774 +
41775 +
41776 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
41777 +
41778 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
41779 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
41780 +    eval "INCLUDEPATH$unique=set"
41781 +
41782 +      if test ""; then
41783 +        INCLUDES="-I$ai_p $INCLUDES"
41784 +      else
41785 +        INCLUDES="$INCLUDES -I$ai_p"
41786 +      fi
41787 +
41788 +  fi
41789 +
41790 +  fi
41791 +
41792 +
41793 +    LIBNAME=sqlite3
41794 +    LIBSYMBOL=sqlite3_open
41795 +
41796 +
41797 +  save_old_LDFLAGS=$LDFLAGS
41798 +  ac_stuff="
41799 +      -L$PDO_SQLITE_DIR/$PHP_LIBDIR -lm
41800 +    "
41801 +
41802 +  save_ext_shared=$ext_shared
41803 +  ext_shared=yes
41804 +
41805 +  for ac_i in $ac_stuff; do
41806 +    case $ac_i in
41807 +    -pthread)
41808 +      if test "$ext_shared" = "yes"; then
41809 +        LDFLAGS="$LDFLAGS -pthread"
41810 +      else
41811 +
41812 +
41813 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
41814 +
41815 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
41816 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
41817 +    eval "EXTRA_LDFLAGS$unique=set"
41818 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
41819 +  fi
41820 +
41821 +      fi
41822 +    ;;
41823 +    -l*)
41824 +      ac_ii=`echo $ac_i|cut -c 3-`
41825 +
41826 +
41827 +  case $ac_ii in
41828 +  c|c_r|pthread*) ;;
41829 +  *)
41830 +    if test "$ext_shared" = "yes"; then
41831 +        LDFLAGS="$LDFLAGS -l$ac_ii"
41832 +    else
41833 +
41834 +
41835 +  case $ac_ii in
41836 +  c|c_r|pthread*) ;;
41837 +  *)
41838 +      LIBS="$LIBS -l$ac_ii"
41839 +   ;;
41840 +  esac
41841 +
41842 +
41843 +    fi
41844 +   ;;
41845 +  esac
41846 +
41847 +
41848 +    ;;
41849 +    -L*)
41850 +      ac_ii=`echo $ac_i|cut -c 3-`
41851 +
41852 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
41853 +
41854 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
41855 +    ai_p=$ac_ii
41856 +  else
41857 +
41858 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
41859 +
41860 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
41861 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
41862 +  fi
41863 +
41864 +
41865 +      if test "$ext_shared" = "yes"; then
41866 +        LDFLAGS="-L$ai_p $LDFLAGS"
41867 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
41868 +      else
41869 +
41870 +
41871 +
41872 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
41873 +
41874 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
41875 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
41876 +    eval "LIBPATH$unique=set"
41877 +
41878 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
41879 +    LDFLAGS="$LDFLAGS -L$ai_p"
41880 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
41881 +
41882 +  fi
41883 +
41884 +
41885 +      fi
41886 +
41887 +  fi
41888 +
41889 +    ;;
41890 +    esac
41891 +  done
41892 +
41893 +  echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
41894 +echo "configure:76113: checking for $LIBSYMBOL in -l$LIBNAME" >&5
41895 +ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
41896 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41897 +  echo $ac_n "(cached) $ac_c" 1>&6
41898 +else
41899 +  ac_save_LIBS="$LIBS"
41900 +LIBS="-l$LIBNAME  $LIBS"
41901 +cat > conftest.$ac_ext <<EOF
41902 +#line 76121 "configure"
41903 +#include "confdefs.h"
41904 +/* Override any gcc2 internal prototype to avoid an error.  */
41905 +/* We use char because int might match the return type of a gcc2
41906 +    builtin and then its argument prototype would still apply.  */
41907 +char $LIBSYMBOL();
41908 +
41909 +int main() {
41910 +$LIBSYMBOL()
41911 +; return 0; }
41912 +EOF
41913 +if { (eval echo configure:76132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41914 +  rm -rf conftest*
41915 +  eval "ac_cv_lib_$ac_lib_var=yes"
41916 +else
41917 +  echo "configure: failed program was:" >&5
41918 +  cat conftest.$ac_ext >&5
41919 +  rm -rf conftest*
41920 +  eval "ac_cv_lib_$ac_lib_var=no"
41921 +fi
41922 +rm -f conftest*
41923 +LIBS="$ac_save_LIBS"
41924 +
41925 +fi
41926 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41927 +  echo "$ac_t""yes" 1>&6
41928 +
41929 +    LDFLAGS=$save_old_LDFLAGS
41930 +    ext_shared=$save_ext_shared
41931 +
41932 +
41933 +
41934 +  if test "$ext_shared" = "yes"; then
41935 +    PDO_SQLITE_SHARED_LIBADD="-l$LIBNAME $PDO_SQLITE_SHARED_LIBADD"
41936 +    if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then
41937 +
41938 +  if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
41939 +
41940 +  if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
41941 +    ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR
41942 +  else
41943 +
41944 +    ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
41945 +
41946 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
41947 +    ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
41948 +  fi
41949 +
41950 +
41951 +      if test "$ext_shared" = "yes"; then
41952 +        PDO_SQLITE_SHARED_LIBADD="-L$ai_p $PDO_SQLITE_SHARED_LIBADD"
41953 +        test -n "$ld_runpath_switch" && PDO_SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_SQLITE_SHARED_LIBADD"
41954 +      else
41955 +
41956 +
41957 +
41958 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
41959 +
41960 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
41961 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
41962 +    eval "LIBPATH$unique=set"
41963 +
41964 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
41965 +    LDFLAGS="$LDFLAGS -L$ai_p"
41966 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
41967 +
41968 +  fi
41969 +
41970 +
41971 +      fi
41972 +
41973 +  fi
41974 +
41975 +    fi
41976 +  else
41977 +
41978 +
41979 +  if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then
41980 +
41981 +  if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
41982 +
41983 +  if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
41984 +    ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR
41985 +  else
41986 +
41987 +    ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
41988 +
41989 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
41990 +    ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
41991 +  fi
41992 +
41993 +
41994 +
41995 +
41996 +
41997 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
41998 +
41999 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
42000 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
42001 +    eval "LIBPATH$unique=set"
42002 +
42003 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
42004 +    LDFLAGS="$LDFLAGS -L$ai_p"
42005 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
42006 +
42007 +  fi
42008 +
42009 +
42010 +
42011 +  fi
42012 +
42013 +  fi
42014 +
42015 +
42016 +  case $LIBNAME in
42017 +  c|c_r|pthread*) ;;
42018 +  *)
42019 +      LIBS="-l$LIBNAME $LIBS"
42020 +   ;;
42021 +  esac
42022 +
42023 +
42024 +
42025 +
42026 +  fi
42027 +
42028 +
42029 +      cat >> confdefs.h <<\EOF
42030 +#define HAVE_PDO_SQLITELIB 1
42031 +EOF
42032 +
42033 +
42034 +
42035 +else
42036 +  echo "$ac_t""no" 1>&6
42037 +
42038 +    LDFLAGS=$save_old_LDFLAGS
42039 +    ext_shared=$save_ext_shared
42040 +    unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
42041 +
42042 +      { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
42043 +
42044 +
42045 +fi
42046 +
42047 +
42048 +  save_old_LDFLAGS=$LDFLAGS
42049 +  ac_stuff=""
42050 +
42051 +  save_ext_shared=$ext_shared
42052 +  ext_shared=yes
42053 +
42054 +  for ac_i in $ac_stuff; do
42055 +    case $ac_i in
42056 +    -pthread)
42057 +      if test "$ext_shared" = "yes"; then
42058 +        LDFLAGS="$LDFLAGS -pthread"
42059 +      else
42060 +
42061 +
42062 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
42063 +
42064 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
42065 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
42066 +    eval "EXTRA_LDFLAGS$unique=set"
42067 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
42068 +  fi
42069 +
42070 +      fi
42071 +    ;;
42072 +    -l*)
42073 +      ac_ii=`echo $ac_i|cut -c 3-`
42074 +
42075 +
42076 +  case $ac_ii in
42077 +  c|c_r|pthread*) ;;
42078 +  *)
42079 +    if test "$ext_shared" = "yes"; then
42080 +        LDFLAGS="$LDFLAGS -l$ac_ii"
42081 +    else
42082 +
42083 +
42084 +  case $ac_ii in
42085 +  c|c_r|pthread*) ;;
42086 +  *)
42087 +      LIBS="$LIBS -l$ac_ii"
42088 +   ;;
42089 +  esac
42090 +
42091 +
42092 +    fi
42093 +   ;;
42094 +  esac
42095 +
42096 +
42097 +    ;;
42098 +    -L*)
42099 +      ac_ii=`echo $ac_i|cut -c 3-`
42100 +
42101 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
42102 +
42103 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
42104 +    ai_p=$ac_ii
42105 +  else
42106 +
42107 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
42108 +
42109 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
42110 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
42111 +  fi
42112 +
42113 +
42114 +      if test "$ext_shared" = "yes"; then
42115 +        LDFLAGS="-L$ai_p $LDFLAGS"
42116 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
42117 +      else
42118 +
42119 +
42120 +
42121 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
42122 +
42123 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
42124 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
42125 +    eval "LIBPATH$unique=set"
42126 +
42127 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
42128 +    LDFLAGS="$LDFLAGS -L$ai_p"
42129 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
42130 +
42131 +  fi
42132 +
42133 +
42134 +      fi
42135 +
42136 +  fi
42137 +
42138 +    ;;
42139 +    esac
42140 +  done
42141 +
42142 +  echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
42143 +echo "configure:76362: checking for sqlite3_key in -lsqlite3" >&5
42144 +ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
42145 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
42146 +  echo $ac_n "(cached) $ac_c" 1>&6
42147 +else
42148 +  ac_save_LIBS="$LIBS"
42149 +LIBS="-lsqlite3  $LIBS"
42150 +cat > conftest.$ac_ext <<EOF
42151 +#line 76370 "configure"
42152 +#include "confdefs.h"
42153 +/* Override any gcc2 internal prototype to avoid an error.  */
42154 +/* We use char because int might match the return type of a gcc2
42155 +    builtin and then its argument prototype would still apply.  */
42156 +char sqlite3_key();
42157 +
42158 +int main() {
42159 +sqlite3_key()
42160 +; return 0; }
42161 +EOF
42162 +if { (eval echo configure:76381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42163 +  rm -rf conftest*
42164 +  eval "ac_cv_lib_$ac_lib_var=yes"
42165 +else
42166 +  echo "configure: failed program was:" >&5
42167 +  cat conftest.$ac_ext >&5
42168 +  rm -rf conftest*
42169 +  eval "ac_cv_lib_$ac_lib_var=no"
42170 +fi
42171 +rm -f conftest*
42172 +LIBS="$ac_save_LIBS"
42173 +
42174 +fi
42175 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
42176 +  echo "$ac_t""yes" 1>&6
42177 +
42178 +    LDFLAGS=$save_old_LDFLAGS
42179 +    ext_shared=$save_ext_shared
42180 +
42181 +      cat >> confdefs.h <<\EOF
42182 +#define HAVE_SQLITE3_KEY 1
42183 +EOF
42184 +
42185 +
42186 +
42187 +else
42188 +  echo "$ac_t""no" 1>&6
42189 +
42190 +    LDFLAGS=$save_old_LDFLAGS
42191 +    ext_shared=$save_ext_shared
42192 +    unset ac_cv_lib_sqlite3_sqlite3_key
42193 +
42194 +
42195 +fi
42196 +
42197 +
42198 +
42199 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD"
42200 +
42201 +
42202 +  ext_builddir=ext/pdo_sqlite
42203 +  ext_srcdir=$abs_srcdir/ext/pdo_sqlite
42204 +
42205 +  ac_extra=`echo "-I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
42206 +
42207 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
42208 +    PHP_PDO_SQLITE_SHARED=no
42209 +
42210 +
42211 +  case ext/pdo_sqlite in
42212 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
42213 +  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
42214 +  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
42215 +  esac
42216 +
42217 +
42218 +
42219 +  b_c_pre=$php_c_pre
42220 +  b_cxx_pre=$php_cxx_pre
42221 +  b_c_meta=$php_c_meta
42222 +  b_cxx_meta=$php_cxx_meta
42223 +  b_c_post=$php_c_post
42224 +  b_cxx_post=$php_cxx_post
42225 +  b_lo=$php_lo
42226 +
42227 +
42228 +  old_IFS=$IFS
42229 +  for ac_src in $php_pdo_sqlite_sources_core; do
42230 +
42231 +      IFS=.
42232 +      set $ac_src
42233 +      ac_obj=$1
42234 +      IFS=$old_IFS
42235 +
42236 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
42237 +
42238 +      case $ac_src in
42239 +        *.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" ;;
42240 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42241 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42242 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
42243 +      esac
42244 +
42245 +    cat >>Makefile.objects<<EOF
42246 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
42247 +       $ac_comp
42248 +EOF
42249 +  done
42250 +
42251 +
42252 +    EXT_STATIC="$EXT_STATIC pdo_sqlite"
42253 +    if test "$ext_shared" != "nocli"; then
42254 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
42255 +    fi
42256 +  else
42257 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
42258 +      PHP_PDO_SQLITE_SHARED=yes
42259 +
42260 +  case ext/pdo_sqlite in
42261 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
42262 +  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
42263 +  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
42264 +  esac
42265 +
42266 +
42267 +
42268 +  b_c_pre=$shared_c_pre
42269 +  b_cxx_pre=$shared_cxx_pre
42270 +  b_c_meta=$shared_c_meta
42271 +  b_cxx_meta=$shared_cxx_meta
42272 +  b_c_post=$shared_c_post
42273 +  b_cxx_post=$shared_cxx_post
42274 +  b_lo=$shared_lo
42275 +
42276 +
42277 +  old_IFS=$IFS
42278 +  for ac_src in $php_pdo_sqlite_sources_core; do
42279 +
42280 +      IFS=.
42281 +      set $ac_src
42282 +      ac_obj=$1
42283 +      IFS=$old_IFS
42284 +
42285 +      shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo"
42286 +
42287 +      case $ac_src in
42288 +        *.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" ;;
42289 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42290 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42291 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
42292 +      esac
42293 +
42294 +    cat >>Makefile.objects<<EOF
42295 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
42296 +       $ac_comp
42297 +EOF
42298 +  done
42299 +
42300 +      case $host_alias in
42301 +        *netware*)
42302 +
42303 +  install_modules="install-modules"
42304 +
42305 +  case $host_alias in
42306 +    *aix*)
42307 +      suffix=so
42308 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_sqlite.so '$ext_builddir'/phppdo_sqlite.so'
42309 +      ;;
42310 +    *netware*)
42311 +      suffix=nlm
42312 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
42313 +      ;;
42314 +    *)
42315 +      suffix=la
42316 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD)'
42317 +      ;;
42318 +  esac
42319 +
42320 +  if test "x" = "xyes"; then
42321 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_sqlite.$suffix"
42322 +  else
42323 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
42324 +  fi
42325 +
42326 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
42327 +
42328 +  cat >>Makefile.objects<<EOF
42329 +\$(phplibdir)/phppdo_sqlite.$suffix: $ext_builddir/phppdo_sqlite.$suffix
42330 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_sqlite.$suffix \$(phplibdir)
42331 +
42332 +$ext_builddir/phppdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PHPPDO_SQLITE_SHARED_DEPENDENCIES)
42333 +       $link_cmd
42334 +
42335 +EOF
42336 +
42337 +          ;;
42338 +        *)
42339 +
42340 +  install_modules="install-modules"
42341 +
42342 +  case $host_alias in
42343 +    *aix*)
42344 +      suffix=so
42345 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_sqlite.so '$ext_builddir'/pdo_sqlite.so'
42346 +      ;;
42347 +    *netware*)
42348 +      suffix=nlm
42349 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
42350 +      ;;
42351 +    *)
42352 +      suffix=la
42353 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD)'
42354 +      ;;
42355 +  esac
42356 +
42357 +  if test "x" = "xyes"; then
42358 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_sqlite.$suffix"
42359 +  else
42360 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
42361 +  fi
42362 +
42363 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
42364 +
42365 +  cat >>Makefile.objects<<EOF
42366 +\$(phplibdir)/pdo_sqlite.$suffix: $ext_builddir/pdo_sqlite.$suffix
42367 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_sqlite.$suffix \$(phplibdir)
42368 +
42369 +$ext_builddir/pdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PDO_SQLITE_SHARED_DEPENDENCIES)
42370 +       $link_cmd
42371 +
42372 +EOF
42373 +
42374 +          ;;
42375 +      esac
42376 +      cat >> confdefs.h <<EOF
42377 +#define COMPILE_DL_PDO_SQLITE 1
42378 +EOF
42379 +
42380 +    fi
42381 +  fi
42382 +
42383 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
42384 +    PHP_PDO_SQLITE_SHARED=no
42385 +    case "$PHP_SAPI" in
42386 +      cgi|embed)
42387 +
42388 +
42389 +  case ext/pdo_sqlite in
42390 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
42391 +  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
42392 +  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
42393 +  esac
42394 +
42395 +
42396 +
42397 +  b_c_pre=$php_c_pre
42398 +  b_cxx_pre=$php_cxx_pre
42399 +  b_c_meta=$php_c_meta
42400 +  b_cxx_meta=$php_cxx_meta
42401 +  b_c_post=$php_c_post
42402 +  b_cxx_post=$php_cxx_post
42403 +  b_lo=$php_lo
42404 +
42405 +
42406 +  old_IFS=$IFS
42407 +  for ac_src in $php_pdo_sqlite_sources_core; do
42408 +
42409 +      IFS=.
42410 +      set $ac_src
42411 +      ac_obj=$1
42412 +      IFS=$old_IFS
42413 +
42414 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
42415 +
42416 +      case $ac_src in
42417 +        *.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" ;;
42418 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42419 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42420 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
42421 +      esac
42422 +
42423 +    cat >>Makefile.objects<<EOF
42424 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
42425 +       $ac_comp
42426 +EOF
42427 +  done
42428 +
42429 +
42430 +        EXT_STATIC="$EXT_STATIC pdo_sqlite"
42431 +        ;;
42432 +      *)
42433 +
42434 +
42435 +  case ext/pdo_sqlite in
42436 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
42437 +  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
42438 +  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
42439 +  esac
42440 +
42441 +
42442 +
42443 +  b_c_pre=$php_c_pre
42444 +  b_cxx_pre=$php_cxx_pre
42445 +  b_c_meta=$php_c_meta
42446 +  b_cxx_meta=$php_cxx_meta
42447 +  b_c_post=$php_c_post
42448 +  b_cxx_post=$php_cxx_post
42449 +  b_lo=$php_lo
42450 +
42451 +
42452 +  old_IFS=$IFS
42453 +  for ac_src in $php_pdo_sqlite_sources_core; do
42454 +
42455 +      IFS=.
42456 +      set $ac_src
42457 +      ac_obj=$1
42458 +      IFS=$old_IFS
42459 +
42460 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
42461 +
42462 +      case $ac_src in
42463 +        *.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" ;;
42464 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42465 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42466 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
42467 +      esac
42468 +
42469 +    cat >>Makefile.objects<<EOF
42470 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
42471 +       $ac_comp
42472 +EOF
42473 +  done
42474 +
42475 +
42476 +        ;;
42477 +    esac
42478 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
42479 +  fi
42480 +
42481 +
42482 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
42483 +
42484 +
42485 +
42486 +  if test "$ext_builddir" = "."; then
42487 +    PHP_PECL_EXTENSION=pdo_sqlite
42488 +
42489 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
42490 +
42491 +  fi
42492 +
42493 +  else
42494 +      # use bundled libs
42495 +      if test "$enable_maintainer_zts" = "yes"; then
42496 +        threadsafe_flags="-DSQLITE_THREADSAFE=1"
42497 +      else
42498 +        threadsafe_flags="-DSQLITE_THREADSAFE=0"
42499 +      fi
42500 +
42501 +      other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
42502 +
42503 +               if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then
42504 +        other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
42505 +      fi
42506 +
42507 +      if test "$PHP_SQLITE3" != "yes"; then
42508 +
42509 +
42510 +  case ext/sqlite3 in
42511 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
42512 +  /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
42513 +  *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
42514 +  esac
42515 +
42516 +
42517 +
42518 +  b_c_pre=$php_c_pre
42519 +  b_cxx_pre=$php_cxx_pre
42520 +  b_c_meta=$php_c_meta
42521 +  b_cxx_meta=$php_cxx_meta
42522 +  b_c_post=$php_c_post
42523 +  b_cxx_post=$php_cxx_post
42524 +  b_lo=$php_lo
42525 +
42526 +
42527 +  old_IFS=$IFS
42528 +  for ac_src in libsqlite/sqlite3.c; do
42529 +
42530 +      IFS=.
42531 +      set $ac_src
42532 +      ac_obj=$1
42533 +      IFS=$old_IFS
42534 +
42535 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
42536 +
42537 +      case $ac_src in
42538 +        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42539 +        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42540 +        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42541 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
42542 +      esac
42543 +
42544 +    cat >>Makefile.objects<<EOF
42545 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
42546 +       $ac_comp
42547 +EOF
42548 +  done
42549 +
42550 +
42551 +      fi
42552 +
42553 +
42554 +  ext_builddir=ext/pdo_sqlite
42555 +  ext_srcdir=$abs_srcdir/ext/pdo_sqlite
42556 +
42557 +  ac_extra=`echo "-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
42558 +
42559 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
42560 +    PHP_PDO_SQLITE_SHARED=no
42561 +
42562 +
42563 +  case ext/pdo_sqlite in
42564 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
42565 +  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
42566 +  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
42567 +  esac
42568 +
42569 +
42570 +
42571 +  b_c_pre=$php_c_pre
42572 +  b_cxx_pre=$php_cxx_pre
42573 +  b_c_meta=$php_c_meta
42574 +  b_cxx_meta=$php_cxx_meta
42575 +  b_c_post=$php_c_post
42576 +  b_cxx_post=$php_cxx_post
42577 +  b_lo=$php_lo
42578 +
42579 +
42580 +  old_IFS=$IFS
42581 +  for ac_src in $php_pdo_sqlite_sources_core; do
42582 +
42583 +      IFS=.
42584 +      set $ac_src
42585 +      ac_obj=$1
42586 +      IFS=$old_IFS
42587 +
42588 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
42589 +
42590 +      case $ac_src in
42591 +        *.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" ;;
42592 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42593 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42594 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
42595 +      esac
42596 +
42597 +    cat >>Makefile.objects<<EOF
42598 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
42599 +       $ac_comp
42600 +EOF
42601 +  done
42602 +
42603 +
42604 +    EXT_STATIC="$EXT_STATIC pdo_sqlite"
42605 +    if test "$ext_shared" != "nocli"; then
42606 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
42607 +    fi
42608 +  else
42609 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
42610 +      PHP_PDO_SQLITE_SHARED=yes
42611 +
42612 +  case ext/pdo_sqlite in
42613 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
42614 +  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
42615 +  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
42616 +  esac
42617 +
42618 +
42619 +
42620 +  b_c_pre=$shared_c_pre
42621 +  b_cxx_pre=$shared_cxx_pre
42622 +  b_c_meta=$shared_c_meta
42623 +  b_cxx_meta=$shared_cxx_meta
42624 +  b_c_post=$shared_c_post
42625 +  b_cxx_post=$shared_cxx_post
42626 +  b_lo=$shared_lo
42627 +
42628 +
42629 +  old_IFS=$IFS
42630 +  for ac_src in $php_pdo_sqlite_sources_core; do
42631 +
42632 +      IFS=.
42633 +      set $ac_src
42634 +      ac_obj=$1
42635 +      IFS=$old_IFS
42636 +
42637 +      shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo"
42638 +
42639 +      case $ac_src in
42640 +        *.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" ;;
42641 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42642 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42643 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
42644 +      esac
42645 +
42646 +    cat >>Makefile.objects<<EOF
42647 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
42648 +       $ac_comp
42649 +EOF
42650 +  done
42651 +
42652 +      case $host_alias in
42653 +        *netware*)
42654 +
42655 +  install_modules="install-modules"
42656 +
42657 +  case $host_alias in
42658 +    *aix*)
42659 +      suffix=so
42660 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppdo_sqlite.so '$ext_builddir'/phppdo_sqlite.so'
42661 +      ;;
42662 +    *netware*)
42663 +      suffix=nlm
42664 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)'
42665 +      ;;
42666 +    *)
42667 +      suffix=la
42668 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PHPPDO_SQLITE_SHARED_LIBADD)'
42669 +      ;;
42670 +  esac
42671 +
42672 +  if test "x" = "xyes"; then
42673 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppdo_sqlite.$suffix"
42674 +  else
42675 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix"
42676 +  fi
42677 +
42678 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
42679 +
42680 +  cat >>Makefile.objects<<EOF
42681 +\$(phplibdir)/phppdo_sqlite.$suffix: $ext_builddir/phppdo_sqlite.$suffix
42682 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppdo_sqlite.$suffix \$(phplibdir)
42683 +
42684 +$ext_builddir/phppdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PHPPDO_SQLITE_SHARED_DEPENDENCIES)
42685 +       $link_cmd
42686 +
42687 +EOF
42688 +
42689 +          ;;
42690 +        *)
42691 +
42692 +  install_modules="install-modules"
42693 +
42694 +  case $host_alias in
42695 +    *aix*)
42696 +      suffix=so
42697 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pdo_sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pdo_sqlite.so '$ext_builddir'/pdo_sqlite.so'
42698 +      ;;
42699 +    *netware*)
42700 +      suffix=nlm
42701 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)'
42702 +      ;;
42703 +    *)
42704 +      suffix=la
42705 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) $(PDO_SQLITE_SHARED_LIBADD)'
42706 +      ;;
42707 +  esac
42708 +
42709 +  if test "x" = "xyes"; then
42710 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo_sqlite.$suffix"
42711 +  else
42712 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix"
42713 +  fi
42714 +
42715 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite"
42716 +
42717 +  cat >>Makefile.objects<<EOF
42718 +\$(phplibdir)/pdo_sqlite.$suffix: $ext_builddir/pdo_sqlite.$suffix
42719 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pdo_sqlite.$suffix \$(phplibdir)
42720 +
42721 +$ext_builddir/pdo_sqlite.$suffix: \$(shared_objects_pdo_sqlite) \$(PDO_SQLITE_SHARED_DEPENDENCIES)
42722 +       $link_cmd
42723 +
42724 +EOF
42725 +
42726 +          ;;
42727 +      esac
42728 +      cat >> confdefs.h <<EOF
42729 +#define COMPILE_DL_PDO_SQLITE 1
42730 +EOF
42731 +
42732 +    fi
42733 +  fi
42734 +
42735 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
42736 +    PHP_PDO_SQLITE_SHARED=no
42737 +    case "$PHP_SAPI" in
42738 +      cgi|embed)
42739 +
42740 +
42741 +  case ext/pdo_sqlite in
42742 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
42743 +  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
42744 +  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
42745 +  esac
42746 +
42747 +
42748 +
42749 +  b_c_pre=$php_c_pre
42750 +  b_cxx_pre=$php_cxx_pre
42751 +  b_c_meta=$php_c_meta
42752 +  b_cxx_meta=$php_cxx_meta
42753 +  b_c_post=$php_c_post
42754 +  b_cxx_post=$php_cxx_post
42755 +  b_lo=$php_lo
42756 +
42757 +
42758 +  old_IFS=$IFS
42759 +  for ac_src in $php_pdo_sqlite_sources_core; do
42760 +
42761 +      IFS=.
42762 +      set $ac_src
42763 +      ac_obj=$1
42764 +      IFS=$old_IFS
42765 +
42766 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
42767 +
42768 +      case $ac_src in
42769 +        *.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" ;;
42770 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42771 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42772 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
42773 +      esac
42774 +
42775 +    cat >>Makefile.objects<<EOF
42776 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
42777 +       $ac_comp
42778 +EOF
42779 +  done
42780 +
42781 +
42782 +        EXT_STATIC="$EXT_STATIC pdo_sqlite"
42783 +        ;;
42784 +      *)
42785 +
42786 +
42787 +  case ext/pdo_sqlite in
42788 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
42789 +  /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
42790 +  *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
42791 +  esac
42792 +
42793 +
42794 +
42795 +  b_c_pre=$php_c_pre
42796 +  b_cxx_pre=$php_cxx_pre
42797 +  b_c_meta=$php_c_meta
42798 +  b_cxx_meta=$php_cxx_meta
42799 +  b_c_post=$php_c_post
42800 +  b_cxx_post=$php_cxx_post
42801 +  b_lo=$php_lo
42802 +
42803 +
42804 +  old_IFS=$IFS
42805 +  for ac_src in $php_pdo_sqlite_sources_core; do
42806 +
42807 +      IFS=.
42808 +      set $ac_src
42809 +      ac_obj=$1
42810 +      IFS=$old_IFS
42811 +
42812 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
42813 +
42814 +      case $ac_src in
42815 +        *.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" ;;
42816 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42817 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
42818 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
42819 +      esac
42820 +
42821 +    cat >>Makefile.objects<<EOF
42822 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
42823 +       $ac_comp
42824 +EOF
42825 +  done
42826 +
42827 +
42828 +        ;;
42829 +    esac
42830 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
42831 +  fi
42832 +
42833 +
42834 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
42835 +
42836 +
42837 +
42838 +  if test "$ext_builddir" = "."; then
42839 +    PHP_PECL_EXTENSION=pdo_sqlite
42840 +
42841 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
42842 +
42843 +  fi
42844 +
42845 +
42846 +
42847 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD"
42848 +
42849 +
42850 +  am_i_shared=$PHP_PDO_SQLITE_SHARED
42851 +  is_it_shared=$PHP_SQLITE3_SHARED
42852 +  is_it_enabled=$PHP_SQLITE3
42853 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
42854 +    { echo "configure: error:
42855 +You've configured extension pdo_sqlite to build statically, but it
42856 +depends on extension sqlite3, which you've configured to build shared.
42857 +You either need to build pdo_sqlite shared or build sqlite3 statically for the
42858 +build to be successful.
42859 +" 1>&2; exit 1; }
42860 +  fi
42861 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
42862 +    { echo "configure: error:
42863 +You've configured extension pdo_sqlite, which depends on extension sqlite3,
42864 +but you've either not enabled sqlite3, or have disabled it.
42865 +" 1>&2; exit 1; }
42866 +  fi
42867 +
42868 +
42869 +  if test "$abs_srcdir/ext/sqlite3/libsqlite" != "/usr/include"; then
42870 +
42871 +  if test -z "$abs_srcdir/ext/sqlite3/libsqlite" || echo "$abs_srcdir/ext/sqlite3/libsqlite" | grep '^/' >/dev/null ; then
42872 +    ai_p=$abs_srcdir/ext/sqlite3/libsqlite
42873 +  else
42874 +
42875 +    ep_dir="`echo $abs_srcdir/ext/sqlite3/libsqlite|$SED 's%/*[^/][^/]*/*$%%'`"
42876 +
42877 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
42878 +    ai_p="$ep_realdir/`basename \"$abs_srcdir/ext/sqlite3/libsqlite\"`"
42879 +  fi
42880 +
42881 +
42882 +
42883 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
42884 +
42885 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
42886 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
42887 +    eval "INCLUDEPATH$unique=set"
42888 +
42889 +      if test ""; then
42890 +        INCLUDES="-I$ai_p $INCLUDES"
42891 +      else
42892 +        INCLUDES="$INCLUDES -I$ai_p"
42893 +      fi
42894 +
42895 +  fi
42896 +
42897 +  fi
42898 +
42899 +
42900 +      for ac_func in usleep nanosleep
42901 +do
42902 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
42903 +echo "configure:77122: checking for $ac_func" >&5
42904 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
42905 +  echo $ac_n "(cached) $ac_c" 1>&6
42906 +else
42907 +  cat > conftest.$ac_ext <<EOF
42908 +#line 77127 "configure"
42909 +#include "confdefs.h"
42910 +/* System header to define __stub macros and hopefully few prototypes,
42911 +    which can conflict with char $ac_func(); below.  */
42912 +#include <assert.h>
42913 +/* Override any gcc2 internal prototype to avoid an error.  */
42914 +/* We use char because int might match the return type of a gcc2
42915 +    builtin and then its argument prototype would still apply.  */
42916 +char $ac_func();
42917 +
42918 +int main() {
42919 +
42920 +/* The GNU C library defines this for functions which it implements
42921 +    to always fail with ENOSYS.  Some functions are actually named
42922 +    something starting with __ and the normal name is an alias.  */
42923 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
42924 +choke me
42925 +#else
42926 +$ac_func();
42927 +#endif
42928 +
42929 +; return 0; }
42930 +EOF
42931 +if { (eval echo configure:77150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42932 +  rm -rf conftest*
42933 +  eval "ac_cv_func_$ac_func=yes"
42934 +else
42935 +  echo "configure: failed program was:" >&5
42936 +  cat conftest.$ac_ext >&5
42937 +  rm -rf conftest*
42938 +  eval "ac_cv_func_$ac_func=no"
42939 +fi
42940 +rm -f conftest*
42941 +fi
42942 +
42943 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
42944 +  echo "$ac_t""yes" 1>&6
42945 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
42946 +  cat >> confdefs.h <<EOF
42947 +#define $ac_tr_func 1
42948 +EOF
42949 +
42950 +else
42951 +  echo "$ac_t""no" 1>&6
42952 +fi
42953 +done
42954 +
42955 +      for ac_hdr in time.h
42956 +do
42957 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
42958 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
42959 +echo "configure:77178: checking for $ac_hdr" >&5
42960 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
42961 +  echo $ac_n "(cached) $ac_c" 1>&6
42962 +else
42963 +  cat > conftest.$ac_ext <<EOF
42964 +#line 77183 "configure"
42965 +#include "confdefs.h"
42966 +#include <$ac_hdr>
42967 +EOF
42968 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
42969 +{ (eval echo configure:77188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
42970 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
42971 +if test -z "$ac_err"; then
42972 +  rm -rf conftest*
42973 +  eval "ac_cv_header_$ac_safe=yes"
42974 +else
42975 +  echo "$ac_err" >&5
42976 +  echo "configure: failed program was:" >&5
42977 +  cat conftest.$ac_ext >&5
42978 +  rm -rf conftest*
42979 +  eval "ac_cv_header_$ac_safe=no"
42980 +fi
42981 +rm -f conftest*
42982 +fi
42983 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
42984 +  echo "$ac_t""yes" 1>&6
42985 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
42986 +  cat >> confdefs.h <<EOF
42987 +#define $ac_tr_hdr 1
42988 +EOF
42989 +
42990 +else
42991 +  echo "$ac_t""no" 1>&6
42992 +fi
42993 +done
42994 +
42995 +  fi
42996 +
42997 +
42998 +  save_old_LDFLAGS=$LDFLAGS
42999 +  ac_stuff=""
43000 +
43001 +  save_ext_shared=$ext_shared
43002 +  ext_shared=yes
43003 +
43004 +  for ac_i in $ac_stuff; do
43005 +    case $ac_i in
43006 +    -pthread)
43007 +      if test "$ext_shared" = "yes"; then
43008 +        LDFLAGS="$LDFLAGS -pthread"
43009 +      else
43010 +
43011 +
43012 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
43013 +
43014 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
43015 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
43016 +    eval "EXTRA_LDFLAGS$unique=set"
43017 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
43018 +  fi
43019 +
43020 +      fi
43021 +    ;;
43022 +    -l*)
43023 +      ac_ii=`echo $ac_i|cut -c 3-`
43024 +
43025 +
43026 +  case $ac_ii in
43027 +  c|c_r|pthread*) ;;
43028 +  *)
43029 +    if test "$ext_shared" = "yes"; then
43030 +        LDFLAGS="$LDFLAGS -l$ac_ii"
43031 +    else
43032 +
43033 +
43034 +  case $ac_ii in
43035 +  c|c_r|pthread*) ;;
43036 +  *)
43037 +      LIBS="$LIBS -l$ac_ii"
43038 +   ;;
43039 +  esac
43040 +
43041 +
43042 +    fi
43043 +   ;;
43044 +  esac
43045 +
43046 +
43047 +    ;;
43048 +    -L*)
43049 +      ac_ii=`echo $ac_i|cut -c 3-`
43050 +
43051 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
43052 +
43053 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
43054 +    ai_p=$ac_ii
43055 +  else
43056 +
43057 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
43058 +
43059 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
43060 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
43061 +  fi
43062 +
43063 +
43064 +      if test "$ext_shared" = "yes"; then
43065 +        LDFLAGS="-L$ai_p $LDFLAGS"
43066 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
43067 +      else
43068 +
43069 +
43070 +
43071 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
43072 +
43073 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
43074 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
43075 +    eval "LIBPATH$unique=set"
43076 +
43077 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
43078 +    LDFLAGS="$LDFLAGS -L$ai_p"
43079 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
43080 +
43081 +  fi
43082 +
43083 +
43084 +      fi
43085 +
43086 +  fi
43087 +
43088 +    ;;
43089 +    esac
43090 +  done
43091 +
43092 +  echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
43093 +echo "configure:77312: checking for fdatasync in -lrt" >&5
43094 +ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'`
43095 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43096 +  echo $ac_n "(cached) $ac_c" 1>&6
43097 +else
43098 +  ac_save_LIBS="$LIBS"
43099 +LIBS="-lrt  $LIBS"
43100 +cat > conftest.$ac_ext <<EOF
43101 +#line 77320 "configure"
43102 +#include "confdefs.h"
43103 +/* Override any gcc2 internal prototype to avoid an error.  */
43104 +/* We use char because int might match the return type of a gcc2
43105 +    builtin and then its argument prototype would still apply.  */
43106 +char fdatasync();
43107 +
43108 +int main() {
43109 +fdatasync()
43110 +; return 0; }
43111 +EOF
43112 +if { (eval echo configure:77331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43113 +  rm -rf conftest*
43114 +  eval "ac_cv_lib_$ac_lib_var=yes"
43115 +else
43116 +  echo "configure: failed program was:" >&5
43117 +  cat conftest.$ac_ext >&5
43118 +  rm -rf conftest*
43119 +  eval "ac_cv_lib_$ac_lib_var=no"
43120 +fi
43121 +rm -f conftest*
43122 +LIBS="$ac_save_LIBS"
43123 +
43124 +fi
43125 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43126 +  echo "$ac_t""yes" 1>&6
43127 +
43128 +    LDFLAGS=$save_old_LDFLAGS
43129 +    ext_shared=$save_ext_shared
43130 +
43131 +
43132 +  case rt in
43133 +  c|c_r|pthread*) ;;
43134 +  *)
43135 +    if test "$ext_shared" = "yes"; then
43136 +        PDO_SQLITE_SHARED_LIBADD="-lrt $PDO_SQLITE_SHARED_LIBADD"
43137 +    else
43138 +
43139 +
43140 +  case rt in
43141 +  c|c_r|pthread*) ;;
43142 +  *)
43143 +      LIBS="-lrt $LIBS"
43144 +   ;;
43145 +  esac
43146 +
43147 +
43148 +    fi
43149 +   ;;
43150 +  esac
43151 +
43152 +
43153 +
43154 +else
43155 +  echo "$ac_t""no" 1>&6
43156 +
43157 +    LDFLAGS=$save_old_LDFLAGS
43158 +    ext_shared=$save_ext_shared
43159 +    unset ac_cv_lib_rt_fdatasync
43160 +
43161 +
43162 +fi
43163 +
43164 +
43165 +
43166 +
43167 +  am_i_shared=$PHP_PDO_SQLITE_SHARED
43168 +  is_it_shared=$PHP_PDO_SHARED
43169 +  is_it_enabled=$PHP_PDO
43170 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
43171 +    { echo "configure: error:
43172 +You've configured extension pdo_sqlite to build statically, but it
43173 +depends on extension pdo, which you've configured to build shared.
43174 +You either need to build pdo_sqlite shared or build pdo statically for the
43175 +build to be successful.
43176 +" 1>&2; exit 1; }
43177 +  fi
43178 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
43179 +    { echo "configure: error:
43180 +You've configured extension pdo_sqlite, which depends on extension pdo,
43181 +but you've either not enabled pdo, or have disabled it.
43182 +" 1>&2; exit 1; }
43183 +  fi
43184 +
43185 +
43186 +fi
43187 +
43188 +
43189 +
43190 +php_with_pgsql=no
43191 +
43192 +echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
43193 +echo "configure:77412: checking for PostgreSQL support" >&5
43194 +# Check whether --with-pgsql or --without-pgsql was given.
43195 +if test "${with_pgsql+set}" = set; then
43196 +  withval="$with_pgsql"
43197 +  PHP_PGSQL=$withval
43198 +else
43199 +
43200 +  PHP_PGSQL=no
43201 +  test "$PHP_ENABLE_ALL" && PHP_PGSQL=$PHP_ENABLE_ALL
43202 +
43203 +fi
43204 +
43205 +
43206 +
43207 +ext_output="yes, shared"
43208 +ext_shared=yes
43209 +case $PHP_PGSQL in
43210 +shared,*)
43211 +  PHP_PGSQL=`echo "$PHP_PGSQL"|$SED 's/^shared,//'`
43212 +  ;;
43213 +shared)
43214 +  PHP_PGSQL=yes
43215 +  ;;
43216 +no)
43217 +  ext_output=no
43218 +  ext_shared=no
43219 +  ;;
43220 +*)
43221 +  ext_output=yes
43222 +  ext_shared=no
43223 +  ;;
43224 +esac
43225 +
43226 +
43227 +
43228 +echo "$ac_t""$ext_output" 1>&6
43229 +
43230 +
43231 +
43232 +
43233 +if test "$PHP_PGSQL" != "no"; then
43234 +
43235 +  if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
43236 +    PGSQL_INCLUDE=$PGSQL_INCLUDE
43237 +  else
43238 +
43239 +    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
43240 +
43241 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
43242 +    PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
43243 +  fi
43244 +
43245 +
43246 +  echo $ac_n "checking for pg_config""... $ac_c" 1>&6
43247 +echo "configure:77466: checking for pg_config" >&5
43248 +  for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
43249 +       if test -x $i/pg_config; then
43250 +      PG_CONFIG="$i/pg_config"
43251 +      break;
43252 +    fi
43253 +  done
43254 +
43255 +  if test -n "$PG_CONFIG"; then
43256 +    echo "$ac_t""$PG_CONFIG" 1>&6
43257 +    PGSQL_INCLUDE=`$PG_CONFIG --includedir`
43258 +    PGSQL_LIBDIR=`$PG_CONFIG --libdir`
43259 +    if test -r "$PGSQL_INCLUDE/pg_config.h"; then
43260 +      cat >> confdefs.h <<\EOF
43261 +#define HAVE_PG_CONFIG_H 1
43262 +EOF
43263 +
43264 +    fi
43265 +  else
43266 +    echo "$ac_t""not found" 1>&6
43267 +    if test "$PHP_PGSQL" = "yes"; then
43268 +      PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
43269 +    else
43270 +      PGSQL_SEARCH_PATHS=$PHP_PGSQL
43271 +    fi
43272 +
43273 +    for i in $PGSQL_SEARCH_PATHS; do
43274 +      for j in include include/pgsql include/postgres include/postgresql ""; do
43275 +        if test -r "$i/$j/libpq-fe.h"; then
43276 +          PGSQL_INC_BASE=$i
43277 +          PGSQL_INCLUDE=$i/$j
43278 +          if test -r "$i/$j/pg_config.h"; then
43279 +            cat >> confdefs.h <<\EOF
43280 +#define HAVE_PG_CONFIG_H 1
43281 +EOF
43282 +
43283 +          fi
43284 +        fi
43285 +      done
43286 +
43287 +      for j in lib $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
43288 +        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
43289 +          PGSQL_LIBDIR=$i/$j
43290 +        fi
43291 +      done
43292 +    done
43293 +  fi
43294 +
43295 +  if test -z "$PGSQL_INCLUDE"; then
43296 +    { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
43297 +  fi
43298 +
43299 +  if test -z "$PGSQL_LIBDIR"; then
43300 +    { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; }
43301 +  fi
43302 +
43303 +  if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
43304 +    { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; }
43305 +  fi
43306 +
43307 +  cat >> confdefs.h <<\EOF
43308 +#define HAVE_PGSQL 1
43309 +EOF
43310 +
43311 +  old_LIBS=$LIBS
43312 +  old_LDFLAGS=$LDFLAGS
43313 +  LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
43314 +  echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
43315 +echo "configure:77534: checking for PQescapeString in -lpq" >&5
43316 +ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'`
43317 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43318 +  echo $ac_n "(cached) $ac_c" 1>&6
43319 +else
43320 +  ac_save_LIBS="$LIBS"
43321 +LIBS="-lpq  $LIBS"
43322 +cat > conftest.$ac_ext <<EOF
43323 +#line 77542 "configure"
43324 +#include "confdefs.h"
43325 +/* Override any gcc2 internal prototype to avoid an error.  */
43326 +/* We use char because int might match the return type of a gcc2
43327 +    builtin and then its argument prototype would still apply.  */
43328 +char PQescapeString();
43329 +
43330 +int main() {
43331 +PQescapeString()
43332 +; return 0; }
43333 +EOF
43334 +if { (eval echo configure:77553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43335 +  rm -rf conftest*
43336 +  eval "ac_cv_lib_$ac_lib_var=yes"
43337 +else
43338 +  echo "configure: failed program was:" >&5
43339 +  cat conftest.$ac_ext >&5
43340 +  rm -rf conftest*
43341 +  eval "ac_cv_lib_$ac_lib_var=no"
43342 +fi
43343 +rm -f conftest*
43344 +LIBS="$ac_save_LIBS"
43345 +
43346 +fi
43347 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43348 +  echo "$ac_t""yes" 1>&6
43349 +  cat >> confdefs.h <<\EOF
43350 +#define HAVE_PQESCAPE 1
43351 +EOF
43352 +
43353 +else
43354 +  echo "$ac_t""no" 1>&6
43355 +fi
43356 +
43357 +  echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
43358 +echo "configure:77577: checking for PQunescapeBytea in -lpq" >&5
43359 +ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'`
43360 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43361 +  echo $ac_n "(cached) $ac_c" 1>&6
43362 +else
43363 +  ac_save_LIBS="$LIBS"
43364 +LIBS="-lpq  $LIBS"
43365 +cat > conftest.$ac_ext <<EOF
43366 +#line 77585 "configure"
43367 +#include "confdefs.h"
43368 +/* Override any gcc2 internal prototype to avoid an error.  */
43369 +/* We use char because int might match the return type of a gcc2
43370 +    builtin and then its argument prototype would still apply.  */
43371 +char PQunescapeBytea();
43372 +
43373 +int main() {
43374 +PQunescapeBytea()
43375 +; return 0; }
43376 +EOF
43377 +if { (eval echo configure:77596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43378 +  rm -rf conftest*
43379 +  eval "ac_cv_lib_$ac_lib_var=yes"
43380 +else
43381 +  echo "configure: failed program was:" >&5
43382 +  cat conftest.$ac_ext >&5
43383 +  rm -rf conftest*
43384 +  eval "ac_cv_lib_$ac_lib_var=no"
43385 +fi
43386 +rm -f conftest*
43387 +LIBS="$ac_save_LIBS"
43388 +
43389 +fi
43390 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43391 +  echo "$ac_t""yes" 1>&6
43392 +  cat >> confdefs.h <<\EOF
43393 +#define HAVE_PQUNESCAPEBYTEA 1
43394 +EOF
43395 +
43396 +else
43397 +  echo "$ac_t""no" 1>&6
43398 +fi
43399 +
43400 +  echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
43401 +echo "configure:77620: checking for PQsetnonblocking in -lpq" >&5
43402 +ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'`
43403 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43404 +  echo $ac_n "(cached) $ac_c" 1>&6
43405 +else
43406 +  ac_save_LIBS="$LIBS"
43407 +LIBS="-lpq  $LIBS"
43408 +cat > conftest.$ac_ext <<EOF
43409 +#line 77628 "configure"
43410 +#include "confdefs.h"
43411 +/* Override any gcc2 internal prototype to avoid an error.  */
43412 +/* We use char because int might match the return type of a gcc2
43413 +    builtin and then its argument prototype would still apply.  */
43414 +char PQsetnonblocking();
43415 +
43416 +int main() {
43417 +PQsetnonblocking()
43418 +; return 0; }
43419 +EOF
43420 +if { (eval echo configure:77639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43421 +  rm -rf conftest*
43422 +  eval "ac_cv_lib_$ac_lib_var=yes"
43423 +else
43424 +  echo "configure: failed program was:" >&5
43425 +  cat conftest.$ac_ext >&5
43426 +  rm -rf conftest*
43427 +  eval "ac_cv_lib_$ac_lib_var=no"
43428 +fi
43429 +rm -f conftest*
43430 +LIBS="$ac_save_LIBS"
43431 +
43432 +fi
43433 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43434 +  echo "$ac_t""yes" 1>&6
43435 +  cat >> confdefs.h <<\EOF
43436 +#define HAVE_PQSETNONBLOCKING 1
43437 +EOF
43438 +
43439 +else
43440 +  echo "$ac_t""no" 1>&6
43441 +fi
43442 +
43443 +  echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
43444 +echo "configure:77663: checking for PQcmdTuples in -lpq" >&5
43445 +ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
43446 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43447 +  echo $ac_n "(cached) $ac_c" 1>&6
43448 +else
43449 +  ac_save_LIBS="$LIBS"
43450 +LIBS="-lpq  $LIBS"
43451 +cat > conftest.$ac_ext <<EOF
43452 +#line 77671 "configure"
43453 +#include "confdefs.h"
43454 +/* Override any gcc2 internal prototype to avoid an error.  */
43455 +/* We use char because int might match the return type of a gcc2
43456 +    builtin and then its argument prototype would still apply.  */
43457 +char PQcmdTuples();
43458 +
43459 +int main() {
43460 +PQcmdTuples()
43461 +; return 0; }
43462 +EOF
43463 +if { (eval echo configure:77682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43464 +  rm -rf conftest*
43465 +  eval "ac_cv_lib_$ac_lib_var=yes"
43466 +else
43467 +  echo "configure: failed program was:" >&5
43468 +  cat conftest.$ac_ext >&5
43469 +  rm -rf conftest*
43470 +  eval "ac_cv_lib_$ac_lib_var=no"
43471 +fi
43472 +rm -f conftest*
43473 +LIBS="$ac_save_LIBS"
43474 +
43475 +fi
43476 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43477 +  echo "$ac_t""yes" 1>&6
43478 +  cat >> confdefs.h <<\EOF
43479 +#define HAVE_PQCMDTUPLES 1
43480 +EOF
43481 +
43482 +else
43483 +  echo "$ac_t""no" 1>&6
43484 +fi
43485 +
43486 +  echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
43487 +echo "configure:77706: checking for PQoidValue in -lpq" >&5
43488 +ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
43489 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43490 +  echo $ac_n "(cached) $ac_c" 1>&6
43491 +else
43492 +  ac_save_LIBS="$LIBS"
43493 +LIBS="-lpq  $LIBS"
43494 +cat > conftest.$ac_ext <<EOF
43495 +#line 77714 "configure"
43496 +#include "confdefs.h"
43497 +/* Override any gcc2 internal prototype to avoid an error.  */
43498 +/* We use char because int might match the return type of a gcc2
43499 +    builtin and then its argument prototype would still apply.  */
43500 +char PQoidValue();
43501 +
43502 +int main() {
43503 +PQoidValue()
43504 +; return 0; }
43505 +EOF
43506 +if { (eval echo configure:77725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43507 +  rm -rf conftest*
43508 +  eval "ac_cv_lib_$ac_lib_var=yes"
43509 +else
43510 +  echo "configure: failed program was:" >&5
43511 +  cat conftest.$ac_ext >&5
43512 +  rm -rf conftest*
43513 +  eval "ac_cv_lib_$ac_lib_var=no"
43514 +fi
43515 +rm -f conftest*
43516 +LIBS="$ac_save_LIBS"
43517 +
43518 +fi
43519 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43520 +  echo "$ac_t""yes" 1>&6
43521 +  cat >> confdefs.h <<\EOF
43522 +#define HAVE_PQOIDVALUE 1
43523 +EOF
43524 +
43525 +else
43526 +  echo "$ac_t""no" 1>&6
43527 +fi
43528 +
43529 +  echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
43530 +echo "configure:77749: checking for PQclientEncoding in -lpq" >&5
43531 +ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
43532 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43533 +  echo $ac_n "(cached) $ac_c" 1>&6
43534 +else
43535 +  ac_save_LIBS="$LIBS"
43536 +LIBS="-lpq  $LIBS"
43537 +cat > conftest.$ac_ext <<EOF
43538 +#line 77757 "configure"
43539 +#include "confdefs.h"
43540 +/* Override any gcc2 internal prototype to avoid an error.  */
43541 +/* We use char because int might match the return type of a gcc2
43542 +    builtin and then its argument prototype would still apply.  */
43543 +char PQclientEncoding();
43544 +
43545 +int main() {
43546 +PQclientEncoding()
43547 +; return 0; }
43548 +EOF
43549 +if { (eval echo configure:77768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43550 +  rm -rf conftest*
43551 +  eval "ac_cv_lib_$ac_lib_var=yes"
43552 +else
43553 +  echo "configure: failed program was:" >&5
43554 +  cat conftest.$ac_ext >&5
43555 +  rm -rf conftest*
43556 +  eval "ac_cv_lib_$ac_lib_var=no"
43557 +fi
43558 +rm -f conftest*
43559 +LIBS="$ac_save_LIBS"
43560 +
43561 +fi
43562 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43563 +  echo "$ac_t""yes" 1>&6
43564 +  cat >> confdefs.h <<\EOF
43565 +#define HAVE_PQCLIENTENCODING 1
43566 +EOF
43567 +
43568 +else
43569 +  echo "$ac_t""no" 1>&6
43570 +fi
43571 +
43572 +  echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
43573 +echo "configure:77792: checking for PQparameterStatus in -lpq" >&5
43574 +ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
43575 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43576 +  echo $ac_n "(cached) $ac_c" 1>&6
43577 +else
43578 +  ac_save_LIBS="$LIBS"
43579 +LIBS="-lpq  $LIBS"
43580 +cat > conftest.$ac_ext <<EOF
43581 +#line 77800 "configure"
43582 +#include "confdefs.h"
43583 +/* Override any gcc2 internal prototype to avoid an error.  */
43584 +/* We use char because int might match the return type of a gcc2
43585 +    builtin and then its argument prototype would still apply.  */
43586 +char PQparameterStatus();
43587 +
43588 +int main() {
43589 +PQparameterStatus()
43590 +; return 0; }
43591 +EOF
43592 +if { (eval echo configure:77811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43593 +  rm -rf conftest*
43594 +  eval "ac_cv_lib_$ac_lib_var=yes"
43595 +else
43596 +  echo "configure: failed program was:" >&5
43597 +  cat conftest.$ac_ext >&5
43598 +  rm -rf conftest*
43599 +  eval "ac_cv_lib_$ac_lib_var=no"
43600 +fi
43601 +rm -f conftest*
43602 +LIBS="$ac_save_LIBS"
43603 +
43604 +fi
43605 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43606 +  echo "$ac_t""yes" 1>&6
43607 +  cat >> confdefs.h <<\EOF
43608 +#define HAVE_PQPARAMETERSTATUS 1
43609 +EOF
43610 +
43611 +else
43612 +  echo "$ac_t""no" 1>&6
43613 +fi
43614 +
43615 +  echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
43616 +echo "configure:77835: checking for PQprotocolVersion in -lpq" >&5
43617 +ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'`
43618 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43619 +  echo $ac_n "(cached) $ac_c" 1>&6
43620 +else
43621 +  ac_save_LIBS="$LIBS"
43622 +LIBS="-lpq  $LIBS"
43623 +cat > conftest.$ac_ext <<EOF
43624 +#line 77843 "configure"
43625 +#include "confdefs.h"
43626 +/* Override any gcc2 internal prototype to avoid an error.  */
43627 +/* We use char because int might match the return type of a gcc2
43628 +    builtin and then its argument prototype would still apply.  */
43629 +char PQprotocolVersion();
43630 +
43631 +int main() {
43632 +PQprotocolVersion()
43633 +; return 0; }
43634 +EOF
43635 +if { (eval echo configure:77854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43636 +  rm -rf conftest*
43637 +  eval "ac_cv_lib_$ac_lib_var=yes"
43638 +else
43639 +  echo "configure: failed program was:" >&5
43640 +  cat conftest.$ac_ext >&5
43641 +  rm -rf conftest*
43642 +  eval "ac_cv_lib_$ac_lib_var=no"
43643 +fi
43644 +rm -f conftest*
43645 +LIBS="$ac_save_LIBS"
43646 +
43647 +fi
43648 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43649 +  echo "$ac_t""yes" 1>&6
43650 +  cat >> confdefs.h <<\EOF
43651 +#define HAVE_PQPROTOCOLVERSION 1
43652 +EOF
43653 +
43654 +else
43655 +  echo "$ac_t""no" 1>&6
43656 +fi
43657 +
43658 +  echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
43659 +echo "configure:77878: checking for PQtransactionStatus in -lpq" >&5
43660 +ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'`
43661 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43662 +  echo $ac_n "(cached) $ac_c" 1>&6
43663 +else
43664 +  ac_save_LIBS="$LIBS"
43665 +LIBS="-lpq  $LIBS"
43666 +cat > conftest.$ac_ext <<EOF
43667 +#line 77886 "configure"
43668 +#include "confdefs.h"
43669 +/* Override any gcc2 internal prototype to avoid an error.  */
43670 +/* We use char because int might match the return type of a gcc2
43671 +    builtin and then its argument prototype would still apply.  */
43672 +char PQtransactionStatus();
43673 +
43674 +int main() {
43675 +PQtransactionStatus()
43676 +; return 0; }
43677 +EOF
43678 +if { (eval echo configure:77897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43679 +  rm -rf conftest*
43680 +  eval "ac_cv_lib_$ac_lib_var=yes"
43681 +else
43682 +  echo "configure: failed program was:" >&5
43683 +  cat conftest.$ac_ext >&5
43684 +  rm -rf conftest*
43685 +  eval "ac_cv_lib_$ac_lib_var=no"
43686 +fi
43687 +rm -f conftest*
43688 +LIBS="$ac_save_LIBS"
43689 +
43690 +fi
43691 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43692 +  echo "$ac_t""yes" 1>&6
43693 +  cat >> confdefs.h <<\EOF
43694 +#define HAVE_PGTRANSACTIONSTATUS 1
43695 +EOF
43696 +
43697 +else
43698 +  echo "$ac_t""no" 1>&6
43699 +fi
43700 +
43701 +  echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
43702 +echo "configure:77921: checking for PQexecParams in -lpq" >&5
43703 +ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'`
43704 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43705 +  echo $ac_n "(cached) $ac_c" 1>&6
43706 +else
43707 +  ac_save_LIBS="$LIBS"
43708 +LIBS="-lpq  $LIBS"
43709 +cat > conftest.$ac_ext <<EOF
43710 +#line 77929 "configure"
43711 +#include "confdefs.h"
43712 +/* Override any gcc2 internal prototype to avoid an error.  */
43713 +/* We use char because int might match the return type of a gcc2
43714 +    builtin and then its argument prototype would still apply.  */
43715 +char PQexecParams();
43716 +
43717 +int main() {
43718 +PQexecParams()
43719 +; return 0; }
43720 +EOF
43721 +if { (eval echo configure:77940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43722 +  rm -rf conftest*
43723 +  eval "ac_cv_lib_$ac_lib_var=yes"
43724 +else
43725 +  echo "configure: failed program was:" >&5
43726 +  cat conftest.$ac_ext >&5
43727 +  rm -rf conftest*
43728 +  eval "ac_cv_lib_$ac_lib_var=no"
43729 +fi
43730 +rm -f conftest*
43731 +LIBS="$ac_save_LIBS"
43732 +
43733 +fi
43734 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43735 +  echo "$ac_t""yes" 1>&6
43736 +  cat >> confdefs.h <<\EOF
43737 +#define HAVE_PQEXECPARAMS 1
43738 +EOF
43739 +
43740 +else
43741 +  echo "$ac_t""no" 1>&6
43742 +fi
43743 +
43744 +  echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
43745 +echo "configure:77964: checking for PQprepare in -lpq" >&5
43746 +ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
43747 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43748 +  echo $ac_n "(cached) $ac_c" 1>&6
43749 +else
43750 +  ac_save_LIBS="$LIBS"
43751 +LIBS="-lpq  $LIBS"
43752 +cat > conftest.$ac_ext <<EOF
43753 +#line 77972 "configure"
43754 +#include "confdefs.h"
43755 +/* Override any gcc2 internal prototype to avoid an error.  */
43756 +/* We use char because int might match the return type of a gcc2
43757 +    builtin and then its argument prototype would still apply.  */
43758 +char PQprepare();
43759 +
43760 +int main() {
43761 +PQprepare()
43762 +; return 0; }
43763 +EOF
43764 +if { (eval echo configure:77983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43765 +  rm -rf conftest*
43766 +  eval "ac_cv_lib_$ac_lib_var=yes"
43767 +else
43768 +  echo "configure: failed program was:" >&5
43769 +  cat conftest.$ac_ext >&5
43770 +  rm -rf conftest*
43771 +  eval "ac_cv_lib_$ac_lib_var=no"
43772 +fi
43773 +rm -f conftest*
43774 +LIBS="$ac_save_LIBS"
43775 +
43776 +fi
43777 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43778 +  echo "$ac_t""yes" 1>&6
43779 +  cat >> confdefs.h <<\EOF
43780 +#define HAVE_PQPREPARE 1
43781 +EOF
43782 +
43783 +else
43784 +  echo "$ac_t""no" 1>&6
43785 +fi
43786 +
43787 +  echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6
43788 +echo "configure:78007: checking for PQexecPrepared in -lpq" >&5
43789 +ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'`
43790 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43791 +  echo $ac_n "(cached) $ac_c" 1>&6
43792 +else
43793 +  ac_save_LIBS="$LIBS"
43794 +LIBS="-lpq  $LIBS"
43795 +cat > conftest.$ac_ext <<EOF
43796 +#line 78015 "configure"
43797 +#include "confdefs.h"
43798 +/* Override any gcc2 internal prototype to avoid an error.  */
43799 +/* We use char because int might match the return type of a gcc2
43800 +    builtin and then its argument prototype would still apply.  */
43801 +char PQexecPrepared();
43802 +
43803 +int main() {
43804 +PQexecPrepared()
43805 +; return 0; }
43806 +EOF
43807 +if { (eval echo configure:78026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43808 +  rm -rf conftest*
43809 +  eval "ac_cv_lib_$ac_lib_var=yes"
43810 +else
43811 +  echo "configure: failed program was:" >&5
43812 +  cat conftest.$ac_ext >&5
43813 +  rm -rf conftest*
43814 +  eval "ac_cv_lib_$ac_lib_var=no"
43815 +fi
43816 +rm -f conftest*
43817 +LIBS="$ac_save_LIBS"
43818 +
43819 +fi
43820 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43821 +  echo "$ac_t""yes" 1>&6
43822 +  cat >> confdefs.h <<\EOF
43823 +#define HAVE_PQEXECPREPARED 1
43824 +EOF
43825 +
43826 +else
43827 +  echo "$ac_t""no" 1>&6
43828 +fi
43829 +
43830 +  echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
43831 +echo "configure:78050: checking for PQresultErrorField in -lpq" >&5
43832 +ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'`
43833 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43834 +  echo $ac_n "(cached) $ac_c" 1>&6
43835 +else
43836 +  ac_save_LIBS="$LIBS"
43837 +LIBS="-lpq  $LIBS"
43838 +cat > conftest.$ac_ext <<EOF
43839 +#line 78058 "configure"
43840 +#include "confdefs.h"
43841 +/* Override any gcc2 internal prototype to avoid an error.  */
43842 +/* We use char because int might match the return type of a gcc2
43843 +    builtin and then its argument prototype would still apply.  */
43844 +char PQresultErrorField();
43845 +
43846 +int main() {
43847 +PQresultErrorField()
43848 +; return 0; }
43849 +EOF
43850 +if { (eval echo configure:78069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43851 +  rm -rf conftest*
43852 +  eval "ac_cv_lib_$ac_lib_var=yes"
43853 +else
43854 +  echo "configure: failed program was:" >&5
43855 +  cat conftest.$ac_ext >&5
43856 +  rm -rf conftest*
43857 +  eval "ac_cv_lib_$ac_lib_var=no"
43858 +fi
43859 +rm -f conftest*
43860 +LIBS="$ac_save_LIBS"
43861 +
43862 +fi
43863 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43864 +  echo "$ac_t""yes" 1>&6
43865 +  cat >> confdefs.h <<\EOF
43866 +#define HAVE_PQRESULTERRORFIELD 1
43867 +EOF
43868 +
43869 +else
43870 +  echo "$ac_t""no" 1>&6
43871 +fi
43872 +
43873 +  echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6
43874 +echo "configure:78093: checking for PQsendQueryParams in -lpq" >&5
43875 +ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'`
43876 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43877 +  echo $ac_n "(cached) $ac_c" 1>&6
43878 +else
43879 +  ac_save_LIBS="$LIBS"
43880 +LIBS="-lpq  $LIBS"
43881 +cat > conftest.$ac_ext <<EOF
43882 +#line 78101 "configure"
43883 +#include "confdefs.h"
43884 +/* Override any gcc2 internal prototype to avoid an error.  */
43885 +/* We use char because int might match the return type of a gcc2
43886 +    builtin and then its argument prototype would still apply.  */
43887 +char PQsendQueryParams();
43888 +
43889 +int main() {
43890 +PQsendQueryParams()
43891 +; return 0; }
43892 +EOF
43893 +if { (eval echo configure:78112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43894 +  rm -rf conftest*
43895 +  eval "ac_cv_lib_$ac_lib_var=yes"
43896 +else
43897 +  echo "configure: failed program was:" >&5
43898 +  cat conftest.$ac_ext >&5
43899 +  rm -rf conftest*
43900 +  eval "ac_cv_lib_$ac_lib_var=no"
43901 +fi
43902 +rm -f conftest*
43903 +LIBS="$ac_save_LIBS"
43904 +
43905 +fi
43906 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43907 +  echo "$ac_t""yes" 1>&6
43908 +  cat >> confdefs.h <<\EOF
43909 +#define HAVE_PQSENDQUERYPARAMS 1
43910 +EOF
43911 +
43912 +else
43913 +  echo "$ac_t""no" 1>&6
43914 +fi
43915 +
43916 +  echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6
43917 +echo "configure:78136: checking for PQsendPrepare in -lpq" >&5
43918 +ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'`
43919 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43920 +  echo $ac_n "(cached) $ac_c" 1>&6
43921 +else
43922 +  ac_save_LIBS="$LIBS"
43923 +LIBS="-lpq  $LIBS"
43924 +cat > conftest.$ac_ext <<EOF
43925 +#line 78144 "configure"
43926 +#include "confdefs.h"
43927 +/* Override any gcc2 internal prototype to avoid an error.  */
43928 +/* We use char because int might match the return type of a gcc2
43929 +    builtin and then its argument prototype would still apply.  */
43930 +char PQsendPrepare();
43931 +
43932 +int main() {
43933 +PQsendPrepare()
43934 +; return 0; }
43935 +EOF
43936 +if { (eval echo configure:78155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43937 +  rm -rf conftest*
43938 +  eval "ac_cv_lib_$ac_lib_var=yes"
43939 +else
43940 +  echo "configure: failed program was:" >&5
43941 +  cat conftest.$ac_ext >&5
43942 +  rm -rf conftest*
43943 +  eval "ac_cv_lib_$ac_lib_var=no"
43944 +fi
43945 +rm -f conftest*
43946 +LIBS="$ac_save_LIBS"
43947 +
43948 +fi
43949 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43950 +  echo "$ac_t""yes" 1>&6
43951 +  cat >> confdefs.h <<\EOF
43952 +#define HAVE_PQSENDPREPARE 1
43953 +EOF
43954 +
43955 +else
43956 +  echo "$ac_t""no" 1>&6
43957 +fi
43958 +
43959 +  echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6
43960 +echo "configure:78179: checking for PQsendQueryPrepared in -lpq" >&5
43961 +ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'`
43962 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43963 +  echo $ac_n "(cached) $ac_c" 1>&6
43964 +else
43965 +  ac_save_LIBS="$LIBS"
43966 +LIBS="-lpq  $LIBS"
43967 +cat > conftest.$ac_ext <<EOF
43968 +#line 78187 "configure"
43969 +#include "confdefs.h"
43970 +/* Override any gcc2 internal prototype to avoid an error.  */
43971 +/* We use char because int might match the return type of a gcc2
43972 +    builtin and then its argument prototype would still apply.  */
43973 +char PQsendQueryPrepared();
43974 +
43975 +int main() {
43976 +PQsendQueryPrepared()
43977 +; return 0; }
43978 +EOF
43979 +if { (eval echo configure:78198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43980 +  rm -rf conftest*
43981 +  eval "ac_cv_lib_$ac_lib_var=yes"
43982 +else
43983 +  echo "configure: failed program was:" >&5
43984 +  cat conftest.$ac_ext >&5
43985 +  rm -rf conftest*
43986 +  eval "ac_cv_lib_$ac_lib_var=no"
43987 +fi
43988 +rm -f conftest*
43989 +LIBS="$ac_save_LIBS"
43990 +
43991 +fi
43992 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43993 +  echo "$ac_t""yes" 1>&6
43994 +  cat >> confdefs.h <<\EOF
43995 +#define HAVE_PQSENDQUERYPREPARED 1
43996 +EOF
43997 +
43998 +else
43999 +  echo "$ac_t""no" 1>&6
44000 +fi
44001 +
44002 +  echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6
44003 +echo "configure:78222: checking for PQputCopyData in -lpq" >&5
44004 +ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'`
44005 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44006 +  echo $ac_n "(cached) $ac_c" 1>&6
44007 +else
44008 +  ac_save_LIBS="$LIBS"
44009 +LIBS="-lpq  $LIBS"
44010 +cat > conftest.$ac_ext <<EOF
44011 +#line 78230 "configure"
44012 +#include "confdefs.h"
44013 +/* Override any gcc2 internal prototype to avoid an error.  */
44014 +/* We use char because int might match the return type of a gcc2
44015 +    builtin and then its argument prototype would still apply.  */
44016 +char PQputCopyData();
44017 +
44018 +int main() {
44019 +PQputCopyData()
44020 +; return 0; }
44021 +EOF
44022 +if { (eval echo configure:78241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44023 +  rm -rf conftest*
44024 +  eval "ac_cv_lib_$ac_lib_var=yes"
44025 +else
44026 +  echo "configure: failed program was:" >&5
44027 +  cat conftest.$ac_ext >&5
44028 +  rm -rf conftest*
44029 +  eval "ac_cv_lib_$ac_lib_var=no"
44030 +fi
44031 +rm -f conftest*
44032 +LIBS="$ac_save_LIBS"
44033 +
44034 +fi
44035 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44036 +  echo "$ac_t""yes" 1>&6
44037 +  cat >> confdefs.h <<\EOF
44038 +#define HAVE_PQPUTCOPYDATA 1
44039 +EOF
44040 +
44041 +else
44042 +  echo "$ac_t""no" 1>&6
44043 +fi
44044 +
44045 +  echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6
44046 +echo "configure:78265: checking for PQputCopyEnd in -lpq" >&5
44047 +ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'`
44048 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44049 +  echo $ac_n "(cached) $ac_c" 1>&6
44050 +else
44051 +  ac_save_LIBS="$LIBS"
44052 +LIBS="-lpq  $LIBS"
44053 +cat > conftest.$ac_ext <<EOF
44054 +#line 78273 "configure"
44055 +#include "confdefs.h"
44056 +/* Override any gcc2 internal prototype to avoid an error.  */
44057 +/* We use char because int might match the return type of a gcc2
44058 +    builtin and then its argument prototype would still apply.  */
44059 +char PQputCopyEnd();
44060 +
44061 +int main() {
44062 +PQputCopyEnd()
44063 +; return 0; }
44064 +EOF
44065 +if { (eval echo configure:78284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44066 +  rm -rf conftest*
44067 +  eval "ac_cv_lib_$ac_lib_var=yes"
44068 +else
44069 +  echo "configure: failed program was:" >&5
44070 +  cat conftest.$ac_ext >&5
44071 +  rm -rf conftest*
44072 +  eval "ac_cv_lib_$ac_lib_var=no"
44073 +fi
44074 +rm -f conftest*
44075 +LIBS="$ac_save_LIBS"
44076 +
44077 +fi
44078 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44079 +  echo "$ac_t""yes" 1>&6
44080 +  cat >> confdefs.h <<\EOF
44081 +#define HAVE_PQPUTCOPYEND 1
44082 +EOF
44083 +
44084 +else
44085 +  echo "$ac_t""no" 1>&6
44086 +fi
44087 +
44088 +  echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6
44089 +echo "configure:78308: checking for PQgetCopyData in -lpq" >&5
44090 +ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'`
44091 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44092 +  echo $ac_n "(cached) $ac_c" 1>&6
44093 +else
44094 +  ac_save_LIBS="$LIBS"
44095 +LIBS="-lpq  $LIBS"
44096 +cat > conftest.$ac_ext <<EOF
44097 +#line 78316 "configure"
44098 +#include "confdefs.h"
44099 +/* Override any gcc2 internal prototype to avoid an error.  */
44100 +/* We use char because int might match the return type of a gcc2
44101 +    builtin and then its argument prototype would still apply.  */
44102 +char PQgetCopyData();
44103 +
44104 +int main() {
44105 +PQgetCopyData()
44106 +; return 0; }
44107 +EOF
44108 +if { (eval echo configure:78327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44109 +  rm -rf conftest*
44110 +  eval "ac_cv_lib_$ac_lib_var=yes"
44111 +else
44112 +  echo "configure: failed program was:" >&5
44113 +  cat conftest.$ac_ext >&5
44114 +  rm -rf conftest*
44115 +  eval "ac_cv_lib_$ac_lib_var=no"
44116 +fi
44117 +rm -f conftest*
44118 +LIBS="$ac_save_LIBS"
44119 +
44120 +fi
44121 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44122 +  echo "$ac_t""yes" 1>&6
44123 +  cat >> confdefs.h <<\EOF
44124 +#define HAVE_PQGETCOPYDATA 1
44125 +EOF
44126 +
44127 +else
44128 +  echo "$ac_t""no" 1>&6
44129 +fi
44130 +
44131 +  echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6
44132 +echo "configure:78351: checking for PQfreemem in -lpq" >&5
44133 +ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'`
44134 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44135 +  echo $ac_n "(cached) $ac_c" 1>&6
44136 +else
44137 +  ac_save_LIBS="$LIBS"
44138 +LIBS="-lpq  $LIBS"
44139 +cat > conftest.$ac_ext <<EOF
44140 +#line 78359 "configure"
44141 +#include "confdefs.h"
44142 +/* Override any gcc2 internal prototype to avoid an error.  */
44143 +/* We use char because int might match the return type of a gcc2
44144 +    builtin and then its argument prototype would still apply.  */
44145 +char PQfreemem();
44146 +
44147 +int main() {
44148 +PQfreemem()
44149 +; return 0; }
44150 +EOF
44151 +if { (eval echo configure:78370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44152 +  rm -rf conftest*
44153 +  eval "ac_cv_lib_$ac_lib_var=yes"
44154 +else
44155 +  echo "configure: failed program was:" >&5
44156 +  cat conftest.$ac_ext >&5
44157 +  rm -rf conftest*
44158 +  eval "ac_cv_lib_$ac_lib_var=no"
44159 +fi
44160 +rm -f conftest*
44161 +LIBS="$ac_save_LIBS"
44162 +
44163 +fi
44164 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44165 +  echo "$ac_t""yes" 1>&6
44166 +  cat >> confdefs.h <<\EOF
44167 +#define HAVE_PQFREEMEM 1
44168 +EOF
44169 +
44170 +else
44171 +  echo "$ac_t""no" 1>&6
44172 +fi
44173 +
44174 +  echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6
44175 +echo "configure:78394: checking for PQsetErrorVerbosity in -lpq" >&5
44176 +ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'`
44177 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44178 +  echo $ac_n "(cached) $ac_c" 1>&6
44179 +else
44180 +  ac_save_LIBS="$LIBS"
44181 +LIBS="-lpq  $LIBS"
44182 +cat > conftest.$ac_ext <<EOF
44183 +#line 78402 "configure"
44184 +#include "confdefs.h"
44185 +/* Override any gcc2 internal prototype to avoid an error.  */
44186 +/* We use char because int might match the return type of a gcc2
44187 +    builtin and then its argument prototype would still apply.  */
44188 +char PQsetErrorVerbosity();
44189 +
44190 +int main() {
44191 +PQsetErrorVerbosity()
44192 +; return 0; }
44193 +EOF
44194 +if { (eval echo configure:78413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44195 +  rm -rf conftest*
44196 +  eval "ac_cv_lib_$ac_lib_var=yes"
44197 +else
44198 +  echo "configure: failed program was:" >&5
44199 +  cat conftest.$ac_ext >&5
44200 +  rm -rf conftest*
44201 +  eval "ac_cv_lib_$ac_lib_var=no"
44202 +fi
44203 +rm -f conftest*
44204 +LIBS="$ac_save_LIBS"
44205 +
44206 +fi
44207 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44208 +  echo "$ac_t""yes" 1>&6
44209 +  cat >> confdefs.h <<\EOF
44210 +#define HAVE_PQSETERRORVERBOSITY 1
44211 +EOF
44212 +
44213 +else
44214 +  echo "$ac_t""no" 1>&6
44215 +fi
44216 +
44217 +  echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6
44218 +echo "configure:78437: checking for PQftable in -lpq" >&5
44219 +ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'`
44220 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44221 +  echo $ac_n "(cached) $ac_c" 1>&6
44222 +else
44223 +  ac_save_LIBS="$LIBS"
44224 +LIBS="-lpq  $LIBS"
44225 +cat > conftest.$ac_ext <<EOF
44226 +#line 78445 "configure"
44227 +#include "confdefs.h"
44228 +/* Override any gcc2 internal prototype to avoid an error.  */
44229 +/* We use char because int might match the return type of a gcc2
44230 +    builtin and then its argument prototype would still apply.  */
44231 +char PQftable();
44232 +
44233 +int main() {
44234 +PQftable()
44235 +; return 0; }
44236 +EOF
44237 +if { (eval echo configure:78456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44238 +  rm -rf conftest*
44239 +  eval "ac_cv_lib_$ac_lib_var=yes"
44240 +else
44241 +  echo "configure: failed program was:" >&5
44242 +  cat conftest.$ac_ext >&5
44243 +  rm -rf conftest*
44244 +  eval "ac_cv_lib_$ac_lib_var=no"
44245 +fi
44246 +rm -f conftest*
44247 +LIBS="$ac_save_LIBS"
44248 +
44249 +fi
44250 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44251 +  echo "$ac_t""yes" 1>&6
44252 +  cat >> confdefs.h <<\EOF
44253 +#define HAVE_PQFTABLE 1
44254 +EOF
44255 +
44256 +else
44257 +  echo "$ac_t""no" 1>&6
44258 +fi
44259 +
44260 +  echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
44261 +echo "configure:78480: checking for PQescapeStringConn in -lpq" >&5
44262 +ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
44263 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44264 +  echo $ac_n "(cached) $ac_c" 1>&6
44265 +else
44266 +  ac_save_LIBS="$LIBS"
44267 +LIBS="-lpq  $LIBS"
44268 +cat > conftest.$ac_ext <<EOF
44269 +#line 78488 "configure"
44270 +#include "confdefs.h"
44271 +/* Override any gcc2 internal prototype to avoid an error.  */
44272 +/* We use char because int might match the return type of a gcc2
44273 +    builtin and then its argument prototype would still apply.  */
44274 +char PQescapeStringConn();
44275 +
44276 +int main() {
44277 +PQescapeStringConn()
44278 +; return 0; }
44279 +EOF
44280 +if { (eval echo configure:78499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44281 +  rm -rf conftest*
44282 +  eval "ac_cv_lib_$ac_lib_var=yes"
44283 +else
44284 +  echo "configure: failed program was:" >&5
44285 +  cat conftest.$ac_ext >&5
44286 +  rm -rf conftest*
44287 +  eval "ac_cv_lib_$ac_lib_var=no"
44288 +fi
44289 +rm -f conftest*
44290 +LIBS="$ac_save_LIBS"
44291 +
44292 +fi
44293 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44294 +  echo "$ac_t""yes" 1>&6
44295 +  cat >> confdefs.h <<\EOF
44296 +#define HAVE_PQESCAPE_CONN 1
44297 +EOF
44298 +
44299 +else
44300 +  echo "$ac_t""no" 1>&6
44301 +fi
44302 +
44303 +  echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
44304 +echo "configure:78523: checking for PQescapeByteaConn in -lpq" >&5
44305 +ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
44306 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44307 +  echo $ac_n "(cached) $ac_c" 1>&6
44308 +else
44309 +  ac_save_LIBS="$LIBS"
44310 +LIBS="-lpq  $LIBS"
44311 +cat > conftest.$ac_ext <<EOF
44312 +#line 78531 "configure"
44313 +#include "confdefs.h"
44314 +/* Override any gcc2 internal prototype to avoid an error.  */
44315 +/* We use char because int might match the return type of a gcc2
44316 +    builtin and then its argument prototype would still apply.  */
44317 +char PQescapeByteaConn();
44318 +
44319 +int main() {
44320 +PQescapeByteaConn()
44321 +; return 0; }
44322 +EOF
44323 +if { (eval echo configure:78542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44324 +  rm -rf conftest*
44325 +  eval "ac_cv_lib_$ac_lib_var=yes"
44326 +else
44327 +  echo "configure: failed program was:" >&5
44328 +  cat conftest.$ac_ext >&5
44329 +  rm -rf conftest*
44330 +  eval "ac_cv_lib_$ac_lib_var=no"
44331 +fi
44332 +rm -f conftest*
44333 +LIBS="$ac_save_LIBS"
44334 +
44335 +fi
44336 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44337 +  echo "$ac_t""yes" 1>&6
44338 +  cat >> confdefs.h <<\EOF
44339 +#define HAVE_PQESCAPE_BYTEA_CONN 1
44340 +EOF
44341 +
44342 +else
44343 +  echo "$ac_t""no" 1>&6
44344 +fi
44345 +
44346 +  echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
44347 +echo "configure:78566: checking for pg_encoding_to_char in -lpq" >&5
44348 +ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
44349 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44350 +  echo $ac_n "(cached) $ac_c" 1>&6
44351 +else
44352 +  ac_save_LIBS="$LIBS"
44353 +LIBS="-lpq  $LIBS"
44354 +cat > conftest.$ac_ext <<EOF
44355 +#line 78574 "configure"
44356 +#include "confdefs.h"
44357 +/* Override any gcc2 internal prototype to avoid an error.  */
44358 +/* We use char because int might match the return type of a gcc2
44359 +    builtin and then its argument prototype would still apply.  */
44360 +char pg_encoding_to_char();
44361 +
44362 +int main() {
44363 +pg_encoding_to_char()
44364 +; return 0; }
44365 +EOF
44366 +if { (eval echo configure:78585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44367 +  rm -rf conftest*
44368 +  eval "ac_cv_lib_$ac_lib_var=yes"
44369 +else
44370 +  echo "configure: failed program was:" >&5
44371 +  cat conftest.$ac_ext >&5
44372 +  rm -rf conftest*
44373 +  eval "ac_cv_lib_$ac_lib_var=no"
44374 +fi
44375 +rm -f conftest*
44376 +LIBS="$ac_save_LIBS"
44377 +
44378 +fi
44379 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44380 +  echo "$ac_t""yes" 1>&6
44381 +  cat >> confdefs.h <<\EOF
44382 +#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
44383 +EOF
44384 +
44385 +else
44386 +  echo "$ac_t""no" 1>&6
44387 +fi
44388 +
44389 +  echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6
44390 +echo "configure:78609: checking for lo_create in -lpq" >&5
44391 +ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'`
44392 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44393 +  echo $ac_n "(cached) $ac_c" 1>&6
44394 +else
44395 +  ac_save_LIBS="$LIBS"
44396 +LIBS="-lpq  $LIBS"
44397 +cat > conftest.$ac_ext <<EOF
44398 +#line 78617 "configure"
44399 +#include "confdefs.h"
44400 +/* Override any gcc2 internal prototype to avoid an error.  */
44401 +/* We use char because int might match the return type of a gcc2
44402 +    builtin and then its argument prototype would still apply.  */
44403 +char lo_create();
44404 +
44405 +int main() {
44406 +lo_create()
44407 +; return 0; }
44408 +EOF
44409 +if { (eval echo configure:78628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44410 +  rm -rf conftest*
44411 +  eval "ac_cv_lib_$ac_lib_var=yes"
44412 +else
44413 +  echo "configure: failed program was:" >&5
44414 +  cat conftest.$ac_ext >&5
44415 +  rm -rf conftest*
44416 +  eval "ac_cv_lib_$ac_lib_var=no"
44417 +fi
44418 +rm -f conftest*
44419 +LIBS="$ac_save_LIBS"
44420 +
44421 +fi
44422 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44423 +  echo "$ac_t""yes" 1>&6
44424 +  cat >> confdefs.h <<\EOF
44425 +#define HAVE_PG_LO_CREATE 1
44426 +EOF
44427 +
44428 +else
44429 +  echo "$ac_t""no" 1>&6
44430 +fi
44431 +
44432 +  echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6
44433 +echo "configure:78652: checking for lo_import_with_oid in -lpq" >&5
44434 +ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'`
44435 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44436 +  echo $ac_n "(cached) $ac_c" 1>&6
44437 +else
44438 +  ac_save_LIBS="$LIBS"
44439 +LIBS="-lpq  $LIBS"
44440 +cat > conftest.$ac_ext <<EOF
44441 +#line 78660 "configure"
44442 +#include "confdefs.h"
44443 +/* Override any gcc2 internal prototype to avoid an error.  */
44444 +/* We use char because int might match the return type of a gcc2
44445 +    builtin and then its argument prototype would still apply.  */
44446 +char lo_import_with_oid();
44447 +
44448 +int main() {
44449 +lo_import_with_oid()
44450 +; return 0; }
44451 +EOF
44452 +if { (eval echo configure:78671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44453 +  rm -rf conftest*
44454 +  eval "ac_cv_lib_$ac_lib_var=yes"
44455 +else
44456 +  echo "configure: failed program was:" >&5
44457 +  cat conftest.$ac_ext >&5
44458 +  rm -rf conftest*
44459 +  eval "ac_cv_lib_$ac_lib_var=no"
44460 +fi
44461 +rm -f conftest*
44462 +LIBS="$ac_save_LIBS"
44463 +
44464 +fi
44465 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44466 +  echo "$ac_t""yes" 1>&6
44467 +  cat >> confdefs.h <<\EOF
44468 +#define HAVE_PG_LO_IMPORT_WITH_OID 1
44469 +EOF
44470 +
44471 +else
44472 +  echo "$ac_t""no" 1>&6
44473 +fi
44474 +
44475 +  LIBS=$old_LIBS
44476 +  LDFLAGS=$old_LDFLAGS
44477 +
44478 +
44479 +
44480 +  if test "$ext_shared" = "yes"; then
44481 +    PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD"
44482 +    if test -n "$PGSQL_LIBDIR"; then
44483 +
44484 +  if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
44485 +
44486 +  if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
44487 +    ai_p=$PGSQL_LIBDIR
44488 +  else
44489 +
44490 +    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
44491 +
44492 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
44493 +    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
44494 +  fi
44495 +
44496 +
44497 +      if test "$ext_shared" = "yes"; then
44498 +        PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD"
44499 +        test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD"
44500 +      else
44501 +
44502 +
44503 +
44504 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
44505 +
44506 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
44507 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
44508 +    eval "LIBPATH$unique=set"
44509 +
44510 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
44511 +    LDFLAGS="$LDFLAGS -L$ai_p"
44512 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
44513 +
44514 +  fi
44515 +
44516 +
44517 +      fi
44518 +
44519 +  fi
44520 +
44521 +    fi
44522 +  else
44523 +
44524 +
44525 +  if test -n "$PGSQL_LIBDIR"; then
44526 +
44527 +  if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
44528 +
44529 +  if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
44530 +    ai_p=$PGSQL_LIBDIR
44531 +  else
44532 +
44533 +    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
44534 +
44535 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
44536 +    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
44537 +  fi
44538 +
44539 +
44540 +
44541 +
44542 +
44543 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
44544 +
44545 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
44546 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
44547 +    eval "LIBPATH$unique=set"
44548 +
44549 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
44550 +    LDFLAGS="$LDFLAGS -L$ai_p"
44551 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
44552 +
44553 +  fi
44554 +
44555 +
44556 +
44557 +  fi
44558 +
44559 +  fi
44560 +
44561 +
44562 +  case pq in
44563 +  c|c_r|pthread*) ;;
44564 +  *)
44565 +      LIBS="-lpq $LIBS"
44566 +   ;;
44567 +  esac
44568 +
44569 +
44570 +
44571 +
44572 +  fi
44573 +
44574 +
44575 +
44576 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD"
44577 +
44578 +
44579 +
44580 +  if test "$PGSQL_INCLUDE" != "/usr/include"; then
44581 +
44582 +  if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
44583 +    ai_p=$PGSQL_INCLUDE
44584 +  else
44585 +
44586 +    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
44587 +
44588 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
44589 +    ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
44590 +  fi
44591 +
44592 +
44593 +
44594 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
44595 +
44596 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
44597 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
44598 +    eval "INCLUDEPATH$unique=set"
44599 +
44600 +      if test ""; then
44601 +        INCLUDES="-I$ai_p $INCLUDES"
44602 +      else
44603 +        INCLUDES="$INCLUDES -I$ai_p"
44604 +      fi
44605 +
44606 +  fi
44607 +
44608 +  fi
44609 +
44610 +
44611 +
44612 +  ext_builddir=ext/pgsql
44613 +  ext_srcdir=$abs_srcdir/ext/pgsql
44614 +
44615 +  ac_extra=
44616 +
44617 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
44618 +    PHP_PGSQL_SHARED=no
44619 +
44620 +
44621 +  case ext/pgsql in
44622 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44623 +  /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44624 +  *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44625 +  esac
44626 +
44627 +
44628 +
44629 +  b_c_pre=$php_c_pre
44630 +  b_cxx_pre=$php_cxx_pre
44631 +  b_c_meta=$php_c_meta
44632 +  b_cxx_meta=$php_cxx_meta
44633 +  b_c_post=$php_c_post
44634 +  b_cxx_post=$php_cxx_post
44635 +  b_lo=$php_lo
44636 +
44637 +
44638 +  old_IFS=$IFS
44639 +  for ac_src in pgsql.c; do
44640 +
44641 +      IFS=.
44642 +      set $ac_src
44643 +      ac_obj=$1
44644 +      IFS=$old_IFS
44645 +
44646 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
44647 +
44648 +      case $ac_src in
44649 +        *.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" ;;
44650 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44651 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44652 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44653 +      esac
44654 +
44655 +    cat >>Makefile.objects<<EOF
44656 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
44657 +       $ac_comp
44658 +EOF
44659 +  done
44660 +
44661 +
44662 +    EXT_STATIC="$EXT_STATIC pgsql"
44663 +    if test "$ext_shared" != "nocli"; then
44664 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
44665 +    fi
44666 +  else
44667 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
44668 +      PHP_PGSQL_SHARED=yes
44669 +
44670 +  case ext/pgsql in
44671 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44672 +  /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44673 +  *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44674 +  esac
44675 +
44676 +
44677 +
44678 +  b_c_pre=$shared_c_pre
44679 +  b_cxx_pre=$shared_cxx_pre
44680 +  b_c_meta=$shared_c_meta
44681 +  b_cxx_meta=$shared_cxx_meta
44682 +  b_c_post=$shared_c_post
44683 +  b_cxx_post=$shared_cxx_post
44684 +  b_lo=$shared_lo
44685 +
44686 +
44687 +  old_IFS=$IFS
44688 +  for ac_src in pgsql.c; do
44689 +
44690 +      IFS=.
44691 +      set $ac_src
44692 +      ac_obj=$1
44693 +      IFS=$old_IFS
44694 +
44695 +      shared_objects_pgsql="$shared_objects_pgsql $ac_bdir$ac_obj.lo"
44696 +
44697 +      case $ac_src in
44698 +        *.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" ;;
44699 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44700 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44701 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44702 +      esac
44703 +
44704 +    cat >>Makefile.objects<<EOF
44705 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
44706 +       $ac_comp
44707 +EOF
44708 +  done
44709 +
44710 +      case $host_alias in
44711 +        *netware*)
44712 +
44713 +  install_modules="install-modules"
44714 +
44715 +  case $host_alias in
44716 +    *aix*)
44717 +      suffix=so
44718 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) $(PHPPGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppgsql.so '$ext_builddir'/phppgsql.so'
44719 +      ;;
44720 +    *netware*)
44721 +      suffix=nlm
44722 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPGSQL, 3)_SHARED_LIBADD)'
44723 +      ;;
44724 +    *)
44725 +      suffix=la
44726 +      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_pgsql) $(PHPPGSQL_SHARED_LIBADD)'
44727 +      ;;
44728 +  esac
44729 +
44730 +  if test "x" = "xyes"; then
44731 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppgsql.$suffix"
44732 +  else
44733 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppgsql.$suffix"
44734 +  fi
44735 +
44736 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
44737 +
44738 +  cat >>Makefile.objects<<EOF
44739 +\$(phplibdir)/phppgsql.$suffix: $ext_builddir/phppgsql.$suffix
44740 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppgsql.$suffix \$(phplibdir)
44741 +
44742 +$ext_builddir/phppgsql.$suffix: \$(shared_objects_pgsql) \$(PHPPGSQL_SHARED_DEPENDENCIES)
44743 +       $link_cmd
44744 +
44745 +EOF
44746 +
44747 +          ;;
44748 +        *)
44749 +
44750 +  install_modules="install-modules"
44751 +
44752 +  case $host_alias in
44753 +    *aix*)
44754 +      suffix=so
44755 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) $(PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pgsql.so '$ext_builddir'/pgsql.so'
44756 +      ;;
44757 +    *netware*)
44758 +      suffix=nlm
44759 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PGSQL, 3)_SHARED_LIBADD)'
44760 +      ;;
44761 +    *)
44762 +      suffix=la
44763 +      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_pgsql) $(PGSQL_SHARED_LIBADD)'
44764 +      ;;
44765 +  esac
44766 +
44767 +  if test "x" = "xyes"; then
44768 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pgsql.$suffix"
44769 +  else
44770 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pgsql.$suffix"
44771 +  fi
44772 +
44773 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
44774 +
44775 +  cat >>Makefile.objects<<EOF
44776 +\$(phplibdir)/pgsql.$suffix: $ext_builddir/pgsql.$suffix
44777 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pgsql.$suffix \$(phplibdir)
44778 +
44779 +$ext_builddir/pgsql.$suffix: \$(shared_objects_pgsql) \$(PGSQL_SHARED_DEPENDENCIES)
44780 +       $link_cmd
44781 +
44782 +EOF
44783 +
44784 +          ;;
44785 +      esac
44786 +      cat >> confdefs.h <<EOF
44787 +#define COMPILE_DL_PGSQL 1
44788 +EOF
44789 +
44790 +    fi
44791 +  fi
44792 +
44793 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
44794 +    PHP_PGSQL_SHARED=no
44795 +    case "$PHP_SAPI" in
44796 +      cgi|embed)
44797 +
44798 +
44799 +  case ext/pgsql in
44800 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44801 +  /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44802 +  *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44803 +  esac
44804 +
44805 +
44806 +
44807 +  b_c_pre=$php_c_pre
44808 +  b_cxx_pre=$php_cxx_pre
44809 +  b_c_meta=$php_c_meta
44810 +  b_cxx_meta=$php_cxx_meta
44811 +  b_c_post=$php_c_post
44812 +  b_cxx_post=$php_cxx_post
44813 +  b_lo=$php_lo
44814 +
44815 +
44816 +  old_IFS=$IFS
44817 +  for ac_src in pgsql.c; do
44818 +
44819 +      IFS=.
44820 +      set $ac_src
44821 +      ac_obj=$1
44822 +      IFS=$old_IFS
44823 +
44824 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
44825 +
44826 +      case $ac_src in
44827 +        *.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" ;;
44828 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44829 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44830 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44831 +      esac
44832 +
44833 +    cat >>Makefile.objects<<EOF
44834 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
44835 +       $ac_comp
44836 +EOF
44837 +  done
44838 +
44839 +
44840 +        EXT_STATIC="$EXT_STATIC pgsql"
44841 +        ;;
44842 +      *)
44843 +
44844 +
44845 +  case ext/pgsql in
44846 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44847 +  /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44848 +  *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44849 +  esac
44850 +
44851 +
44852 +
44853 +  b_c_pre=$php_c_pre
44854 +  b_cxx_pre=$php_cxx_pre
44855 +  b_c_meta=$php_c_meta
44856 +  b_cxx_meta=$php_cxx_meta
44857 +  b_c_post=$php_c_post
44858 +  b_cxx_post=$php_cxx_post
44859 +  b_lo=$php_lo
44860 +
44861 +
44862 +  old_IFS=$IFS
44863 +  for ac_src in pgsql.c; do
44864 +
44865 +      IFS=.
44866 +      set $ac_src
44867 +      ac_obj=$1
44868 +      IFS=$old_IFS
44869 +
44870 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
44871 +
44872 +      case $ac_src in
44873 +        *.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" ;;
44874 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44875 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44876 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44877 +      esac
44878 +
44879 +    cat >>Makefile.objects<<EOF
44880 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
44881 +       $ac_comp
44882 +EOF
44883 +  done
44884 +
44885 +
44886 +        ;;
44887 +    esac
44888 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
44889 +  fi
44890 +
44891 +
44892 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
44893 +
44894 +
44895 +
44896 +  if test "$ext_builddir" = "."; then
44897 +    PHP_PECL_EXTENSION=pgsql
44898 +
44899 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
44900 +
44901 +  fi
44902 +
44903 +fi
44904 +
44905 +
44906 +
44907 +
44908 +
44909 +php_enable_phar=yes
44910 +
44911 +echo $ac_n "checking for phar archive support""... $ac_c" 1>&6
44912 +echo "configure:79131: checking for phar archive support" >&5
44913 +# Check whether --enable-phar or --disable-phar was given.
44914 +if test "${enable_phar+set}" = set; then
44915 +  enableval="$enable_phar"
44916 +  PHP_PHAR=$enableval
44917 +else
44918 +
44919 +  PHP_PHAR=yes
44920 +  test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL
44921 +
44922 +fi
44923 +
44924 +
44925 +
44926 +ext_output="yes, shared"
44927 +ext_shared=yes
44928 +case $PHP_PHAR in
44929 +shared,*)
44930 +  PHP_PHAR=`echo "$PHP_PHAR"|$SED 's/^shared,//'`
44931 +  ;;
44932 +shared)
44933 +  PHP_PHAR=yes
44934 +  ;;
44935 +no)
44936 +  ext_output=no
44937 +  ext_shared=no
44938 +  ;;
44939 +*)
44940 +  ext_output=yes
44941 +  ext_shared=no
44942 +  ;;
44943 +esac
44944 +
44945 +
44946 +
44947 +echo "$ac_t""$ext_output" 1>&6
44948 +
44949 +
44950 +
44951 +
44952 +if test "$PHP_PHAR" != "no"; then
44953 +
44954 +  ext_builddir=ext/phar
44955 +  ext_srcdir=$abs_srcdir/ext/phar
44956 +
44957 +  ac_extra=
44958 +
44959 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
44960 +    PHP_PHAR_SHARED=no
44961 +
44962 +
44963 +  case ext/phar in
44964 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44965 +  /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44966 +  *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44967 +  esac
44968 +
44969 +
44970 +
44971 +  b_c_pre=$php_c_pre
44972 +  b_cxx_pre=$php_cxx_pre
44973 +  b_c_meta=$php_c_meta
44974 +  b_cxx_meta=$php_cxx_meta
44975 +  b_c_post=$php_c_post
44976 +  b_cxx_post=$php_cxx_post
44977 +  b_lo=$php_lo
44978 +
44979 +
44980 +  old_IFS=$IFS
44981 +  for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
44982 +
44983 +      IFS=.
44984 +      set $ac_src
44985 +      ac_obj=$1
44986 +      IFS=$old_IFS
44987 +
44988 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
44989 +
44990 +      case $ac_src in
44991 +        *.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" ;;
44992 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44993 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44994 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44995 +      esac
44996 +
44997 +    cat >>Makefile.objects<<EOF
44998 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
44999 +       $ac_comp
45000 +EOF
45001 +  done
45002 +
45003 +
45004 +    EXT_STATIC="$EXT_STATIC phar"
45005 +    if test "$ext_shared" != "nocli"; then
45006 +      EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
45007 +    fi
45008 +  else
45009 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
45010 +      PHP_PHAR_SHARED=yes
45011 +
45012 +  case ext/phar in
45013 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45014 +  /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45015 +  *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45016 +  esac
45017 +
45018 +
45019 +
45020 +  b_c_pre=$shared_c_pre
45021 +  b_cxx_pre=$shared_cxx_pre
45022 +  b_c_meta=$shared_c_meta
45023 +  b_cxx_meta=$shared_cxx_meta
45024 +  b_c_post=$shared_c_post
45025 +  b_cxx_post=$shared_cxx_post
45026 +  b_lo=$shared_lo
45027 +
45028 +
45029 +  old_IFS=$IFS
45030 +  for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
45031 +
45032 +      IFS=.
45033 +      set $ac_src
45034 +      ac_obj=$1
45035 +      IFS=$old_IFS
45036 +
45037 +      shared_objects_phar="$shared_objects_phar $ac_bdir$ac_obj.lo"
45038 +
45039 +      case $ac_src in
45040 +        *.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" ;;
45041 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45042 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45043 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45044 +      esac
45045 +
45046 +    cat >>Makefile.objects<<EOF
45047 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45048 +       $ac_comp
45049 +EOF
45050 +  done
45051 +
45052 +      case $host_alias in
45053 +        *netware*)
45054 +
45055 +  install_modules="install-modules"
45056 +
45057 +  case $host_alias in
45058 +    *aix*)
45059 +      suffix=so
45060 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpphar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHPPHAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpphar.so '$ext_builddir'/phpphar.so'
45061 +      ;;
45062 +    *netware*)
45063 +      suffix=nlm
45064 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPHAR, 3)_SHARED_LIBADD)'
45065 +      ;;
45066 +    *)
45067 +      suffix=la
45068 +      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_phar) $(PHPPHAR_SHARED_LIBADD)'
45069 +      ;;
45070 +  esac
45071 +
45072 +  if test "x" = "xyes"; then
45073 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpphar.$suffix"
45074 +  else
45075 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpphar.$suffix"
45076 +  fi
45077 +
45078 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
45079 +
45080 +  cat >>Makefile.objects<<EOF
45081 +\$(phplibdir)/phpphar.$suffix: $ext_builddir/phpphar.$suffix
45082 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpphar.$suffix \$(phplibdir)
45083 +
45084 +$ext_builddir/phpphar.$suffix: \$(shared_objects_phar) \$(PHPPHAR_SHARED_DEPENDENCIES)
45085 +       $link_cmd
45086 +
45087 +EOF
45088 +
45089 +          ;;
45090 +        *)
45091 +
45092 +  install_modules="install-modules"
45093 +
45094 +  case $host_alias in
45095 +    *aix*)
45096 +      suffix=so
45097 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phar.so '$ext_builddir'/phar.so'
45098 +      ;;
45099 +    *netware*)
45100 +      suffix=nlm
45101 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHAR, 3)_SHARED_LIBADD)'
45102 +      ;;
45103 +    *)
45104 +      suffix=la
45105 +      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_phar) $(PHAR_SHARED_LIBADD)'
45106 +      ;;
45107 +  esac
45108 +
45109 +  if test "x" = "xyes"; then
45110 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phar.$suffix"
45111 +  else
45112 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phar.$suffix"
45113 +  fi
45114 +
45115 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
45116 +
45117 +  cat >>Makefile.objects<<EOF
45118 +\$(phplibdir)/phar.$suffix: $ext_builddir/phar.$suffix
45119 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phar.$suffix \$(phplibdir)
45120 +
45121 +$ext_builddir/phar.$suffix: \$(shared_objects_phar) \$(PHAR_SHARED_DEPENDENCIES)
45122 +       $link_cmd
45123 +
45124 +EOF
45125 +
45126 +          ;;
45127 +      esac
45128 +      cat >> confdefs.h <<EOF
45129 +#define COMPILE_DL_PHAR 1
45130 +EOF
45131 +
45132 +    fi
45133 +  fi
45134 +
45135 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
45136 +    PHP_PHAR_SHARED=no
45137 +    case "$PHP_SAPI" in
45138 +      cgi|embed)
45139 +
45140 +
45141 +  case ext/phar in
45142 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45143 +  /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45144 +  *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45145 +  esac
45146 +
45147 +
45148 +
45149 +  b_c_pre=$php_c_pre
45150 +  b_cxx_pre=$php_cxx_pre
45151 +  b_c_meta=$php_c_meta
45152 +  b_cxx_meta=$php_cxx_meta
45153 +  b_c_post=$php_c_post
45154 +  b_cxx_post=$php_cxx_post
45155 +  b_lo=$php_lo
45156 +
45157 +
45158 +  old_IFS=$IFS
45159 +  for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
45160 +
45161 +      IFS=.
45162 +      set $ac_src
45163 +      ac_obj=$1
45164 +      IFS=$old_IFS
45165 +
45166 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
45167 +
45168 +      case $ac_src in
45169 +        *.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" ;;
45170 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45171 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45172 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45173 +      esac
45174 +
45175 +    cat >>Makefile.objects<<EOF
45176 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45177 +       $ac_comp
45178 +EOF
45179 +  done
45180 +
45181 +
45182 +        EXT_STATIC="$EXT_STATIC phar"
45183 +        ;;
45184 +      *)
45185 +
45186 +
45187 +  case ext/phar in
45188 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45189 +  /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45190 +  *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45191 +  esac
45192 +
45193 +
45194 +
45195 +  b_c_pre=$php_c_pre
45196 +  b_cxx_pre=$php_cxx_pre
45197 +  b_c_meta=$php_c_meta
45198 +  b_cxx_meta=$php_cxx_meta
45199 +  b_c_post=$php_c_post
45200 +  b_cxx_post=$php_cxx_post
45201 +  b_lo=$php_lo
45202 +
45203 +
45204 +  old_IFS=$IFS
45205 +  for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
45206 +
45207 +      IFS=.
45208 +      set $ac_src
45209 +      ac_obj=$1
45210 +      IFS=$old_IFS
45211 +
45212 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
45213 +
45214 +      case $ac_src in
45215 +        *.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" ;;
45216 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45217 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45218 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45219 +      esac
45220 +
45221 +    cat >>Makefile.objects<<EOF
45222 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45223 +       $ac_comp
45224 +EOF
45225 +  done
45226 +
45227 +
45228 +        ;;
45229 +    esac
45230 +    EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
45231 +  fi
45232 +
45233 +
45234 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
45235 +
45236 +
45237 +
45238 +  if test "$ext_builddir" = "."; then
45239 +    PHP_PECL_EXTENSION=phar
45240 +
45241 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
45242 +
45243 +  fi
45244 +
45245 +  echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6
45246 +echo "configure:79465: checking for phar openssl support" >&5
45247 +  if test "$PHP_HASH_SHARED" != "yes"; then
45248 +    if test "$PHP_HASH" != "no"; then
45249 +      cat >> confdefs.h <<\EOF
45250 +#define PHAR_HASH_OK 1
45251 +EOF
45252 +
45253 +    fi
45254 +  else
45255 +    echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2
45256 +  fi
45257 +  if test "$PHP_OPENSSL_SHARED" = "yes"; then
45258 +    echo "$ac_t""no (shared openssl)" 1>&6
45259 +  else
45260 +    if test "$PHP_OPENSSL" = "yes"; then
45261 +      echo "$ac_t""yes" 1>&6
45262 +      cat >> confdefs.h <<\EOF
45263 +#define PHAR_HAVE_OPENSSL 1
45264 +EOF
45265 +
45266 +    else
45267 +      echo "$ac_t""no" 1>&6
45268 +    fi
45269 +  fi
45270 +
45271 +  am_i_shared=$PHP_PHAR_SHARED
45272 +  is_it_shared=$PHP_HASH_SHARED
45273 +  is_it_enabled=$PHP_HASH
45274 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
45275 +    { echo "configure: error:
45276 +You've configured extension phar to build statically, but it
45277 +depends on extension hash, which you've configured to build shared.
45278 +You either need to build phar shared or build hash statically for the
45279 +build to be successful.
45280 +" 1>&2; exit 1; }
45281 +  fi
45282 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
45283 +    { echo "configure: error:
45284 +You've configured extension phar, which depends on extension hash,
45285 +but you've either not enabled hash, or have disabled it.
45286 +" 1>&2; exit 1; }
45287 +  fi
45288 +
45289 +
45290 +  am_i_shared=$PHP_PHAR_SHARED
45291 +  is_it_shared=$PHP_SPL_SHARED
45292 +  is_it_enabled=$PHP_SPL
45293 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
45294 +    { echo "configure: error:
45295 +You've configured extension phar to build statically, but it
45296 +depends on extension spl, which you've configured to build shared.
45297 +You either need to build phar shared or build spl statically for the
45298 +build to be successful.
45299 +" 1>&2; exit 1; }
45300 +  fi
45301 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
45302 +    { echo "configure: error:
45303 +You've configured extension phar, which depends on extension spl,
45304 +but you've either not enabled spl, or have disabled it.
45305 +" 1>&2; exit 1; }
45306 +  fi
45307 +
45308 +
45309 +  src=$ext_srcdir/Makefile.frag
45310 +  ac_srcdir=$ext_srcdir
45311 +  ac_builddir=$ext_builddir
45312 +  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
45313 +
45314 +fi
45315 +
45316 +
45317 +
45318 +php_enable_posix=yes
45319 +
45320 +echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
45321 +echo "configure:79540: checking whether to enable POSIX-like functions" >&5
45322 +# Check whether --enable-posix or --disable-posix was given.
45323 +if test "${enable_posix+set}" = set; then
45324 +  enableval="$enable_posix"
45325 +  PHP_POSIX=$enableval
45326 +else
45327 +
45328 +  PHP_POSIX=yes
45329 +  test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL
45330 +
45331 +fi
45332 +
45333 +
45334 +
45335 +ext_output="yes, shared"
45336 +ext_shared=yes
45337 +case $PHP_POSIX in
45338 +shared,*)
45339 +  PHP_POSIX=`echo "$PHP_POSIX"|$SED 's/^shared,//'`
45340 +  ;;
45341 +shared)
45342 +  PHP_POSIX=yes
45343 +  ;;
45344 +no)
45345 +  ext_output=no
45346 +  ext_shared=no
45347 +  ;;
45348 +*)
45349 +  ext_output=yes
45350 +  ext_shared=no
45351 +  ;;
45352 +esac
45353 +
45354 +
45355 +
45356 +echo "$ac_t""$ext_output" 1>&6
45357 +
45358 +
45359 +
45360 +
45361 +if test "$PHP_POSIX" = "yes"; then
45362 +  cat >> confdefs.h <<\EOF
45363 +#define HAVE_POSIX 1
45364 +EOF
45365 +
45366 +
45367 +  ext_builddir=ext/posix
45368 +  ext_srcdir=$abs_srcdir/ext/posix
45369 +
45370 +  ac_extra=
45371 +
45372 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
45373 +    PHP_POSIX_SHARED=no
45374 +
45375 +
45376 +  case ext/posix in
45377 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45378 +  /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45379 +  *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45380 +  esac
45381 +
45382 +
45383 +
45384 +  b_c_pre=$php_c_pre
45385 +  b_cxx_pre=$php_cxx_pre
45386 +  b_c_meta=$php_c_meta
45387 +  b_cxx_meta=$php_cxx_meta
45388 +  b_c_post=$php_c_post
45389 +  b_cxx_post=$php_cxx_post
45390 +  b_lo=$php_lo
45391 +
45392 +
45393 +  old_IFS=$IFS
45394 +  for ac_src in posix.c; do
45395 +
45396 +      IFS=.
45397 +      set $ac_src
45398 +      ac_obj=$1
45399 +      IFS=$old_IFS
45400 +
45401 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
45402 +
45403 +      case $ac_src in
45404 +        *.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" ;;
45405 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45406 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45407 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45408 +      esac
45409 +
45410 +    cat >>Makefile.objects<<EOF
45411 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45412 +       $ac_comp
45413 +EOF
45414 +  done
45415 +
45416 +
45417 +    EXT_STATIC="$EXT_STATIC posix"
45418 +    if test "$ext_shared" != "nocli"; then
45419 +      EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
45420 +    fi
45421 +  else
45422 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
45423 +      PHP_POSIX_SHARED=yes
45424 +
45425 +  case ext/posix in
45426 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45427 +  /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45428 +  *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45429 +  esac
45430 +
45431 +
45432 +
45433 +  b_c_pre=$shared_c_pre
45434 +  b_cxx_pre=$shared_cxx_pre
45435 +  b_c_meta=$shared_c_meta
45436 +  b_cxx_meta=$shared_cxx_meta
45437 +  b_c_post=$shared_c_post
45438 +  b_cxx_post=$shared_cxx_post
45439 +  b_lo=$shared_lo
45440 +
45441 +
45442 +  old_IFS=$IFS
45443 +  for ac_src in posix.c; do
45444 +
45445 +      IFS=.
45446 +      set $ac_src
45447 +      ac_obj=$1
45448 +      IFS=$old_IFS
45449 +
45450 +      shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo"
45451 +
45452 +      case $ac_src in
45453 +        *.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" ;;
45454 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45455 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45456 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45457 +      esac
45458 +
45459 +    cat >>Makefile.objects<<EOF
45460 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45461 +       $ac_comp
45462 +EOF
45463 +  done
45464 +
45465 +      case $host_alias in
45466 +        *netware*)
45467 +
45468 +  install_modules="install-modules"
45469 +
45470 +  case $host_alias in
45471 +    *aix*)
45472 +      suffix=so
45473 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpposix.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) $(PHPPOSIX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpposix.so '$ext_builddir'/phpposix.so'
45474 +      ;;
45475 +    *netware*)
45476 +      suffix=nlm
45477 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPOSIX, 3)_SHARED_LIBADD)'
45478 +      ;;
45479 +    *)
45480 +      suffix=la
45481 +      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_posix) $(PHPPOSIX_SHARED_LIBADD)'
45482 +      ;;
45483 +  esac
45484 +
45485 +  if test "x" = "xyes"; then
45486 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpposix.$suffix"
45487 +  else
45488 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix"
45489 +  fi
45490 +
45491 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
45492 +
45493 +  cat >>Makefile.objects<<EOF
45494 +\$(phplibdir)/phpposix.$suffix: $ext_builddir/phpposix.$suffix
45495 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpposix.$suffix \$(phplibdir)
45496 +
45497 +$ext_builddir/phpposix.$suffix: \$(shared_objects_posix) \$(PHPPOSIX_SHARED_DEPENDENCIES)
45498 +       $link_cmd
45499 +
45500 +EOF
45501 +
45502 +          ;;
45503 +        *)
45504 +
45505 +  install_modules="install-modules"
45506 +
45507 +  case $host_alias in
45508 +    *aix*)
45509 +      suffix=so
45510 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/posix.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) $(POSIX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/posix.so '$ext_builddir'/posix.so'
45511 +      ;;
45512 +    *netware*)
45513 +      suffix=nlm
45514 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(POSIX, 3)_SHARED_LIBADD)'
45515 +      ;;
45516 +    *)
45517 +      suffix=la
45518 +      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_posix) $(POSIX_SHARED_LIBADD)'
45519 +      ;;
45520 +  esac
45521 +
45522 +  if test "x" = "xyes"; then
45523 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/posix.$suffix"
45524 +  else
45525 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/posix.$suffix"
45526 +  fi
45527 +
45528 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
45529 +
45530 +  cat >>Makefile.objects<<EOF
45531 +\$(phplibdir)/posix.$suffix: $ext_builddir/posix.$suffix
45532 +       \$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir)
45533 +
45534 +$ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES)
45535 +       $link_cmd
45536 +
45537 +EOF
45538 +
45539 +          ;;
45540 +      esac
45541 +      cat >> confdefs.h <<EOF
45542 +#define COMPILE_DL_POSIX 1
45543 +EOF
45544 +
45545 +    fi
45546 +  fi
45547 +
45548 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
45549 +    PHP_POSIX_SHARED=no
45550 +    case "$PHP_SAPI" in
45551 +      cgi|embed)
45552 +
45553 +
45554 +  case ext/posix in
45555 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45556 +  /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45557 +  *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45558 +  esac
45559 +
45560 +
45561 +
45562 +  b_c_pre=$php_c_pre
45563 +  b_cxx_pre=$php_cxx_pre
45564 +  b_c_meta=$php_c_meta
45565 +  b_cxx_meta=$php_cxx_meta
45566 +  b_c_post=$php_c_post
45567 +  b_cxx_post=$php_cxx_post
45568 +  b_lo=$php_lo
45569 +
45570 +
45571 +  old_IFS=$IFS
45572 +  for ac_src in posix.c; do
45573 +
45574 +      IFS=.
45575 +      set $ac_src
45576 +      ac_obj=$1
45577 +      IFS=$old_IFS
45578 +
45579 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
45580 +
45581 +      case $ac_src in
45582 +        *.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" ;;
45583 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45584 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45585 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45586 +      esac
45587 +
45588 +    cat >>Makefile.objects<<EOF
45589 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45590 +       $ac_comp
45591 +EOF
45592 +  done
45593 +
45594 +
45595 +        EXT_STATIC="$EXT_STATIC posix"
45596 +        ;;
45597 +      *)
45598 +
45599 +
45600 +  case ext/posix in
45601 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45602 +  /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45603 +  *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45604 +  esac
45605 +
45606 +
45607 +
45608 +  b_c_pre=$php_c_pre
45609 +  b_cxx_pre=$php_cxx_pre
45610 +  b_c_meta=$php_c_meta
45611 +  b_cxx_meta=$php_cxx_meta
45612 +  b_c_post=$php_c_post
45613 +  b_cxx_post=$php_cxx_post
45614 +  b_lo=$php_lo
45615 +
45616 +
45617 +  old_IFS=$IFS
45618 +  for ac_src in posix.c; do
45619 +
45620 +      IFS=.
45621 +      set $ac_src
45622 +      ac_obj=$1
45623 +      IFS=$old_IFS
45624 +
45625 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
45626 +
45627 +      case $ac_src in
45628 +        *.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" ;;
45629 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45630 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45631 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45632 +      esac
45633 +
45634 +    cat >>Makefile.objects<<EOF
45635 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45636 +       $ac_comp
45637 +EOF
45638 +  done
45639 +
45640 +
45641 +        ;;
45642 +    esac
45643 +    EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
45644 +  fi
45645 +
45646 +
45647 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
45648 +
45649 +
45650 +
45651 +  if test "$ext_builddir" = "."; then
45652 +    PHP_PECL_EXTENSION=posix
45653 +
45654 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
45655 +
45656 +  fi
45657 +
45658 +
45659 +  for ac_hdr in sys/mkdev.h
45660 +do
45661 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
45662 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
45663 +echo "configure:79882: checking for $ac_hdr" >&5
45664 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
45665 +  echo $ac_n "(cached) $ac_c" 1>&6
45666 +else
45667 +  cat > conftest.$ac_ext <<EOF
45668 +#line 79887 "configure"
45669 +#include "confdefs.h"
45670 +#include <$ac_hdr>
45671 +EOF
45672 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
45673 +{ (eval echo configure:79892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
45674 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
45675 +if test -z "$ac_err"; then
45676 +  rm -rf conftest*
45677 +  eval "ac_cv_header_$ac_safe=yes"
45678 +else
45679 +  echo "$ac_err" >&5
45680 +  echo "configure: failed program was:" >&5
45681 +  cat conftest.$ac_ext >&5
45682 +  rm -rf conftest*
45683 +  eval "ac_cv_header_$ac_safe=no"
45684 +fi
45685 +rm -f conftest*
45686 +fi
45687 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
45688 +  echo "$ac_t""yes" 1>&6
45689 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
45690 +  cat >> confdefs.h <<EOF
45691 +#define $ac_tr_hdr 1
45692 +EOF
45693 +
45694 +else
45695 +  echo "$ac_t""no" 1>&6
45696 +fi
45697 +done
45698 +
45699 +
45700 +  for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
45701 +do
45702 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
45703 +echo "configure:79922: checking for $ac_func" >&5
45704 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
45705 +  echo $ac_n "(cached) $ac_c" 1>&6
45706 +else
45707 +  cat > conftest.$ac_ext <<EOF
45708 +#line 79927 "configure"
45709 +#include "confdefs.h"
45710 +/* System header to define __stub macros and hopefully few prototypes,
45711 +    which can conflict with char $ac_func(); below.  */
45712 +#include <assert.h>
45713 +/* Override any gcc2 internal prototype to avoid an error.  */
45714 +/* We use char because int might match the return type of a gcc2
45715 +    builtin and then its argument prototype would still apply.  */
45716 +char $ac_func();
45717 +
45718 +int main() {
45719 +
45720 +/* The GNU C library defines this for functions which it implements
45721 +    to always fail with ENOSYS.  Some functions are actually named
45722 +    something starting with __ and the normal name is an alias.  */
45723 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
45724 +choke me
45725 +#else
45726 +$ac_func();
45727 +#endif
45728 +
45729 +; return 0; }
45730 +EOF
45731 +if { (eval echo configure:79950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
45732 +  rm -rf conftest*
45733 +  eval "ac_cv_func_$ac_func=yes"
45734 +else
45735 +  echo "configure: failed program was:" >&5
45736 +  cat conftest.$ac_ext >&5
45737 +  rm -rf conftest*
45738 +  eval "ac_cv_func_$ac_func=no"
45739 +fi
45740 +rm -f conftest*
45741 +fi
45742 +
45743 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
45744 +  echo "$ac_t""yes" 1>&6
45745 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
45746 +  cat >> confdefs.h <<EOF
45747 +#define $ac_tr_func 1
45748 +EOF
45749 +
45750 +else
45751 +  echo "$ac_t""no" 1>&6
45752 +fi
45753 +done
45754 +
45755 +
45756 +  echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6
45757 +echo "configure:79976: checking for working ttyname_r() implementation" >&5
45758 +  if test "$cross_compiling" = yes; then
45759 +
45760 +    echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6
45761 +
45762 +else
45763 +  cat > conftest.$ac_ext <<EOF
45764 +#line 79983 "configure"
45765 +#include "confdefs.h"
45766 +
45767 +#include <unistd.h>
45768 +
45769 +int main(int argc, char *argv[])
45770 +{
45771 +       char buf[64];
45772 +
45773 +       return ttyname_r(0, buf, 64) ? 1 : 0;
45774 +}
45775 +
45776 +EOF
45777 +if { (eval echo configure:79996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
45778 +then
45779 +
45780 +    echo "$ac_t""yes" 1>&6
45781 +    cat >> confdefs.h <<\EOF
45782 +#define HAVE_TTYNAME_R 1
45783 +EOF
45784 +
45785 +
45786 +else
45787 +  echo "configure: failed program was:" >&5
45788 +  cat conftest.$ac_ext >&5
45789 +  rm -fr conftest*
45790 +
45791 +    echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6
45792 +
45793 +fi
45794 +rm -fr conftest*
45795 +fi
45796 +
45797 +
45798 +  echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6
45799 +echo "configure:80018: checking for utsname.domainname" >&5
45800 +if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then
45801 +  echo $ac_n "(cached) $ac_c" 1>&6
45802 +else
45803 +
45804 +    cat > conftest.$ac_ext <<EOF
45805 +#line 80024 "configure"
45806 +#include "confdefs.h"
45807 +
45808 +      #define _GNU_SOURCE
45809 +      #include <sys/utsname.h>
45810 +
45811 +int main() {
45812 +
45813 +      return sizeof(((struct utsname *)0)->domainname);
45814 +
45815 +; return 0; }
45816 +EOF
45817 +if { (eval echo configure:80036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
45818 +  rm -rf conftest*
45819 +
45820 +      ac_cv_have_utsname_domainname=yes
45821 +
45822 +else
45823 +  echo "configure: failed program was:" >&5
45824 +  cat conftest.$ac_ext >&5
45825 +  rm -rf conftest*
45826 +
45827 +      ac_cv_have_utsname_domainname=no
45828 +
45829 +fi
45830 +rm -f conftest*
45831 +
45832 +fi
45833 +
45834 +echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6
45835 +  if test "$ac_cv_have_utsname_domainname" = yes; then
45836 +    cat >> confdefs.h <<\EOF
45837 +#define HAVE_UTSNAME_DOMAINNAME 1
45838 +EOF
45839 +
45840 +  fi
45841 +fi
45842 +
45843 +
45844 +
45845 +php_with_pspell=no
45846 +
45847 +echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
45848 +echo "configure:80067: checking for PSPELL support" >&5
45849 +# Check whether --with-pspell or --without-pspell was given.
45850 +if test "${with_pspell+set}" = set; then
45851 +  withval="$with_pspell"
45852 +  PHP_PSPELL=$withval
45853 +else
45854 +
45855 +  PHP_PSPELL=no
45856 +  test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL
45857 +
45858 +fi
45859 +
45860 +
45861 +
45862 +ext_output="yes, shared"
45863 +ext_shared=yes
45864 +case $PHP_PSPELL in
45865 +shared,*)
45866 +  PHP_PSPELL=`echo "$PHP_PSPELL"|$SED 's/^shared,//'`
45867 +  ;;
45868 +shared)
45869 +  PHP_PSPELL=yes
45870 +  ;;
45871 +no)
45872 +  ext_output=no
45873 +  ext_shared=no
45874 +  ;;
45875 +*)
45876 +  ext_output=yes
45877 +  ext_shared=no
45878 +  ;;
45879 +esac
45880 +
45881 +
45882 +
45883 +echo "$ac_t""$ext_output" 1>&6
45884 +
45885 +
45886 +
45887 +
45888 +if test "$PHP_PSPELL" != "no"; then
45889 +
45890 +  ext_builddir=ext/pspell
45891 +  ext_srcdir=$abs_srcdir/ext/pspell
45892 +
45893 +  ac_extra=
45894 +
45895 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
45896 +    PHP_PSPELL_SHARED=no
45897 +
45898 +
45899 +  case ext/pspell in
45900 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45901 +  /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45902 +  *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45903 +  esac
45904 +
45905 +
45906 +
45907 +  b_c_pre=$php_c_pre
45908 +  b_cxx_pre=$php_cxx_pre
45909 +  b_c_meta=$php_c_meta
45910 +  b_cxx_meta=$php_cxx_meta
45911 +  b_c_post=$php_c_post
45912 +  b_cxx_post=$php_cxx_post
45913 +  b_lo=$php_lo
45914 +
45915 +
45916 +  old_IFS=$IFS
45917 +  for ac_src in pspell.c; do
45918 +
45919 +      IFS=.
45920 +      set $ac_src
45921 +      ac_obj=$1
45922 +      IFS=$old_IFS
45923 +
45924 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
45925 +
45926 +      case $ac_src in
45927 +        *.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" ;;
45928 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45929 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45930 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45931 +      esac
45932 +
45933 +    cat >>Makefile.objects<<EOF
45934 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45935 +       $ac_comp
45936 +EOF
45937 +  done
45938 +
45939 +
45940 +    EXT_STATIC="$EXT_STATIC pspell"
45941 +    if test "$ext_shared" != "nocli"; then
45942 +      EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
45943 +    fi
45944 +  else
45945 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
45946 +      PHP_PSPELL_SHARED=yes
45947 +
45948 +  case ext/pspell in
45949 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45950 +  /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45951 +  *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45952 +  esac
45953 +
45954 +
45955 +
45956 +  b_c_pre=$shared_c_pre
45957 +  b_cxx_pre=$shared_cxx_pre
45958 +  b_c_meta=$shared_c_meta
45959 +  b_cxx_meta=$shared_cxx_meta
45960 +  b_c_post=$shared_c_post
45961 +  b_cxx_post=$shared_cxx_post
45962 +  b_lo=$shared_lo
45963 +
45964 +
45965 +  old_IFS=$IFS
45966 +  for ac_src in pspell.c; do
45967 +
45968 +      IFS=.
45969 +      set $ac_src
45970 +      ac_obj=$1
45971 +      IFS=$old_IFS
45972 +
45973 +      shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo"
45974 +
45975 +      case $ac_src in
45976 +        *.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" ;;
45977 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45978 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45979 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45980 +      esac
45981 +
45982 +    cat >>Makefile.objects<<EOF
45983 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45984 +       $ac_comp
45985 +EOF
45986 +  done
45987 +
45988 +      case $host_alias in
45989 +        *netware*)
45990 +
45991 +  install_modules="install-modules"
45992 +
45993 +  case $host_alias in
45994 +    *aix*)
45995 +      suffix=so
45996 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppspell.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppspell.so '$ext_builddir'/phppspell.so'
45997 +      ;;
45998 +    *netware*)
45999 +      suffix=nlm
46000 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPSPELL, 3)_SHARED_LIBADD)'
46001 +      ;;
46002 +    *)
46003 +      suffix=la
46004 +      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_pspell) $(PHPPSPELL_SHARED_LIBADD)'
46005 +      ;;
46006 +  esac
46007 +
46008 +  if test "x" = "xyes"; then
46009 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppspell.$suffix"
46010 +  else
46011 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix"
46012 +  fi
46013 +
46014 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
46015 +
46016 +  cat >>Makefile.objects<<EOF
46017 +\$(phplibdir)/phppspell.$suffix: $ext_builddir/phppspell.$suffix
46018 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phppspell.$suffix \$(phplibdir)
46019 +
46020 +$ext_builddir/phppspell.$suffix: \$(shared_objects_pspell) \$(PHPPSPELL_SHARED_DEPENDENCIES)
46021 +       $link_cmd
46022 +
46023 +EOF
46024 +
46025 +          ;;
46026 +        *)
46027 +
46028 +  install_modules="install-modules"
46029 +
46030 +  case $host_alias in
46031 +    *aix*)
46032 +      suffix=so
46033 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pspell.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PSPELL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pspell.so '$ext_builddir'/pspell.so'
46034 +      ;;
46035 +    *netware*)
46036 +      suffix=nlm
46037 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PSPELL, 3)_SHARED_LIBADD)'
46038 +      ;;
46039 +    *)
46040 +      suffix=la
46041 +      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_pspell) $(PSPELL_SHARED_LIBADD)'
46042 +      ;;
46043 +  esac
46044 +
46045 +  if test "x" = "xyes"; then
46046 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pspell.$suffix"
46047 +  else
46048 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pspell.$suffix"
46049 +  fi
46050 +
46051 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
46052 +
46053 +  cat >>Makefile.objects<<EOF
46054 +\$(phplibdir)/pspell.$suffix: $ext_builddir/pspell.$suffix
46055 +       \$(LIBTOOL) --mode=install cp $ext_builddir/pspell.$suffix \$(phplibdir)
46056 +
46057 +$ext_builddir/pspell.$suffix: \$(shared_objects_pspell) \$(PSPELL_SHARED_DEPENDENCIES)
46058 +       $link_cmd
46059 +
46060 +EOF
46061 +
46062 +          ;;
46063 +      esac
46064 +      cat >> confdefs.h <<EOF
46065 +#define COMPILE_DL_PSPELL 1
46066 +EOF
46067 +
46068 +    fi
46069 +  fi
46070 +
46071 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
46072 +    PHP_PSPELL_SHARED=no
46073 +    case "$PHP_SAPI" in
46074 +      cgi|embed)
46075 +
46076 +
46077 +  case ext/pspell in
46078 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
46079 +  /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46080 +  *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46081 +  esac
46082 +
46083 +
46084 +
46085 +  b_c_pre=$php_c_pre
46086 +  b_cxx_pre=$php_cxx_pre
46087 +  b_c_meta=$php_c_meta
46088 +  b_cxx_meta=$php_cxx_meta
46089 +  b_c_post=$php_c_post
46090 +  b_cxx_post=$php_cxx_post
46091 +  b_lo=$php_lo
46092 +
46093 +
46094 +  old_IFS=$IFS
46095 +  for ac_src in pspell.c; do
46096 +
46097 +      IFS=.
46098 +      set $ac_src
46099 +      ac_obj=$1
46100 +      IFS=$old_IFS
46101 +
46102 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
46103 +
46104 +      case $ac_src in
46105 +        *.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" ;;
46106 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
46107 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
46108 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
46109 +      esac
46110 +
46111 +    cat >>Makefile.objects<<EOF
46112 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
46113 +       $ac_comp
46114 +EOF
46115 +  done
46116 +
46117 +
46118 +        EXT_STATIC="$EXT_STATIC pspell"
46119 +        ;;
46120 +      *)
46121 +
46122 +
46123 +  case ext/pspell in
46124 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
46125 +  /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46126 +  *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46127 +  esac
46128 +
46129 +
46130 +
46131 +  b_c_pre=$php_c_pre
46132 +  b_cxx_pre=$php_cxx_pre
46133 +  b_c_meta=$php_c_meta
46134 +  b_cxx_meta=$php_cxx_meta
46135 +  b_c_post=$php_c_post
46136 +  b_cxx_post=$php_cxx_post
46137 +  b_lo=$php_lo
46138 +
46139 +
46140 +  old_IFS=$IFS
46141 +  for ac_src in pspell.c; do
46142 +
46143 +      IFS=.
46144 +      set $ac_src
46145 +      ac_obj=$1
46146 +      IFS=$old_IFS
46147 +
46148 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
46149 +
46150 +      case $ac_src in
46151 +        *.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" ;;
46152 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
46153 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
46154 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
46155 +      esac
46156 +
46157 +    cat >>Makefile.objects<<EOF
46158 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
46159 +       $ac_comp
46160 +EOF
46161 +  done
46162 +
46163 +
46164 +        ;;
46165 +    esac
46166 +    EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
46167 +  fi
46168 +
46169 +
46170 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
46171 +
46172 +
46173 +
46174 +  if test "$ext_builddir" = "."; then
46175 +    PHP_PECL_EXTENSION=pspell
46176 +
46177 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
46178 +
46179 +  fi
46180 +
46181 +       if test "$PHP_PSPELL" != "yes"; then
46182 +           PSPELL_SEARCH_DIRS=$PHP_PSPELL
46183 +       else
46184 +           PSPELL_SEARCH_DIRS="/usr/local /usr"
46185 +       fi
46186 +       for i in $PSPELL_SEARCH_DIRS; do
46187 +               if test -f $i/include/pspell/pspell.h; then
46188 +                       PSPELL_DIR=$i
46189 +                       PSPELL_INCDIR=$i/include/pspell
46190 +               elif test -f $i/include/pspell.h; then
46191 +                       PSPELL_DIR=$i
46192 +                       PSPELL_INCDIR=$i/include
46193 +               fi
46194 +       done
46195 +
46196 +       if test -z "$PSPELL_DIR"; then
46197 +               { echo "configure: error: Cannot find pspell" 1>&2; exit 1; }
46198 +       fi
46199 +
46200 +       PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR
46201 +
46202 +
46203 +
46204 +  if test "$ext_shared" = "yes"; then
46205 +    PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD"
46206 +    if test -n "$PSPELL_LIBDIR"; then
46207 +
46208 +  if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
46209 +
46210 +  if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
46211 +    ai_p=$PSPELL_LIBDIR
46212 +  else
46213 +
46214 +    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
46215 +
46216 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46217 +    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
46218 +  fi
46219 +
46220 +
46221 +      if test "$ext_shared" = "yes"; then
46222 +        PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
46223 +        test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD"
46224 +      else
46225 +
46226 +
46227 +
46228 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46229 +
46230 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
46231 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
46232 +    eval "LIBPATH$unique=set"
46233 +
46234 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
46235 +    LDFLAGS="$LDFLAGS -L$ai_p"
46236 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
46237 +
46238 +  fi
46239 +
46240 +
46241 +      fi
46242 +
46243 +  fi
46244 +
46245 +    fi
46246 +  else
46247 +
46248 +
46249 +  if test -n "$PSPELL_LIBDIR"; then
46250 +
46251 +  if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
46252 +
46253 +  if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
46254 +    ai_p=$PSPELL_LIBDIR
46255 +  else
46256 +
46257 +    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
46258 +
46259 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46260 +    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
46261 +  fi
46262 +
46263 +
46264 +
46265 +
46266 +
46267 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46268 +
46269 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
46270 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
46271 +    eval "LIBPATH$unique=set"
46272 +
46273 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
46274 +    LDFLAGS="$LDFLAGS -L$ai_p"
46275 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
46276 +
46277 +  fi
46278 +
46279 +
46280 +
46281 +  fi
46282 +
46283 +  fi
46284 +
46285 +
46286 +  case pspell in
46287 +  c|c_r|pthread*) ;;
46288 +  *)
46289 +      LIBS="-lpspell $LIBS"
46290 +   ;;
46291 +  esac
46292 +
46293 +
46294 +
46295 +
46296 +  fi
46297 +
46298 +
46299 +
46300 +
46301 +  save_old_LDFLAGS=$LDFLAGS
46302 +  ac_stuff="
46303 +               -L$PSPELL_LIBDIR
46304 +       "
46305 +
46306 +  save_ext_shared=$ext_shared
46307 +  ext_shared=yes
46308 +
46309 +  for ac_i in $ac_stuff; do
46310 +    case $ac_i in
46311 +    -pthread)
46312 +      if test "$ext_shared" = "yes"; then
46313 +        LDFLAGS="$LDFLAGS -pthread"
46314 +      else
46315 +
46316 +
46317 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
46318 +
46319 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
46320 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
46321 +    eval "EXTRA_LDFLAGS$unique=set"
46322 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
46323 +  fi
46324 +
46325 +      fi
46326 +    ;;
46327 +    -l*)
46328 +      ac_ii=`echo $ac_i|cut -c 3-`
46329 +
46330 +
46331 +  case $ac_ii in
46332 +  c|c_r|pthread*) ;;
46333 +  *)
46334 +    if test "$ext_shared" = "yes"; then
46335 +        LDFLAGS="$LDFLAGS -l$ac_ii"
46336 +    else
46337 +
46338 +
46339 +  case $ac_ii in
46340 +  c|c_r|pthread*) ;;
46341 +  *)
46342 +      LIBS="$LIBS -l$ac_ii"
46343 +   ;;
46344 +  esac
46345 +
46346 +
46347 +    fi
46348 +   ;;
46349 +  esac
46350 +
46351 +
46352 +    ;;
46353 +    -L*)
46354 +      ac_ii=`echo $ac_i|cut -c 3-`
46355 +
46356 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
46357 +
46358 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
46359 +    ai_p=$ac_ii
46360 +  else
46361 +
46362 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
46363 +
46364 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46365 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
46366 +  fi
46367 +
46368 +
46369 +      if test "$ext_shared" = "yes"; then
46370 +        LDFLAGS="-L$ai_p $LDFLAGS"
46371 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
46372 +      else
46373 +
46374 +
46375 +
46376 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46377 +
46378 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
46379 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
46380 +    eval "LIBPATH$unique=set"
46381 +
46382 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
46383 +    LDFLAGS="$LDFLAGS -L$ai_p"
46384 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
46385 +
46386 +  fi
46387 +
46388
46389 -else
46390 -  echo "$ac_t""no" 1>&6
46391 -fi
46392 +      fi
46393 +
46394 +  fi
46395
46396 -  echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
46397 -echo "configure:75946: checking for PQprepare in -lpq" >&5
46398 -ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
46399 +    ;;
46400 +    esac
46401 +  done
46402 +
46403 +  echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
46404 +echo "configure:80617: checking for new_aspell_config in -laspell" >&5
46405 +ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'`
46406  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46407    echo $ac_n "(cached) $ac_c" 1>&6
46408  else
46409    ac_save_LIBS="$LIBS"
46410 -LIBS="-lpq  $LIBS"
46411 +LIBS="-laspell  $LIBS"
46412  cat > conftest.$ac_ext <<EOF
46413 -#line 75954 "configure"
46414 +#line 80625 "configure"
46415  #include "confdefs.h"
46416  /* Override any gcc2 internal prototype to avoid an error.  */
46417  /* We use char because int might match the return type of a gcc2
46418      builtin and then its argument prototype would still apply.  */
46419 -char PQprepare();
46420 +char new_aspell_config();
46421
46422  int main() {
46423 -PQprepare()
46424 +new_aspell_config()
46425  ; return 0; }
46426  EOF
46427 -if { (eval echo configure:75965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46428 +if { (eval echo configure:80636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46429    rm -rf conftest*
46430    eval "ac_cv_lib_$ac_lib_var=yes"
46431  else
46432 @@ -75976,250 +80647,316 @@ LIBS="$ac_save_LIBS"
46433  fi
46434  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
46435    echo "$ac_t""yes" 1>&6
46436 -  cat >> confdefs.h <<\EOF
46437 -#define HAVE_PQPREPARE 1
46438 -EOF
46439 +
46440 +    LDFLAGS=$save_old_LDFLAGS
46441 +    ext_shared=$save_ext_shared
46442 +
46443 +
46444
46445 -else
46446 -  echo "$ac_t""no" 1>&6
46447 -fi
46448 +  if test "$ext_shared" = "yes"; then
46449 +    PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD"
46450 +    if test -n "$PSPELL_LIBDIR"; then
46451 +
46452 +  if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
46453 +
46454 +  if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
46455 +    ai_p=$PSPELL_LIBDIR
46456 +  else
46457 +
46458 +    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
46459 +
46460 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46461 +    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
46462 +  fi
46463
46464 -  echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6
46465 -echo "configure:75989: checking for PQexecPrepared in -lpq" >&5
46466 -ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'`
46467 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46468 -  echo $ac_n "(cached) $ac_c" 1>&6
46469 -else
46470 -  ac_save_LIBS="$LIBS"
46471 -LIBS="-lpq  $LIBS"
46472 -cat > conftest.$ac_ext <<EOF
46473 -#line 75997 "configure"
46474 -#include "confdefs.h"
46475 -/* Override any gcc2 internal prototype to avoid an error.  */
46476 -/* We use char because int might match the return type of a gcc2
46477 -    builtin and then its argument prototype would still apply.  */
46478 -char PQexecPrepared();
46479 +
46480 +      if test "$ext_shared" = "yes"; then
46481 +        PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
46482 +        test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD"
46483 +      else
46484 +
46485 +
46486 +
46487 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46488 +
46489 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
46490 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
46491 +    eval "LIBPATH$unique=set"
46492 +
46493 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
46494 +    LDFLAGS="$LDFLAGS -L$ai_p"
46495 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
46496 +
46497 +  fi
46498
46499 -int main() {
46500 -PQexecPrepared()
46501 -; return 0; }
46502 -EOF
46503 -if { (eval echo configure:76008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46504 -  rm -rf conftest*
46505 -  eval "ac_cv_lib_$ac_lib_var=yes"
46506 -else
46507 -  echo "configure: failed program was:" >&5
46508 -  cat conftest.$ac_ext >&5
46509 -  rm -rf conftest*
46510 -  eval "ac_cv_lib_$ac_lib_var=no"
46511 -fi
46512 -rm -f conftest*
46513 -LIBS="$ac_save_LIBS"
46514
46515 -fi
46516 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
46517 -  echo "$ac_t""yes" 1>&6
46518 -  cat >> confdefs.h <<\EOF
46519 -#define HAVE_PQEXECPREPARED 1
46520 -EOF
46521 +      fi
46522 +
46523 +  fi
46524
46525 -else
46526 -  echo "$ac_t""no" 1>&6
46527 -fi
46528 +    fi
46529 +  else
46530 +
46531
46532 -  echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
46533 -echo "configure:76032: checking for PQresultErrorField in -lpq" >&5
46534 -ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'`
46535 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46536 -  echo $ac_n "(cached) $ac_c" 1>&6
46537 -else
46538 -  ac_save_LIBS="$LIBS"
46539 -LIBS="-lpq  $LIBS"
46540 -cat > conftest.$ac_ext <<EOF
46541 -#line 76040 "configure"
46542 -#include "confdefs.h"
46543 -/* Override any gcc2 internal prototype to avoid an error.  */
46544 -/* We use char because int might match the return type of a gcc2
46545 -    builtin and then its argument prototype would still apply.  */
46546 -char PQresultErrorField();
46547 +  if test -n "$PSPELL_LIBDIR"; then
46548 +
46549 +  if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
46550 +
46551 +  if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
46552 +    ai_p=$PSPELL_LIBDIR
46553 +  else
46554 +
46555 +    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
46556 +
46557 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46558 +    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
46559 +  fi
46560
46561 -int main() {
46562 -PQresultErrorField()
46563 -; return 0; }
46564 -EOF
46565 -if { (eval echo configure:76051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46566 -  rm -rf conftest*
46567 -  eval "ac_cv_lib_$ac_lib_var=yes"
46568 -else
46569 -  echo "configure: failed program was:" >&5
46570 -  cat conftest.$ac_ext >&5
46571 -  rm -rf conftest*
46572 -  eval "ac_cv_lib_$ac_lib_var=no"
46573 -fi
46574 -rm -f conftest*
46575 -LIBS="$ac_save_LIBS"
46576 +
46577 +
46578 +
46579 +
46580 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46581 +
46582 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
46583 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
46584 +    eval "LIBPATH$unique=set"
46585 +
46586 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
46587 +    LDFLAGS="$LDFLAGS -L$ai_p"
46588 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
46589 +
46590 +  fi
46591
46592 -fi
46593 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
46594 -  echo "$ac_t""yes" 1>&6
46595 -  cat >> confdefs.h <<\EOF
46596 -#define HAVE_PQRESULTERRORFIELD 1
46597 -EOF
46598
46599 -else
46600 -  echo "$ac_t""no" 1>&6
46601 -fi
46602 +
46603 +  fi
46604
46605 -  echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6
46606 -echo "configure:76075: checking for PQsendQueryParams in -lpq" >&5
46607 -ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'`
46608 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46609 -  echo $ac_n "(cached) $ac_c" 1>&6
46610 -else
46611 -  ac_save_LIBS="$LIBS"
46612 -LIBS="-lpq  $LIBS"
46613 -cat > conftest.$ac_ext <<EOF
46614 -#line 76083 "configure"
46615 -#include "confdefs.h"
46616 -/* Override any gcc2 internal prototype to avoid an error.  */
46617 -/* We use char because int might match the return type of a gcc2
46618 -    builtin and then its argument prototype would still apply.  */
46619 -char PQsendQueryParams();
46620 +  fi
46621 +
46622 +
46623 +  case aspell in
46624 +  c|c_r|pthread*) ;;
46625 +  *)
46626 +      LIBS="-laspell $LIBS"
46627 +   ;;
46628 +  esac
46629
46630 -int main() {
46631 -PQsendQueryParams()
46632 -; return 0; }
46633 -EOF
46634 -if { (eval echo configure:76094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46635 -  rm -rf conftest*
46636 -  eval "ac_cv_lib_$ac_lib_var=yes"
46637 -else
46638 -  echo "configure: failed program was:" >&5
46639 -  cat conftest.$ac_ext >&5
46640 -  rm -rf conftest*
46641 -  eval "ac_cv_lib_$ac_lib_var=no"
46642 -fi
46643 -rm -f conftest*
46644 -LIBS="$ac_save_LIBS"
46645
46646 -fi
46647 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
46648 -  echo "$ac_t""yes" 1>&6
46649 -  cat >> confdefs.h <<\EOF
46650 -#define HAVE_PQSENDQUERYPARAMS 1
46651 -EOF
46652
46653 +
46654 +  fi
46655 +
46656 +
46657 +
46658 +
46659  else
46660    echo "$ac_t""no" 1>&6
46661 +
46662 +    LDFLAGS=$save_old_LDFLAGS
46663 +    ext_shared=$save_ext_shared
46664 +    unset ac_cv_lib_aspell_new_aspell_config
46665 +
46666 +
46667  fi
46668
46669 -  echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6
46670 -echo "configure:76118: checking for PQsendPrepare in -lpq" >&5
46671 -ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'`
46672 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46673 -  echo $ac_n "(cached) $ac_c" 1>&6
46674 -else
46675 -  ac_save_LIBS="$LIBS"
46676 -LIBS="-lpq  $LIBS"
46677 -cat > conftest.$ac_ext <<EOF
46678 -#line 76126 "configure"
46679 -#include "confdefs.h"
46680 -/* Override any gcc2 internal prototype to avoid an error.  */
46681 -/* We use char because int might match the return type of a gcc2
46682 -    builtin and then its argument prototype would still apply.  */
46683 -char PQsendPrepare();
46684
46685 -int main() {
46686 -PQsendPrepare()
46687 -; return 0; }
46688 +
46689 +  if test "$PSPELL_INCDIR" != "/usr/include"; then
46690 +
46691 +  if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then
46692 +    ai_p=$PSPELL_INCDIR
46693 +  else
46694 +
46695 +    ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
46696 +
46697 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46698 +    ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`"
46699 +  fi
46700 +
46701 +
46702 +
46703 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46704 +
46705 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
46706 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
46707 +    eval "INCLUDEPATH$unique=set"
46708 +
46709 +      if test ""; then
46710 +        INCLUDES="-I$ai_p $INCLUDES"
46711 +      else
46712 +        INCLUDES="$INCLUDES -I$ai_p"
46713 +      fi
46714 +
46715 +  fi
46716 +
46717 +  fi
46718 +
46719 +
46720 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD"
46721 +
46722 +       cat >> confdefs.h <<\EOF
46723 +#define HAVE_PSPELL 1
46724  EOF
46725 -if { (eval echo configure:76137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46726 -  rm -rf conftest*
46727 -  eval "ac_cv_lib_$ac_lib_var=yes"
46728 -else
46729 -  echo "configure: failed program was:" >&5
46730 -  cat conftest.$ac_ext >&5
46731 -  rm -rf conftest*
46732 -  eval "ac_cv_lib_$ac_lib_var=no"
46733 -fi
46734 -rm -f conftest*
46735 -LIBS="$ac_save_LIBS"
46736
46737  fi
46738 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
46739 -  echo "$ac_t""yes" 1>&6
46740 -  cat >> confdefs.h <<\EOF
46741 -#define HAVE_PQSENDPREPARE 1
46742 -EOF
46743
46744 +
46745 +
46746 +php_with_libedit=no
46747 +
46748 +echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
46749 +echo "configure:80810: checking for libedit readline replacement" >&5
46750 +# Check whether --with-libedit or --without-libedit was given.
46751 +if test "${with_libedit+set}" = set; then
46752 +  withval="$with_libedit"
46753 +  PHP_LIBEDIT=$withval
46754  else
46755 -  echo "$ac_t""no" 1>&6
46756 +
46757 +  PHP_LIBEDIT=no
46758 +  test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL
46759 +
46760  fi
46761
46762 -  echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6
46763 -echo "configure:76161: checking for PQsendQueryPrepared in -lpq" >&5
46764 -ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'`
46765 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46766 -  echo $ac_n "(cached) $ac_c" 1>&6
46767 -else
46768 -  ac_save_LIBS="$LIBS"
46769 -LIBS="-lpq  $LIBS"
46770 -cat > conftest.$ac_ext <<EOF
46771 -#line 76169 "configure"
46772 -#include "confdefs.h"
46773 -/* Override any gcc2 internal prototype to avoid an error.  */
46774 -/* We use char because int might match the return type of a gcc2
46775 -    builtin and then its argument prototype would still apply.  */
46776 -char PQsendQueryPrepared();
46777
46778 -int main() {
46779 -PQsendQueryPrepared()
46780 -; return 0; }
46781 -EOF
46782 -if { (eval echo configure:76180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46783 -  rm -rf conftest*
46784 -  eval "ac_cv_lib_$ac_lib_var=yes"
46785 +
46786 +ext_output="yes, shared"
46787 +ext_shared=yes
46788 +case $PHP_LIBEDIT in
46789 +shared,*)
46790 +  PHP_LIBEDIT=`echo "$PHP_LIBEDIT"|$SED 's/^shared,//'`
46791 +  ;;
46792 +shared)
46793 +  PHP_LIBEDIT=yes
46794 +  ;;
46795 +no)
46796 +  ext_output=no
46797 +  ext_shared=no
46798 +  ;;
46799 +*)
46800 +  ext_output=yes
46801 +  ext_shared=no
46802 +  ;;
46803 +esac
46804 +
46805 +
46806 +
46807 +echo "$ac_t""$ext_output" 1>&6
46808 +
46809 +
46810 +
46811 +
46812 +if test "$PHP_LIBEDIT" = "no"; then
46813 +
46814 +php_with_readline=no
46815 +
46816 +echo $ac_n "checking for readline support""... $ac_c" 1>&6
46817 +echo "configure:80855: checking for readline support" >&5
46818 +# Check whether --with-readline or --without-readline was given.
46819 +if test "${with_readline+set}" = set; then
46820 +  withval="$with_readline"
46821 +  PHP_READLINE=$withval
46822  else
46823 -  echo "configure: failed program was:" >&5
46824 -  cat conftest.$ac_ext >&5
46825 -  rm -rf conftest*
46826 -  eval "ac_cv_lib_$ac_lib_var=no"
46827 -fi
46828 -rm -f conftest*
46829 -LIBS="$ac_save_LIBS"
46830 +
46831 +  PHP_READLINE=no
46832 +  test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL
46833
46834  fi
46835 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
46836 -  echo "$ac_t""yes" 1>&6
46837 -  cat >> confdefs.h <<\EOF
46838 -#define HAVE_PQSENDQUERYPREPARED 1
46839 -EOF
46840 +
46841 +
46842 +
46843 +ext_output="yes, shared"
46844 +ext_shared=yes
46845 +case $PHP_READLINE in
46846 +shared,*)
46847 +  PHP_READLINE=`echo "$PHP_READLINE"|$SED 's/^shared,//'`
46848 +  ;;
46849 +shared)
46850 +  PHP_READLINE=yes
46851 +  ;;
46852 +no)
46853 +  ext_output=no
46854 +  ext_shared=no
46855 +  ;;
46856 +*)
46857 +  ext_output=yes
46858 +  ext_shared=no
46859 +  ;;
46860 +esac
46861 +
46862 +
46863 +
46864 +echo "$ac_t""$ext_output" 1>&6
46865 +
46866 +
46867
46868  else
46869 -  echo "$ac_t""no" 1>&6
46870 +    php_with_readline=no
46871  fi
46872
46873 -  echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6
46874 -echo "configure:76204: checking for PQputCopyData in -lpq" >&5
46875 -ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'`
46876 +if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
46877 +  for i in $PHP_READLINE /usr/local /usr; do
46878 +    test -f $i/include/readline/readline.h && READLINE_DIR=$i && break
46879 +  done
46880 +
46881 +  if test -z "$READLINE_DIR"; then
46882 +    { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; }
46883 +  fi
46884 +
46885 +
46886 +  if test "$READLINE_DIR/include" != "/usr/include"; then
46887 +
46888 +  if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then
46889 +    ai_p=$READLINE_DIR/include
46890 +  else
46891 +
46892 +    ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
46893 +
46894 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46895 +    ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`"
46896 +  fi
46897 +
46898 +
46899 +
46900 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46901 +
46902 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
46903 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
46904 +    eval "INCLUDEPATH$unique=set"
46905 +
46906 +      if test ""; then
46907 +        INCLUDES="-I$ai_p $INCLUDES"
46908 +      else
46909 +        INCLUDES="$INCLUDES -I$ai_p"
46910 +      fi
46911 +
46912 +  fi
46913 +
46914 +  fi
46915 +
46916 +
46917 +  PHP_READLINE_LIBS=""
46918 +  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
46919 +echo "configure:80941: checking for tgetent in -lncurses" >&5
46920 +ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
46921  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46922    echo $ac_n "(cached) $ac_c" 1>&6
46923  else
46924    ac_save_LIBS="$LIBS"
46925 -LIBS="-lpq  $LIBS"
46926 +LIBS="-lncurses  $LIBS"
46927  cat > conftest.$ac_ext <<EOF
46928 -#line 76212 "configure"
46929 +#line 80949 "configure"
46930  #include "confdefs.h"
46931  /* Override any gcc2 internal prototype to avoid an error.  */
46932  /* We use char because int might match the return type of a gcc2
46933      builtin and then its argument prototype would still apply.  */
46934 -char PQputCopyData();
46935 +char tgetent();
46936
46937  int main() {
46938 -PQputCopyData()
46939 +tgetent()
46940  ; return 0; }
46941  EOF
46942 -if { (eval echo configure:76223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46943 +if { (eval echo configure:80960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46944    rm -rf conftest*
46945    eval "ac_cv_lib_$ac_lib_var=yes"
46946  else
46947 @@ -76234,78 +80971,56 @@ LIBS="$ac_save_LIBS"
46948  fi
46949  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
46950    echo "$ac_t""yes" 1>&6
46951 -  cat >> confdefs.h <<\EOF
46952 -#define HAVE_PQPUTCOPYDATA 1
46953 -EOF
46954 -
46955 -else
46956 -  echo "$ac_t""no" 1>&6
46957 -fi
46958 -
46959 -  echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6
46960 -echo "configure:76247: checking for PQputCopyEnd in -lpq" >&5
46961 -ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'`
46962 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46963 -  echo $ac_n "(cached) $ac_c" 1>&6
46964 -else
46965 -  ac_save_LIBS="$LIBS"
46966 -LIBS="-lpq  $LIBS"
46967 -cat > conftest.$ac_ext <<EOF
46968 -#line 76255 "configure"
46969 -#include "confdefs.h"
46970 -/* Override any gcc2 internal prototype to avoid an error.  */
46971 -/* We use char because int might match the return type of a gcc2
46972 -    builtin and then its argument prototype would still apply.  */
46973 -char PQputCopyEnd();
46974 +
46975 +
46976 +
46977 +  case ncurses in
46978 +  c|c_r|pthread*) ;;
46979 +  *)
46980 +    if test "$ext_shared" = "yes"; then
46981 +        READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
46982 +    else
46983 +
46984 +
46985 +  case ncurses in
46986 +  c|c_r|pthread*) ;;
46987 +  *)
46988 +      LIBS="-lncurses $LIBS"
46989 +   ;;
46990 +  esac
46991
46992 -int main() {
46993 -PQputCopyEnd()
46994 -; return 0; }
46995 -EOF
46996 -if { (eval echo configure:76266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46997 -  rm -rf conftest*
46998 -  eval "ac_cv_lib_$ac_lib_var=yes"
46999 -else
47000 -  echo "configure: failed program was:" >&5
47001 -  cat conftest.$ac_ext >&5
47002 -  rm -rf conftest*
47003 -  eval "ac_cv_lib_$ac_lib_var=no"
47004 -fi
47005 -rm -f conftest*
47006 -LIBS="$ac_save_LIBS"
47007
47008 -fi
47009 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47010 -  echo "$ac_t""yes" 1>&6
47011 -  cat >> confdefs.h <<\EOF
47012 -#define HAVE_PQPUTCOPYEND 1
47013 -EOF
47014 +    fi
47015 +   ;;
47016 +  esac
47017 +
47018
47019 +    PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
47020 +
47021  else
47022    echo "$ac_t""no" 1>&6
47023 -fi
47024
47025 -  echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6
47026 -echo "configure:76290: checking for PQgetCopyData in -lpq" >&5
47027 -ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'`
47028 +    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
47029 +echo "configure:81005: checking for tgetent in -ltermcap" >&5
47030 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
47031  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47032    echo $ac_n "(cached) $ac_c" 1>&6
47033  else
47034    ac_save_LIBS="$LIBS"
47035 -LIBS="-lpq  $LIBS"
47036 +LIBS="-ltermcap  $LIBS"
47037  cat > conftest.$ac_ext <<EOF
47038 -#line 76298 "configure"
47039 +#line 81013 "configure"
47040  #include "confdefs.h"
47041  /* Override any gcc2 internal prototype to avoid an error.  */
47042  /* We use char because int might match the return type of a gcc2
47043      builtin and then its argument prototype would still apply.  */
47044 -char PQgetCopyData();
47045 +char tgetent();
47046
47047  int main() {
47048 -PQgetCopyData()
47049 +tgetent()
47050  ; return 0; }
47051  EOF
47052 -if { (eval echo configure:76309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47053 +if { (eval echo configure:81024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47054    rm -rf conftest*
47055    eval "ac_cv_lib_$ac_lib_var=yes"
47056  else
47057 @@ -76320,35 +81035,158 @@ LIBS="$ac_save_LIBS"
47058  fi
47059  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47060    echo "$ac_t""yes" 1>&6
47061 -  cat >> confdefs.h <<\EOF
47062 -#define HAVE_PQGETCOPYDATA 1
47063 -EOF
47064 +
47065 +
47066 +
47067 +  case termcap in
47068 +  c|c_r|pthread*) ;;
47069 +  *)
47070 +    if test "$ext_shared" = "yes"; then
47071 +        READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
47072 +    else
47073 +
47074 +
47075 +  case termcap in
47076 +  c|c_r|pthread*) ;;
47077 +  *)
47078 +      LIBS="-ltermcap $LIBS"
47079 +   ;;
47080 +  esac
47081 +
47082 +
47083 +    fi
47084 +   ;;
47085 +  esac
47086
47087 +
47088 +      PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap"
47089 +
47090  else
47091    echo "$ac_t""no" 1>&6
47092  fi
47093
47094 -  echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6
47095 -echo "configure:76333: checking for PQfreemem in -lpq" >&5
47096 -ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'`
47097 +
47098 +fi
47099 +
47100 +
47101 +
47102 +  save_old_LDFLAGS=$LDFLAGS
47103 +  ac_stuff="
47104 +    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
47105 +  "
47106 +
47107 +  save_ext_shared=$ext_shared
47108 +  ext_shared=yes
47109 +
47110 +  for ac_i in $ac_stuff; do
47111 +    case $ac_i in
47112 +    -pthread)
47113 +      if test "$ext_shared" = "yes"; then
47114 +        LDFLAGS="$LDFLAGS -pthread"
47115 +      else
47116 +
47117 +
47118 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
47119 +
47120 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
47121 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47122 +    eval "EXTRA_LDFLAGS$unique=set"
47123 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
47124 +  fi
47125 +
47126 +      fi
47127 +    ;;
47128 +    -l*)
47129 +      ac_ii=`echo $ac_i|cut -c 3-`
47130 +
47131 +
47132 +  case $ac_ii in
47133 +  c|c_r|pthread*) ;;
47134 +  *)
47135 +    if test "$ext_shared" = "yes"; then
47136 +        LDFLAGS="$LDFLAGS -l$ac_ii"
47137 +    else
47138 +
47139 +
47140 +  case $ac_ii in
47141 +  c|c_r|pthread*) ;;
47142 +  *)
47143 +      LIBS="$LIBS -l$ac_ii"
47144 +   ;;
47145 +  esac
47146 +
47147 +
47148 +    fi
47149 +   ;;
47150 +  esac
47151 +
47152 +
47153 +    ;;
47154 +    -L*)
47155 +      ac_ii=`echo $ac_i|cut -c 3-`
47156 +
47157 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
47158 +
47159 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
47160 +    ai_p=$ac_ii
47161 +  else
47162 +
47163 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
47164 +
47165 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47166 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
47167 +  fi
47168 +
47169 +
47170 +      if test "$ext_shared" = "yes"; then
47171 +        LDFLAGS="-L$ai_p $LDFLAGS"
47172 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
47173 +      else
47174 +
47175 +
47176 +
47177 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
47178 +
47179 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
47180 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47181 +    eval "LIBPATH$unique=set"
47182 +
47183 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
47184 +    LDFLAGS="$LDFLAGS -L$ai_p"
47185 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
47186 +
47187 +  fi
47188 +
47189 +
47190 +      fi
47191 +
47192 +  fi
47193 +
47194 +    ;;
47195 +    esac
47196 +  done
47197 +
47198 +  echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
47199 +echo "configure:81171: checking for readline in -lreadline" >&5
47200 +ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
47201  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47202    echo $ac_n "(cached) $ac_c" 1>&6
47203  else
47204    ac_save_LIBS="$LIBS"
47205 -LIBS="-lpq  $LIBS"
47206 +LIBS="-lreadline  $LIBS"
47207  cat > conftest.$ac_ext <<EOF
47208 -#line 76341 "configure"
47209 +#line 81179 "configure"
47210  #include "confdefs.h"
47211  /* Override any gcc2 internal prototype to avoid an error.  */
47212  /* We use char because int might match the return type of a gcc2
47213      builtin and then its argument prototype would still apply.  */
47214 -char PQfreemem();
47215 +char readline();
47216
47217  int main() {
47218 -PQfreemem()
47219 +readline()
47220  ; return 0; }
47221  EOF
47222 -if { (eval echo configure:76352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47223 +if { (eval echo configure:81190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47224    rm -rf conftest*
47225    eval "ac_cv_lib_$ac_lib_var=yes"
47226  else
47227 @@ -76363,35 +81201,240 @@ LIBS="$ac_save_LIBS"
47228  fi
47229  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47230    echo "$ac_t""yes" 1>&6
47231 -  cat >> confdefs.h <<\EOF
47232 -#define HAVE_PQFREEMEM 1
47233 -EOF
47234 +
47235 +    LDFLAGS=$save_old_LDFLAGS
47236 +    ext_shared=$save_ext_shared
47237 +
47238 +
47239 +
47240 +  if test "$ext_shared" = "yes"; then
47241 +    READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD"
47242 +    if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
47243 +
47244 +  if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
47245 +
47246 +  if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
47247 +    ai_p=$READLINE_DIR/$PHP_LIBDIR
47248 +  else
47249 +
47250 +    ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
47251 +
47252 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47253 +    ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
47254 +  fi
47255 +
47256 +
47257 +      if test "$ext_shared" = "yes"; then
47258 +        READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
47259 +        test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD"
47260 +      else
47261 +
47262 +
47263 +
47264 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
47265 +
47266 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
47267 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47268 +    eval "LIBPATH$unique=set"
47269 +
47270 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
47271 +    LDFLAGS="$LDFLAGS -L$ai_p"
47272 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
47273 +
47274 +  fi
47275 +
47276 +
47277 +      fi
47278 +
47279 +  fi
47280 +
47281 +    fi
47282 +  else
47283 +
47284 +
47285 +  if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
47286 +
47287 +  if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
47288 +
47289 +  if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
47290 +    ai_p=$READLINE_DIR/$PHP_LIBDIR
47291 +  else
47292 +
47293 +    ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
47294 +
47295 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47296 +    ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
47297 +  fi
47298 +
47299 +
47300 +
47301 +
47302 +
47303 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
47304 +
47305 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
47306 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47307 +    eval "LIBPATH$unique=set"
47308 +
47309 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
47310 +    LDFLAGS="$LDFLAGS -L$ai_p"
47311 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
47312 +
47313 +  fi
47314 +
47315 +
47316 +
47317 +  fi
47318 +
47319 +  fi
47320 +
47321 +
47322 +  case readline in
47323 +  c|c_r|pthread*) ;;
47324 +  *)
47325 +      LIBS="-lreadline $LIBS"
47326 +   ;;
47327 +  esac
47328 +
47329 +
47330 +
47331
47332 +  fi
47333 +
47334 +
47335 +
47336 +
47337  else
47338    echo "$ac_t""no" 1>&6
47339 +
47340 +    LDFLAGS=$save_old_LDFLAGS
47341 +    ext_shared=$save_ext_shared
47342 +    unset ac_cv_lib_readline_readline
47343 +
47344 +    { echo "configure: error: readline library not found" 1>&2; exit 1; }
47345 +
47346 +
47347  fi
47348
47349 -  echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6
47350 -echo "configure:76376: checking for PQsetErrorVerbosity in -lpq" >&5
47351 -ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'`
47352 +
47353 +
47354 +  save_old_LDFLAGS=$LDFLAGS
47355 +  ac_stuff="
47356 +    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
47357 +  "
47358 +
47359 +  save_ext_shared=$ext_shared
47360 +  ext_shared=yes
47361 +
47362 +  for ac_i in $ac_stuff; do
47363 +    case $ac_i in
47364 +    -pthread)
47365 +      if test "$ext_shared" = "yes"; then
47366 +        LDFLAGS="$LDFLAGS -pthread"
47367 +      else
47368 +
47369 +
47370 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
47371 +
47372 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
47373 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47374 +    eval "EXTRA_LDFLAGS$unique=set"
47375 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
47376 +  fi
47377 +
47378 +      fi
47379 +    ;;
47380 +    -l*)
47381 +      ac_ii=`echo $ac_i|cut -c 3-`
47382 +
47383 +
47384 +  case $ac_ii in
47385 +  c|c_r|pthread*) ;;
47386 +  *)
47387 +    if test "$ext_shared" = "yes"; then
47388 +        LDFLAGS="$LDFLAGS -l$ac_ii"
47389 +    else
47390 +
47391 +
47392 +  case $ac_ii in
47393 +  c|c_r|pthread*) ;;
47394 +  *)
47395 +      LIBS="$LIBS -l$ac_ii"
47396 +   ;;
47397 +  esac
47398 +
47399 +
47400 +    fi
47401 +   ;;
47402 +  esac
47403 +
47404 +
47405 +    ;;
47406 +    -L*)
47407 +      ac_ii=`echo $ac_i|cut -c 3-`
47408 +
47409 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
47410 +
47411 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
47412 +    ai_p=$ac_ii
47413 +  else
47414 +
47415 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
47416 +
47417 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47418 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
47419 +  fi
47420 +
47421 +
47422 +      if test "$ext_shared" = "yes"; then
47423 +        LDFLAGS="-L$ai_p $LDFLAGS"
47424 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
47425 +      else
47426 +
47427 +
47428 +
47429 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
47430 +
47431 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
47432 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47433 +    eval "LIBPATH$unique=set"
47434 +
47435 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
47436 +    LDFLAGS="$LDFLAGS -L$ai_p"
47437 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
47438 +
47439 +  fi
47440 +
47441 +
47442 +      fi
47443 +
47444 +  fi
47445 +
47446 +    ;;
47447 +    esac
47448 +  done
47449 +
47450 +  echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6
47451 +echo "configure:81419: checking for rl_pending_input in -lreadline" >&5
47452 +ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'`
47453  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47454    echo $ac_n "(cached) $ac_c" 1>&6
47455  else
47456    ac_save_LIBS="$LIBS"
47457 -LIBS="-lpq  $LIBS"
47458 +LIBS="-lreadline  $LIBS"
47459  cat > conftest.$ac_ext <<EOF
47460 -#line 76384 "configure"
47461 +#line 81427 "configure"
47462  #include "confdefs.h"
47463  /* Override any gcc2 internal prototype to avoid an error.  */
47464  /* We use char because int might match the return type of a gcc2
47465      builtin and then its argument prototype would still apply.  */
47466 -char PQsetErrorVerbosity();
47467 +char rl_pending_input();
47468
47469  int main() {
47470 -PQsetErrorVerbosity()
47471 +rl_pending_input()
47472  ; return 0; }
47473  EOF
47474 -if { (eval echo configure:76395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47475 +if { (eval echo configure:81438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47476    rm -rf conftest*
47477    eval "ac_cv_lib_$ac_lib_var=yes"
47478  else
47479 @@ -76406,35 +81449,142 @@ LIBS="$ac_save_LIBS"
47480  fi
47481  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47482    echo "$ac_t""yes" 1>&6
47483 -  cat >> confdefs.h <<\EOF
47484 -#define HAVE_PQSETERRORVERBOSITY 1
47485 -EOF
47486 -
47487 +
47488 +    LDFLAGS=$save_old_LDFLAGS
47489 +    ext_shared=$save_ext_shared
47490 +
47491 +
47492  else
47493    echo "$ac_t""no" 1>&6
47494 +
47495 +    LDFLAGS=$save_old_LDFLAGS
47496 +    ext_shared=$save_ext_shared
47497 +    unset ac_cv_lib_readline_rl_pending_input
47498 +
47499 +    { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; }
47500 +
47501 +
47502  fi
47503
47504 -  echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6
47505 -echo "configure:76419: checking for PQftable in -lpq" >&5
47506 -ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'`
47507 +
47508 +
47509 +  save_old_LDFLAGS=$LDFLAGS
47510 +  ac_stuff="
47511 +    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
47512 +  "
47513 +
47514 +  save_ext_shared=$ext_shared
47515 +  ext_shared=yes
47516 +
47517 +  for ac_i in $ac_stuff; do
47518 +    case $ac_i in
47519 +    -pthread)
47520 +      if test "$ext_shared" = "yes"; then
47521 +        LDFLAGS="$LDFLAGS -pthread"
47522 +      else
47523 +
47524 +
47525 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
47526 +
47527 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
47528 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47529 +    eval "EXTRA_LDFLAGS$unique=set"
47530 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
47531 +  fi
47532 +
47533 +      fi
47534 +    ;;
47535 +    -l*)
47536 +      ac_ii=`echo $ac_i|cut -c 3-`
47537 +
47538 +
47539 +  case $ac_ii in
47540 +  c|c_r|pthread*) ;;
47541 +  *)
47542 +    if test "$ext_shared" = "yes"; then
47543 +        LDFLAGS="$LDFLAGS -l$ac_ii"
47544 +    else
47545 +
47546 +
47547 +  case $ac_ii in
47548 +  c|c_r|pthread*) ;;
47549 +  *)
47550 +      LIBS="$LIBS -l$ac_ii"
47551 +   ;;
47552 +  esac
47553 +
47554 +
47555 +    fi
47556 +   ;;
47557 +  esac
47558 +
47559 +
47560 +    ;;
47561 +    -L*)
47562 +      ac_ii=`echo $ac_i|cut -c 3-`
47563 +
47564 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
47565 +
47566 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
47567 +    ai_p=$ac_ii
47568 +  else
47569 +
47570 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
47571 +
47572 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47573 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
47574 +  fi
47575 +
47576 +
47577 +      if test "$ext_shared" = "yes"; then
47578 +        LDFLAGS="-L$ai_p $LDFLAGS"
47579 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
47580 +      else
47581 +
47582 +
47583 +
47584 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
47585 +
47586 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
47587 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47588 +    eval "LIBPATH$unique=set"
47589 +
47590 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
47591 +    LDFLAGS="$LDFLAGS -L$ai_p"
47592 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
47593 +
47594 +  fi
47595 +
47596 +
47597 +      fi
47598 +
47599 +  fi
47600 +
47601 +    ;;
47602 +    esac
47603 +  done
47604 +
47605 +  echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6
47606 +echo "configure:81569: checking for rl_callback_read_char in -lreadline" >&5
47607 +ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'`
47608  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47609    echo $ac_n "(cached) $ac_c" 1>&6
47610  else
47611    ac_save_LIBS="$LIBS"
47612 -LIBS="-lpq  $LIBS"
47613 +LIBS="-lreadline  $LIBS"
47614  cat > conftest.$ac_ext <<EOF
47615 -#line 76427 "configure"
47616 +#line 81577 "configure"
47617  #include "confdefs.h"
47618  /* Override any gcc2 internal prototype to avoid an error.  */
47619  /* We use char because int might match the return type of a gcc2
47620      builtin and then its argument prototype would still apply.  */
47621 -char PQftable();
47622 +char rl_callback_read_char();
47623
47624  int main() {
47625 -PQftable()
47626 +rl_callback_read_char()
47627  ; return 0; }
47628  EOF
47629 -if { (eval echo configure:76438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47630 +if { (eval echo configure:81588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47631    rm -rf conftest*
47632    eval "ac_cv_lib_$ac_lib_var=yes"
47633  else
47634 @@ -76449,121 +81599,95 @@ LIBS="$ac_save_LIBS"
47635  fi
47636  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47637    echo "$ac_t""yes" 1>&6
47638 -  cat >> confdefs.h <<\EOF
47639 -#define HAVE_PQFTABLE 1
47640 +
47641 +    LDFLAGS=$save_old_LDFLAGS
47642 +    ext_shared=$save_ext_shared
47643 +
47644 +    cat >> confdefs.h <<\EOF
47645 +#define HAVE_RL_CALLBACK_READ_CHAR 1
47646  EOF
47647
47648 +
47649 +
47650  else
47651    echo "$ac_t""no" 1>&6
47652 -fi
47653 -
47654 -  echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
47655 -echo "configure:76462: checking for PQescapeStringConn in -lpq" >&5
47656 -ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
47657 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47658 -  echo $ac_n "(cached) $ac_c" 1>&6
47659 -else
47660 -  ac_save_LIBS="$LIBS"
47661 -LIBS="-lpq  $LIBS"
47662 -cat > conftest.$ac_ext <<EOF
47663 -#line 76470 "configure"
47664 -#include "confdefs.h"
47665 -/* Override any gcc2 internal prototype to avoid an error.  */
47666 -/* We use char because int might match the return type of a gcc2
47667 -    builtin and then its argument prototype would still apply.  */
47668 -char PQescapeStringConn();
47669
47670 -int main() {
47671 -PQescapeStringConn()
47672 -; return 0; }
47673 -EOF
47674 -if { (eval echo configure:76481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47675 -  rm -rf conftest*
47676 -  eval "ac_cv_lib_$ac_lib_var=yes"
47677 -else
47678 -  echo "configure: failed program was:" >&5
47679 -  cat conftest.$ac_ext >&5
47680 -  rm -rf conftest*
47681 -  eval "ac_cv_lib_$ac_lib_var=no"
47682 +    LDFLAGS=$save_old_LDFLAGS
47683 +    ext_shared=$save_ext_shared
47684 +    unset ac_cv_lib_readline_rl_callback_read_char
47685 +
47686 +
47687  fi
47688 -rm -f conftest*
47689 -LIBS="$ac_save_LIBS"
47690
47691 -fi
47692 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47693 -  echo "$ac_t""yes" 1>&6
47694 +
47695    cat >> confdefs.h <<\EOF
47696 -#define HAVE_PQESCAPE_CONN 1
47697 +#define HAVE_LIBREADLINE 1
47698  EOF
47699
47700 -else
47701 -  echo "$ac_t""no" 1>&6
47702 -fi
47703
47704 -  echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
47705 -echo "configure:76505: checking for PQescapeByteaConn in -lpq" >&5
47706 -ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
47707 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47708 -  echo $ac_n "(cached) $ac_c" 1>&6
47709 -else
47710 -  ac_save_LIBS="$LIBS"
47711 -LIBS="-lpq  $LIBS"
47712 -cat > conftest.$ac_ext <<EOF
47713 -#line 76513 "configure"
47714 -#include "confdefs.h"
47715 -/* Override any gcc2 internal prototype to avoid an error.  */
47716 -/* We use char because int might match the return type of a gcc2
47717 -    builtin and then its argument prototype would still apply.  */
47718 -char PQescapeByteaConn();
47719 +elif test "$PHP_LIBEDIT" != "no"; then
47720
47721 -int main() {
47722 -PQescapeByteaConn()
47723 -; return 0; }
47724 -EOF
47725 -if { (eval echo configure:76524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47726 -  rm -rf conftest*
47727 -  eval "ac_cv_lib_$ac_lib_var=yes"
47728 -else
47729 -  echo "configure: failed program was:" >&5
47730 -  cat conftest.$ac_ext >&5
47731 -  rm -rf conftest*
47732 -  eval "ac_cv_lib_$ac_lib_var=no"
47733 -fi
47734 -rm -f conftest*
47735 -LIBS="$ac_save_LIBS"
47736 +  for i in $PHP_LIBEDIT /usr/local /usr; do
47737 +    test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
47738 +  done
47739
47740 -fi
47741 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47742 -  echo "$ac_t""yes" 1>&6
47743 -  cat >> confdefs.h <<\EOF
47744 -#define HAVE_PQESCAPE_BYTEA_CONN 1
47745 -EOF
47746 +  if test -z "$LIBEDIT_DIR"; then
47747 +    { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; }
47748 +  fi
47749
47750 -else
47751 -  echo "$ac_t""no" 1>&6
47752 -fi
47753 +
47754 +  if test "$LIBEDIT_DIR/include" != "/usr/include"; then
47755 +
47756 +  if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then
47757 +    ai_p=$LIBEDIT_DIR/include
47758 +  else
47759 +
47760 +    ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
47761 +
47762 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47763 +    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`"
47764 +  fi
47765
47766 -  echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
47767 -echo "configure:76548: checking for pg_encoding_to_char in -lpq" >&5
47768 -ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
47769 +
47770 +
47771 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
47772 +
47773 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
47774 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47775 +    eval "INCLUDEPATH$unique=set"
47776 +
47777 +      if test ""; then
47778 +        INCLUDES="-I$ai_p $INCLUDES"
47779 +      else
47780 +        INCLUDES="$INCLUDES -I$ai_p"
47781 +      fi
47782 +
47783 +  fi
47784 +
47785 +  fi
47786 +
47787 +
47788 +  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
47789 +echo "configure:81672: checking for tgetent in -lncurses" >&5
47790 +ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
47791  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47792    echo $ac_n "(cached) $ac_c" 1>&6
47793  else
47794    ac_save_LIBS="$LIBS"
47795 -LIBS="-lpq  $LIBS"
47796 +LIBS="-lncurses  $LIBS"
47797  cat > conftest.$ac_ext <<EOF
47798 -#line 76556 "configure"
47799 +#line 81680 "configure"
47800  #include "confdefs.h"
47801  /* Override any gcc2 internal prototype to avoid an error.  */
47802  /* We use char because int might match the return type of a gcc2
47803      builtin and then its argument prototype would still apply.  */
47804 -char pg_encoding_to_char();
47805 +char tgetent();
47806
47807  int main() {
47808 -pg_encoding_to_char()
47809 +tgetent()
47810  ; return 0; }
47811  EOF
47812 -if { (eval echo configure:76567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47813 +if { (eval echo configure:81691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47814    rm -rf conftest*
47815    eval "ac_cv_lib_$ac_lib_var=yes"
47816  else
47817 @@ -76578,35 +81702,55 @@ LIBS="$ac_save_LIBS"
47818  fi
47819  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47820    echo "$ac_t""yes" 1>&6
47821 -  cat >> confdefs.h <<\EOF
47822 -#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
47823 -EOF
47824 +
47825 +
47826 +
47827 +  case ncurses in
47828 +  c|c_r|pthread*) ;;
47829 +  *)
47830 +    if test "$ext_shared" = "yes"; then
47831 +        READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
47832 +    else
47833 +
47834 +
47835 +  case ncurses in
47836 +  c|c_r|pthread*) ;;
47837 +  *)
47838 +      LIBS="-lncurses $LIBS"
47839 +   ;;
47840 +  esac
47841 +
47842 +
47843 +    fi
47844 +   ;;
47845 +  esac
47846 +
47847
47848 +
47849  else
47850    echo "$ac_t""no" 1>&6
47851 -fi
47852
47853 -  echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6
47854 -echo "configure:76591: checking for lo_create in -lpq" >&5
47855 -ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'`
47856 +    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
47857 +echo "configure:81735: checking for tgetent in -ltermcap" >&5
47858 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
47859  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47860    echo $ac_n "(cached) $ac_c" 1>&6
47861  else
47862    ac_save_LIBS="$LIBS"
47863 -LIBS="-lpq  $LIBS"
47864 +LIBS="-ltermcap  $LIBS"
47865  cat > conftest.$ac_ext <<EOF
47866 -#line 76599 "configure"
47867 +#line 81743 "configure"
47868  #include "confdefs.h"
47869  /* Override any gcc2 internal prototype to avoid an error.  */
47870  /* We use char because int might match the return type of a gcc2
47871      builtin and then its argument prototype would still apply.  */
47872 -char lo_create();
47873 +char tgetent();
47874
47875  int main() {
47876 -lo_create()
47877 +tgetent()
47878  ; return 0; }
47879  EOF
47880 -if { (eval echo configure:76610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47881 +if { (eval echo configure:81754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47882    rm -rf conftest*
47883    eval "ac_cv_lib_$ac_lib_var=yes"
47884  else
47885 @@ -76621,35 +81765,157 @@ LIBS="$ac_save_LIBS"
47886  fi
47887  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47888    echo "$ac_t""yes" 1>&6
47889 -  cat >> confdefs.h <<\EOF
47890 -#define HAVE_PG_LO_CREATE 1
47891 -EOF
47892 +
47893 +
47894 +
47895 +  case termcap in
47896 +  c|c_r|pthread*) ;;
47897 +  *)
47898 +    if test "$ext_shared" = "yes"; then
47899 +        READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
47900 +    else
47901 +
47902 +
47903 +  case termcap in
47904 +  c|c_r|pthread*) ;;
47905 +  *)
47906 +      LIBS="-ltermcap $LIBS"
47907 +   ;;
47908 +  esac
47909 +
47910 +
47911 +    fi
47912 +   ;;
47913 +  esac
47914 +
47915
47916 +
47917  else
47918    echo "$ac_t""no" 1>&6
47919  fi
47920
47921 -  echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6
47922 -echo "configure:76634: checking for lo_import_with_oid in -lpq" >&5
47923 -ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'`
47924 +
47925 +fi
47926 +
47927 +
47928 +
47929 +  save_old_LDFLAGS=$LDFLAGS
47930 +  ac_stuff="
47931 +    -L$READLINE_DIR/$PHP_LIBDIR
47932 +  "
47933 +
47934 +  save_ext_shared=$ext_shared
47935 +  ext_shared=yes
47936 +
47937 +  for ac_i in $ac_stuff; do
47938 +    case $ac_i in
47939 +    -pthread)
47940 +      if test "$ext_shared" = "yes"; then
47941 +        LDFLAGS="$LDFLAGS -pthread"
47942 +      else
47943 +
47944 +
47945 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
47946 +
47947 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
47948 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
47949 +    eval "EXTRA_LDFLAGS$unique=set"
47950 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
47951 +  fi
47952 +
47953 +      fi
47954 +    ;;
47955 +    -l*)
47956 +      ac_ii=`echo $ac_i|cut -c 3-`
47957 +
47958 +
47959 +  case $ac_ii in
47960 +  c|c_r|pthread*) ;;
47961 +  *)
47962 +    if test "$ext_shared" = "yes"; then
47963 +        LDFLAGS="$LDFLAGS -l$ac_ii"
47964 +    else
47965 +
47966 +
47967 +  case $ac_ii in
47968 +  c|c_r|pthread*) ;;
47969 +  *)
47970 +      LIBS="$LIBS -l$ac_ii"
47971 +   ;;
47972 +  esac
47973 +
47974 +
47975 +    fi
47976 +   ;;
47977 +  esac
47978 +
47979 +
47980 +    ;;
47981 +    -L*)
47982 +      ac_ii=`echo $ac_i|cut -c 3-`
47983 +
47984 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
47985 +
47986 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
47987 +    ai_p=$ac_ii
47988 +  else
47989 +
47990 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
47991 +
47992 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47993 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
47994 +  fi
47995 +
47996 +
47997 +      if test "$ext_shared" = "yes"; then
47998 +        LDFLAGS="-L$ai_p $LDFLAGS"
47999 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
48000 +      else
48001 +
48002 +
48003 +
48004 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48005 +
48006 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
48007 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
48008 +    eval "LIBPATH$unique=set"
48009 +
48010 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
48011 +    LDFLAGS="$LDFLAGS -L$ai_p"
48012 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
48013 +
48014 +  fi
48015 +
48016 +
48017 +      fi
48018 +
48019 +  fi
48020 +
48021 +    ;;
48022 +    esac
48023 +  done
48024 +
48025 +  echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
48026 +echo "configure:81900: checking for readline in -ledit" >&5
48027 +ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
48028  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
48029    echo $ac_n "(cached) $ac_c" 1>&6
48030  else
48031    ac_save_LIBS="$LIBS"
48032 -LIBS="-lpq  $LIBS"
48033 +LIBS="-ledit  $LIBS"
48034  cat > conftest.$ac_ext <<EOF
48035 -#line 76642 "configure"
48036 +#line 81908 "configure"
48037  #include "confdefs.h"
48038  /* Override any gcc2 internal prototype to avoid an error.  */
48039  /* We use char because int might match the return type of a gcc2
48040      builtin and then its argument prototype would still apply.  */
48041 -char lo_import_with_oid();
48042 +char readline();
48043
48044  int main() {
48045 -lo_import_with_oid()
48046 +readline()
48047  ; return 0; }
48048  EOF
48049 -if { (eval echo configure:76653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
48050 +if { (eval echo configure:81919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
48051    rm -rf conftest*
48052    eval "ac_cv_lib_$ac_lib_var=yes"
48053  else
48054 @@ -76664,39 +81930,32 @@ LIBS="$ac_save_LIBS"
48055  fi
48056  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
48057    echo "$ac_t""yes" 1>&6
48058 -  cat >> confdefs.h <<\EOF
48059 -#define HAVE_PG_LO_IMPORT_WITH_OID 1
48060 -EOF
48061 -
48062 -else
48063 -  echo "$ac_t""no" 1>&6
48064 -fi
48065 -
48066 -  LIBS=$old_LIBS
48067 -  LDFLAGS=$old_LDFLAGS
48068 -
48069
48070 +    LDFLAGS=$save_old_LDFLAGS
48071 +    ext_shared=$save_ext_shared
48072 +
48073 +
48074
48075    if test "$ext_shared" = "yes"; then
48076 -    PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD"
48077 -    if test -n "$PGSQL_LIBDIR"; then
48078 +    READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD"
48079 +    if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then
48080
48081 -  if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
48082 +  if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
48083
48084 -  if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
48085 -    ai_p=$PGSQL_LIBDIR
48086 +  if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
48087 +    ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
48088    else
48089
48090 -    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
48091 +    ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
48092
48093      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48094 -    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
48095 +    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
48096    fi
48097
48098
48099        if test "$ext_shared" = "yes"; then
48100 -        PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD"
48101 -        test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD"
48102 +        READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
48103 +        test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD"
48104        else
48105
48106
48107 @@ -76722,18 +81981,18 @@ fi
48108    else
48109
48110
48111 -  if test -n "$PGSQL_LIBDIR"; then
48112 +  if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then
48113
48114 -  if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
48115 +  if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
48116
48117 -  if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
48118 -    ai_p=$PGSQL_LIBDIR
48119 +  if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
48120 +    ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
48121    else
48122
48123 -    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
48124 +    ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
48125
48126      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48127 -    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
48128 +    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
48129    fi
48130
48131
48132 @@ -76759,10 +82018,10 @@ fi
48133    fi
48134
48135
48136 -  case pq in
48137 +  case edit in
48138    c|c_r|pthread*) ;;
48139    *)
48140 -      LIBS="-lpq $LIBS"
48141 +      LIBS="-ledit $LIBS"
48142     ;;
48143    esac
48144
48145 @@ -76771,57 +82030,98 @@ fi
48146
48147    fi
48148
48149 -
48150
48151 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD"
48152 -
48153 -
48154
48155 -  if test "$PGSQL_INCLUDE" != "/usr/include"; then
48156 -
48157 -  if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
48158 -    ai_p=$PGSQL_INCLUDE
48159 -  else
48160 -
48161 -    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
48162 -
48163 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48164 -    ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
48165 -  fi
48166 +
48167 +else
48168 +  echo "$ac_t""no" 1>&6
48169
48170 +    LDFLAGS=$save_old_LDFLAGS
48171 +    ext_shared=$save_ext_shared
48172 +    unset ac_cv_lib_edit_readline
48173
48174 +    { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; }
48175
48176 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48177
48178 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
48179 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
48180 -    eval "INCLUDEPATH$unique=set"
48181 -
48182 -      if test ""; then
48183 -        INCLUDES="-I$ai_p $INCLUDES"
48184 -      else
48185 -        INCLUDES="$INCLUDES -I$ai_p"
48186 -      fi
48187 -
48188 -  fi
48189 +fi
48190
48191 -  fi
48192
48193 +  cat >> confdefs.h <<\EOF
48194 +#define HAVE_LIBEDIT 1
48195 +EOF
48196 +
48197 +fi
48198 +
48199 +if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
48200 +  for ac_func in rl_completion_matches
48201 +do
48202 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
48203 +echo "configure:82060: checking for $ac_func" >&5
48204 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
48205 +  echo $ac_n "(cached) $ac_c" 1>&6
48206 +else
48207 +  cat > conftest.$ac_ext <<EOF
48208 +#line 82065 "configure"
48209 +#include "confdefs.h"
48210 +/* System header to define __stub macros and hopefully few prototypes,
48211 +    which can conflict with char $ac_func(); below.  */
48212 +#include <assert.h>
48213 +/* Override any gcc2 internal prototype to avoid an error.  */
48214 +/* We use char because int might match the return type of a gcc2
48215 +    builtin and then its argument prototype would still apply.  */
48216 +char $ac_func();
48217 +
48218 +int main() {
48219 +
48220 +/* The GNU C library defines this for functions which it implements
48221 +    to always fail with ENOSYS.  Some functions are actually named
48222 +    something starting with __ and the normal name is an alias.  */
48223 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
48224 +choke me
48225 +#else
48226 +$ac_func();
48227 +#endif
48228 +
48229 +; return 0; }
48230 +EOF
48231 +if { (eval echo configure:82088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
48232 +  rm -rf conftest*
48233 +  eval "ac_cv_func_$ac_func=yes"
48234 +else
48235 +  echo "configure: failed program was:" >&5
48236 +  cat conftest.$ac_ext >&5
48237 +  rm -rf conftest*
48238 +  eval "ac_cv_func_$ac_func=no"
48239 +fi
48240 +rm -f conftest*
48241 +fi
48242 +
48243 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
48244 +  echo "$ac_t""yes" 1>&6
48245 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
48246 +  cat >> confdefs.h <<EOF
48247 +#define $ac_tr_func 1
48248 +EOF
48249 +
48250 +else
48251 +  echo "$ac_t""no" 1>&6
48252 +fi
48253 +done
48254
48255
48256 -  ext_builddir=ext/pgsql
48257 -  ext_srcdir=$abs_srcdir/ext/pgsql
48258 +  ext_builddir=ext/readline
48259 +  ext_srcdir=$abs_srcdir/ext/readline
48260
48261    ac_extra=
48262
48263 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
48264 -    PHP_PGSQL_SHARED=no
48265 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then
48266 +    PHP_READLINE_SHARED=no
48267
48268
48269 -  case ext/pgsql in
48270 +  case ext/readline in
48271    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
48272 -  /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48273 -  *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48274 +  /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48275 +  *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48276    esac
48277
48278
48279 @@ -76836,7 +82136,7 @@ fi
48280
48281
48282    old_IFS=$IFS
48283 -  for ac_src in pgsql.c; do
48284 +  for ac_src in readline.c; do
48285
48286        IFS=.
48287        set $ac_src
48288 @@ -76859,18 +82159,18 @@ EOF
48289    done
48290
48291
48292 -    EXT_STATIC="$EXT_STATIC pgsql"
48293 +    EXT_STATIC="$EXT_STATIC readline"
48294      if test "$ext_shared" != "nocli"; then
48295 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
48296 +      EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
48297      fi
48298    else
48299      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
48300 -      PHP_PGSQL_SHARED=yes
48301 +      PHP_READLINE_SHARED=yes
48302
48303 -  case ext/pgsql in
48304 +  case ext/readline in
48305    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
48306 -  /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48307 -  *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48308 +  /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48309 +  *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48310    esac
48311
48312
48313 @@ -76885,14 +82185,14 @@ EOF
48314
48315
48316    old_IFS=$IFS
48317 -  for ac_src in pgsql.c; do
48318 +  for ac_src in readline.c; do
48319
48320        IFS=.
48321        set $ac_src
48322        ac_obj=$1
48323        IFS=$old_IFS
48324
48325 -      shared_objects_pgsql="$shared_objects_pgsql $ac_bdir$ac_obj.lo"
48326 +      shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo"
48327
48328        case $ac_src in
48329          *.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" ;;
48330 @@ -76915,31 +82215,31 @@ EOF
48331    case $host_alias in
48332      *aix*)
48333        suffix=so
48334 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) $(PHPPGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppgsql.so '$ext_builddir'/phppgsql.so'
48335 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreadline.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreadline.so '$ext_builddir'/phpreadline.so'
48336        ;;
48337      *netware*)
48338        suffix=nlm
48339 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPGSQL, 3)_SHARED_LIBADD)'
48340 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)'
48341        ;;
48342      *)
48343        suffix=la
48344 -      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_pgsql) $(PHPPGSQL_SHARED_LIBADD)'
48345 +      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_readline) $(PHPREADLINE_SHARED_LIBADD)'
48346        ;;
48347    esac
48348
48349    if test "x" = "xyes"; then
48350 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppgsql.$suffix"
48351 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreadline.$suffix"
48352    else
48353 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppgsql.$suffix"
48354 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix"
48355    fi
48356
48357 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
48358 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
48359
48360 -  cat >>Makefile.objects<<EOF
48361 -\$(phplibdir)/phppgsql.$suffix: $ext_builddir/phppgsql.$suffix
48362 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppgsql.$suffix \$(phplibdir)
48363 +  cat >>Makefile.objects<<EOF
48364 +\$(phplibdir)/phpreadline.$suffix: $ext_builddir/phpreadline.$suffix
48365 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpreadline.$suffix \$(phplibdir)
48366
48367 -$ext_builddir/phppgsql.$suffix: \$(shared_objects_pgsql) \$(PHPPGSQL_SHARED_DEPENDENCIES)
48368 +$ext_builddir/phpreadline.$suffix: \$(shared_objects_readline) \$(PHPREADLINE_SHARED_DEPENDENCIES)
48369         $link_cmd
48370
48371  EOF
48372 @@ -76952,31 +82252,31 @@ EOF
48373    case $host_alias in
48374      *aix*)
48375        suffix=so
48376 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) $(PGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pgsql.so '$ext_builddir'/pgsql.so'
48377 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/readline.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(READLINE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/readline.so '$ext_builddir'/readline.so'
48378        ;;
48379      *netware*)
48380        suffix=nlm
48381 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PGSQL, 3)_SHARED_LIBADD)'
48382 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(READLINE, 3)_SHARED_LIBADD)'
48383        ;;
48384      *)
48385        suffix=la
48386 -      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_pgsql) $(PGSQL_SHARED_LIBADD)'
48387 +      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_readline) $(READLINE_SHARED_LIBADD)'
48388        ;;
48389    esac
48390
48391    if test "x" = "xyes"; then
48392 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pgsql.$suffix"
48393 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/readline.$suffix"
48394    else
48395 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pgsql.$suffix"
48396 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/readline.$suffix"
48397    fi
48398
48399 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
48400 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
48401
48402    cat >>Makefile.objects<<EOF
48403 -\$(phplibdir)/pgsql.$suffix: $ext_builddir/pgsql.$suffix
48404 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pgsql.$suffix \$(phplibdir)
48405 +\$(phplibdir)/readline.$suffix: $ext_builddir/readline.$suffix
48406 +       \$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir)
48407
48408 -$ext_builddir/pgsql.$suffix: \$(shared_objects_pgsql) \$(PGSQL_SHARED_DEPENDENCIES)
48409 +$ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES)
48410         $link_cmd
48411
48412  EOF
48413 @@ -76984,22 +82284,22 @@ EOF
48414            ;;
48415        esac
48416        cat >> confdefs.h <<EOF
48417 -#define COMPILE_DL_PGSQL 1
48418 +#define COMPILE_DL_READLINE 1
48419  EOF
48420
48421      fi
48422    fi
48423
48424 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
48425 -    PHP_PGSQL_SHARED=no
48426 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
48427 +    PHP_READLINE_SHARED=no
48428      case "$PHP_SAPI" in
48429        cgi|embed)
48430
48431
48432 -  case ext/pgsql in
48433 +  case ext/readline in
48434    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
48435 -  /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48436 -  *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48437 +  /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48438 +  *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48439    esac
48440
48441
48442 @@ -77014,7 +82314,7 @@ EOF
48443
48444
48445    old_IFS=$IFS
48446 -  for ac_src in pgsql.c; do
48447 +  for ac_src in readline.c; do
48448
48449        IFS=.
48450        set $ac_src
48451 @@ -77037,15 +82337,15 @@ EOF
48452    done
48453
48454
48455 -        EXT_STATIC="$EXT_STATIC pgsql"
48456 +        EXT_STATIC="$EXT_STATIC readline"
48457          ;;
48458        *)
48459
48460
48461 -  case ext/pgsql in
48462 +  case ext/readline in
48463    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
48464 -  /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48465 -  *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48466 +  /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48467 +  *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48468    esac
48469
48470
48471 @@ -77060,7 +82360,7 @@ EOF
48472
48473
48474    old_IFS=$IFS
48475 -  for ac_src in pgsql.c; do
48476 +  for ac_src in readline.c; do
48477
48478        IFS=.
48479        set $ac_src
48480 @@ -77085,7 +82385,7 @@ EOF
48481
48482          ;;
48483      esac
48484 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
48485 +    EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
48486    fi
48487
48488
48489 @@ -77094,30 +82394,31 @@ EOF
48490
48491
48492    if test "$ext_builddir" = "."; then
48493 -    PHP_PECL_EXTENSION=pgsql
48494 +    PHP_PECL_EXTENSION=readline
48495
48496    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
48497
48498    fi
48499
48500 -fi
48501 -
48502 +
48503 +  PHP_VAR_SUBST="$PHP_VAR_SUBST READLINE_SHARED_LIBADD"
48504
48505 +fi
48506
48507
48508
48509 -php_enable_phar=yes
48510 +php_with_recode=no
48511
48512 -echo $ac_n "checking for phar archive support""... $ac_c" 1>&6
48513 -echo "configure:77113: checking for phar archive support" >&5
48514 -# Check whether --enable-phar or --disable-phar was given.
48515 -if test "${enable_phar+set}" = set; then
48516 -  enableval="$enable_phar"
48517 -  PHP_PHAR=$enableval
48518 +echo $ac_n "checking for recode support""... $ac_c" 1>&6
48519 +echo "configure:82414: checking for recode support" >&5
48520 +# Check whether --with-recode or --without-recode was given.
48521 +if test "${with_recode+set}" = set; then
48522 +  withval="$with_recode"
48523 +  PHP_RECODE=$withval
48524  else
48525
48526 -  PHP_PHAR=yes
48527 -  test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL
48528 +  PHP_RECODE=no
48529 +  test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL
48530
48531  fi
48532
48533 @@ -77125,12 +82426,12 @@ fi
48534
48535  ext_output="yes, shared"
48536  ext_shared=yes
48537 -case $PHP_PHAR in
48538 +case $PHP_RECODE in
48539  shared,*)
48540 -  PHP_PHAR=`echo "$PHP_PHAR"|$SED 's/^shared,//'`
48541 +  PHP_RECODE=`echo "$PHP_RECODE"|$SED 's/^shared,//'`
48542    ;;
48543  shared)
48544 -  PHP_PHAR=yes
48545 +  PHP_RECODE=yes
48546    ;;
48547  no)
48548    ext_output=no
48549 @@ -77149,21 +82450,503 @@ echo "$ac_t""$ext_output" 1>&6
48550
48551
48552
48553 -if test "$PHP_PHAR" != "no"; then
48554 +if test "$PHP_RECODE" != "no"; then
48555 +  RECODE_LIST="$PHP_RECODE /usr/local /usr /opt"
48556 +
48557 +  for i in $RECODE_LIST; do
48558 +    if test -f $i/include/recode.h; then
48559 +      RECODE_DIR=$i
48560 +      RECODE_INC=include
48561 +      RECODE_LIB=$PHP_LIBDIR
48562 +    fi
48563 +    if test -f $i/include/recode/recode.h; then
48564 +      RECODE_DIR=$i
48565 +      RECODE_INC=include/recode
48566 +      RECODE_LIB=$PHP_LIBDIR/recode
48567 +    fi
48568 +    if test -f $i/recode/include/recode.h; then
48569 +      RECODE_DIR=$i/recode
48570 +      RECODE_INC=include
48571 +      RECODE_LIB=$PHP_LIBDIR
48572 +    fi
48573 +    test -n "$RECODE_DIR" && break
48574 +  done
48575 +
48576 +  if test -z "$RECODE_DIR"; then
48577 +    { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; }
48578 +  fi
48579 +
48580 +
48581 +  save_old_LDFLAGS=$LDFLAGS
48582 +  ac_stuff="
48583 +    -L$RECODE_DIR/$RECODE_LIB
48584 +  "
48585 +
48586 +  save_ext_shared=$ext_shared
48587 +  ext_shared=yes
48588 +
48589 +  for ac_i in $ac_stuff; do
48590 +    case $ac_i in
48591 +    -pthread)
48592 +      if test "$ext_shared" = "yes"; then
48593 +        LDFLAGS="$LDFLAGS -pthread"
48594 +      else
48595 +
48596 +
48597 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
48598 +
48599 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
48600 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
48601 +    eval "EXTRA_LDFLAGS$unique=set"
48602 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
48603 +  fi
48604 +
48605 +      fi
48606 +    ;;
48607 +    -l*)
48608 +      ac_ii=`echo $ac_i|cut -c 3-`
48609 +
48610 +
48611 +  case $ac_ii in
48612 +  c|c_r|pthread*) ;;
48613 +  *)
48614 +    if test "$ext_shared" = "yes"; then
48615 +        LDFLAGS="$LDFLAGS -l$ac_ii"
48616 +    else
48617 +
48618 +
48619 +  case $ac_ii in
48620 +  c|c_r|pthread*) ;;
48621 +  *)
48622 +      LIBS="$LIBS -l$ac_ii"
48623 +   ;;
48624 +  esac
48625 +
48626 +
48627 +    fi
48628 +   ;;
48629 +  esac
48630 +
48631 +
48632 +    ;;
48633 +    -L*)
48634 +      ac_ii=`echo $ac_i|cut -c 3-`
48635 +
48636 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
48637 +
48638 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
48639 +    ai_p=$ac_ii
48640 +  else
48641 +
48642 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
48643 +
48644 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48645 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
48646 +  fi
48647 +
48648 +
48649 +      if test "$ext_shared" = "yes"; then
48650 +        LDFLAGS="-L$ai_p $LDFLAGS"
48651 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
48652 +      else
48653 +
48654 +
48655 +
48656 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48657 +
48658 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
48659 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
48660 +    eval "LIBPATH$unique=set"
48661 +
48662 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
48663 +    LDFLAGS="$LDFLAGS -L$ai_p"
48664 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
48665 +
48666 +  fi
48667 +
48668 +
48669 +      fi
48670 +
48671 +  fi
48672 +
48673 +    ;;
48674 +    esac
48675 +  done
48676 +
48677 +  echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
48678 +echo "configure:82578: checking for recode_format_table in -lrecode" >&5
48679 +ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'`
48680 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
48681 +  echo $ac_n "(cached) $ac_c" 1>&6
48682 +else
48683 +  ac_save_LIBS="$LIBS"
48684 +LIBS="-lrecode  $LIBS"
48685 +cat > conftest.$ac_ext <<EOF
48686 +#line 82586 "configure"
48687 +#include "confdefs.h"
48688 +/* Override any gcc2 internal prototype to avoid an error.  */
48689 +/* We use char because int might match the return type of a gcc2
48690 +    builtin and then its argument prototype would still apply.  */
48691 +char recode_format_table();
48692 +
48693 +int main() {
48694 +recode_format_table()
48695 +; return 0; }
48696 +EOF
48697 +if { (eval echo configure:82597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
48698 +  rm -rf conftest*
48699 +  eval "ac_cv_lib_$ac_lib_var=yes"
48700 +else
48701 +  echo "configure: failed program was:" >&5
48702 +  cat conftest.$ac_ext >&5
48703 +  rm -rf conftest*
48704 +  eval "ac_cv_lib_$ac_lib_var=no"
48705 +fi
48706 +rm -f conftest*
48707 +LIBS="$ac_save_LIBS"
48708 +
48709 +fi
48710 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
48711 +  echo "$ac_t""yes" 1>&6
48712 +
48713 +    LDFLAGS=$save_old_LDFLAGS
48714 +    ext_shared=$save_ext_shared
48715 +
48716 +
48717 +
48718 +  if test "$ext_shared" = "yes"; then
48719 +    RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
48720 +    if test -n "$RECODE_DIR/$RECODE_LIB"; then
48721 +
48722 +  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
48723 +
48724 +  if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
48725 +    ai_p=$RECODE_DIR/$RECODE_LIB
48726 +  else
48727 +
48728 +    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
48729 +
48730 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48731 +    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
48732 +  fi
48733 +
48734 +
48735 +      if test "$ext_shared" = "yes"; then
48736 +        RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
48737 +        test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD"
48738 +      else
48739 +
48740 +
48741 +
48742 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48743 +
48744 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
48745 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
48746 +    eval "LIBPATH$unique=set"
48747 +
48748 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
48749 +    LDFLAGS="$LDFLAGS -L$ai_p"
48750 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
48751 +
48752 +  fi
48753 +
48754 +
48755 +      fi
48756 +
48757 +  fi
48758 +
48759 +    fi
48760 +  else
48761 +
48762 +
48763 +  if test -n "$RECODE_DIR/$RECODE_LIB"; then
48764 +
48765 +  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
48766 +
48767 +  if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
48768 +    ai_p=$RECODE_DIR/$RECODE_LIB
48769 +  else
48770 +
48771 +    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
48772 +
48773 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48774 +    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
48775 +  fi
48776 +
48777 +
48778 +
48779 +
48780 +
48781 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48782 +
48783 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
48784 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
48785 +    eval "LIBPATH$unique=set"
48786 +
48787 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
48788 +    LDFLAGS="$LDFLAGS -L$ai_p"
48789 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
48790 +
48791 +  fi
48792 +
48793 +
48794 +
48795 +  fi
48796 +
48797 +  fi
48798 +
48799 +
48800 +  case recode in
48801 +  c|c_r|pthread*) ;;
48802 +  *)
48803 +      LIBS="-lrecode $LIBS"
48804 +   ;;
48805 +  esac
48806 +
48807 +
48808 +
48809 +
48810 +  fi
48811 +
48812 +
48813 +
48814 +
48815 +else
48816 +  echo "$ac_t""no" 1>&6
48817 +
48818 +    LDFLAGS=$save_old_LDFLAGS
48819 +    ext_shared=$save_ext_shared
48820 +    unset ac_cv_lib_recode_recode_format_table
48821 +
48822 +    old_LDFLAGS=$LDFLAGS
48823 +    old_LIBS=$LIBS
48824 +    LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
48825 +    LIBS="$LIBS -lrecode"
48826 +    cat > conftest.$ac_ext <<EOF
48827 +#line 82727 "configure"
48828 +#include "confdefs.h"
48829 +
48830 +char *program_name;
48831 +
48832 +int main() {
48833 +
48834 +recode_format_table();
48835 +
48836 +; return 0; }
48837 +EOF
48838 +if { (eval echo configure:82738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
48839 +  rm -rf conftest*
48840 +
48841 +
48842 +
48843 +  if test "$ext_shared" = "yes"; then
48844 +    RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
48845 +    if test -n "$RECODE_DIR/$RECODE_LIB"; then
48846 +
48847 +  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
48848 +
48849 +  if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
48850 +    ai_p=$RECODE_DIR/$RECODE_LIB
48851 +  else
48852 +
48853 +    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
48854 +
48855 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48856 +    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
48857 +  fi
48858 +
48859 +
48860 +      if test "$ext_shared" = "yes"; then
48861 +        RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
48862 +        test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD"
48863 +      else
48864 +
48865 +
48866 +
48867 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48868 +
48869 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
48870 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
48871 +    eval "LIBPATH$unique=set"
48872 +
48873 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
48874 +    LDFLAGS="$LDFLAGS -L$ai_p"
48875 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
48876 +
48877 +  fi
48878 +
48879 +
48880 +      fi
48881 +
48882 +  fi
48883 +
48884 +    fi
48885 +  else
48886 +
48887 +
48888 +  if test -n "$RECODE_DIR/$RECODE_LIB"; then
48889 +
48890 +  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
48891 +
48892 +  if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
48893 +    ai_p=$RECODE_DIR/$RECODE_LIB
48894 +  else
48895 +
48896 +    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
48897 +
48898 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48899 +    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
48900 +  fi
48901 +
48902 +
48903 +
48904 +
48905 +
48906 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48907 +
48908 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
48909 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
48910 +    eval "LIBPATH$unique=set"
48911 +
48912 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
48913 +    LDFLAGS="$LDFLAGS -L$ai_p"
48914 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
48915 +
48916 +  fi
48917 +
48918 +
48919 +
48920 +  fi
48921 +
48922 +  fi
48923 +
48924 +
48925 +  case recode in
48926 +  c|c_r|pthread*) ;;
48927 +  *)
48928 +      DLIBS="-lrecode $DLIBS"
48929 +   ;;
48930 +  esac
48931 +
48932 +
48933 +
48934 +
48935 +  fi
48936 +
48937 +
48938 +      cat >> confdefs.h <<\EOF
48939 +#define HAVE_BROKEN_RECODE 1
48940 +EOF
48941 +
48942 +
48943 +else
48944 +  echo "configure: failed program was:" >&5
48945 +  cat conftest.$ac_ext >&5
48946 +  rm -rf conftest*
48947 +
48948 +      { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; }
48949 +
48950 +fi
48951 +rm -f conftest*
48952 +    LIBS=$old_LIBS
48953 +    LDFLAGS=$old_LDFLAGS
48954 +
48955 +
48956 +fi
48957 +
48958 +
48959 +  cat >> confdefs.h <<\EOF
48960 +#define HAVE_LIBRECODE 1
48961 +EOF
48962 +
48963 +
48964 +  if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then
48965 +
48966 +  if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then
48967 +    ai_p=$RECODE_DIR/$RECODE_INC
48968 +  else
48969 +
48970 +    ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`"
48971 +
48972 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48973 +    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`"
48974 +  fi
48975 +
48976 +
48977 +
48978 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48979 +
48980 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
48981 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
48982 +    eval "INCLUDEPATH$unique=set"
48983 +
48984 +      if test ""; then
48985 +        INCLUDES="-I$ai_p $INCLUDES"
48986 +      else
48987 +        INCLUDES="$INCLUDES -I$ai_p"
48988 +      fi
48989 +
48990 +  fi
48991 +
48992 +  fi
48993 +
48994 +
48995 +  PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD"
48996 +
48997 +  for ac_hdr in stdbool.h
48998 +do
48999 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
49000 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
49001 +echo "configure:82901: checking for $ac_hdr" >&5
49002 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
49003 +  echo $ac_n "(cached) $ac_c" 1>&6
49004 +else
49005 +  cat > conftest.$ac_ext <<EOF
49006 +#line 82906 "configure"
49007 +#include "confdefs.h"
49008 +#include <$ac_hdr>
49009 +EOF
49010 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
49011 +{ (eval echo configure:82911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
49012 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
49013 +if test -z "$ac_err"; then
49014 +  rm -rf conftest*
49015 +  eval "ac_cv_header_$ac_safe=yes"
49016 +else
49017 +  echo "$ac_err" >&5
49018 +  echo "configure: failed program was:" >&5
49019 +  cat conftest.$ac_ext >&5
49020 +  rm -rf conftest*
49021 +  eval "ac_cv_header_$ac_safe=no"
49022 +fi
49023 +rm -f conftest*
49024 +fi
49025 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
49026 +  echo "$ac_t""yes" 1>&6
49027 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
49028 +  cat >> confdefs.h <<EOF
49029 +#define $ac_tr_hdr 1
49030 +EOF
49031 +
49032 +else
49033 +  echo "$ac_t""no" 1>&6
49034 +fi
49035 +done
49036 +
49037
49038 -  ext_builddir=ext/phar
49039 -  ext_srcdir=$abs_srcdir/ext/phar
49040 +  ext_builddir=ext/recode
49041 +  ext_srcdir=$abs_srcdir/ext/recode
49042
49043    ac_extra=
49044
49045    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
49046 -    PHP_PHAR_SHARED=no
49047 +    PHP_RECODE_SHARED=no
49048
49049
49050 -  case ext/phar in
49051 +  case ext/recode in
49052    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49053 -  /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49054 -  *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49055 +  /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49056 +  *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49057    esac
49058
49059
49060 @@ -77178,7 +82961,7 @@ if test "$PHP_PHAR" != "no"; then
49061
49062
49063    old_IFS=$IFS
49064 -  for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
49065 +  for ac_src in recode.c; do
49066
49067        IFS=.
49068        set $ac_src
49069 @@ -77201,18 +82984,18 @@ EOF
49070    done
49071
49072
49073 -    EXT_STATIC="$EXT_STATIC phar"
49074 +    EXT_STATIC="$EXT_STATIC recode"
49075      if test "$ext_shared" != "nocli"; then
49076 -      EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
49077 +      EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
49078      fi
49079    else
49080      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
49081 -      PHP_PHAR_SHARED=yes
49082 +      PHP_RECODE_SHARED=yes
49083
49084 -  case ext/phar in
49085 +  case ext/recode in
49086    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49087 -  /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49088 -  *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49089 +  /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49090 +  *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49091    esac
49092
49093
49094 @@ -77227,14 +83010,14 @@ EOF
49095
49096
49097    old_IFS=$IFS
49098 -  for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
49099 +  for ac_src in recode.c; do
49100
49101        IFS=.
49102        set $ac_src
49103        ac_obj=$1
49104        IFS=$old_IFS
49105
49106 -      shared_objects_phar="$shared_objects_phar $ac_bdir$ac_obj.lo"
49107 +      shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo"
49108
49109        case $ac_src in
49110          *.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" ;;
49111 @@ -77257,31 +83040,31 @@ EOF
49112    case $host_alias in
49113      *aix*)
49114        suffix=so
49115 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpphar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHPPHAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpphar.so '$ext_builddir'/phpphar.so'
49116 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phprecode.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phprecode.so '$ext_builddir'/phprecode.so'
49117        ;;
49118      *netware*)
49119        suffix=nlm
49120 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPHAR, 3)_SHARED_LIBADD)'
49121 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPRECODE, 3)_SHARED_LIBADD)'
49122        ;;
49123      *)
49124        suffix=la
49125 -      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_phar) $(PHPPHAR_SHARED_LIBADD)'
49126 +      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_recode) $(PHPRECODE_SHARED_LIBADD)'
49127        ;;
49128    esac
49129
49130    if test "x" = "xyes"; then
49131 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpphar.$suffix"
49132 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phprecode.$suffix"
49133    else
49134 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpphar.$suffix"
49135 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix"
49136    fi
49137
49138 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
49139 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
49140
49141    cat >>Makefile.objects<<EOF
49142 -\$(phplibdir)/phpphar.$suffix: $ext_builddir/phpphar.$suffix
49143 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpphar.$suffix \$(phplibdir)
49144 +\$(phplibdir)/phprecode.$suffix: $ext_builddir/phprecode.$suffix
49145 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phprecode.$suffix \$(phplibdir)
49146
49147 -$ext_builddir/phpphar.$suffix: \$(shared_objects_phar) \$(PHPPHAR_SHARED_DEPENDENCIES)
49148 +$ext_builddir/phprecode.$suffix: \$(shared_objects_recode) \$(PHPRECODE_SHARED_DEPENDENCIES)
49149         $link_cmd
49150
49151  EOF
49152 @@ -77294,31 +83077,31 @@ EOF
49153    case $host_alias in
49154      *aix*)
49155        suffix=so
49156 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phar.so '$ext_builddir'/phar.so'
49157 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/recode.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(RECODE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/recode.so '$ext_builddir'/recode.so'
49158        ;;
49159      *netware*)
49160        suffix=nlm
49161 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHAR, 3)_SHARED_LIBADD)'
49162 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(RECODE, 3)_SHARED_LIBADD)'
49163        ;;
49164      *)
49165        suffix=la
49166 -      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_phar) $(PHAR_SHARED_LIBADD)'
49167 +      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_recode) $(RECODE_SHARED_LIBADD)'
49168        ;;
49169    esac
49170
49171    if test "x" = "xyes"; then
49172 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phar.$suffix"
49173 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/recode.$suffix"
49174    else
49175 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phar.$suffix"
49176 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/recode.$suffix"
49177    fi
49178
49179 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
49180 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
49181
49182    cat >>Makefile.objects<<EOF
49183 -\$(phplibdir)/phar.$suffix: $ext_builddir/phar.$suffix
49184 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phar.$suffix \$(phplibdir)
49185 +\$(phplibdir)/recode.$suffix: $ext_builddir/recode.$suffix
49186 +       \$(LIBTOOL) --mode=install cp $ext_builddir/recode.$suffix \$(phplibdir)
49187
49188 -$ext_builddir/phar.$suffix: \$(shared_objects_phar) \$(PHAR_SHARED_DEPENDENCIES)
49189 +$ext_builddir/recode.$suffix: \$(shared_objects_recode) \$(RECODE_SHARED_DEPENDENCIES)
49190         $link_cmd
49191
49192  EOF
49193 @@ -77326,22 +83109,22 @@ EOF
49194            ;;
49195        esac
49196        cat >> confdefs.h <<EOF
49197 -#define COMPILE_DL_PHAR 1
49198 +#define COMPILE_DL_RECODE 1
49199  EOF
49200
49201      fi
49202    fi
49203
49204    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
49205 -    PHP_PHAR_SHARED=no
49206 +    PHP_RECODE_SHARED=no
49207      case "$PHP_SAPI" in
49208        cgi|embed)
49209
49210
49211 -  case ext/phar in
49212 +  case ext/recode in
49213    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49214 -  /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49215 -  *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49216 +  /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49217 +  *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49218    esac
49219
49220
49221 @@ -77356,7 +83139,7 @@ EOF
49222
49223
49224    old_IFS=$IFS
49225 -  for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
49226 +  for ac_src in recode.c; do
49227
49228        IFS=.
49229        set $ac_src
49230 @@ -77379,15 +83162,15 @@ EOF
49231    done
49232
49233
49234 -        EXT_STATIC="$EXT_STATIC phar"
49235 +        EXT_STATIC="$EXT_STATIC recode"
49236          ;;
49237        *)
49238
49239
49240 -  case ext/phar in
49241 +  case ext/recode in
49242    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49243 -  /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49244 -  *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49245 +  /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49246 +  *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49247    esac
49248
49249
49250 @@ -77402,7 +83185,7 @@ EOF
49251
49252
49253    old_IFS=$IFS
49254 -  for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do
49255 +  for ac_src in recode.c; do
49256
49257        IFS=.
49258        set $ac_src
49259 @@ -77427,7 +83210,7 @@ EOF
49260
49261          ;;
49262      esac
49263 -    EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
49264 +    EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
49265    fi
49266
49267
49268 @@ -77436,147 +83219,33 @@ EOF
49269
49270
49271    if test "$ext_builddir" = "."; then
49272 -    PHP_PECL_EXTENSION=phar
49273 +    PHP_PECL_EXTENSION=recode
49274
49275    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
49276
49277    fi
49278
49279 -  echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6
49280 -echo "configure:77447: checking for phar openssl support" >&5
49281 -  if test "$PHP_HASH_SHARED" != "yes"; then
49282 -    if test "$PHP_HASH" != "no"; then
49283 -      cat >> confdefs.h <<\EOF
49284 -#define PHAR_HASH_OK 1
49285 -EOF
49286 -
49287 -    fi
49288 -  else
49289 -    echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2
49290 -  fi
49291 -  if test "$PHP_OPENSSL_SHARED" = "yes"; then
49292 -    echo "$ac_t""no (shared openssl)" 1>&6
49293 -  else
49294 -    if test "$PHP_OPENSSL" = "yes"; then
49295 -      echo "$ac_t""yes" 1>&6
49296 -      cat >> confdefs.h <<\EOF
49297 -#define PHAR_HAVE_OPENSSL 1
49298 -EOF
49299 -
49300 -    else
49301 -      echo "$ac_t""no" 1>&6
49302 -    fi
49303 -  fi
49304 -
49305 -  am_i_shared=$PHP_PHAR_SHARED
49306 -  is_it_shared=$PHP_HASH_SHARED
49307 -  is_it_enabled=$PHP_HASH
49308 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
49309 -    { echo "configure: error:
49310 -You've configured extension phar to build statically, but it
49311 -depends on extension hash, which you've configured to build shared.
49312 -You either need to build phar shared or build hash statically for the
49313 -build to be successful.
49314 -" 1>&2; exit 1; }
49315 -  fi
49316 -  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
49317 -    { echo "configure: error:
49318 -You've configured extension phar, which depends on extension hash,
49319 -but you've either not enabled hash, or have disabled it.
49320 -" 1>&2; exit 1; }
49321 -  fi
49322 -
49323 -
49324 -  am_i_shared=$PHP_PHAR_SHARED
49325 -  is_it_shared=$PHP_SPL_SHARED
49326 -  is_it_enabled=$PHP_SPL
49327 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
49328 -    { echo "configure: error:
49329 -You've configured extension phar to build statically, but it
49330 -depends on extension spl, which you've configured to build shared.
49331 -You either need to build phar shared or build spl statically for the
49332 -build to be successful.
49333 -" 1>&2; exit 1; }
49334 -  fi
49335 -  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
49336 -    { echo "configure: error:
49337 -You've configured extension phar, which depends on extension spl,
49338 -but you've either not enabled spl, or have disabled it.
49339 -" 1>&2; exit 1; }
49340 -  fi
49341 -
49342 -
49343 -  src=$ext_srcdir/Makefile.frag
49344 -  ac_srcdir=$ext_srcdir
49345 -  ac_builddir=$ext_builddir
49346 -  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
49347 -
49348 -fi
49349 -
49350 -
49351 -
49352 -php_enable_posix=yes
49353 -
49354 -echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
49355 -echo "configure:77522: checking whether to enable POSIX-like functions" >&5
49356 -# Check whether --enable-posix or --disable-posix was given.
49357 -if test "${enable_posix+set}" = set; then
49358 -  enableval="$enable_posix"
49359 -  PHP_POSIX=$enableval
49360 -else
49361 -
49362 -  PHP_POSIX=yes
49363 -  test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL
49364 -
49365  fi
49366
49367
49368 -
49369 -ext_output="yes, shared"
49370 -ext_shared=yes
49371 -case $PHP_POSIX in
49372 -shared,*)
49373 -  PHP_POSIX=`echo "$PHP_POSIX"|$SED 's/^shared,//'`
49374 -  ;;
49375 -shared)
49376 -  PHP_POSIX=yes
49377 -  ;;
49378 -no)
49379 -  ext_output=no
49380 -  ext_shared=no
49381 -  ;;
49382 -*)
49383 -  ext_output=yes
49384 -  ext_shared=no
49385 -  ;;
49386 -esac
49387 -
49388 -
49389 -
49390 -echo "$ac_t""$ext_output" 1>&6
49391 -
49392 -
49393 -
49394 -
49395 -if test "$PHP_POSIX" = "yes"; then
49396 -  cat >> confdefs.h <<\EOF
49397 -#define HAVE_POSIX 1
49398 +cat >> confdefs.h <<\EOF
49399 +#define HAVE_REFLECTION 1
49400  EOF
49401
49402 -
49403 -  ext_builddir=ext/posix
49404 -  ext_srcdir=$abs_srcdir/ext/posix
49405 +
49406 +  ext_builddir=ext/reflection
49407 +  ext_srcdir=$abs_srcdir/ext/reflection
49408
49409    ac_extra=
49410
49411 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
49412 -    PHP_POSIX_SHARED=no
49413 +  if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
49414 +    PHP_REFLECTION_SHARED=no
49415
49416
49417 -  case ext/posix in
49418 +  case ext/reflection in
49419    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49420 -  /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49421 -  *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49422 +  /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49423 +  *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49424    esac
49425
49426
49427 @@ -77591,7 +83260,7 @@ EOF
49428
49429
49430    old_IFS=$IFS
49431 -  for ac_src in posix.c; do
49432 +  for ac_src in php_reflection.c; do
49433
49434        IFS=.
49435        set $ac_src
49436 @@ -77614,18 +83283,18 @@ EOF
49437    done
49438
49439
49440 -    EXT_STATIC="$EXT_STATIC posix"
49441 -    if test "$ext_shared" != "nocli"; then
49442 -      EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
49443 +    EXT_STATIC="$EXT_STATIC reflection"
49444 +    if test "no" != "nocli"; then
49445 +      EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
49446      fi
49447    else
49448 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
49449 -      PHP_POSIX_SHARED=yes
49450 +    if test "no" = "shared" || test "no" = "yes"; then
49451 +      PHP_REFLECTION_SHARED=yes
49452
49453 -  case ext/posix in
49454 +  case ext/reflection in
49455    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49456 -  /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49457 -  *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49458 +  /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49459 +  *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49460    esac
49461
49462
49463 @@ -77640,14 +83309,14 @@ EOF
49464
49465
49466    old_IFS=$IFS
49467 -  for ac_src in posix.c; do
49468 +  for ac_src in php_reflection.c; do
49469
49470        IFS=.
49471        set $ac_src
49472        ac_obj=$1
49473        IFS=$old_IFS
49474
49475 -      shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo"
49476 +      shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo"
49477
49478        case $ac_src in
49479          *.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" ;;
49480 @@ -77670,31 +83339,31 @@ EOF
49481    case $host_alias in
49482      *aix*)
49483        suffix=so
49484 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpposix.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) $(PHPPOSIX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpposix.so '$ext_builddir'/phpposix.so'
49485 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreflection.so '$ext_builddir'/phpreflection.so'
49486        ;;
49487      *netware*)
49488        suffix=nlm
49489 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPOSIX, 3)_SHARED_LIBADD)'
49490 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)'
49491        ;;
49492      *)
49493        suffix=la
49494 -      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_posix) $(PHPPOSIX_SHARED_LIBADD)'
49495 +      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_reflection) $(PHPREFLECTION_SHARED_LIBADD)'
49496        ;;
49497    esac
49498
49499    if test "x" = "xyes"; then
49500 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpposix.$suffix"
49501 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreflection.$suffix"
49502    else
49503 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix"
49504 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix"
49505    fi
49506
49507 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
49508 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
49509
49510    cat >>Makefile.objects<<EOF
49511 -\$(phplibdir)/phpposix.$suffix: $ext_builddir/phpposix.$suffix
49512 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpposix.$suffix \$(phplibdir)
49513 +\$(phplibdir)/phpreflection.$suffix: $ext_builddir/phpreflection.$suffix
49514 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpreflection.$suffix \$(phplibdir)
49515
49516 -$ext_builddir/phpposix.$suffix: \$(shared_objects_posix) \$(PHPPOSIX_SHARED_DEPENDENCIES)
49517 +$ext_builddir/phpreflection.$suffix: \$(shared_objects_reflection) \$(PHPREFLECTION_SHARED_DEPENDENCIES)
49518         $link_cmd
49519
49520  EOF
49521 @@ -77707,31 +83376,31 @@ EOF
49522    case $host_alias in
49523      *aix*)
49524        suffix=so
49525 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/posix.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) $(POSIX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/posix.so '$ext_builddir'/posix.so'
49526 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/reflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(REFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/reflection.so '$ext_builddir'/reflection.so'
49527        ;;
49528      *netware*)
49529        suffix=nlm
49530 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(POSIX, 3)_SHARED_LIBADD)'
49531 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(REFLECTION, 3)_SHARED_LIBADD)'
49532        ;;
49533      *)
49534        suffix=la
49535 -      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_posix) $(POSIX_SHARED_LIBADD)'
49536 +      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_reflection) $(REFLECTION_SHARED_LIBADD)'
49537        ;;
49538    esac
49539
49540    if test "x" = "xyes"; then
49541 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/posix.$suffix"
49542 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/reflection.$suffix"
49543    else
49544 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/posix.$suffix"
49545 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/reflection.$suffix"
49546    fi
49547
49548 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
49549 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
49550
49551    cat >>Makefile.objects<<EOF
49552 -\$(phplibdir)/posix.$suffix: $ext_builddir/posix.$suffix
49553 -       \$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir)
49554 +\$(phplibdir)/reflection.$suffix: $ext_builddir/reflection.$suffix
49555 +       \$(LIBTOOL) --mode=install cp $ext_builddir/reflection.$suffix \$(phplibdir)
49556
49557 -$ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES)
49558 +$ext_builddir/reflection.$suffix: \$(shared_objects_reflection) \$(REFLECTION_SHARED_DEPENDENCIES)
49559         $link_cmd
49560
49561  EOF
49562 @@ -77739,22 +83408,22 @@ EOF
49563            ;;
49564        esac
49565        cat >> confdefs.h <<EOF
49566 -#define COMPILE_DL_POSIX 1
49567 +#define COMPILE_DL_REFLECTION 1
49568  EOF
49569
49570      fi
49571    fi
49572
49573 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
49574 -    PHP_POSIX_SHARED=no
49575 +  if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
49576 +    PHP_REFLECTION_SHARED=no
49577      case "$PHP_SAPI" in
49578        cgi|embed)
49579
49580
49581 -  case ext/posix in
49582 +  case ext/reflection in
49583    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49584 -  /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49585 -  *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49586 +  /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49587 +  *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49588    esac
49589
49590
49591 @@ -77769,7 +83438,7 @@ EOF
49592
49593
49594    old_IFS=$IFS
49595 -  for ac_src in posix.c; do
49596 +  for ac_src in php_reflection.c; do
49597
49598        IFS=.
49599        set $ac_src
49600 @@ -77792,15 +83461,15 @@ EOF
49601    done
49602
49603
49604 -        EXT_STATIC="$EXT_STATIC posix"
49605 +        EXT_STATIC="$EXT_STATIC reflection"
49606          ;;
49607        *)
49608
49609
49610 -  case ext/posix in
49611 +  case ext/reflection in
49612    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49613 -  /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49614 -  *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49615 +  /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49616 +  *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49617    esac
49618
49619
49620 @@ -77815,7 +83484,7 @@ EOF
49621
49622
49623    old_IFS=$IFS
49624 -  for ac_src in posix.c; do
49625 +  for ac_src in php_reflection.c; do
49626
49627        IFS=.
49628        set $ac_src
49629 @@ -77840,7 +83509,7 @@ EOF
49630
49631          ;;
49632      esac
49633 -    EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
49634 +    EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
49635    fi
49636
49637
49638 @@ -77849,257 +83518,338 @@ EOF
49639
49640
49641    if test "$ext_builddir" = "."; then
49642 -    PHP_PECL_EXTENSION=posix
49643 +    PHP_PECL_EXTENSION=reflection
49644
49645    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
49646
49647    fi
49648
49649
49650 -  for ac_hdr in sys/mkdev.h
49651 -do
49652 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
49653 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
49654 -echo "configure:77864: checking for $ac_hdr" >&5
49655 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
49656 -  echo $ac_n "(cached) $ac_c" 1>&6
49657 -else
49658 -  cat > conftest.$ac_ext <<EOF
49659 -#line 77869 "configure"
49660 -#include "confdefs.h"
49661 -#include <$ac_hdr>
49662 -EOF
49663 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
49664 -{ (eval echo configure:77874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
49665 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
49666 -if test -z "$ac_err"; then
49667 -  rm -rf conftest*
49668 -  eval "ac_cv_header_$ac_safe=yes"
49669 +
49670 +
49671 +php_enable_session=yes
49672 +
49673 +echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
49674 +echo "configure:83534: checking whether to enable PHP sessions" >&5
49675 +# Check whether --enable-session or --disable-session was given.
49676 +if test "${enable_session+set}" = set; then
49677 +  enableval="$enable_session"
49678 +  PHP_SESSION=$enableval
49679  else
49680 -  echo "$ac_err" >&5
49681 -  echo "configure: failed program was:" >&5
49682 -  cat conftest.$ac_ext >&5
49683 -  rm -rf conftest*
49684 -  eval "ac_cv_header_$ac_safe=no"
49685 -fi
49686 -rm -f conftest*
49687 +
49688 +  PHP_SESSION=yes
49689 +  test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL
49690 +
49691  fi
49692 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
49693 -  echo "$ac_t""yes" 1>&6
49694 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
49695 -  cat >> confdefs.h <<EOF
49696 -#define $ac_tr_hdr 1
49697 -EOF
49698 -
49699 +
49700 +
49701 +
49702 +ext_output="yes, shared"
49703 +ext_shared=yes
49704 +case $PHP_SESSION in
49705 +shared,*)
49706 +  PHP_SESSION=`echo "$PHP_SESSION"|$SED 's/^shared,//'`
49707 +  ;;
49708 +shared)
49709 +  PHP_SESSION=yes
49710 +  ;;
49711 +no)
49712 +  ext_output=no
49713 +  ext_shared=no
49714 +  ;;
49715 +*)
49716 +  ext_output=yes
49717 +  ext_shared=no
49718 +  ;;
49719 +esac
49720 +
49721 +
49722 +
49723 +echo "$ac_t""$ext_output" 1>&6
49724 +
49725 +
49726 +
49727 +
49728 +
49729 +php_with_mm=no
49730 +
49731 +echo $ac_n "checking for mm support""... $ac_c" 1>&6
49732 +echo "configure:83578: checking for mm support" >&5
49733 +# Check whether --with-mm or --without-mm was given.
49734 +if test "${with_mm+set}" = set; then
49735 +  withval="$with_mm"
49736 +  PHP_MM=$withval
49737  else
49738 -  echo "$ac_t""no" 1>&6
49739 +
49740 +  PHP_MM=no
49741 +
49742 +
49743  fi
49744 -done
49745
49746
49747 -  for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
49748 -do
49749 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
49750 -echo "configure:77904: checking for $ac_func" >&5
49751 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
49752 +ext_output=$PHP_MM
49753 +echo "$ac_t""$ext_output" 1>&6
49754 +
49755 +
49756 +
49757 +
49758 +if test "$PHP_SESSION" != "no"; then
49759 +
49760 +  echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
49761 +echo "configure:83600: checking whether pwrite works" >&5
49762 +if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
49763    echo $ac_n "(cached) $ac_c" 1>&6
49764  else
49765 +
49766 +
49767 +  if test "$cross_compiling" = yes; then
49768 +
49769 +    ac_cv_pwrite=no
49770 +
49771 +else
49772    cat > conftest.$ac_ext <<EOF
49773 -#line 77909 "configure"
49774 +#line 83612 "configure"
49775  #include "confdefs.h"
49776 -/* System header to define __stub macros and hopefully few prototypes,
49777 -    which can conflict with char $ac_func(); below.  */
49778 -#include <assert.h>
49779 -/* Override any gcc2 internal prototype to avoid an error.  */
49780 -/* We use char because int might match the return type of a gcc2
49781 -    builtin and then its argument prototype would still apply.  */
49782 -char $ac_func();
49783
49784 -int main() {
49785 +#include <sys/types.h>
49786 +#include <sys/stat.h>
49787 +#include <fcntl.h>
49788 +#include <unistd.h>
49789 +#include <errno.h>
49790
49791 -/* The GNU C library defines this for functions which it implements
49792 -    to always fail with ENOSYS.  Some functions are actually named
49793 -    something starting with __ and the normal name is an alias.  */
49794 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
49795 -choke me
49796 -#else
49797 -$ac_func();
49798 -#endif
49799 +    main() {
49800 +    int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600);
49801
49802 -; return 0; }
49803 -EOF
49804 -if { (eval echo configure:77932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
49805 -  rm -rf conftest*
49806 -  eval "ac_cv_func_$ac_func=yes"
49807 -else
49808 -  echo "configure: failed program was:" >&5
49809 -  cat conftest.$ac_ext >&5
49810 -  rm -rf conftest*
49811 -  eval "ac_cv_func_$ac_func=no"
49812 -fi
49813 -rm -f conftest*
49814 -fi
49815 +    if (fd < 0) exit(1);
49816 +    if (pwrite(fd, "text", 4, 0) != 4) exit(1);
49817 +    /* Linux glibc breakage until 2.2.5 */
49818 +    if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1);
49819 +    exit(0);
49820 +    }
49821
49822 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
49823 -  echo "$ac_t""yes" 1>&6
49824 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
49825 -  cat >> confdefs.h <<EOF
49826 -#define $ac_tr_func 1
49827 +
49828  EOF
49829 -
49830 +if { (eval echo configure:83633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
49831 +then
49832 +
49833 +    ac_cv_pwrite=yes
49834 +
49835  else
49836 -  echo "$ac_t""no" 1>&6
49837 +  echo "configure: failed program was:" >&5
49838 +  cat conftest.$ac_ext >&5
49839 +  rm -fr conftest*
49840 +
49841 +    ac_cv_pwrite=no
49842 +
49843 +fi
49844 +rm -fr conftest*
49845  fi
49846 -done
49847
49848
49849 -  echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6
49850 -echo "configure:77958: checking for working ttyname_r() implementation" >&5
49851 +    if test "$ac_cv_pwrite" = "no"; then
49852 +
49853    if test "$cross_compiling" = yes; then
49854
49855 -    echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6
49856 +    ac_cv_pwrite=no
49857
49858  else
49859    cat > conftest.$ac_ext <<EOF
49860 -#line 77965 "configure"
49861 +#line 83658 "configure"
49862  #include "confdefs.h"
49863
49864 +#include <sys/types.h>
49865 +#include <sys/stat.h>
49866 +#include <fcntl.h>
49867  #include <unistd.h>
49868 +#include <errno.h>
49869 +ssize_t pwrite(int, void *, size_t, off64_t);
49870 +    main() {
49871 +    int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600);
49872
49873 -int main(int argc, char *argv[])
49874 -{
49875 -       char buf[64];
49876 +    if (fd < 0) exit(1);
49877 +    if (pwrite(fd, "text", 4, 0) != 4) exit(1);
49878 +    /* Linux glibc breakage until 2.2.5 */
49879 +    if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1);
49880 +    exit(0);
49881 +    }
49882
49883 -       return ttyname_r(0, buf, 64) ? 1 : 0;
49884 -}
49885
49886  EOF
49887 -if { (eval echo configure:77978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
49888 +if { (eval echo configure:83679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
49889  then
49890
49891 -    echo "$ac_t""yes" 1>&6
49892 -    cat >> confdefs.h <<\EOF
49893 -#define HAVE_TTYNAME_R 1
49894 -EOF
49895 -
49896 +    ac_cv_pwrite=yes
49897
49898  else
49899    echo "configure: failed program was:" >&5
49900    cat conftest.$ac_ext >&5
49901    rm -fr conftest*
49902
49903 -    echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6
49904 +    ac_cv_pwrite=no
49905
49906  fi
49907  rm -fr conftest*
49908  fi
49909
49910
49911 -  echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6
49912 -echo "configure:78000: checking for utsname.domainname" >&5
49913 -if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then
49914 +      if test "$ac_cv_pwrite" = "yes"; then
49915 +        ac_cv_pwrite=64
49916 +      fi
49917 +    fi
49918 +
49919 +fi
49920 +
49921 +echo "$ac_t""$ac_cv_pwrite" 1>&6
49922 +
49923 +  if test "$ac_cv_pwrite" != "no"; then
49924 +    cat >> confdefs.h <<\EOF
49925 +#define HAVE_PWRITE 1
49926 +EOF
49927 +
49928 +    if test "$ac_cv_pwrite" = "64"; then
49929 +      cat >> confdefs.h <<\EOF
49930 +#define PHP_PWRITE_64 1
49931 +EOF
49932 +
49933 +    fi
49934 +  fi
49935 +
49936 +
49937 +  echo $ac_n "checking whether pread works""... $ac_c" 1>&6
49938 +echo "configure:83720: checking whether pread works" >&5
49939 +if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
49940    echo $ac_n "(cached) $ac_c" 1>&6
49941  else
49942
49943 -    cat > conftest.$ac_ext <<EOF
49944 -#line 78006 "configure"
49945 +
49946 +  echo test > conftest_in
49947 +  if test "$cross_compiling" = yes; then
49948 +
49949 +    ac_cv_pread=no
49950 +
49951 +else
49952 +  cat > conftest.$ac_ext <<EOF
49953 +#line 83733 "configure"
49954  #include "confdefs.h"
49955
49956 -      #define _GNU_SOURCE
49957 -      #include <sys/utsname.h>
49958 -
49959 -int main() {
49960 +#include <sys/types.h>
49961 +#include <sys/stat.h>
49962 +#include <fcntl.h>
49963 +#include <unistd.h>
49964 +#include <errno.h>
49965
49966 -      return sizeof(((struct utsname *)0)->domainname);
49967 -
49968 -; return 0; }
49969 +    main() {
49970 +    char buf[3];
49971 +    int fd = open("conftest_in", O_RDONLY);
49972 +    if (fd < 0) exit(1);
49973 +    if (pread(fd, buf, 2, 0) != 2) exit(1);
49974 +    /* Linux glibc breakage until 2.2.5 */
49975 +    if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
49976 +    exit(0);
49977 +    }
49978 +
49979  EOF
49980 -if { (eval echo configure:78018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
49981 -  rm -rf conftest*
49982 +if { (eval echo configure:83753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
49983 +then
49984 +
49985 +    ac_cv_pread=yes
49986
49987 -      ac_cv_have_utsname_domainname=yes
49988 -
49989  else
49990    echo "configure: failed program was:" >&5
49991    cat conftest.$ac_ext >&5
49992 -  rm -rf conftest*
49993 +  rm -fr conftest*
49994
49995 -      ac_cv_have_utsname_domainname=no
49996 -
49997 -fi
49998 -rm -f conftest*
49999 +    ac_cv_pread=no
50000
50001  fi
50002 -
50003 -echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6
50004 -  if test "$ac_cv_have_utsname_domainname" = yes; then
50005 -    cat >> confdefs.h <<\EOF
50006 -#define HAVE_UTSNAME_DOMAINNAME 1
50007 -EOF
50008 -
50009 -  fi
50010 +rm -fr conftest*
50011  fi
50012
50013 +  rm -f conftest_in
50014
50015 +    if test "$ac_cv_pread" = "no"; then
50016 +
50017 +  echo test > conftest_in
50018 +  if test "$cross_compiling" = yes; then
50019 +
50020 +    ac_cv_pread=no
50021 +
50022 +else
50023 +  cat > conftest.$ac_ext <<EOF
50024 +#line 83780 "configure"
50025 +#include "confdefs.h"
50026
50027 -php_with_pspell=no
50028 -
50029 -echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
50030 -echo "configure:78049: checking for PSPELL support" >&5
50031 -# Check whether --with-pspell or --without-pspell was given.
50032 -if test "${with_pspell+set}" = set; then
50033 -  withval="$with_pspell"
50034 -  PHP_PSPELL=$withval
50035 +#include <sys/types.h>
50036 +#include <sys/stat.h>
50037 +#include <fcntl.h>
50038 +#include <unistd.h>
50039 +#include <errno.h>
50040 +ssize_t pread(int, void *, size_t, off64_t);
50041 +    main() {
50042 +    char buf[3];
50043 +    int fd = open("conftest_in", O_RDONLY);
50044 +    if (fd < 0) exit(1);
50045 +    if (pread(fd, buf, 2, 0) != 2) exit(1);
50046 +    /* Linux glibc breakage until 2.2.5 */
50047 +    if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
50048 +    exit(0);
50049 +    }
50050 +
50051 +EOF
50052 +if { (eval echo configure:83800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
50053 +then
50054 +
50055 +    ac_cv_pread=yes
50056 +
50057  else
50058 +  echo "configure: failed program was:" >&5
50059 +  cat conftest.$ac_ext >&5
50060 +  rm -fr conftest*
50061 +
50062 +    ac_cv_pread=no
50063
50064 -  PHP_PSPELL=no
50065 -  test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL
50066 -
50067 +fi
50068 +rm -fr conftest*
50069  fi
50070
50071 +  rm -f conftest_in
50072
50073 +      if test "$ac_cv_pread" = "yes"; then
50074 +        ac_cv_pread=64
50075 +      fi
50076 +    fi
50077 +
50078 +fi
50079
50080 -ext_output="yes, shared"
50081 -ext_shared=yes
50082 -case $PHP_PSPELL in
50083 -shared,*)
50084 -  PHP_PSPELL=`echo "$PHP_PSPELL"|$SED 's/^shared,//'`
50085 -  ;;
50086 -shared)
50087 -  PHP_PSPELL=yes
50088 -  ;;
50089 -no)
50090 -  ext_output=no
50091 -  ext_shared=no
50092 -  ;;
50093 -*)
50094 -  ext_output=yes
50095 -  ext_shared=no
50096 -  ;;
50097 -esac
50098 -
50099 -
50100 -
50101 -echo "$ac_t""$ext_output" 1>&6
50102 +echo "$ac_t""$ac_cv_pread" 1>&6
50103
50104 +  if test "$ac_cv_pread" != "no"; then
50105 +    cat >> confdefs.h <<\EOF
50106 +#define HAVE_PREAD 1
50107 +EOF
50108
50109 +    if test "$ac_cv_pread" = "64"; then
50110 +      cat >> confdefs.h <<\EOF
50111 +#define PHP_PREAD_64 1
50112 +EOF
50113
50114 +    fi
50115 +  fi
50116
50117 -if test "$PHP_PSPELL" != "no"; then
50118 -
50119 -  ext_builddir=ext/pspell
50120 -  ext_srcdir=$abs_srcdir/ext/pspell
50121 +
50122 +  ext_builddir=ext/session
50123 +  ext_srcdir=$abs_srcdir/ext/session
50124
50125    ac_extra=
50126
50127    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
50128 -    PHP_PSPELL_SHARED=no
50129 +    PHP_SESSION_SHARED=no
50130
50131
50132 -  case ext/pspell in
50133 +  case ext/session in
50134    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50135 -  /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50136 -  *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50137 +  /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50138 +  *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50139    esac
50140
50141
50142 @@ -78114,7 +83864,7 @@ if test "$PHP_PSPELL" != "no"; then
50143
50144
50145    old_IFS=$IFS
50146 -  for ac_src in pspell.c; do
50147 +  for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
50148
50149        IFS=.
50150        set $ac_src
50151 @@ -78137,18 +83887,18 @@ EOF
50152    done
50153
50154
50155 -    EXT_STATIC="$EXT_STATIC pspell"
50156 +    EXT_STATIC="$EXT_STATIC session"
50157      if test "$ext_shared" != "nocli"; then
50158 -      EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
50159 +      EXT_CLI_STATIC="$EXT_CLI_STATIC session"
50160      fi
50161    else
50162      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
50163 -      PHP_PSPELL_SHARED=yes
50164 +      PHP_SESSION_SHARED=yes
50165
50166 -  case ext/pspell in
50167 +  case ext/session in
50168    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50169 -  /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50170 -  *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50171 +  /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50172 +  *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50173    esac
50174
50175
50176 @@ -78163,14 +83913,14 @@ EOF
50177
50178
50179    old_IFS=$IFS
50180 -  for ac_src in pspell.c; do
50181 +  for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
50182
50183        IFS=.
50184        set $ac_src
50185        ac_obj=$1
50186        IFS=$old_IFS
50187
50188 -      shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo"
50189 +      shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo"
50190
50191        case $ac_src in
50192          *.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" ;;
50193 @@ -78193,31 +83943,31 @@ EOF
50194    case $host_alias in
50195      *aix*)
50196        suffix=so
50197 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppspell.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppspell.so '$ext_builddir'/phppspell.so'
50198 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsession.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsession.so '$ext_builddir'/phpsession.so'
50199        ;;
50200      *netware*)
50201        suffix=nlm
50202 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPSPELL, 3)_SHARED_LIBADD)'
50203 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSESSION, 3)_SHARED_LIBADD)'
50204        ;;
50205      *)
50206        suffix=la
50207 -      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_pspell) $(PHPPSPELL_SHARED_LIBADD)'
50208 +      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_session) $(PHPSESSION_SHARED_LIBADD)'
50209        ;;
50210    esac
50211
50212    if test "x" = "xyes"; then
50213 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppspell.$suffix"
50214 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsession.$suffix"
50215    else
50216 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix"
50217 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix"
50218    fi
50219
50220 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
50221 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
50222
50223    cat >>Makefile.objects<<EOF
50224 -\$(phplibdir)/phppspell.$suffix: $ext_builddir/phppspell.$suffix
50225 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phppspell.$suffix \$(phplibdir)
50226 +\$(phplibdir)/phpsession.$suffix: $ext_builddir/phpsession.$suffix
50227 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsession.$suffix \$(phplibdir)
50228
50229 -$ext_builddir/phppspell.$suffix: \$(shared_objects_pspell) \$(PHPPSPELL_SHARED_DEPENDENCIES)
50230 +$ext_builddir/phpsession.$suffix: \$(shared_objects_session) \$(PHPSESSION_SHARED_DEPENDENCIES)
50231         $link_cmd
50232
50233  EOF
50234 @@ -78230,31 +83980,31 @@ EOF
50235    case $host_alias in
50236      *aix*)
50237        suffix=so
50238 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/pspell.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PSPELL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/pspell.so '$ext_builddir'/pspell.so'
50239 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/session.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(SESSION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/session.so '$ext_builddir'/session.so'
50240        ;;
50241      *netware*)
50242        suffix=nlm
50243 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PSPELL, 3)_SHARED_LIBADD)'
50244 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SESSION, 3)_SHARED_LIBADD)'
50245        ;;
50246      *)
50247        suffix=la
50248 -      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_pspell) $(PSPELL_SHARED_LIBADD)'
50249 +      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_session) $(SESSION_SHARED_LIBADD)'
50250        ;;
50251    esac
50252
50253    if test "x" = "xyes"; then
50254 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pspell.$suffix"
50255 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/session.$suffix"
50256    else
50257 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pspell.$suffix"
50258 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/session.$suffix"
50259    fi
50260
50261 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
50262 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
50263
50264    cat >>Makefile.objects<<EOF
50265 -\$(phplibdir)/pspell.$suffix: $ext_builddir/pspell.$suffix
50266 -       \$(LIBTOOL) --mode=install cp $ext_builddir/pspell.$suffix \$(phplibdir)
50267 +\$(phplibdir)/session.$suffix: $ext_builddir/session.$suffix
50268 +       \$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir)
50269
50270 -$ext_builddir/pspell.$suffix: \$(shared_objects_pspell) \$(PSPELL_SHARED_DEPENDENCIES)
50271 +$ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES)
50272         $link_cmd
50273
50274  EOF
50275 @@ -78262,22 +84012,22 @@ EOF
50276            ;;
50277        esac
50278        cat >> confdefs.h <<EOF
50279 -#define COMPILE_DL_PSPELL 1
50280 +#define COMPILE_DL_SESSION 1
50281  EOF
50282
50283      fi
50284    fi
50285
50286    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
50287 -    PHP_PSPELL_SHARED=no
50288 +    PHP_SESSION_SHARED=no
50289      case "$PHP_SAPI" in
50290        cgi|embed)
50291
50292
50293 -  case ext/pspell in
50294 +  case ext/session in
50295    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50296 -  /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50297 -  *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50298 +  /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50299 +  *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50300    esac
50301
50302
50303 @@ -78292,7 +84042,7 @@ EOF
50304
50305
50306    old_IFS=$IFS
50307 -  for ac_src in pspell.c; do
50308 +  for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
50309
50310        IFS=.
50311        set $ac_src
50312 @@ -78315,15 +84065,15 @@ EOF
50313    done
50314
50315
50316 -        EXT_STATIC="$EXT_STATIC pspell"
50317 +        EXT_STATIC="$EXT_STATIC session"
50318          ;;
50319        *)
50320
50321
50322 -  case ext/pspell in
50323 +  case ext/session in
50324    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50325 -  /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50326 -  *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50327 +  /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50328 +  *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50329    esac
50330
50331
50332 @@ -78338,7 +84088,7 @@ EOF
50333
50334
50335    old_IFS=$IFS
50336 -  for ac_src in pspell.c; do
50337 +  for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
50338
50339        IFS=.
50340        set $ac_src
50341 @@ -78363,7 +84113,7 @@ EOF
50342
50343          ;;
50344      esac
50345 -    EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
50346 +    EXT_CLI_STATIC="$EXT_CLI_STATIC session"
50347    fi
50348
50349
50350 @@ -78372,289 +84122,110 @@ EOF
50351
50352
50353    if test "$ext_builddir" = "."; then
50354 -    PHP_PECL_EXTENSION=pspell
50355 +    PHP_PECL_EXTENSION=session
50356
50357    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
50358
50359    fi
50360
50361 -       if test "$PHP_PSPELL" != "yes"; then
50362 -           PSPELL_SEARCH_DIRS=$PHP_PSPELL
50363 -       else
50364 -           PSPELL_SEARCH_DIRS="/usr/local /usr"
50365 -       fi
50366 -       for i in $PSPELL_SEARCH_DIRS; do
50367 -               if test -f $i/include/pspell/pspell.h; then
50368 -                       PSPELL_DIR=$i
50369 -                       PSPELL_INCDIR=$i/include/pspell
50370 -               elif test -f $i/include/pspell.h; then
50371 -                       PSPELL_DIR=$i
50372 -                       PSPELL_INCDIR=$i/include
50373 -               fi
50374 -       done
50375 -
50376 -       if test -z "$PSPELL_DIR"; then
50377 -               { echo "configure: error: Cannot find pspell" 1>&2; exit 1; }
50378 -       fi
50379 -
50380 -       PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR
50381 -
50382 -
50383 -
50384 -  if test "$ext_shared" = "yes"; then
50385 -    PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD"
50386 -    if test -n "$PSPELL_LIBDIR"; then
50387 -
50388 -  if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
50389 -
50390 -  if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
50391 -    ai_p=$PSPELL_LIBDIR
50392 -  else
50393 -
50394 -    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
50395 -
50396 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50397 -    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
50398 -  fi
50399 -
50400 -
50401 -      if test "$ext_shared" = "yes"; then
50402 -        PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
50403 -        test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD"
50404 -      else
50405 -
50406 -
50407 -
50408 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
50409 -
50410 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
50411 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
50412 -    eval "LIBPATH$unique=set"
50413 -
50414 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
50415 -    LDFLAGS="$LDFLAGS -L$ai_p"
50416 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
50417 -
50418 -  fi
50419 -
50420 -
50421 -      fi
50422 -
50423 -  fi
50424 -
50425 -    fi
50426 -  else
50427 -
50428 -
50429 -  if test -n "$PSPELL_LIBDIR"; then
50430 -
50431 -  if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
50432 -
50433 -  if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
50434 -    ai_p=$PSPELL_LIBDIR
50435 -  else
50436 -
50437 -    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
50438 -
50439 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50440 -    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
50441 -  fi
50442 -
50443 -
50444 -
50445 -
50446 -
50447 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
50448 -
50449 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
50450 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
50451 -    eval "LIBPATH$unique=set"
50452 -
50453 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
50454 -    LDFLAGS="$LDFLAGS -L$ai_p"
50455 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
50456
50457 +  am_i_shared=$PHP_SESSION_SHARED
50458 +  is_it_shared=$PHP_HASH_SHARED
50459 +  is_it_enabled=$PHP_HASH
50460 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
50461 +    { echo "configure: error:
50462 +You've configured extension session to build statically, but it
50463 +depends on extension hash, which you've configured to build shared.
50464 +You either need to build session shared or build hash statically for the
50465 +build to be successful.
50466 +" 1>&2; exit 1; }
50467    fi
50468 -
50469 -
50470 -
50471 -  fi
50472 -
50473 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
50474 +    { echo "configure: error:
50475 +You've configured extension session, which depends on extension hash,
50476 +but you've either not enabled hash, or have disabled it.
50477 +" 1>&2; exit 1; }
50478    fi
50479
50480
50481 -  case pspell in
50482 -  c|c_r|pthread*) ;;
50483 -  *)
50484 -      LIBS="-lpspell $LIBS"
50485 -   ;;
50486 -  esac
50487 -
50488 -
50489 -
50490 -
50491 +  am_i_shared=$PHP_SESSION_SHARED
50492 +  is_it_shared=$PHP_SPL_SHARED
50493 +  is_it_enabled=$PHP_SPL
50494 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
50495 +    { echo "configure: error:
50496 +You've configured extension session to build statically, but it
50497 +depends on extension spl, which you've configured to build shared.
50498 +You either need to build session shared or build spl statically for the
50499 +build to be successful.
50500 +" 1>&2; exit 1; }
50501    fi
50502 -
50503 -
50504 -
50505 -
50506 -  save_old_LDFLAGS=$LDFLAGS
50507 -  ac_stuff="
50508 -               -L$PSPELL_LIBDIR
50509 -       "
50510 -
50511 -  save_ext_shared=$ext_shared
50512 -  ext_shared=yes
50513 -
50514 -  for ac_i in $ac_stuff; do
50515 -    case $ac_i in
50516 -    -pthread)
50517 -      if test "$ext_shared" = "yes"; then
50518 -        LDFLAGS="$LDFLAGS -pthread"
50519 -      else
50520 -
50521 -
50522 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
50523 -
50524 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
50525 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
50526 -    eval "EXTRA_LDFLAGS$unique=set"
50527 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
50528 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
50529 +    { echo "configure: error:
50530 +You've configured extension session, which depends on extension spl,
50531 +but you've either not enabled spl, or have disabled it.
50532 +" 1>&2; exit 1; }
50533    fi
50534 -
50535 -      fi
50536 -    ;;
50537 -    -l*)
50538 -      ac_ii=`echo $ac_i|cut -c 3-`
50539 -
50540
50541 -  case $ac_ii in
50542 -  c|c_r|pthread*) ;;
50543 -  *)
50544 -    if test "$ext_shared" = "yes"; then
50545 -        LDFLAGS="$LDFLAGS -l$ac_ii"
50546 -    else
50547 -
50548
50549 -  case $ac_ii in
50550 -  c|c_r|pthread*) ;;
50551 -  *)
50552 -      LIBS="$LIBS -l$ac_ii"
50553 -   ;;
50554 -  esac
50555 -
50556 -
50557 -    fi
50558 -   ;;
50559 -  esac
50560 -
50561 -
50562 -    ;;
50563 -    -L*)
50564 -      ac_ii=`echo $ac_i|cut -c 3-`
50565 -
50566 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
50567 -
50568 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
50569 -    ai_p=$ac_ii
50570 -  else
50571 -
50572 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
50573 -
50574 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50575 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
50576 -  fi
50577 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD"
50578
50579 -
50580 -      if test "$ext_shared" = "yes"; then
50581 -        LDFLAGS="-L$ai_p $LDFLAGS"
50582 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
50583 -      else
50584 -
50585
50586
50587 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
50588 +    header_path=ext/session
50589 +    for header_file in php_session.h mod_files.h mod_user.h; do
50590 +      hp_hf="$header_path/$header_file"
50591 +
50592
50593 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
50594 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
50595 -    eval "LIBPATH$unique=set"
50596 -
50597 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
50598 -    LDFLAGS="$LDFLAGS -L$ai_p"
50599 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
50600 +  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
50601
50602 -  fi
50603 -
50604 -
50605 -      fi
50606 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
50607 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
50608 +    eval "INSTALLHEADERS$unique=set"
50609
50610 +        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
50611 +
50612    fi
50613
50614 -    ;;
50615 -    esac
50616 -  done
50617 -
50618 -  echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
50619 -echo "configure:78599: checking for new_aspell_config in -laspell" >&5
50620 -ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'`
50621 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
50622 -  echo $ac_n "(cached) $ac_c" 1>&6
50623 -else
50624 -  ac_save_LIBS="$LIBS"
50625 -LIBS="-laspell  $LIBS"
50626 -cat > conftest.$ac_ext <<EOF
50627 -#line 78607 "configure"
50628 -#include "confdefs.h"
50629 -/* Override any gcc2 internal prototype to avoid an error.  */
50630 -/* We use char because int might match the return type of a gcc2
50631 -    builtin and then its argument prototype would still apply.  */
50632 -char new_aspell_config();
50633 +    done
50634 +
50635
50636 -int main() {
50637 -new_aspell_config()
50638 -; return 0; }
50639 +  cat >> confdefs.h <<\EOF
50640 +#define HAVE_PHP_SESSION 1
50641  EOF
50642 -if { (eval echo configure:78618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
50643 -  rm -rf conftest*
50644 -  eval "ac_cv_lib_$ac_lib_var=yes"
50645 -else
50646 -  echo "configure: failed program was:" >&5
50647 -  cat conftest.$ac_ext >&5
50648 -  rm -rf conftest*
50649 -  eval "ac_cv_lib_$ac_lib_var=no"
50650 -fi
50651 -rm -f conftest*
50652 -LIBS="$ac_save_LIBS"
50653
50654  fi
50655 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
50656 -  echo "$ac_t""yes" 1>&6
50657 +
50658 +if test "$PHP_MM" != "no"; then
50659 +  for i in $PHP_MM /usr/local /usr; do
50660 +    test -f "$i/include/mm.h" && MM_DIR=$i && break
50661 +  done
50662 +
50663 +  if test -z "$MM_DIR" ; then
50664 +    { echo "configure: error: cannot find mm library" 1>&2; exit 1; }
50665 +  fi
50666 +
50667
50668 -    LDFLAGS=$save_old_LDFLAGS
50669 -    ext_shared=$save_ext_shared
50670 -
50671 -
50672
50673    if test "$ext_shared" = "yes"; then
50674 -    PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD"
50675 -    if test -n "$PSPELL_LIBDIR"; then
50676 +    SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD"
50677 +    if test -n "$MM_DIR/$PHP_LIBDIR"; then
50678
50679 -  if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
50680 +  if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
50681
50682 -  if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
50683 -    ai_p=$PSPELL_LIBDIR
50684 +  if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
50685 +    ai_p=$MM_DIR/$PHP_LIBDIR
50686    else
50687
50688 -    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
50689 +    ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
50690
50691      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50692 -    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
50693 +    ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
50694    fi
50695
50696
50697        if test "$ext_shared" = "yes"; then
50698 -        PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
50699 -        test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD"
50700 +        SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD"
50701 +        test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD"
50702        else
50703
50704
50705 @@ -78680,18 +84251,18 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
50706    else
50707
50708
50709 -  if test -n "$PSPELL_LIBDIR"; then
50710 +  if test -n "$MM_DIR/$PHP_LIBDIR"; then
50711
50712 -  if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
50713 +  if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
50714
50715 -  if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
50716 -    ai_p=$PSPELL_LIBDIR
50717 +  if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
50718 +    ai_p=$MM_DIR/$PHP_LIBDIR
50719    else
50720
50721 -    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
50722 +    ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
50723
50724      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50725 -    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
50726 +    ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
50727    fi
50728
50729
50730 @@ -78717,10 +84288,10 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
50731    fi
50732
50733
50734 -  case aspell in
50735 +  case mm in
50736    c|c_r|pthread*) ;;
50737    *)
50738 -      LIBS="-laspell $LIBS"
50739 +      LIBS="-lmm $LIBS"
50740     ;;
50741    esac
50742
50743 @@ -78730,30 +84301,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
50744    fi
50745
50746
50747 -
50748 -
50749 -else
50750 -  echo "$ac_t""no" 1>&6
50751 -
50752 -    LDFLAGS=$save_old_LDFLAGS
50753 -    ext_shared=$save_ext_shared
50754 -    unset ac_cv_lib_aspell_new_aspell_config
50755 -
50756
50757 -fi
50758 -
50759 -
50760 -
50761 -  if test "$PSPELL_INCDIR" != "/usr/include"; then
50762 +  if test "$MM_DIR/include" != "/usr/include"; then
50763
50764 -  if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then
50765 -    ai_p=$PSPELL_INCDIR
50766 +  if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then
50767 +    ai_p=$MM_DIR/include
50768    else
50769
50770 -    ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
50771 +    ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
50772
50773      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50774 -    ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`"
50775 +    ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`"
50776    fi
50777
50778
50779 @@ -78774,29 +84332,43 @@ fi
50780
50781    fi
50782
50783 -
50784 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD"
50785 +
50786 +
50787 +    for header_file in ext/session/mod_mm.h; do
50788 +
50789 +
50790 +  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
50791 +
50792 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
50793 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
50794 +    eval "INSTALLHEADERS$unique=set"
50795 +
50796 +        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
50797 +
50798 +  fi
50799
50800 -       cat >> confdefs.h <<\EOF
50801 -#define HAVE_PSPELL 1
50802 +    done
50803 +
50804 +
50805 +  cat >> confdefs.h <<\EOF
50806 +#define HAVE_LIBMM 1
50807  EOF
50808
50809  fi
50810
50811
50812 +php_enable_shmop=no
50813
50814 -php_with_libedit=no
50815 -
50816 -echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
50817 -echo "configure:78792: checking for libedit readline replacement" >&5
50818 -# Check whether --with-libedit or --without-libedit was given.
50819 -if test "${with_libedit+set}" = set; then
50820 -  withval="$with_libedit"
50821 -  PHP_LIBEDIT=$withval
50822 +echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
50823 +echo "configure:84364: checking whether to enable shmop support" >&5
50824 +# Check whether --enable-shmop or --disable-shmop was given.
50825 +if test "${enable_shmop+set}" = set; then
50826 +  enableval="$enable_shmop"
50827 +  PHP_SHMOP=$enableval
50828  else
50829
50830 -  PHP_LIBEDIT=no
50831 -  test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL
50832 +  PHP_SHMOP=no
50833 +  test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL
50834
50835  fi
50836
50837 @@ -78804,12 +84376,12 @@ fi
50838
50839  ext_output="yes, shared"
50840  ext_shared=yes
50841 -case $PHP_LIBEDIT in
50842 +case $PHP_SHMOP in
50843  shared,*)
50844 -  PHP_LIBEDIT=`echo "$PHP_LIBEDIT"|$SED 's/^shared,//'`
50845 +  PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'`
50846    ;;
50847  shared)
50848 -  PHP_LIBEDIT=yes
50849 +  PHP_SHMOP=yes
50850    ;;
50851  no)
50852    ext_output=no
50853 @@ -78828,243 +84400,416 @@ echo "$ac_t""$ext_output" 1>&6
50854
50855
50856
50857 -if test "$PHP_LIBEDIT" = "no"; then
50858 +if test "$PHP_SHMOP" != "no"; then
50859 +  cat >> confdefs.h <<\EOF
50860 +#define HAVE_SHMOP 1
50861 +EOF
50862 +
50863
50864 -php_with_readline=no
50865 +  ext_builddir=ext/shmop
50866 +  ext_srcdir=$abs_srcdir/ext/shmop
50867
50868 -echo $ac_n "checking for readline support""... $ac_c" 1>&6
50869 -echo "configure:78837: checking for readline support" >&5
50870 -# Check whether --with-readline or --without-readline was given.
50871 -if test "${with_readline+set}" = set; then
50872 -  withval="$with_readline"
50873 -  PHP_READLINE=$withval
50874 -else
50875 +  ac_extra=
50876 +
50877 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
50878 +    PHP_SHMOP_SHARED=no
50879 +
50880 +
50881 +  case ext/shmop in
50882 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50883 +  /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50884 +  *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50885 +  esac
50886 +
50887
50888 -  PHP_READLINE=no
50889 -  test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL
50890
50891 -fi
50892 +  b_c_pre=$php_c_pre
50893 +  b_cxx_pre=$php_cxx_pre
50894 +  b_c_meta=$php_c_meta
50895 +  b_cxx_meta=$php_cxx_meta
50896 +  b_c_post=$php_c_post
50897 +  b_cxx_post=$php_cxx_post
50898 +  b_lo=$php_lo
50899
50900
50901 +  old_IFS=$IFS
50902 +  for ac_src in shmop.c; do
50903 +
50904 +      IFS=.
50905 +      set $ac_src
50906 +      ac_obj=$1
50907 +      IFS=$old_IFS
50908 +
50909 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
50910 +
50911 +      case $ac_src in
50912 +        *.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" ;;
50913 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50914 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50915 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
50916 +      esac
50917
50918 -ext_output="yes, shared"
50919 -ext_shared=yes
50920 -case $PHP_READLINE in
50921 -shared,*)
50922 -  PHP_READLINE=`echo "$PHP_READLINE"|$SED 's/^shared,//'`
50923 -  ;;
50924 -shared)
50925 -  PHP_READLINE=yes
50926 -  ;;
50927 -no)
50928 -  ext_output=no
50929 -  ext_shared=no
50930 -  ;;
50931 -*)
50932 -  ext_output=yes
50933 -  ext_shared=no
50934 -  ;;
50935 -esac
50936 +    cat >>Makefile.objects<<EOF
50937 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
50938 +       $ac_comp
50939 +EOF
50940 +  done
50941
50942
50943 +    EXT_STATIC="$EXT_STATIC shmop"
50944 +    if test "$ext_shared" != "nocli"; then
50945 +      EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
50946 +    fi
50947 +  else
50948 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
50949 +      PHP_SHMOP_SHARED=yes
50950 +
50951 +  case ext/shmop in
50952 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50953 +  /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50954 +  *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50955 +  esac
50956 +
50957 +
50958
50959 -echo "$ac_t""$ext_output" 1>&6
50960 +  b_c_pre=$shared_c_pre
50961 +  b_cxx_pre=$shared_cxx_pre
50962 +  b_c_meta=$shared_c_meta
50963 +  b_cxx_meta=$shared_cxx_meta
50964 +  b_c_post=$shared_c_post
50965 +  b_cxx_post=$shared_cxx_post
50966 +  b_lo=$shared_lo
50967
50968
50969 +  old_IFS=$IFS
50970 +  for ac_src in shmop.c; do
50971 +
50972 +      IFS=.
50973 +      set $ac_src
50974 +      ac_obj=$1
50975 +      IFS=$old_IFS
50976 +
50977 +      shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo"
50978
50979 -else
50980 -    php_with_readline=no
50981 -fi
50982 +      case $ac_src in
50983 +        *.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" ;;
50984 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50985 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50986 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
50987 +      esac
50988
50989 -if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
50990 -  for i in $PHP_READLINE /usr/local /usr; do
50991 -    test -f $i/include/readline/readline.h && READLINE_DIR=$i && break
50992 +    cat >>Makefile.objects<<EOF
50993 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
50994 +       $ac_comp
50995 +EOF
50996    done
50997
50998 -  if test -z "$READLINE_DIR"; then
50999 -    { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; }
51000 -  fi
51001 +      case $host_alias in
51002 +        *netware*)
51003 +
51004 +  install_modules="install-modules"
51005 +
51006 +  case $host_alias in
51007 +    *aix*)
51008 +      suffix=so
51009 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpshmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpshmop.so '$ext_builddir'/phpshmop.so'
51010 +      ;;
51011 +    *netware*)
51012 +      suffix=nlm
51013 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)'
51014 +      ;;
51015 +    *)
51016 +      suffix=la
51017 +      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_shmop) $(PHPSHMOP_SHARED_LIBADD)'
51018 +      ;;
51019 +  esac
51020
51021 +  if test "x" = "xyes"; then
51022 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix"
51023 +  else
51024 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix"
51025 +  fi
51026
51027 -  if test "$READLINE_DIR/include" != "/usr/include"; then
51028 -
51029 -  if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then
51030 -    ai_p=$READLINE_DIR/include
51031 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
51032 +
51033 +  cat >>Makefile.objects<<EOF
51034 +\$(phplibdir)/phpshmop.$suffix: $ext_builddir/phpshmop.$suffix
51035 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpshmop.$suffix \$(phplibdir)
51036 +
51037 +$ext_builddir/phpshmop.$suffix: \$(shared_objects_shmop) \$(PHPSHMOP_SHARED_DEPENDENCIES)
51038 +       $link_cmd
51039 +
51040 +EOF
51041 +
51042 +          ;;
51043 +        *)
51044 +
51045 +  install_modules="install-modules"
51046 +
51047 +  case $host_alias in
51048 +    *aix*)
51049 +      suffix=so
51050 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/shmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(SHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/shmop.so '$ext_builddir'/shmop.so'
51051 +      ;;
51052 +    *netware*)
51053 +      suffix=nlm
51054 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SHMOP, 3)_SHARED_LIBADD)'
51055 +      ;;
51056 +    *)
51057 +      suffix=la
51058 +      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_shmop) $(SHMOP_SHARED_LIBADD)'
51059 +      ;;
51060 +  esac
51061 +
51062 +  if test "x" = "xyes"; then
51063 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/shmop.$suffix"
51064    else
51065 -
51066 -    ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
51067 -
51068 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
51069 -    ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`"
51070 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/shmop.$suffix"
51071    fi
51072 +
51073 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
51074
51075 -
51076 +  cat >>Makefile.objects<<EOF
51077 +\$(phplibdir)/shmop.$suffix: $ext_builddir/shmop.$suffix
51078 +       \$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir)
51079 +
51080 +$ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES)
51081 +       $link_cmd
51082 +
51083 +EOF
51084 +
51085 +          ;;
51086 +      esac
51087 +      cat >> confdefs.h <<EOF
51088 +#define COMPILE_DL_SHMOP 1
51089 +EOF
51090 +
51091 +    fi
51092 +  fi
51093 +
51094 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
51095 +    PHP_SHMOP_SHARED=no
51096 +    case "$PHP_SAPI" in
51097 +      cgi|embed)
51098 +
51099 +
51100 +  case ext/shmop in
51101 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
51102 +  /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
51103 +  *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
51104 +  esac
51105
51106 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
51107
51108 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
51109 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
51110 -    eval "INCLUDEPATH$unique=set"
51111 -
51112 -      if test ""; then
51113 -        INCLUDES="-I$ai_p $INCLUDES"
51114 -      else
51115 -        INCLUDES="$INCLUDES -I$ai_p"
51116 -      fi
51117 -
51118 -  fi
51119
51120 -  fi
51121 +  b_c_pre=$php_c_pre
51122 +  b_cxx_pre=$php_cxx_pre
51123 +  b_c_meta=$php_c_meta
51124 +  b_cxx_meta=$php_cxx_meta
51125 +  b_c_post=$php_c_post
51126 +  b_cxx_post=$php_cxx_post
51127 +  b_lo=$php_lo
51128
51129
51130 -  PHP_READLINE_LIBS=""
51131 -  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
51132 -echo "configure:78923: checking for tgetent in -lncurses" >&5
51133 -ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
51134 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
51135 -  echo $ac_n "(cached) $ac_c" 1>&6
51136 -else
51137 -  ac_save_LIBS="$LIBS"
51138 -LIBS="-lncurses  $LIBS"
51139 -cat > conftest.$ac_ext <<EOF
51140 -#line 78931 "configure"
51141 -#include "confdefs.h"
51142 -/* Override any gcc2 internal prototype to avoid an error.  */
51143 -/* We use char because int might match the return type of a gcc2
51144 -    builtin and then its argument prototype would still apply.  */
51145 -char tgetent();
51146 +  old_IFS=$IFS
51147 +  for ac_src in shmop.c; do
51148 +
51149 +      IFS=.
51150 +      set $ac_src
51151 +      ac_obj=$1
51152 +      IFS=$old_IFS
51153 +
51154 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
51155
51156 -int main() {
51157 -tgetent()
51158 -; return 0; }
51159 +      case $ac_src in
51160 +        *.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" ;;
51161 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51162 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51163 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
51164 +      esac
51165 +
51166 +    cat >>Makefile.objects<<EOF
51167 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
51168 +       $ac_comp
51169  EOF
51170 -if { (eval echo configure:78942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
51171 -  rm -rf conftest*
51172 -  eval "ac_cv_lib_$ac_lib_var=yes"
51173 -else
51174 -  echo "configure: failed program was:" >&5
51175 -  cat conftest.$ac_ext >&5
51176 -  rm -rf conftest*
51177 -  eval "ac_cv_lib_$ac_lib_var=no"
51178 -fi
51179 -rm -f conftest*
51180 -LIBS="$ac_save_LIBS"
51181 +  done
51182 +
51183 +
51184 +        EXT_STATIC="$EXT_STATIC shmop"
51185 +        ;;
51186 +      *)
51187 +
51188 +
51189 +  case ext/shmop in
51190 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
51191 +  /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
51192 +  *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
51193 +  esac
51194 +
51195 +
51196 +
51197 +  b_c_pre=$php_c_pre
51198 +  b_cxx_pre=$php_cxx_pre
51199 +  b_c_meta=$php_c_meta
51200 +  b_cxx_meta=$php_cxx_meta
51201 +  b_c_post=$php_c_post
51202 +  b_cxx_post=$php_cxx_post
51203 +  b_lo=$php_lo
51204 +
51205 +
51206 +  old_IFS=$IFS
51207 +  for ac_src in shmop.c; do
51208 +
51209 +      IFS=.
51210 +      set $ac_src
51211 +      ac_obj=$1
51212 +      IFS=$old_IFS
51213 +
51214 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
51215 +
51216 +      case $ac_src in
51217 +        *.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" ;;
51218 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51219 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51220 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
51221 +      esac
51222
51223 -fi
51224 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
51225 -  echo "$ac_t""yes" 1>&6
51226 +    cat >>Makefile.objects<<EOF
51227 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
51228 +       $ac_comp
51229 +EOF
51230 +  done
51231 +
51232 +
51233 +        ;;
51234 +    esac
51235 +    EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
51236 +  fi
51237
51238 -
51239
51240 -  case ncurses in
51241 -  c|c_r|pthread*) ;;
51242 -  *)
51243 -    if test "$ext_shared" = "yes"; then
51244 -        READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
51245 -    else
51246 -
51247 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
51248
51249 -  case ncurses in
51250 -  c|c_r|pthread*) ;;
51251 -  *)
51252 -      LIBS="-lncurses $LIBS"
51253 -   ;;
51254 -  esac
51255
51256
51257 -    fi
51258 -   ;;
51259 -  esac
51260 +  if test "$ext_builddir" = "."; then
51261 +    PHP_PECL_EXTENSION=shmop
51262 +
51263 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
51264
51265 +  fi
51266
51267 -    PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
51268 -
51269 -else
51270 -  echo "$ac_t""no" 1>&6
51271 +fi
51272
51273 -    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
51274 -echo "configure:78987: checking for tgetent in -ltermcap" >&5
51275 -ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
51276 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
51277 -  echo $ac_n "(cached) $ac_c" 1>&6
51278 -else
51279 -  ac_save_LIBS="$LIBS"
51280 -LIBS="-ltermcap  $LIBS"
51281 -cat > conftest.$ac_ext <<EOF
51282 -#line 78995 "configure"
51283 -#include "confdefs.h"
51284 -/* Override any gcc2 internal prototype to avoid an error.  */
51285 -/* We use char because int might match the return type of a gcc2
51286 -    builtin and then its argument prototype would still apply.  */
51287 -char tgetent();
51288
51289 -int main() {
51290 -tgetent()
51291 -; return 0; }
51292 -EOF
51293 -if { (eval echo configure:79006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
51294 -  rm -rf conftest*
51295 -  eval "ac_cv_lib_$ac_lib_var=yes"
51296 +
51297 +php_enable_simplexml=yes
51298 +
51299 +echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6
51300 +echo "configure:84708: checking whether to enable SimpleXML support" >&5
51301 +# Check whether --enable-simplexml or --disable-simplexml was given.
51302 +if test "${enable_simplexml+set}" = set; then
51303 +  enableval="$enable_simplexml"
51304 +  PHP_SIMPLEXML=$enableval
51305  else
51306 -  echo "configure: failed program was:" >&5
51307 -  cat conftest.$ac_ext >&5
51308 -  rm -rf conftest*
51309 -  eval "ac_cv_lib_$ac_lib_var=no"
51310 -fi
51311 -rm -f conftest*
51312 -LIBS="$ac_save_LIBS"
51313 +
51314 +  PHP_SIMPLEXML=yes
51315 +  test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL
51316
51317  fi
51318 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
51319 -  echo "$ac_t""yes" 1>&6
51320 +
51321 +
51322 +
51323 +ext_output="yes, shared"
51324 +ext_shared=yes
51325 +case $PHP_SIMPLEXML in
51326 +shared,*)
51327 +  PHP_SIMPLEXML=`echo "$PHP_SIMPLEXML"|$SED 's/^shared,//'`
51328 +  ;;
51329 +shared)
51330 +  PHP_SIMPLEXML=yes
51331 +  ;;
51332 +no)
51333 +  ext_output=no
51334 +  ext_shared=no
51335 +  ;;
51336 +*)
51337 +  ext_output=yes
51338 +  ext_shared=no
51339 +  ;;
51340 +esac
51341 +
51342 +
51343 +
51344 +echo "$ac_t""$ext_output" 1>&6
51345 +
51346 +
51347 +
51348 +
51349 +if test -z "$PHP_LIBXML_DIR"; then
51350
51351 -
51352 +php_with_libxml_dir=no
51353 +
51354 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
51355 +echo "configure:84753: checking libxml2 install dir" >&5
51356 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
51357 +if test "${with_libxml_dir+set}" = set; then
51358 +  withval="$with_libxml_dir"
51359 +  PHP_LIBXML_DIR=$withval
51360 +else
51361
51362 -  case termcap in
51363 -  c|c_r|pthread*) ;;
51364 -  *)
51365 -    if test "$ext_shared" = "yes"; then
51366 -        READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
51367 -    else
51368 -
51369 +  PHP_LIBXML_DIR=no
51370
51371 -  case termcap in
51372 -  c|c_r|pthread*) ;;
51373 -  *)
51374 -      LIBS="-ltermcap $LIBS"
51375 -   ;;
51376 -  esac
51377
51378 +fi
51379
51380 -    fi
51381 -   ;;
51382 -  esac
51383 +
51384 +ext_output=$PHP_LIBXML_DIR
51385 +echo "$ac_t""$ext_output" 1>&6
51386
51387
51388 -      PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap"
51389 -
51390 -else
51391 -  echo "$ac_t""no" 1>&6
51392 -fi
51393
51394 -
51395  fi
51396
51397 +if test "$PHP_SIMPLEXML" != "no"; then
51398 +
51399 +  if test "$PHP_LIBXML" = "no"; then
51400 +    { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
51401 +  fi
51402
51403
51404 -  save_old_LDFLAGS=$LDFLAGS
51405 -  ac_stuff="
51406 -    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
51407 -  "
51408 -
51409 -  save_ext_shared=$ext_shared
51410 -  ext_shared=yes
51411 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
51412 +echo "configure:84781: checking for xml2-config path" >&5
51413 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
51414 +  echo $ac_n "(cached) $ac_c" 1>&6
51415 +else
51416
51417 -  for ac_i in $ac_stuff; do
51418 +  for i in $PHP_LIBXML_DIR /usr/local /usr; do
51419 +    if test -x "$i/bin/xml2-config"; then
51420 +      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
51421 +      break
51422 +    fi
51423 +  done
51424 +
51425 +fi
51426 +
51427 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
51428 +
51429 +  if test -x "$ac_cv_php_xml2_config_path"; then
51430 +    XML2_CONFIG="$ac_cv_php_xml2_config_path"
51431 +    libxml_full_version=`$XML2_CONFIG --version`
51432 +    ac_IFS=$IFS
51433 +    IFS="."
51434 +    set $libxml_full_version
51435 +    IFS=$ac_IFS
51436 +    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
51437 +    if test "$LIBXML_VERSION" -ge "2006011"; then
51438 +      LIBXML_LIBS=`$XML2_CONFIG --libs`
51439 +      LIBXML_INCS=`$XML2_CONFIG --cflags`
51440 +
51441 +  for ac_i in $LIBXML_LIBS; do
51442      case $ac_i in
51443      -pthread)
51444        if test "$ext_shared" = "yes"; then
51445 -        LDFLAGS="$LDFLAGS -pthread"
51446 +        SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread"
51447        else
51448
51449
51450 @@ -79086,7 +84831,7 @@ fi
51451    c|c_r|pthread*) ;;
51452    *)
51453      if test "$ext_shared" = "yes"; then
51454 -        LDFLAGS="$LDFLAGS -l$ac_ii"
51455 +        SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii"
51456      else
51457
51458
51459 @@ -79121,8 +84866,8 @@ fi
51460
51461
51462        if test "$ext_shared" = "yes"; then
51463 -        LDFLAGS="-L$ai_p $LDFLAGS"
51464 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
51465 +        SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD"
51466 +        test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD"
51467        else
51468
51469
51470 @@ -79148,486 +84893,608 @@ fi
51471      esac
51472    done
51473
51474 -  echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
51475 -echo "configure:79153: checking for readline in -lreadline" >&5
51476 -ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
51477 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
51478 +
51479 +  for ac_i in $LIBXML_INCS; do
51480 +    case $ac_i in
51481 +    -I*)
51482 +      ac_ii=`echo $ac_i|cut -c 3-`
51483 +
51484 +  if test "$ac_ii" != "/usr/include"; then
51485 +
51486 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
51487 +    ai_p=$ac_ii
51488 +  else
51489 +
51490 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
51491 +
51492 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
51493 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
51494 +  fi
51495 +
51496 +
51497 +
51498 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
51499 +
51500 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
51501 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
51502 +    eval "INCLUDEPATH$unique=set"
51503 +
51504 +      if test ""; then
51505 +        INCLUDES="-I$ai_p $INCLUDES"
51506 +      else
51507 +        INCLUDES="$INCLUDES -I$ai_p"
51508 +      fi
51509 +
51510 +  fi
51511 +
51512 +  fi
51513 +
51514 +    ;;
51515 +    esac
51516 +  done
51517 +
51518 +
51519 +            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
51520 +echo "configure:84939: checking whether libxml build works" >&5
51521 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
51522    echo $ac_n "(cached) $ac_c" 1>&6
51523  else
51524 -  ac_save_LIBS="$LIBS"
51525 -LIBS="-lreadline  $LIBS"
51526 -cat > conftest.$ac_ext <<EOF
51527 -#line 79161 "configure"
51528 +
51529 +
51530 +  old_LIBS=$LIBS
51531 +  LIBS="
51532 +          $SIMPLEXML_SHARED_LIBADD
51533 +         $LIBS"
51534 +  if test "$cross_compiling" = yes; then
51535 +
51536 +    LIBS=$old_LIBS
51537 +
51538 +else
51539 +  cat > conftest.$ac_ext <<EOF
51540 +#line 84955 "configure"
51541  #include "confdefs.h"
51542 -/* Override any gcc2 internal prototype to avoid an error.  */
51543 -/* We use char because int might match the return type of a gcc2
51544 -    builtin and then its argument prototype would still apply.  */
51545 -char readline();
51546
51547 -int main() {
51548 -readline()
51549 -; return 0; }
51550 +
51551 +    char xmlInitParser();
51552 +    int main() {
51553 +      xmlInitParser();
51554 +      return 0;
51555 +    }
51556 +
51557  EOF
51558 -if { (eval echo configure:79172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
51559 -  rm -rf conftest*
51560 -  eval "ac_cv_lib_$ac_lib_var=yes"
51561 +if { (eval echo configure:84966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
51562 +then
51563 +
51564 +    LIBS=$old_LIBS
51565 +
51566 +          php_cv_libxml_build_works=yes
51567 +
51568 +
51569  else
51570    echo "configure: failed program was:" >&5
51571    cat conftest.$ac_ext >&5
51572 -  rm -rf conftest*
51573 -  eval "ac_cv_lib_$ac_lib_var=no"
51574 +  rm -fr conftest*
51575 +
51576 +    LIBS=$old_LIBS
51577 +
51578 +          echo "$ac_t""no" 1>&6
51579 +          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
51580 +
51581 +
51582 +fi
51583 +rm -fr conftest*
51584  fi
51585 -rm -f conftest*
51586 -LIBS="$ac_save_LIBS"
51587
51588 +
51589 +
51590  fi
51591 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
51592 -  echo "$ac_t""yes" 1>&6
51593 -
51594 -    LDFLAGS=$save_old_LDFLAGS
51595 -    ext_shared=$save_ext_shared
51596 -
51597 -
51598
51599 -  if test "$ext_shared" = "yes"; then
51600 -    READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD"
51601 -    if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
51602 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
51603 +      if test "$php_cv_libxml_build_works" = "yes"; then
51604 +        cat >> confdefs.h <<\EOF
51605 +#define HAVE_LIBXML 1
51606 +EOF
51607 +
51608 +      fi
51609
51610 -  if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
51611 -
51612 -  if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
51613 -    ai_p=$READLINE_DIR/$PHP_LIBDIR
51614 -  else
51615 -
51616 -    ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
51617 +    cat >> confdefs.h <<\EOF
51618 +#define HAVE_SIMPLEXML 1
51619 +EOF
51620 +
51621
51622 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
51623 -    ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
51624 -  fi
51625 +  ext_builddir=ext/simplexml
51626 +  ext_srcdir=$abs_srcdir/ext/simplexml
51627 +
51628 +  ac_extra=
51629
51630 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
51631 +    PHP_SIMPLEXML_SHARED=no
51632
51633 -      if test "$ext_shared" = "yes"; then
51634 -        READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
51635 -        test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD"
51636 -      else
51637 -
51638
51639 +  case ext/simplexml in
51640 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
51641 +  /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
51642 +  *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
51643 +  esac
51644
51645 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
51646
51647 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
51648 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
51649 -    eval "LIBPATH$unique=set"
51650 -
51651 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
51652 -    LDFLAGS="$LDFLAGS -L$ai_p"
51653 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
51654 +
51655 +  b_c_pre=$php_c_pre
51656 +  b_cxx_pre=$php_cxx_pre
51657 +  b_c_meta=$php_c_meta
51658 +  b_cxx_meta=$php_cxx_meta
51659 +  b_c_post=$php_c_post
51660 +  b_cxx_post=$php_cxx_post
51661 +  b_lo=$php_lo
51662 +
51663 +
51664 +  old_IFS=$IFS
51665 +  for ac_src in simplexml.c sxe.c; do
51666
51667 -  fi
51668 +      IFS=.
51669 +      set $ac_src
51670 +      ac_obj=$1
51671 +      IFS=$old_IFS
51672 +
51673 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
51674
51675 +      case $ac_src in
51676 +        *.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" ;;
51677 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51678 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51679 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
51680 +      esac
51681
51682 -      fi
51683 -
51684 -  fi
51685 +    cat >>Makefile.objects<<EOF
51686 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
51687 +       $ac_comp
51688 +EOF
51689 +  done
51690
51691 +
51692 +    EXT_STATIC="$EXT_STATIC simplexml"
51693 +    if test "$ext_shared" != "nocli"; then
51694 +      EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
51695      fi
51696    else
51697 -
51698 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
51699 +      PHP_SIMPLEXML_SHARED=yes
51700 +
51701 +  case ext/simplexml in
51702 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
51703 +  /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
51704 +  *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
51705 +  esac
51706 +
51707 +
51708 +
51709 +  b_c_pre=$shared_c_pre
51710 +  b_cxx_pre=$shared_cxx_pre
51711 +  b_c_meta=$shared_c_meta
51712 +  b_cxx_meta=$shared_cxx_meta
51713 +  b_c_post=$shared_c_post
51714 +  b_cxx_post=$shared_cxx_post
51715 +  b_lo=$shared_lo
51716 +
51717 +
51718 +  old_IFS=$IFS
51719 +  for ac_src in simplexml.c sxe.c; do
51720 +
51721 +      IFS=.
51722 +      set $ac_src
51723 +      ac_obj=$1
51724 +      IFS=$old_IFS
51725 +
51726 +      shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo"
51727 +
51728 +      case $ac_src in
51729 +        *.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" ;;
51730 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51731 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51732 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
51733 +      esac
51734 +
51735 +    cat >>Makefile.objects<<EOF
51736 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
51737 +       $ac_comp
51738 +EOF
51739 +  done
51740 +
51741 +      case $host_alias in
51742 +        *netware*)
51743 +
51744 +  install_modules="install-modules"
51745 +
51746 +  case $host_alias in
51747 +    *aix*)
51748 +      suffix=so
51749 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsimplexml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsimplexml.so '$ext_builddir'/phpsimplexml.so'
51750 +      ;;
51751 +    *netware*)
51752 +      suffix=nlm
51753 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSIMPLEXML, 3)_SHARED_LIBADD)'
51754 +      ;;
51755 +    *)
51756 +      suffix=la
51757 +      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_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD)'
51758 +      ;;
51759 +  esac
51760 +
51761 +  if test "x" = "xyes"; then
51762 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsimplexml.$suffix"
51763 +  else
51764 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix"
51765 +  fi
51766 +
51767 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
51768 +
51769 +  cat >>Makefile.objects<<EOF
51770 +\$(phplibdir)/phpsimplexml.$suffix: $ext_builddir/phpsimplexml.$suffix
51771 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsimplexml.$suffix \$(phplibdir)
51772 +
51773 +$ext_builddir/phpsimplexml.$suffix: \$(shared_objects_simplexml) \$(PHPSIMPLEXML_SHARED_DEPENDENCIES)
51774 +       $link_cmd
51775 +
51776 +EOF
51777 +
51778 +          ;;
51779 +        *)
51780 +
51781 +  install_modules="install-modules"
51782 +
51783 +  case $host_alias in
51784 +    *aix*)
51785 +      suffix=so
51786 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/simplexml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(SIMPLEXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/simplexml.so '$ext_builddir'/simplexml.so'
51787 +      ;;
51788 +    *netware*)
51789 +      suffix=nlm
51790 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SIMPLEXML, 3)_SHARED_LIBADD)'
51791 +      ;;
51792 +    *)
51793 +      suffix=la
51794 +      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_simplexml) $(SIMPLEXML_SHARED_LIBADD)'
51795 +      ;;
51796 +  esac
51797 +
51798 +  if test "x" = "xyes"; then
51799 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/simplexml.$suffix"
51800 +  else
51801 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/simplexml.$suffix"
51802 +  fi
51803 +
51804 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
51805 +
51806 +  cat >>Makefile.objects<<EOF
51807 +\$(phplibdir)/simplexml.$suffix: $ext_builddir/simplexml.$suffix
51808 +       \$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir)
51809 +
51810 +$ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES)
51811 +       $link_cmd
51812 +
51813 +EOF
51814 +
51815 +          ;;
51816 +      esac
51817 +      cat >> confdefs.h <<EOF
51818 +#define COMPILE_DL_SIMPLEXML 1
51819 +EOF
51820
51821 -  if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
51822 -
51823 -  if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
51824 -
51825 -  if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
51826 -    ai_p=$READLINE_DIR/$PHP_LIBDIR
51827 -  else
51828 -
51829 -    ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
51830 -
51831 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
51832 -    ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
51833 +    fi
51834    fi
51835
51836 -
51837 -
51838 -
51839 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
51840 +    PHP_SIMPLEXML_SHARED=no
51841 +    case "$PHP_SAPI" in
51842 +      cgi|embed)
51843 +
51844
51845 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
51846 +  case ext/simplexml in
51847 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
51848 +  /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
51849 +  *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
51850 +  esac
51851
51852 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
51853 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
51854 -    eval "LIBPATH$unique=set"
51855 -
51856 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
51857 -    LDFLAGS="$LDFLAGS -L$ai_p"
51858 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
51859
51860 -  fi
51861
51862 +  b_c_pre=$php_c_pre
51863 +  b_cxx_pre=$php_cxx_pre
51864 +  b_c_meta=$php_c_meta
51865 +  b_cxx_meta=$php_cxx_meta
51866 +  b_c_post=$php_c_post
51867 +  b_cxx_post=$php_cxx_post
51868 +  b_lo=$php_lo
51869
51870 -
51871 -  fi
51872
51873 -  fi
51874 -
51875 +  old_IFS=$IFS
51876 +  for ac_src in simplexml.c sxe.c; do
51877
51878 -  case readline in
51879 -  c|c_r|pthread*) ;;
51880 -  *)
51881 -      LIBS="-lreadline $LIBS"
51882 -   ;;
51883 -  esac
51884 -
51885 -
51886 +      IFS=.
51887 +      set $ac_src
51888 +      ac_obj=$1
51889 +      IFS=$old_IFS
51890 +
51891 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
51892
51893 +      case $ac_src in
51894 +        *.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" ;;
51895 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51896 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51897 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
51898 +      esac
51899
51900 -  fi
51901 +    cat >>Makefile.objects<<EOF
51902 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
51903 +       $ac_comp
51904 +EOF
51905 +  done
51906
51907
51908 +        EXT_STATIC="$EXT_STATIC simplexml"
51909 +        ;;
51910 +      *)
51911 +
51912
51913 -
51914 -else
51915 -  echo "$ac_t""no" 1>&6
51916 -
51917 -    LDFLAGS=$save_old_LDFLAGS
51918 -    ext_shared=$save_ext_shared
51919 -    unset ac_cv_lib_readline_readline
51920 -
51921 -    { echo "configure: error: readline library not found" 1>&2; exit 1; }
51922 +  case ext/simplexml in
51923 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
51924 +  /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
51925 +  *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
51926 +  esac
51927
51928
51929 -fi
51930
51931 +  b_c_pre=$php_c_pre
51932 +  b_cxx_pre=$php_cxx_pre
51933 +  b_c_meta=$php_c_meta
51934 +  b_cxx_meta=$php_cxx_meta
51935 +  b_c_post=$php_c_post
51936 +  b_cxx_post=$php_cxx_post
51937 +  b_lo=$php_lo
51938
51939 -
51940 -  save_old_LDFLAGS=$LDFLAGS
51941 -  ac_stuff="
51942 -    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
51943 -  "
51944 -
51945 -  save_ext_shared=$ext_shared
51946 -  ext_shared=yes
51947 -
51948 -  for ac_i in $ac_stuff; do
51949 -    case $ac_i in
51950 -    -pthread)
51951 -      if test "$ext_shared" = "yes"; then
51952 -        LDFLAGS="$LDFLAGS -pthread"
51953 -      else
51954 -
51955 -
51956 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
51957 -
51958 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
51959 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
51960 -    eval "EXTRA_LDFLAGS$unique=set"
51961 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
51962 -  fi
51963
51964 -      fi
51965 -    ;;
51966 -    -l*)
51967 -      ac_ii=`echo $ac_i|cut -c 3-`
51968 -
51969 +  old_IFS=$IFS
51970 +  for ac_src in simplexml.c sxe.c; do
51971
51972 -  case $ac_ii in
51973 -  c|c_r|pthread*) ;;
51974 -  *)
51975 -    if test "$ext_shared" = "yes"; then
51976 -        LDFLAGS="$LDFLAGS -l$ac_ii"
51977 -    else
51978 +      IFS=.
51979 +      set $ac_src
51980 +      ac_obj=$1
51981 +      IFS=$old_IFS
51982
51983 -
51984 -  case $ac_ii in
51985 -  c|c_r|pthread*) ;;
51986 -  *)
51987 -      LIBS="$LIBS -l$ac_ii"
51988 -   ;;
51989 -  esac
51990 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
51991
51992 +      case $ac_src in
51993 +        *.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" ;;
51994 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51995 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51996 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
51997 +      esac
51998
51999 -    fi
52000 -   ;;
52001 -  esac
52002 +    cat >>Makefile.objects<<EOF
52003 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
52004 +       $ac_comp
52005 +EOF
52006 +  done
52007
52008
52009 -    ;;
52010 -    -L*)
52011 -      ac_ii=`echo $ac_i|cut -c 3-`
52012 -
52013 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
52014 -
52015 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
52016 -    ai_p=$ac_ii
52017 -  else
52018 -
52019 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
52020 +        ;;
52021 +    esac
52022 +    EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
52023 +  fi
52024 +
52025 +
52026 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
52027 +
52028 +
52029 +
52030 +  if test "$ext_builddir" = "."; then
52031 +    PHP_PECL_EXTENSION=simplexml
52032
52033 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52034 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
52035 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
52036 +
52037    fi
52038
52039
52040 -      if test "$ext_shared" = "yes"; then
52041 -        LDFLAGS="-L$ai_p $LDFLAGS"
52042 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
52043 -      else
52044 -
52045 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SIMPLEXML_SHARED_LIBADD"
52046 +
52047
52048 +    else
52049 +      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
52050 +    fi
52051 +else
52052 +    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
52053
52054 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
52055 +  fi
52056 +
52057
52058 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
52059 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
52060 -    eval "LIBPATH$unique=set"
52061 -
52062 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
52063 -    LDFLAGS="$LDFLAGS -L$ai_p"
52064 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
52065 +  am_i_shared=$PHP_SIMPLEXML_SHARED
52066 +  is_it_shared=$PHP_LIBXML_SHARED
52067 +  is_it_enabled=$PHP_LIBXML
52068 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
52069 +    { echo "configure: error:
52070 +You've configured extension simplexml to build statically, but it
52071 +depends on extension libxml, which you've configured to build shared.
52072 +You either need to build simplexml shared or build libxml statically for the
52073 +build to be successful.
52074 +" 1>&2; exit 1; }
52075 +  fi
52076 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
52077 +    { echo "configure: error:
52078 +You've configured extension simplexml, which depends on extension libxml,
52079 +but you've either not enabled libxml, or have disabled it.
52080 +" 1>&2; exit 1; }
52081 +  fi
52082
52083 +
52084 +  am_i_shared=$PHP_SIMPLEXML_SHARED
52085 +  is_it_shared=$PHP_SPL_SHARED
52086 +  is_it_enabled=$PHP_SPL
52087 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
52088 +    { echo "configure: error:
52089 +You've configured extension simplexml to build statically, but it
52090 +depends on extension spl, which you've configured to build shared.
52091 +You either need to build simplexml shared or build spl statically for the
52092 +build to be successful.
52093 +" 1>&2; exit 1; }
52094 +  fi
52095 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
52096 +    { echo "configure: error:
52097 +You've configured extension simplexml, which depends on extension spl,
52098 +but you've either not enabled spl, or have disabled it.
52099 +" 1>&2; exit 1; }
52100    fi
52101 +
52102 +fi
52103
52104
52105 -      fi
52106 -
52107 -  fi
52108
52109 -    ;;
52110 -    esac
52111 -  done
52112 +php_with_snmp=no
52113
52114 -  echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6
52115 -echo "configure:79401: checking for rl_pending_input in -lreadline" >&5
52116 -ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'`
52117 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
52118 -  echo $ac_n "(cached) $ac_c" 1>&6
52119 +echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
52120 +echo "configure:85354: checking for SNMP support" >&5
52121 +# Check whether --with-snmp or --without-snmp was given.
52122 +if test "${with_snmp+set}" = set; then
52123 +  withval="$with_snmp"
52124 +  PHP_SNMP=$withval
52125  else
52126 -  ac_save_LIBS="$LIBS"
52127 -LIBS="-lreadline  $LIBS"
52128 -cat > conftest.$ac_ext <<EOF
52129 -#line 79409 "configure"
52130 -#include "confdefs.h"
52131 -/* Override any gcc2 internal prototype to avoid an error.  */
52132 -/* We use char because int might match the return type of a gcc2
52133 -    builtin and then its argument prototype would still apply.  */
52134 -char rl_pending_input();
52135 +
52136 +  PHP_SNMP=no
52137 +  test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL
52138
52139 -int main() {
52140 -rl_pending_input()
52141 -; return 0; }
52142 -EOF
52143 -if { (eval echo configure:79420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
52144 -  rm -rf conftest*
52145 -  eval "ac_cv_lib_$ac_lib_var=yes"
52146 -else
52147 -  echo "configure: failed program was:" >&5
52148 -  cat conftest.$ac_ext >&5
52149 -  rm -rf conftest*
52150 -  eval "ac_cv_lib_$ac_lib_var=no"
52151  fi
52152 -rm -f conftest*
52153 -LIBS="$ac_save_LIBS"
52154
52155 -fi
52156 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
52157 -  echo "$ac_t""yes" 1>&6
52158 -
52159 -    LDFLAGS=$save_old_LDFLAGS
52160 -    ext_shared=$save_ext_shared
52161 -
52162 -
52163 -else
52164 -  echo "$ac_t""no" 1>&6
52165
52166 -    LDFLAGS=$save_old_LDFLAGS
52167 -    ext_shared=$save_ext_shared
52168 -    unset ac_cv_lib_readline_rl_pending_input
52169 -
52170 -    { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; }
52171 -
52172 -
52173 -fi
52174
52175 +ext_output="yes, shared"
52176 +ext_shared=yes
52177 +case $PHP_SNMP in
52178 +shared,*)
52179 +  PHP_SNMP=`echo "$PHP_SNMP"|$SED 's/^shared,//'`
52180 +  ;;
52181 +shared)
52182 +  PHP_SNMP=yes
52183 +  ;;
52184 +no)
52185 +  ext_output=no
52186 +  ext_shared=no
52187 +  ;;
52188 +*)
52189 +  ext_output=yes
52190 +  ext_shared=no
52191 +  ;;
52192 +esac
52193
52194 -
52195 -  save_old_LDFLAGS=$LDFLAGS
52196 -  ac_stuff="
52197 -    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
52198 -  "
52199 -
52200 -  save_ext_shared=$ext_shared
52201 -  ext_shared=yes
52202 -
52203 -  for ac_i in $ac_stuff; do
52204 -    case $ac_i in
52205 -    -pthread)
52206 -      if test "$ext_shared" = "yes"; then
52207 -        LDFLAGS="$LDFLAGS -pthread"
52208 -      else
52209 -
52210 -
52211 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
52212 -
52213 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
52214 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
52215 -    eval "EXTRA_LDFLAGS$unique=set"
52216 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
52217 -  fi
52218
52219 -      fi
52220 -    ;;
52221 -    -l*)
52222 -      ac_ii=`echo $ac_i|cut -c 3-`
52223 -
52224 -
52225 -  case $ac_ii in
52226 -  c|c_r|pthread*) ;;
52227 -  *)
52228 -    if test "$ext_shared" = "yes"; then
52229 -        LDFLAGS="$LDFLAGS -l$ac_ii"
52230 -    else
52231 -
52232 -
52233 -  case $ac_ii in
52234 -  c|c_r|pthread*) ;;
52235 -  *)
52236 -      LIBS="$LIBS -l$ac_ii"
52237 -   ;;
52238 -  esac
52239
52240 +echo "$ac_t""$ext_output" 1>&6
52241
52242 -    fi
52243 -   ;;
52244 -  esac
52245
52246
52247 -    ;;
52248 -    -L*)
52249 -      ac_ii=`echo $ac_i|cut -c 3-`
52250 -
52251 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
52252 -
52253 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
52254 -    ai_p=$ac_ii
52255 -  else
52256 -
52257 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
52258 -
52259 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52260 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
52261 -  fi
52262
52263 -
52264 -      if test "$ext_shared" = "yes"; then
52265 -        LDFLAGS="-L$ai_p $LDFLAGS"
52266 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
52267 -      else
52268 -
52269 -
52270 -
52271 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
52272 +
52273 +php_with_openssl_dir=no
52274 +
52275 +echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
52276 +echo "configure:85398: checking OpenSSL dir for SNMP" >&5
52277 +# Check whether --with-openssl-dir or --without-openssl-dir was given.
52278 +if test "${with_openssl_dir+set}" = set; then
52279 +  withval="$with_openssl_dir"
52280 +  PHP_OPENSSL_DIR=$withval
52281 +else
52282
52283 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
52284 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
52285 -    eval "LIBPATH$unique=set"
52286 -
52287 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
52288 -    LDFLAGS="$LDFLAGS -L$ai_p"
52289 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
52290 +  PHP_OPENSSL_DIR=no
52291
52292 -  fi
52293
52294 +fi
52295
52296 -      fi
52297 -
52298 -  fi
52299
52300 -    ;;
52301 -    esac
52302 -  done
52303 +ext_output=$PHP_OPENSSL_DIR
52304 +echo "$ac_t""$ext_output" 1>&6
52305
52306 -  echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6
52307 -echo "configure:79551: checking for rl_callback_read_char in -lreadline" >&5
52308 -ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'`
52309 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
52310 -  echo $ac_n "(cached) $ac_c" 1>&6
52311 -else
52312 -  ac_save_LIBS="$LIBS"
52313 -LIBS="-lreadline  $LIBS"
52314 -cat > conftest.$ac_ext <<EOF
52315 -#line 79559 "configure"
52316 -#include "confdefs.h"
52317 -/* Override any gcc2 internal prototype to avoid an error.  */
52318 -/* We use char because int might match the return type of a gcc2
52319 -    builtin and then its argument prototype would still apply.  */
52320 -char rl_callback_read_char();
52321
52322 -int main() {
52323 -rl_callback_read_char()
52324 -; return 0; }
52325 -EOF
52326 -if { (eval echo configure:79570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
52327 -  rm -rf conftest*
52328 -  eval "ac_cv_lib_$ac_lib_var=yes"
52329 -else
52330 -  echo "configure: failed program was:" >&5
52331 -  cat conftest.$ac_ext >&5
52332 -  rm -rf conftest*
52333 -  eval "ac_cv_lib_$ac_lib_var=no"
52334 -fi
52335 -rm -f conftest*
52336 -LIBS="$ac_save_LIBS"
52337
52338 -fi
52339 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
52340 -  echo "$ac_t""yes" 1>&6
52341 -
52342 -    LDFLAGS=$save_old_LDFLAGS
52343 -    ext_shared=$save_ext_shared
52344 -
52345 -    cat >> confdefs.h <<\EOF
52346 -#define HAVE_RL_CALLBACK_READ_CHAR 1
52347 -EOF
52348
52349 +
52350 +php_enable_ucd_snmp_hack=no
52351 +
52352 +echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
52353 +echo "configure:85421: checking whether to enable UCD SNMP hack" >&5
52354 +# Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
52355 +if test "${enable_ucd_snmp_hack+set}" = set; then
52356 +  enableval="$enable_ucd_snmp_hack"
52357 +  PHP_UCD_SNMP_HACK=$enableval
52358 +else
52359
52360 +  PHP_UCD_SNMP_HACK=no
52361
52362 -else
52363 -  echo "$ac_t""no" 1>&6
52364
52365 -    LDFLAGS=$save_old_LDFLAGS
52366 -    ext_shared=$save_ext_shared
52367 -    unset ac_cv_lib_readline_rl_callback_read_char
52368 -
52369 -
52370  fi
52371
52372
52373 -  cat >> confdefs.h <<\EOF
52374 -#define HAVE_LIBREADLINE 1
52375 -EOF
52376 +ext_output=$PHP_UCD_SNMP_HACK
52377 +echo "$ac_t""$ext_output" 1>&6
52378
52379
52380 -elif test "$PHP_LIBEDIT" != "no"; then
52381
52382 -  for i in $PHP_LIBEDIT /usr/local /usr; do
52383 -    test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
52384 +
52385 +if test "$PHP_SNMP" != "no"; then
52386 +
52387 +        if test "$PHP_SNMP" = "yes"; then
52388 +    # Extract the first word of "net-snmp-config", so it can be a program name with args.
52389 +set dummy net-snmp-config; ac_word=$2
52390 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
52391 +echo "configure:85446: checking for $ac_word" >&5
52392 +if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then
52393 +  echo $ac_n "(cached) $ac_c" 1>&6
52394 +else
52395 +  case "$SNMP_CONFIG" in
52396 +  /*)
52397 +  ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
52398 +  ;;
52399 +  ?:/*)
52400 +  ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path.
52401 +  ;;
52402 +  *)
52403 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
52404 +  ac_dummy="/usr/local/bin:$PATH"
52405 +  for ac_dir in $ac_dummy; do
52406 +    test -z "$ac_dir" && ac_dir=.
52407 +    if test -f $ac_dir/$ac_word; then
52408 +      ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word"
52409 +      break
52410 +    fi
52411    done
52412 +  IFS="$ac_save_ifs"
52413 +  ;;
52414 +esac
52415 +fi
52416 +SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG"
52417 +if test -n "$SNMP_CONFIG"; then
52418 +  echo "$ac_t""$SNMP_CONFIG" 1>&6
52419 +else
52420 +  echo "$ac_t""no" 1>&6
52421 +fi
52422
52423 -  if test -z "$LIBEDIT_DIR"; then
52424 -    { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; }
52425 +  else
52426 +    SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config"
52427    fi
52428
52429 -
52430 -  if test "$LIBEDIT_DIR/include" != "/usr/include"; then
52431 +  if test -x "$SNMP_CONFIG"; then
52432 +    SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs`
52433 +    SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`"
52434 +    SNMP_PREFIX=`$SNMP_CONFIG --prefix`
52435 +
52436 +    if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
52437 +
52438 +  if test "${SNMP_PREFIX}/include" != "/usr/include"; then
52439
52440 -  if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then
52441 -    ai_p=$LIBEDIT_DIR/include
52442 +  if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then
52443 +    ai_p=${SNMP_PREFIX}/include
52444    else
52445
52446 -    ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
52447 +    ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`"
52448
52449      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52450 -    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`"
52451 +    ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`"
52452    fi
52453
52454
52455 @@ -79648,152 +85515,12 @@ elif test "$PHP_LIBEDIT" != "no"; then
52456
52457    fi
52458
52459 -
52460 -  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
52461 -echo "configure:79654: checking for tgetent in -lncurses" >&5
52462 -ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
52463 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
52464 -  echo $ac_n "(cached) $ac_c" 1>&6
52465 -else
52466 -  ac_save_LIBS="$LIBS"
52467 -LIBS="-lncurses  $LIBS"
52468 -cat > conftest.$ac_ext <<EOF
52469 -#line 79662 "configure"
52470 -#include "confdefs.h"
52471 -/* Override any gcc2 internal prototype to avoid an error.  */
52472 -/* We use char because int might match the return type of a gcc2
52473 -    builtin and then its argument prototype would still apply.  */
52474 -char tgetent();
52475 -
52476 -int main() {
52477 -tgetent()
52478 -; return 0; }
52479 -EOF
52480 -if { (eval echo configure:79673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
52481 -  rm -rf conftest*
52482 -  eval "ac_cv_lib_$ac_lib_var=yes"
52483 -else
52484 -  echo "configure: failed program was:" >&5
52485 -  cat conftest.$ac_ext >&5
52486 -  rm -rf conftest*
52487 -  eval "ac_cv_lib_$ac_lib_var=no"
52488 -fi
52489 -rm -f conftest*
52490 -LIBS="$ac_save_LIBS"
52491 -
52492 -fi
52493 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
52494 -  echo "$ac_t""yes" 1>&6
52495 -
52496 -
52497 -
52498 -  case ncurses in
52499 -  c|c_r|pthread*) ;;
52500 -  *)
52501 -    if test "$ext_shared" = "yes"; then
52502 -        READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
52503 -    else
52504 -
52505 -
52506 -  case ncurses in
52507 -  c|c_r|pthread*) ;;
52508 -  *)
52509 -      LIBS="-lncurses $LIBS"
52510 -   ;;
52511 -  esac
52512 -
52513 -
52514 -    fi
52515 -   ;;
52516 -  esac
52517 -
52518 -
52519 -
52520 -else
52521 -  echo "$ac_t""no" 1>&6
52522 -
52523 -    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
52524 -echo "configure:79717: checking for tgetent in -ltermcap" >&5
52525 -ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
52526 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
52527 -  echo $ac_n "(cached) $ac_c" 1>&6
52528 -else
52529 -  ac_save_LIBS="$LIBS"
52530 -LIBS="-ltermcap  $LIBS"
52531 -cat > conftest.$ac_ext <<EOF
52532 -#line 79725 "configure"
52533 -#include "confdefs.h"
52534 -/* Override any gcc2 internal prototype to avoid an error.  */
52535 -/* We use char because int might match the return type of a gcc2
52536 -    builtin and then its argument prototype would still apply.  */
52537 -char tgetent();
52538 -
52539 -int main() {
52540 -tgetent()
52541 -; return 0; }
52542 -EOF
52543 -if { (eval echo configure:79736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
52544 -  rm -rf conftest*
52545 -  eval "ac_cv_lib_$ac_lib_var=yes"
52546 -else
52547 -  echo "configure: failed program was:" >&5
52548 -  cat conftest.$ac_ext >&5
52549 -  rm -rf conftest*
52550 -  eval "ac_cv_lib_$ac_lib_var=no"
52551 -fi
52552 -rm -f conftest*
52553 -LIBS="$ac_save_LIBS"
52554 -
52555 -fi
52556 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
52557 -  echo "$ac_t""yes" 1>&6
52558 -
52559 -
52560 -
52561 -  case termcap in
52562 -  c|c_r|pthread*) ;;
52563 -  *)
52564 -    if test "$ext_shared" = "yes"; then
52565 -        READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
52566 -    else
52567
52568 -
52569 -  case termcap in
52570 -  c|c_r|pthread*) ;;
52571 -  *)
52572 -      LIBS="-ltermcap $LIBS"
52573 -   ;;
52574 -  esac
52575 -
52576 -
52577 -    fi
52578 -   ;;
52579 -  esac
52580 -
52581 -
52582 -
52583 -else
52584 -  echo "$ac_t""no" 1>&6
52585 -fi
52586 -
52587 -
52588 -fi
52589 -
52590 -
52591 -
52592 -  save_old_LDFLAGS=$LDFLAGS
52593 -  ac_stuff="
52594 -    -L$READLINE_DIR/$PHP_LIBDIR
52595 -  "
52596 -
52597 -  save_ext_shared=$ext_shared
52598 -  ext_shared=yes
52599 -
52600 -  for ac_i in $ac_stuff; do
52601 +  for ac_i in $SNMP_LIBS; do
52602      case $ac_i in
52603      -pthread)
52604        if test "$ext_shared" = "yes"; then
52605 -        LDFLAGS="$LDFLAGS -pthread"
52606 +        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread"
52607        else
52608
52609
52610 @@ -79815,7 +85542,7 @@ fi
52611    c|c_r|pthread*) ;;
52612    *)
52613      if test "$ext_shared" = "yes"; then
52614 -        LDFLAGS="$LDFLAGS -l$ac_ii"
52615 +        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
52616      else
52617
52618
52619 @@ -79850,8 +85577,8 @@ fi
52620
52621
52622        if test "$ext_shared" = "yes"; then
52623 -        LDFLAGS="-L$ai_p $LDFLAGS"
52624 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
52625 +        SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
52626 +        test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
52627        else
52628
52629
52630 @@ -79877,212 +85604,74 @@ fi
52631      esac
52632    done
52633
52634 -  echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
52635 -echo "configure:79882: checking for readline in -ledit" >&5
52636 -ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
52637 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
52638 -  echo $ac_n "(cached) $ac_c" 1>&6
52639 -else
52640 -  ac_save_LIBS="$LIBS"
52641 -LIBS="-ledit  $LIBS"
52642 -cat > conftest.$ac_ext <<EOF
52643 -#line 79890 "configure"
52644 -#include "confdefs.h"
52645 -/* Override any gcc2 internal prototype to avoid an error.  */
52646 -/* We use char because int might match the return type of a gcc2
52647 -    builtin and then its argument prototype would still apply.  */
52648 -char readline();
52649 -
52650 -int main() {
52651 -readline()
52652 -; return 0; }
52653 +      cat >> confdefs.h <<\EOF
52654 +#define HAVE_NET_SNMP 1
52655  EOF
52656 -if { (eval echo configure:79901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
52657 -  rm -rf conftest*
52658 -  eval "ac_cv_lib_$ac_lib_var=yes"
52659 -else
52660 -  echo "configure: failed program was:" >&5
52661 -  cat conftest.$ac_ext >&5
52662 -  rm -rf conftest*
52663 -  eval "ac_cv_lib_$ac_lib_var=no"
52664 -fi
52665 -rm -f conftest*
52666 -LIBS="$ac_save_LIBS"
52667 -
52668 -fi
52669 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
52670 -  echo "$ac_t""yes" 1>&6
52671 -
52672 -    LDFLAGS=$save_old_LDFLAGS
52673 -    ext_shared=$save_ext_shared
52674 -
52675 -
52676 -
52677 -  if test "$ext_shared" = "yes"; then
52678 -    READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD"
52679 -    if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then
52680 -
52681 -  if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
52682 -
52683 -  if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
52684 -    ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
52685 -  else
52686 -
52687 -    ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
52688 -
52689 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52690 -    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
52691 -  fi
52692 -
52693 -
52694 -      if test "$ext_shared" = "yes"; then
52695 -        READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
52696 -        test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD"
52697 -      else
52698 -
52699 -
52700 -
52701 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
52702 -
52703 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
52704 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
52705 -    eval "LIBPATH$unique=set"
52706 -
52707 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
52708 -    LDFLAGS="$LDFLAGS -L$ai_p"
52709 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
52710 -
52711 -  fi
52712 -
52713 -
52714 -      fi
52715 -
52716 -  fi
52717
52718 +      SNMP_LIBNAME=netsnmp
52719 +    else
52720 +      { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; }
52721      fi
52722 -  else
52723 -
52724 -
52725 -  if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then
52726 -
52727 -  if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
52728 -
52729 -  if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
52730 -    ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
52731 -  else
52732 -
52733 -    ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
52734 -
52735 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52736 -    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
52737 -  fi
52738 -
52739 -
52740 -
52741 -
52742 -
52743 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
52744 -
52745 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
52746 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
52747 -    eval "LIBPATH$unique=set"
52748 -
52749 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
52750 -    LDFLAGS="$LDFLAGS -L$ai_p"
52751 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
52752 -
52753 -  fi
52754 -
52755 -
52756 -
52757 -  fi
52758 -
52759 -  fi
52760 -
52761 -
52762 -  case edit in
52763 -  c|c_r|pthread*) ;;
52764 -  *)
52765 -      LIBS="-ledit $LIBS"
52766 -   ;;
52767 -  esac
52768 -
52769 -
52770 -
52771 -
52772 -  fi
52773 -
52774 -
52775 -
52776 -
52777 -else
52778 -  echo "$ac_t""no" 1>&6
52779 -
52780 -    LDFLAGS=$save_old_LDFLAGS
52781 -    ext_shared=$save_ext_shared
52782 -    unset ac_cv_lib_edit_readline
52783 -
52784 -    { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; }
52785 -
52786 -
52787 -fi
52788 -
52789 +  else
52790
52791 -  cat >> confdefs.h <<\EOF
52792 -#define HAVE_LIBEDIT 1
52793 -EOF
52794 +
52795 +    if test "$PHP_SNMP" = "yes"; then
52796 +      for i in /usr/include /usr/local/include; do
52797 +        test -f $i/snmp.h                       && SNMP_INCDIR=$i
52798 +        test -f $i/ucd-snmp/snmp.h              && SNMP_INCDIR=$i/ucd-snmp
52799 +        test -f $i/snmp/snmp.h                  && SNMP_INCDIR=$i/snmp
52800 +        test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
52801 +      done
52802 +      for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do
52803 +        test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i
52804 +      done
52805 +    else
52806 +      SNMP_INCDIR=$PHP_SNMP/include
52807 +      test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp
52808 +      SNMP_LIBDIR=$PHP_SNMP/lib
52809 +    fi
52810
52811 -fi
52812 +    if test -z "$SNMP_INCDIR"; then
52813 +      { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; }
52814 +    elif test -z "$SNMP_LIBDIR"; then
52815 +      { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; }
52816 +    fi
52817
52818 -if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
52819 -  for ac_func in rl_completion_matches
52820 +    old_CPPFLAGS=$CPPFLAGS
52821 +    CPPFLAGS=-I$SNMP_INCDIR
52822 +    for ac_hdr in default_store.h
52823  do
52824 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
52825 -echo "configure:80042: checking for $ac_func" >&5
52826 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
52827 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
52828 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
52829 +echo "configure:85647: checking for $ac_hdr" >&5
52830 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
52831    echo $ac_n "(cached) $ac_c" 1>&6
52832  else
52833    cat > conftest.$ac_ext <<EOF
52834 -#line 80047 "configure"
52835 +#line 85652 "configure"
52836  #include "confdefs.h"
52837 -/* System header to define __stub macros and hopefully few prototypes,
52838 -    which can conflict with char $ac_func(); below.  */
52839 -#include <assert.h>
52840 -/* Override any gcc2 internal prototype to avoid an error.  */
52841 -/* We use char because int might match the return type of a gcc2
52842 -    builtin and then its argument prototype would still apply.  */
52843 -char $ac_func();
52844 -
52845 -int main() {
52846 -
52847 -/* The GNU C library defines this for functions which it implements
52848 -    to always fail with ENOSYS.  Some functions are actually named
52849 -    something starting with __ and the normal name is an alias.  */
52850 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
52851 -choke me
52852 -#else
52853 -$ac_func();
52854 -#endif
52855 -
52856 -; return 0; }
52857 +#include <$ac_hdr>
52858  EOF
52859 -if { (eval echo configure:80070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
52860 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
52861 +{ (eval echo configure:85657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
52862 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
52863 +if test -z "$ac_err"; then
52864    rm -rf conftest*
52865 -  eval "ac_cv_func_$ac_func=yes"
52866 +  eval "ac_cv_header_$ac_safe=yes"
52867  else
52868 +  echo "$ac_err" >&5
52869    echo "configure: failed program was:" >&5
52870    cat conftest.$ac_ext >&5
52871    rm -rf conftest*
52872 -  eval "ac_cv_func_$ac_func=no"
52873 +  eval "ac_cv_header_$ac_safe=no"
52874  fi
52875  rm -f conftest*
52876  fi
52877 -
52878 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
52879 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
52880    echo "$ac_t""yes" 1>&6
52881 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
52882 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
52883    cat >> confdefs.h <<EOF
52884 -#define $ac_tr_func 1
52885 +#define $ac_tr_hdr 1
52886  EOF
52887
52888  else
52889 @@ -80090,379 +85679,510 @@ else
52890  fi
52891  done
52892
52893 -
52894 -  ext_builddir=ext/readline
52895 -  ext_srcdir=$abs_srcdir/ext/readline
52896 -
52897 -  ac_extra=
52898 +    if test "$ac_cv_header_default_store_h" = "yes"; then
52899 +      echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
52900 +echo "configure:85685: checking for OpenSSL support in SNMP libraries" >&5
52901 +      cat > conftest.$ac_ext <<EOF
52902 +#line 85687 "configure"
52903 +#include "confdefs.h"
52904
52905 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then
52906 -    PHP_READLINE_SHARED=no
52907 -
52908 -
52909 -  case ext/readline in
52910 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
52911 -  /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52912 -  *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52913 -  esac
52914 +#include <ucd-snmp-config.h>
52915 +#if USE_OPENSSL
52916 +        yes
52917 +#endif
52918 +
52919 +EOF
52920 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
52921 +  egrep "yes" >/dev/null 2>&1; then
52922 +  rm -rf conftest*
52923
52924 +        SNMP_SSL=yes
52925 +
52926 +else
52927 +  rm -rf conftest*
52928
52929 +        SNMP_SSL=no
52930 +
52931 +fi
52932 +rm -f conftest*
52933
52934 -  b_c_pre=$php_c_pre
52935 -  b_cxx_pre=$php_cxx_pre
52936 -  b_c_meta=$php_c_meta
52937 -  b_cxx_meta=$php_cxx_meta
52938 -  b_c_post=$php_c_post
52939 -  b_cxx_post=$php_cxx_post
52940 -  b_lo=$php_lo
52941 -
52942 -
52943 -  old_IFS=$IFS
52944 -  for ac_src in readline.c; do
52945 +    fi
52946 +    CPPFLAGS=$old_CPPFLAGS
52947 +    echo "$ac_t""$SNMP_SSL" 1>&6
52948
52949 -      IFS=.
52950 -      set $ac_src
52951 -      ac_obj=$1
52952 -      IFS=$old_IFS
52953 +    if test "$SNMP_SSL" = "yes"; then
52954 +      if test "$PHP_OPENSSL_DIR" != "no"; then
52955 +        PHP_OPENSSL=$PHP_OPENSSL_DIR
52956 +      fi
52957
52958 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
52959 +      if test "$PHP_OPENSSL" = "no"; then
52960 +        { echo "configure: error: The UCD-SNMP in this system is built with SSL support.
52961
52962 -      case $ac_src in
52963 -        *.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" ;;
52964 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
52965 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
52966 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
52967 -      esac
52968 +        Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; }
52969 +      else
52970 +
52971 +  found_openssl=no
52972 +  unset OPENSSL_INCDIR
52973 +  unset OPENSSL_LIBDIR
52974
52975 -    cat >>Makefile.objects<<EOF
52976 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
52977 -       $ac_comp
52978 -EOF
52979 +    test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
52980 +  test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
52981 +
52982 +    if test "$PHP_OPENSSL" != "no"; then
52983 +    PHP_OPENSSL_DIR=$PHP_OPENSSL
52984 +  elif test "$PHP_IMAP_SSL" != "no"; then
52985 +    PHP_OPENSSL_DIR=$PHP_IMAP_SSL
52986 +  fi
52987 +
52988 +    if test -z "$PKG_CONFIG"; then
52989 +    # Extract the first word of "pkg-config", so it can be a program name with args.
52990 +set dummy pkg-config; ac_word=$2
52991 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
52992 +echo "configure:85742: checking for $ac_word" >&5
52993 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
52994 +  echo $ac_n "(cached) $ac_c" 1>&6
52995 +else
52996 +  case "$PKG_CONFIG" in
52997 +  /*)
52998 +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
52999 +  ;;
53000 +  ?:/*)
53001 +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
53002 +  ;;
53003 +  *)
53004 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
53005 +  ac_dummy="$PATH"
53006 +  for ac_dir in $ac_dummy; do
53007 +    test -z "$ac_dir" && ac_dir=.
53008 +    if test -f $ac_dir/$ac_word; then
53009 +      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
53010 +      break
53011 +    fi
53012    done
53013 +  IFS="$ac_save_ifs"
53014 +  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
53015 +  ;;
53016 +esac
53017 +fi
53018 +PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
53019 +if test -n "$PKG_CONFIG"; then
53020 +  echo "$ac_t""$PKG_CONFIG" 1>&6
53021 +else
53022 +  echo "$ac_t""no" 1>&6
53023 +fi
53024
53025 +  fi
53026
53027 -    EXT_STATIC="$EXT_STATIC readline"
53028 -    if test "$ext_shared" != "nocli"; then
53029 -      EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
53030 +    if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
53031 +    if $PKG_CONFIG --atleast-version=0.9.6 openssl; then
53032 +      found_openssl=yes
53033 +      OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
53034 +      OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
53035 +      OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
53036 +    else
53037 +      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
53038      fi
53039 -  else
53040 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
53041 -      PHP_READLINE_SHARED=yes
53042 +
53043 +    if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
53044
53045 -  case ext/readline in
53046 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53047 -  /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53048 -  *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53049 -  esac
53050 +  for ac_i in $OPENSSL_LIBS; do
53051 +    case $ac_i in
53052 +    -pthread)
53053 +      if test "$ext_shared" = "yes"; then
53054 +        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread"
53055 +      else
53056 +
53057
53058 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
53059
53060 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
53061 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
53062 +    eval "EXTRA_LDFLAGS$unique=set"
53063 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
53064 +  fi
53065
53066 -  b_c_pre=$shared_c_pre
53067 -  b_cxx_pre=$shared_cxx_pre
53068 -  b_c_meta=$shared_c_meta
53069 -  b_cxx_meta=$shared_cxx_meta
53070 -  b_c_post=$shared_c_post
53071 -  b_cxx_post=$shared_cxx_post
53072 -  b_lo=$shared_lo
53073 -
53074 -
53075 -  old_IFS=$IFS
53076 -  for ac_src in readline.c; do
53077 +      fi
53078 +    ;;
53079 +    -l*)
53080 +      ac_ii=`echo $ac_i|cut -c 3-`
53081 +
53082
53083 -      IFS=.
53084 -      set $ac_src
53085 -      ac_obj=$1
53086 -      IFS=$old_IFS
53087 +  case $ac_ii in
53088 +  c|c_r|pthread*) ;;
53089 +  *)
53090 +    if test "$ext_shared" = "yes"; then
53091 +        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
53092 +    else
53093
53094 -      shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo"
53095 -
53096 -      case $ac_src in
53097 -        *.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" ;;
53098 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
53099 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
53100 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
53101 -      esac
53102 -
53103 -    cat >>Makefile.objects<<EOF
53104 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
53105 -       $ac_comp
53106 -EOF
53107 -  done
53108 +
53109 +  case $ac_ii in
53110 +  c|c_r|pthread*) ;;
53111 +  *)
53112 +      LIBS="$LIBS -l$ac_ii"
53113 +   ;;
53114 +  esac
53115
53116 -      case $host_alias in
53117 -        *netware*)
53118 -
53119 -  install_modules="install-modules"
53120
53121 -  case $host_alias in
53122 -    *aix*)
53123 -      suffix=so
53124 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreadline.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreadline.so '$ext_builddir'/phpreadline.so'
53125 -      ;;
53126 -    *netware*)
53127 -      suffix=nlm
53128 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)'
53129 -      ;;
53130 -    *)
53131 -      suffix=la
53132 -      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_readline) $(PHPREADLINE_SHARED_LIBADD)'
53133 -      ;;
53134 +    fi
53135 +   ;;
53136    esac
53137
53138 -  if test "x" = "xyes"; then
53139 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreadline.$suffix"
53140 +
53141 +    ;;
53142 +    -L*)
53143 +      ac_ii=`echo $ac_i|cut -c 3-`
53144 +
53145 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
53146 +
53147 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
53148 +    ai_p=$ac_ii
53149    else
53150 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix"
53151 +
53152 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
53153 +
53154 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53155 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
53156    fi
53157 -
53158 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
53159 -
53160 -  cat >>Makefile.objects<<EOF
53161 -\$(phplibdir)/phpreadline.$suffix: $ext_builddir/phpreadline.$suffix
53162 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpreadline.$suffix \$(phplibdir)
53163
53164 -$ext_builddir/phpreadline.$suffix: \$(shared_objects_readline) \$(PHPREADLINE_SHARED_DEPENDENCIES)
53165 -       $link_cmd
53166 +
53167 +      if test "$ext_shared" = "yes"; then
53168 +        SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
53169 +        test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
53170 +      else
53171 +
53172 +
53173 +
53174 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53175 +
53176 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
53177 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
53178 +    eval "LIBPATH$unique=set"
53179 +
53180 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
53181 +    LDFLAGS="$LDFLAGS -L$ai_p"
53182 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
53183 +
53184 +  fi
53185
53186 -EOF
53187
53188 -          ;;
53189 -        *)
53190 -
53191 -  install_modules="install-modules"
53192 +      fi
53193 +
53194 +  fi
53195
53196 -  case $host_alias in
53197 -    *aix*)
53198 -      suffix=so
53199 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/readline.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(READLINE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/readline.so '$ext_builddir'/readline.so'
53200 -      ;;
53201 -    *netware*)
53202 -      suffix=nlm
53203 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(READLINE, 3)_SHARED_LIBADD)'
53204 -      ;;
53205 -    *)
53206 -      suffix=la
53207 -      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_readline) $(READLINE_SHARED_LIBADD)'
53208 -      ;;
53209 -  esac
53210 +    ;;
53211 +    esac
53212 +  done
53213
53214 -  if test "x" = "xyes"; then
53215 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/readline.$suffix"
53216 +
53217 +  for ac_i in $OPENSSL_INCS; do
53218 +    case $ac_i in
53219 +    -I*)
53220 +      ac_ii=`echo $ac_i|cut -c 3-`
53221 +
53222 +  if test "$ac_ii" != "/usr/include"; then
53223 +
53224 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
53225 +    ai_p=$ac_ii
53226    else
53227 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/readline.$suffix"
53228 +
53229 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
53230 +
53231 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53232 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
53233    fi
53234 -
53235 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
53236 -
53237 -  cat >>Makefile.objects<<EOF
53238 -\$(phplibdir)/readline.$suffix: $ext_builddir/readline.$suffix
53239 -       \$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir)
53240
53241 -$ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES)
53242 -       $link_cmd
53243 +
53244 +
53245 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53246 +
53247 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
53248 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
53249 +    eval "INCLUDEPATH$unique=set"
53250 +
53251 +      if test ""; then
53252 +        INCLUDES="-I$ai_p $INCLUDES"
53253 +      else
53254 +        INCLUDES="$INCLUDES -I$ai_p"
53255 +      fi
53256 +
53257 +  fi
53258
53259 -EOF
53260 +  fi
53261
53262 -          ;;
53263 -      esac
53264 -      cat >> confdefs.h <<EOF
53265 -#define COMPILE_DL_READLINE 1
53266 -EOF
53267 +    ;;
53268 +    esac
53269 +  done
53270
53271      fi
53272    fi
53273
53274 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
53275 -    PHP_READLINE_SHARED=no
53276 -    case "$PHP_SAPI" in
53277 -      cgi|embed)
53278 -
53279 -
53280 -  case ext/readline in
53281 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53282 -  /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53283 -  *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53284 -  esac
53285 -
53286 +    if test "$found_openssl" = "no"; then
53287
53288 +    if test "$PHP_OPENSSL_DIR" = "yes"; then
53289 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
53290 +    fi
53291
53292 -  b_c_pre=$php_c_pre
53293 -  b_cxx_pre=$php_cxx_pre
53294 -  b_c_meta=$php_c_meta
53295 -  b_cxx_meta=$php_cxx_meta
53296 -  b_c_post=$php_c_post
53297 -  b_cxx_post=$php_cxx_post
53298 -  b_lo=$php_lo
53299 +    for i in $PHP_OPENSSL_DIR; do
53300 +      if test -r $i/include/openssl/evp.h; then
53301 +        OPENSSL_INCDIR=$i/include
53302 +      fi
53303 +      if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then
53304 +        OPENSSL_LIBDIR=$i/$PHP_LIBDIR
53305 +      fi
53306 +      test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
53307 +    done
53308
53309 +    if test -z "$OPENSSL_INCDIR"; then
53310 +      { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; }
53311 +    fi
53312
53313 -  old_IFS=$IFS
53314 -  for ac_src in readline.c; do
53315 -
53316 -      IFS=.
53317 -      set $ac_src
53318 -      ac_obj=$1
53319 -      IFS=$old_IFS
53320 -
53321 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
53322 +    if test -z "$OPENSSL_LIBDIR"; then
53323 +      { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; }
53324 +    fi
53325
53326 -      case $ac_src in
53327 -        *.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" ;;
53328 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
53329 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
53330 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
53331 -      esac
53332 +    old_CPPFLAGS=$CPPFLAGS
53333 +    CPPFLAGS=-I$OPENSSL_INCDIR
53334 +    echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
53335 +echo "configure:85947: checking for OpenSSL version" >&5
53336 +    cat > conftest.$ac_ext <<EOF
53337 +#line 85949 "configure"
53338 +#include "confdefs.h"
53339
53340 -    cat >>Makefile.objects<<EOF
53341 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
53342 -       $ac_comp
53343 +#include <openssl/opensslv.h>
53344 +#if OPENSSL_VERSION_NUMBER >= 0x0090600fL
53345 +  yes
53346 +#endif
53347 +
53348  EOF
53349 -  done
53350 -
53351 -
53352 -        EXT_STATIC="$EXT_STATIC readline"
53353 -        ;;
53354 -      *)
53355 -
53356 -
53357 -  case ext/readline in
53358 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53359 -  /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53360 -  *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53361 -  esac
53362 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
53363 +  egrep "yes" >/dev/null 2>&1; then
53364 +  rm -rf conftest*
53365
53366 +      echo "$ac_t"">= 0.9.6" 1>&6
53367 +
53368 +else
53369 +  rm -rf conftest*
53370
53371 +      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
53372 +
53373 +fi
53374 +rm -f conftest*
53375
53376 -  b_c_pre=$php_c_pre
53377 -  b_cxx_pre=$php_cxx_pre
53378 -  b_c_meta=$php_c_meta
53379 -  b_cxx_meta=$php_cxx_meta
53380 -  b_c_post=$php_c_post
53381 -  b_cxx_post=$php_cxx_post
53382 -  b_lo=$php_lo
53383 +    CPPFLAGS=$old_CPPFLAGS
53384
53385 +
53386 +  if test "$OPENSSL_INCDIR" != "/usr/include"; then
53387 +
53388 +  if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then
53389 +    ai_p=$OPENSSL_INCDIR
53390 +  else
53391 +
53392 +    ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
53393 +
53394 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53395 +    ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`"
53396 +  fi
53397
53398 -  old_IFS=$IFS
53399 -  for ac_src in readline.c; do
53400 +
53401
53402 -      IFS=.
53403 -      set $ac_src
53404 -      ac_obj=$1
53405 -      IFS=$old_IFS
53406 -
53407 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
53408 -
53409 -      case $ac_src in
53410 -        *.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" ;;
53411 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
53412 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
53413 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
53414 -      esac
53415 -
53416 -    cat >>Makefile.objects<<EOF
53417 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
53418 -       $ac_comp
53419 -EOF
53420 -  done
53421 -
53422 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53423 +
53424 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
53425 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
53426 +    eval "INCLUDEPATH$unique=set"
53427 +
53428 +      if test ""; then
53429 +        INCLUDES="-I$ai_p $INCLUDES"
53430 +      else
53431 +        INCLUDES="$INCLUDES -I$ai_p"
53432 +      fi
53433 +
53434 +  fi
53435
53436 -        ;;
53437 -    esac
53438 -    EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
53439    fi
53440 +
53441
53442 +
53443 +  save_old_LDFLAGS=$LDFLAGS
53444 +  ac_stuff="
53445 +      -L$OPENSSL_LIBDIR
53446 +    "
53447
53448 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
53449 +  save_ext_shared=$ext_shared
53450 +  ext_shared=yes
53451
53452 -
53453 -
53454 -  if test "$ext_builddir" = "."; then
53455 -    PHP_PECL_EXTENSION=readline
53456 -
53457 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
53458 -
53459 +  for ac_i in $ac_stuff; do
53460 +    case $ac_i in
53461 +    -pthread)
53462 +      if test "$ext_shared" = "yes"; then
53463 +        LDFLAGS="$LDFLAGS -pthread"
53464 +      else
53465 +
53466 +
53467 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
53468 +
53469 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
53470 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
53471 +    eval "EXTRA_LDFLAGS$unique=set"
53472 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
53473    fi
53474
53475 +      fi
53476 +    ;;
53477 +    -l*)
53478 +      ac_ii=`echo $ac_i|cut -c 3-`
53479 +
53480
53481 -  PHP_VAR_SUBST="$PHP_VAR_SUBST READLINE_SHARED_LIBADD"
53482 +  case $ac_ii in
53483 +  c|c_r|pthread*) ;;
53484 +  *)
53485 +    if test "$ext_shared" = "yes"; then
53486 +        LDFLAGS="$LDFLAGS -l$ac_ii"
53487 +    else
53488 +
53489 +
53490 +  case $ac_ii in
53491 +  c|c_r|pthread*) ;;
53492 +  *)
53493 +      LIBS="$LIBS -l$ac_ii"
53494 +   ;;
53495 +  esac
53496
53497 -fi
53498
53499 +    fi
53500 +   ;;
53501 +  esac
53502
53503
53504 -php_with_recode=no
53505 +    ;;
53506 +    -L*)
53507 +      ac_ii=`echo $ac_i|cut -c 3-`
53508 +
53509 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
53510 +
53511 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
53512 +    ai_p=$ac_ii
53513 +  else
53514 +
53515 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
53516 +
53517 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53518 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
53519 +  fi
53520
53521 -echo $ac_n "checking for recode support""... $ac_c" 1>&6
53522 -echo "configure:80396: checking for recode support" >&5
53523 -# Check whether --with-recode or --without-recode was given.
53524 -if test "${with_recode+set}" = set; then
53525 -  withval="$with_recode"
53526 -  PHP_RECODE=$withval
53527 -else
53528 +
53529 +      if test "$ext_shared" = "yes"; then
53530 +        LDFLAGS="-L$ai_p $LDFLAGS"
53531 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
53532 +      else
53533 +
53534
53535 -  PHP_RECODE=no
53536 -  test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL
53537 -
53538 -fi
53539 +
53540 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53541 +
53542 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
53543 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
53544 +    eval "LIBPATH$unique=set"
53545 +
53546 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
53547 +    LDFLAGS="$LDFLAGS -L$ai_p"
53548 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
53549 +
53550 +  fi
53551
53552
53553 +      fi
53554 +
53555 +  fi
53556
53557 -ext_output="yes, shared"
53558 -ext_shared=yes
53559 -case $PHP_RECODE in
53560 -shared,*)
53561 -  PHP_RECODE=`echo "$PHP_RECODE"|$SED 's/^shared,//'`
53562 -  ;;
53563 -shared)
53564 -  PHP_RECODE=yes
53565 -  ;;
53566 -no)
53567 -  ext_output=no
53568 -  ext_shared=no
53569 -  ;;
53570 -*)
53571 -  ext_output=yes
53572 -  ext_shared=no
53573 -  ;;
53574 -esac
53575 +    ;;
53576 +    esac
53577 +  done
53578
53579 +  echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
53580 +echo "configure:86104: checking for CRYPTO_free in -lcrypto" >&5
53581 +ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
53582 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
53583 +  echo $ac_n "(cached) $ac_c" 1>&6
53584 +else
53585 +  ac_save_LIBS="$LIBS"
53586 +LIBS="-lcrypto  $LIBS"
53587 +cat > conftest.$ac_ext <<EOF
53588 +#line 86112 "configure"
53589 +#include "confdefs.h"
53590 +/* Override any gcc2 internal prototype to avoid an error.  */
53591 +/* We use char because int might match the return type of a gcc2
53592 +    builtin and then its argument prototype would still apply.  */
53593 +char CRYPTO_free();
53594
53595 +int main() {
53596 +CRYPTO_free()
53597 +; return 0; }
53598 +EOF
53599 +if { (eval echo configure:86123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
53600 +  rm -rf conftest*
53601 +  eval "ac_cv_lib_$ac_lib_var=yes"
53602 +else
53603 +  echo "configure: failed program was:" >&5
53604 +  cat conftest.$ac_ext >&5
53605 +  rm -rf conftest*
53606 +  eval "ac_cv_lib_$ac_lib_var=no"
53607 +fi
53608 +rm -f conftest*
53609 +LIBS="$ac_save_LIBS"
53610
53611 -echo "$ac_t""$ext_output" 1>&6
53612 +fi
53613 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
53614 +  echo "$ac_t""yes" 1>&6
53615 +
53616 +    LDFLAGS=$save_old_LDFLAGS
53617 +    ext_shared=$save_ext_shared
53618 +
53619 +
53620 +
53621 +  case crypto in
53622 +  c|c_r|pthread*) ;;
53623 +  *)
53624 +    if test "$ext_shared" = "yes"; then
53625 +        SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD"
53626 +    else
53627 +
53628 +
53629 +  case crypto in
53630 +  c|c_r|pthread*) ;;
53631 +  *)
53632 +      LIBS="-lcrypto $LIBS"
53633 +   ;;
53634 +  esac
53635
53636
53637 +    fi
53638 +   ;;
53639 +  esac
53640
53641
53642 -if test "$PHP_RECODE" != "no"; then
53643 -  RECODE_LIST="$PHP_RECODE /usr/local /usr /opt"
53644 +
53645 +
53646 +else
53647 +  echo "$ac_t""no" 1>&6
53648
53649 -  for i in $RECODE_LIST; do
53650 -    if test -f $i/include/recode.h; then
53651 -      RECODE_DIR=$i
53652 -      RECODE_INC=include
53653 -      RECODE_LIB=$PHP_LIBDIR
53654 -    fi
53655 -    if test -f $i/include/recode/recode.h; then
53656 -      RECODE_DIR=$i
53657 -      RECODE_INC=include/recode
53658 -      RECODE_LIB=$PHP_LIBDIR/recode
53659 -    fi
53660 -    if test -f $i/recode/include/recode.h; then
53661 -      RECODE_DIR=$i/recode
53662 -      RECODE_INC=include
53663 -      RECODE_LIB=$PHP_LIBDIR
53664 -    fi
53665 -    test -n "$RECODE_DIR" && break
53666 -  done
53667 +    LDFLAGS=$save_old_LDFLAGS
53668 +    ext_shared=$save_ext_shared
53669 +    unset ac_cv_lib_crypto_CRYPTO_free
53670 +
53671 +      { echo "configure: error: libcrypto not found!" 1>&2; exit 1; }
53672 +
53673 +
53674 +fi
53675
53676 -  if test -z "$RECODE_DIR"; then
53677 -    { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; }
53678 -  fi
53679
53680 -
53681 +    old_LIBS=$LIBS
53682 +    LIBS="$LIBS -lcrypto"
53683 +
53684    save_old_LDFLAGS=$LDFLAGS
53685    ac_stuff="
53686 -    -L$RECODE_DIR/$RECODE_LIB
53687 -  "
53688 +      -L$OPENSSL_LIBDIR
53689 +    "
53690
53691    save_ext_shared=$ext_shared
53692    ext_shared=yes
53693 @@ -80555,27 +86275,27 @@ if test "$PHP_RECODE" != "no"; then
53694      esac
53695    done
53696
53697 -  echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
53698 -echo "configure:80560: checking for recode_format_table in -lrecode" >&5
53699 -ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'`
53700 +  echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
53701 +echo "configure:86280: checking for SSL_CTX_set_ssl_version in -lssl" >&5
53702 +ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
53703  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
53704    echo $ac_n "(cached) $ac_c" 1>&6
53705  else
53706    ac_save_LIBS="$LIBS"
53707 -LIBS="-lrecode  $LIBS"
53708 +LIBS="-lssl  $LIBS"
53709  cat > conftest.$ac_ext <<EOF
53710 -#line 80568 "configure"
53711 +#line 86288 "configure"
53712  #include "confdefs.h"
53713  /* Override any gcc2 internal prototype to avoid an error.  */
53714  /* We use char because int might match the return type of a gcc2
53715      builtin and then its argument prototype would still apply.  */
53716 -char recode_format_table();
53717 +char SSL_CTX_set_ssl_version();
53718
53719  int main() {
53720 -recode_format_table()
53721 +SSL_CTX_set_ssl_version()
53722  ; return 0; }
53723  EOF
53724 -if { (eval echo configure:80579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
53725 +if { (eval echo configure:86299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
53726    rm -rf conftest*
53727    eval "ac_cv_lib_$ac_lib_var=yes"
53728  else
53729 @@ -80594,28 +86314,214 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
53730      LDFLAGS=$save_old_LDFLAGS
53731      ext_shared=$save_ext_shared
53732
53733 +      found_openssl=yes
53734 +
53735 +
53736 +else
53737 +  echo "$ac_t""no" 1>&6
53738 +
53739 +    LDFLAGS=$save_old_LDFLAGS
53740 +    ext_shared=$save_ext_shared
53741 +    unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
53742 +
53743 +      { echo "configure: error: libssl not found!" 1>&2; exit 1; }
53744 +
53745 +
53746 +fi
53747 +
53748 +    LIBS=$old_LIBS
53749 +
53750 +
53751 +  case ssl in
53752 +  c|c_r|pthread*) ;;
53753 +  *)
53754 +    if test "$ext_shared" = "yes"; then
53755 +        SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD"
53756 +    else
53757 +
53758 +
53759 +  case ssl in
53760 +  c|c_r|pthread*) ;;
53761 +  *)
53762 +      LIBS="-lssl $LIBS"
53763 +   ;;
53764 +  esac
53765 +
53766 +
53767 +    fi
53768 +   ;;
53769 +  esac
53770 +
53771 +
53772 +
53773 +
53774 +  if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then
53775 +
53776 +  if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then
53777 +    ai_p=$OPENSSL_LIBDIR
53778 +  else
53779 +
53780 +    ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
53781 +
53782 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53783 +    ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
53784 +  fi
53785 +
53786 +
53787 +      if test "$ext_shared" = "yes"; then
53788 +        SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
53789 +        test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
53790 +      else
53791 +
53792 +
53793 +
53794 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53795 +
53796 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
53797 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
53798 +    eval "LIBPATH$unique=set"
53799 +
53800 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
53801 +    LDFLAGS="$LDFLAGS -L$ai_p"
53802 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
53803 +
53804 +  fi
53805 +
53806 +
53807 +      fi
53808 +
53809 +  fi
53810 +
53811 +  fi
53812 +
53813 +  if test "$found_openssl" = "yes"; then
53814 +    OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
53815 +
53816 +
53817 +:
53818 +else
53819 +          { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; }
53820 +
53821 +  fi
53822 +
53823 +      fi
53824 +    fi
53825 +
53826 +    echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
53827 +echo "configure:86412: checking for kstat_read in -lkstat" >&5
53828 +ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
53829 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
53830 +  echo $ac_n "(cached) $ac_c" 1>&6
53831 +else
53832 +  ac_save_LIBS="$LIBS"
53833 +LIBS="-lkstat  $LIBS"
53834 +cat > conftest.$ac_ext <<EOF
53835 +#line 86420 "configure"
53836 +#include "confdefs.h"
53837 +/* Override any gcc2 internal prototype to avoid an error.  */
53838 +/* We use char because int might match the return type of a gcc2
53839 +    builtin and then its argument prototype would still apply.  */
53840 +char kstat_read();
53841 +
53842 +int main() {
53843 +kstat_read()
53844 +; return 0; }
53845 +EOF
53846 +if { (eval echo configure:86431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
53847 +  rm -rf conftest*
53848 +  eval "ac_cv_lib_$ac_lib_var=yes"
53849 +else
53850 +  echo "configure: failed program was:" >&5
53851 +  cat conftest.$ac_ext >&5
53852 +  rm -rf conftest*
53853 +  eval "ac_cv_lib_$ac_lib_var=no"
53854 +fi
53855 +rm -f conftest*
53856 +LIBS="$ac_save_LIBS"
53857 +
53858 +fi
53859 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
53860 +  echo "$ac_t""yes" 1>&6
53861 +
53862 +
53863 +  case kstat in
53864 +  c|c_r|pthread*) ;;
53865 +  *)
53866 +    if test "$ext_shared" = "yes"; then
53867 +        SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD"
53868 +    else
53869 +
53870 +
53871 +  case kstat in
53872 +  c|c_r|pthread*) ;;
53873 +  *)
53874 +      LIBS="-lkstat $LIBS"
53875 +   ;;
53876 +  esac
53877 +
53878 +
53879 +    fi
53880 +   ;;
53881 +  esac
53882 +
53883 +
53884 +else
53885 +  echo "$ac_t""no" 1>&6
53886 +fi
53887 +
53888 +
53889 +  if test "$SNMP_INCDIR" != "/usr/include"; then
53890 +
53891 +  if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then
53892 +    ai_p=$SNMP_INCDIR
53893 +  else
53894 +
53895 +    ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
53896 +
53897 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53898 +    ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`"
53899 +  fi
53900 +
53901 +
53902 +
53903 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53904 +
53905 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
53906 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
53907 +    eval "INCLUDEPATH$unique=set"
53908 +
53909 +      if test ""; then
53910 +        INCLUDES="-I$ai_p $INCLUDES"
53911 +      else
53912 +        INCLUDES="$INCLUDES -I$ai_p"
53913 +      fi
53914 +
53915 +  fi
53916 +
53917 +  fi
53918 +
53919
53920
53921    if test "$ext_shared" = "yes"; then
53922 -    RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
53923 -    if test -n "$RECODE_DIR/$RECODE_LIB"; then
53924 +    SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD"
53925 +    if test -n "$SNMP_LIBDIR"; then
53926
53927 -  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
53928 +  if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
53929
53930 -  if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
53931 -    ai_p=$RECODE_DIR/$RECODE_LIB
53932 +  if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
53933 +    ai_p=$SNMP_LIBDIR
53934    else
53935
53936 -    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
53937 +    ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
53938
53939      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53940 -    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
53941 +    ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`"
53942    fi
53943
53944
53945        if test "$ext_shared" = "yes"; then
53946 -        RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
53947 -        test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD"
53948 +        SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
53949 +        test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
53950        else
53951
53952
53953 @@ -80641,18 +86547,18 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
53954    else
53955
53956
53957 -  if test -n "$RECODE_DIR/$RECODE_LIB"; then
53958 +  if test -n "$SNMP_LIBDIR"; then
53959
53960 -  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
53961 +  if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
53962
53963 -  if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
53964 -    ai_p=$RECODE_DIR/$RECODE_LIB
53965 +  if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
53966 +    ai_p=$SNMP_LIBDIR
53967    else
53968
53969 -    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
53970 +    ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
53971
53972      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53973 -    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
53974 +    ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`"
53975    fi
53976
53977
53978 @@ -80678,10 +86584,10 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
53979    fi
53980
53981
53982 -  case recode in
53983 +  case snmp in
53984    c|c_r|pthread*) ;;
53985    *)
53986 -      LIBS="-lrecode $LIBS"
53987 +      LIBS="-lsnmp $LIBS"
53988     ;;
53989    esac
53990
53991 @@ -80691,56 +86597,81 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
53992    fi
53993
53994
53995 -
53996 -
53997 -else
53998 -  echo "$ac_t""no" 1>&6
53999 -
54000 -    LDFLAGS=$save_old_LDFLAGS
54001 -    ext_shared=$save_ext_shared
54002 -    unset ac_cv_lib_recode_recode_format_table
54003 -
54004 -    old_LDFLAGS=$LDFLAGS
54005 -    old_LIBS=$LIBS
54006 -    LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
54007 -    LIBS="$LIBS -lrecode"
54008 -    cat > conftest.$ac_ext <<EOF
54009 -#line 80709 "configure"
54010 -#include "confdefs.h"
54011 +    SNMP_LIBNAME=snmp
54012 +  fi
54013
54014 -char *program_name;
54015
54016 -int main() {
54017 +  save_old_LDFLAGS=$LDFLAGS
54018 +  ac_stuff="
54019 +    $SNMP_SHARED_LIBADD
54020 +  "
54021 +
54022 +  save_ext_shared=$ext_shared
54023 +  ext_shared=yes
54024 +
54025 +  for ac_i in $ac_stuff; do
54026 +    case $ac_i in
54027 +    -pthread)
54028 +      if test "$ext_shared" = "yes"; then
54029 +        LDFLAGS="$LDFLAGS -pthread"
54030 +      else
54031 +
54032 +
54033 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
54034 +
54035 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
54036 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
54037 +    eval "EXTRA_LDFLAGS$unique=set"
54038 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
54039 +  fi
54040
54041 -recode_format_table();
54042 -
54043 -; return 0; }
54044 -EOF
54045 -if { (eval echo configure:80720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
54046 -  rm -rf conftest*
54047 +      fi
54048 +    ;;
54049 +    -l*)
54050 +      ac_ii=`echo $ac_i|cut -c 3-`
54051 +
54052
54053 +  case $ac_ii in
54054 +  c|c_r|pthread*) ;;
54055 +  *)
54056 +    if test "$ext_shared" = "yes"; then
54057 +        LDFLAGS="$LDFLAGS -l$ac_ii"
54058 +    else
54059
54060 +
54061 +  case $ac_ii in
54062 +  c|c_r|pthread*) ;;
54063 +  *)
54064 +      LIBS="$LIBS -l$ac_ii"
54065 +   ;;
54066 +  esac
54067
54068 -  if test "$ext_shared" = "yes"; then
54069 -    RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
54070 -    if test -n "$RECODE_DIR/$RECODE_LIB"; then
54071 +
54072 +    fi
54073 +   ;;
54074 +  esac
54075 +
54076 +
54077 +    ;;
54078 +    -L*)
54079 +      ac_ii=`echo $ac_i|cut -c 3-`
54080
54081 -  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
54082 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
54083
54084 -  if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
54085 -    ai_p=$RECODE_DIR/$RECODE_LIB
54086 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
54087 +    ai_p=$ac_ii
54088    else
54089
54090 -    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
54091 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
54092
54093      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54094 -    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
54095 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
54096    fi
54097
54098
54099        if test "$ext_shared" = "yes"; then
54100 -        RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
54101 -        test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD"
54102 +        LDFLAGS="-L$ai_p $LDFLAGS"
54103 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
54104        else
54105
54106
54107 @@ -80762,26 +86693,140 @@ if { (eval echo configure:80720: \"$ac_l
54108
54109    fi
54110
54111 -    fi
54112 -  else
54113 +    ;;
54114 +    esac
54115 +  done
54116 +
54117 +  echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
54118 +echo "configure:86702: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
54119 +ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'`
54120 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
54121 +  echo $ac_n "(cached) $ac_c" 1>&6
54122 +else
54123 +  ac_save_LIBS="$LIBS"
54124 +LIBS="-l$SNMP_LIBNAME  $LIBS"
54125 +cat > conftest.$ac_ext <<EOF
54126 +#line 86710 "configure"
54127 +#include "confdefs.h"
54128 +/* Override any gcc2 internal prototype to avoid an error.  */
54129 +/* We use char because int might match the return type of a gcc2
54130 +    builtin and then its argument prototype would still apply.  */
54131 +char snmp_parse_oid();
54132 +
54133 +int main() {
54134 +snmp_parse_oid()
54135 +; return 0; }
54136 +EOF
54137 +if { (eval echo configure:86721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
54138 +  rm -rf conftest*
54139 +  eval "ac_cv_lib_$ac_lib_var=yes"
54140 +else
54141 +  echo "configure: failed program was:" >&5
54142 +  cat conftest.$ac_ext >&5
54143 +  rm -rf conftest*
54144 +  eval "ac_cv_lib_$ac_lib_var=no"
54145 +fi
54146 +rm -f conftest*
54147 +LIBS="$ac_save_LIBS"
54148 +
54149 +fi
54150 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
54151 +  echo "$ac_t""yes" 1>&6
54152 +
54153 +    LDFLAGS=$save_old_LDFLAGS
54154 +    ext_shared=$save_ext_shared
54155
54156 +    cat >> confdefs.h <<\EOF
54157 +#define HAVE_SNMP_PARSE_OID 1
54158 +EOF
54159
54160 -  if test -n "$RECODE_DIR/$RECODE_LIB"; then
54161 +
54162 +
54163 +else
54164 +  echo "$ac_t""no" 1>&6
54165 +
54166 +    LDFLAGS=$save_old_LDFLAGS
54167 +    ext_shared=$save_ext_shared
54168 +    unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid
54169
54170 -  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
54171 +
54172 +fi
54173 +
54174 +
54175 +
54176 +  save_old_LDFLAGS=$LDFLAGS
54177 +  ac_stuff="
54178 +    $SNMP_SHARED_LIBADD
54179 +  "
54180 +
54181 +  save_ext_shared=$ext_shared
54182 +  ext_shared=yes
54183 +
54184 +  for ac_i in $ac_stuff; do
54185 +    case $ac_i in
54186 +    -pthread)
54187 +      if test "$ext_shared" = "yes"; then
54188 +        LDFLAGS="$LDFLAGS -pthread"
54189 +      else
54190 +
54191 +
54192 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
54193 +
54194 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
54195 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
54196 +    eval "EXTRA_LDFLAGS$unique=set"
54197 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
54198 +  fi
54199 +
54200 +      fi
54201 +    ;;
54202 +    -l*)
54203 +      ac_ii=`echo $ac_i|cut -c 3-`
54204 +
54205 +
54206 +  case $ac_ii in
54207 +  c|c_r|pthread*) ;;
54208 +  *)
54209 +    if test "$ext_shared" = "yes"; then
54210 +        LDFLAGS="$LDFLAGS -l$ac_ii"
54211 +    else
54212 +
54213 +
54214 +  case $ac_ii in
54215 +  c|c_r|pthread*) ;;
54216 +  *)
54217 +      LIBS="$LIBS -l$ac_ii"
54218 +   ;;
54219 +  esac
54220 +
54221 +
54222 +    fi
54223 +   ;;
54224 +  esac
54225 +
54226 +
54227 +    ;;
54228 +    -L*)
54229 +      ac_ii=`echo $ac_i|cut -c 3-`
54230 +
54231 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
54232
54233 -  if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
54234 -    ai_p=$RECODE_DIR/$RECODE_LIB
54235 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
54236 +    ai_p=$ac_ii
54237    else
54238
54239 -    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
54240 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
54241
54242      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54243 -    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
54244 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
54245    fi
54246
54247
54248 -
54249 +      if test "$ext_shared" = "yes"; then
54250 +        LDFLAGS="-L$ai_p $LDFLAGS"
54251 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
54252 +      else
54253 +
54254
54255
54256    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
54257 @@ -80797,138 +86842,93 @@ if { (eval echo configure:80720: \"$ac_l
54258    fi
54259
54260
54261 +      fi
54262
54263    fi
54264
54265 -  fi
54266 -
54267 -
54268 -  case recode in
54269 -  c|c_r|pthread*) ;;
54270 -  *)
54271 -      DLIBS="-lrecode $DLIBS"
54272 -   ;;
54273 -  esac
54274 -
54275 -
54276 -
54277 -
54278 -  fi
54279 +    ;;
54280 +    esac
54281 +  done
54282
54283 +  echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
54284 +echo "configure:86855: checking for init_snmp in -l$SNMP_LIBNAME" >&5
54285 +ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'`
54286 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
54287 +  echo $ac_n "(cached) $ac_c" 1>&6
54288 +else
54289 +  ac_save_LIBS="$LIBS"
54290 +LIBS="-l$SNMP_LIBNAME  $LIBS"
54291 +cat > conftest.$ac_ext <<EOF
54292 +#line 86863 "configure"
54293 +#include "confdefs.h"
54294 +/* Override any gcc2 internal prototype to avoid an error.  */
54295 +/* We use char because int might match the return type of a gcc2
54296 +    builtin and then its argument prototype would still apply.  */
54297 +char init_snmp();
54298
54299 -      cat >> confdefs.h <<\EOF
54300 -#define HAVE_BROKEN_RECODE 1
54301 +int main() {
54302 +init_snmp()
54303 +; return 0; }
54304  EOF
54305 -
54306 -
54307 +if { (eval echo configure:86874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
54308 +  rm -rf conftest*
54309 +  eval "ac_cv_lib_$ac_lib_var=yes"
54310  else
54311    echo "configure: failed program was:" >&5
54312    cat conftest.$ac_ext >&5
54313    rm -rf conftest*
54314 -
54315 -      { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; }
54316 -
54317 +  eval "ac_cv_lib_$ac_lib_var=no"
54318  fi
54319  rm -f conftest*
54320 -    LIBS=$old_LIBS
54321 -    LDFLAGS=$old_LDFLAGS
54322 -
54323 -
54324 -fi
54325 -
54326 +LIBS="$ac_save_LIBS"
54327
54328 -  cat >> confdefs.h <<\EOF
54329 -#define HAVE_LIBRECODE 1
54330 +fi
54331 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
54332 +  echo "$ac_t""yes" 1>&6
54333 +
54334 +    LDFLAGS=$save_old_LDFLAGS
54335 +    ext_shared=$save_ext_shared
54336 +
54337 +    cat >> confdefs.h <<\EOF
54338 +#define HAVE_SNMP 1
54339  EOF
54340
54341
54342 -  if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then
54343 -
54344 -  if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then
54345 -    ai_p=$RECODE_DIR/$RECODE_INC
54346 -  else
54347 -
54348 -    ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`"
54349 -
54350 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54351 -    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`"
54352 -  fi
54353 +
54354 +else
54355 +  echo "$ac_t""no" 1>&6
54356
54357 +    LDFLAGS=$save_old_LDFLAGS
54358 +    ext_shared=$save_ext_shared
54359 +    unset ac_cv_lib_$SNMP_LIBNAME_init_snmp
54360
54361 +    { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; }
54362
54363 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
54364
54365 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
54366 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
54367 -    eval "INCLUDEPATH$unique=set"
54368 -
54369 -      if test ""; then
54370 -        INCLUDES="-I$ai_p $INCLUDES"
54371 -      else
54372 -        INCLUDES="$INCLUDES -I$ai_p"
54373 -      fi
54374 -
54375 -  fi
54376 -
54377 -  fi
54378 +fi
54379
54380 -
54381 -  PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD"
54382
54383 -  for ac_hdr in stdbool.h
54384 -do
54385 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
54386 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
54387 -echo "configure:80883: checking for $ac_hdr" >&5
54388 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
54389 -  echo $ac_n "(cached) $ac_c" 1>&6
54390 -else
54391 -  cat > conftest.$ac_ext <<EOF
54392 -#line 80888 "configure"
54393 -#include "confdefs.h"
54394 -#include <$ac_hdr>
54395 -EOF
54396 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
54397 -{ (eval echo configure:80893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
54398 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
54399 -if test -z "$ac_err"; then
54400 -  rm -rf conftest*
54401 -  eval "ac_cv_header_$ac_safe=yes"
54402 -else
54403 -  echo "$ac_err" >&5
54404 -  echo "configure: failed program was:" >&5
54405 -  cat conftest.$ac_ext >&5
54406 -  rm -rf conftest*
54407 -  eval "ac_cv_header_$ac_safe=no"
54408 -fi
54409 -rm -f conftest*
54410 -fi
54411 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
54412 -  echo "$ac_t""yes" 1>&6
54413 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
54414 -  cat >> confdefs.h <<EOF
54415 -#define $ac_tr_hdr 1
54416 +  if test "$PHP_UCD_SNMP_HACK" = "yes" ; then
54417 +    cat >> confdefs.h <<\EOF
54418 +#define UCD_SNMP_HACK 1
54419  EOF
54420 -
54421 -else
54422 -  echo "$ac_t""no" 1>&6
54423 -fi
54424 -done
54425
54426 +  fi
54427
54428 -  ext_builddir=ext/recode
54429 -  ext_srcdir=$abs_srcdir/ext/recode
54430 +
54431 +  ext_builddir=ext/snmp
54432 +  ext_srcdir=$abs_srcdir/ext/snmp
54433
54434    ac_extra=
54435
54436    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
54437 -    PHP_RECODE_SHARED=no
54438 +    PHP_SNMP_SHARED=no
54439
54440
54441 -  case ext/recode in
54442 +  case ext/snmp in
54443    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
54444 -  /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54445 -  *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54446 +  /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54447 +  *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54448    esac
54449
54450
54451 @@ -80943,7 +86943,7 @@ done
54452
54453
54454    old_IFS=$IFS
54455 -  for ac_src in recode.c; do
54456 +  for ac_src in snmp.c; do
54457
54458        IFS=.
54459        set $ac_src
54460 @@ -80966,18 +86966,18 @@ EOF
54461    done
54462
54463
54464 -    EXT_STATIC="$EXT_STATIC recode"
54465 +    EXT_STATIC="$EXT_STATIC snmp"
54466      if test "$ext_shared" != "nocli"; then
54467 -      EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
54468 +      EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
54469      fi
54470    else
54471      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
54472 -      PHP_RECODE_SHARED=yes
54473 +      PHP_SNMP_SHARED=yes
54474
54475 -  case ext/recode in
54476 +  case ext/snmp in
54477    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
54478 -  /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54479 -  *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54480 +  /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54481 +  *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54482    esac
54483
54484
54485 @@ -80992,14 +86992,14 @@ EOF
54486
54487
54488    old_IFS=$IFS
54489 -  for ac_src in recode.c; do
54490 +  for ac_src in snmp.c; do
54491
54492        IFS=.
54493        set $ac_src
54494        ac_obj=$1
54495        IFS=$old_IFS
54496
54497 -      shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo"
54498 +      shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo"
54499
54500        case $ac_src in
54501          *.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" ;;
54502 @@ -81022,31 +87022,31 @@ EOF
54503    case $host_alias in
54504      *aix*)
54505        suffix=so
54506 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phprecode.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phprecode.so '$ext_builddir'/phprecode.so'
54507 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsnmp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsnmp.so '$ext_builddir'/phpsnmp.so'
54508        ;;
54509      *netware*)
54510        suffix=nlm
54511 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPRECODE, 3)_SHARED_LIBADD)'
54512 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)'
54513        ;;
54514      *)
54515        suffix=la
54516 -      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_recode) $(PHPRECODE_SHARED_LIBADD)'
54517 +      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_snmp) $(PHPSNMP_SHARED_LIBADD)'
54518        ;;
54519    esac
54520
54521    if test "x" = "xyes"; then
54522 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phprecode.$suffix"
54523 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsnmp.$suffix"
54524    else
54525 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix"
54526 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix"
54527    fi
54528
54529 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
54530 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
54531
54532    cat >>Makefile.objects<<EOF
54533 -\$(phplibdir)/phprecode.$suffix: $ext_builddir/phprecode.$suffix
54534 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phprecode.$suffix \$(phplibdir)
54535 +\$(phplibdir)/phpsnmp.$suffix: $ext_builddir/phpsnmp.$suffix
54536 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsnmp.$suffix \$(phplibdir)
54537
54538 -$ext_builddir/phprecode.$suffix: \$(shared_objects_recode) \$(PHPRECODE_SHARED_DEPENDENCIES)
54539 +$ext_builddir/phpsnmp.$suffix: \$(shared_objects_snmp) \$(PHPSNMP_SHARED_DEPENDENCIES)
54540         $link_cmd
54541
54542  EOF
54543 @@ -81059,31 +87059,31 @@ EOF
54544    case $host_alias in
54545      *aix*)
54546        suffix=so
54547 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/recode.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(RECODE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/recode.so '$ext_builddir'/recode.so'
54548 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/snmp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(SNMP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/snmp.so '$ext_builddir'/snmp.so'
54549        ;;
54550      *netware*)
54551        suffix=nlm
54552 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(RECODE, 3)_SHARED_LIBADD)'
54553 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SNMP, 3)_SHARED_LIBADD)'
54554        ;;
54555      *)
54556        suffix=la
54557 -      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_recode) $(RECODE_SHARED_LIBADD)'
54558 +      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_snmp) $(SNMP_SHARED_LIBADD)'
54559        ;;
54560    esac
54561
54562    if test "x" = "xyes"; then
54563 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/recode.$suffix"
54564 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/snmp.$suffix"
54565    else
54566 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/recode.$suffix"
54567 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/snmp.$suffix"
54568    fi
54569
54570 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
54571 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
54572
54573    cat >>Makefile.objects<<EOF
54574 -\$(phplibdir)/recode.$suffix: $ext_builddir/recode.$suffix
54575 -       \$(LIBTOOL) --mode=install cp $ext_builddir/recode.$suffix \$(phplibdir)
54576 +\$(phplibdir)/snmp.$suffix: $ext_builddir/snmp.$suffix
54577 +       \$(LIBTOOL) --mode=install cp $ext_builddir/snmp.$suffix \$(phplibdir)
54578
54579 -$ext_builddir/recode.$suffix: \$(shared_objects_recode) \$(RECODE_SHARED_DEPENDENCIES)
54580 +$ext_builddir/snmp.$suffix: \$(shared_objects_snmp) \$(SNMP_SHARED_DEPENDENCIES)
54581         $link_cmd
54582
54583  EOF
54584 @@ -81091,22 +87091,22 @@ EOF
54585            ;;
54586        esac
54587        cat >> confdefs.h <<EOF
54588 -#define COMPILE_DL_RECODE 1
54589 +#define COMPILE_DL_SNMP 1
54590  EOF
54591
54592      fi
54593    fi
54594
54595    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
54596 -    PHP_RECODE_SHARED=no
54597 +    PHP_SNMP_SHARED=no
54598      case "$PHP_SAPI" in
54599        cgi|embed)
54600
54601
54602 -  case ext/recode in
54603 +  case ext/snmp in
54604    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
54605 -  /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54606 -  *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54607 +  /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54608 +  *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54609    esac
54610
54611
54612 @@ -81121,7 +87121,7 @@ EOF
54613
54614
54615    old_IFS=$IFS
54616 -  for ac_src in recode.c; do
54617 +  for ac_src in snmp.c; do
54618
54619        IFS=.
54620        set $ac_src
54621 @@ -81144,15 +87144,15 @@ EOF
54622    done
54623
54624
54625 -        EXT_STATIC="$EXT_STATIC recode"
54626 +        EXT_STATIC="$EXT_STATIC snmp"
54627          ;;
54628        *)
54629
54630
54631 -  case ext/recode in
54632 +  case ext/snmp in
54633    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
54634 -  /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54635 -  *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54636 +  /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54637 +  *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54638    esac
54639
54640
54641 @@ -81167,7 +87167,7 @@ EOF
54642
54643
54644    old_IFS=$IFS
54645 -  for ac_src in recode.c; do
54646 +  for ac_src in snmp.c; do
54647
54648        IFS=.
54649        set $ac_src
54650 @@ -81190,44 +87190,344 @@ EOF
54651    done
54652
54653
54654 -        ;;
54655 -    esac
54656 -    EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
54657 -  fi
54658 +        ;;
54659 +    esac
54660 +    EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
54661 +  fi
54662 +
54663 +
54664 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
54665 +
54666 +
54667 +
54668 +  if test "$ext_builddir" = "."; then
54669 +    PHP_PECL_EXTENSION=snmp
54670 +
54671 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
54672 +
54673 +  fi
54674 +
54675 +
54676 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SNMP_SHARED_LIBADD"
54677 +
54678 +fi
54679 +
54680 +
54681 +
54682 +php_enable_soap=no
54683 +
54684 +echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6
54685 +echo "configure:87221: checking whether to enable SOAP support" >&5
54686 +# Check whether --enable-soap or --disable-soap was given.
54687 +if test "${enable_soap+set}" = set; then
54688 +  enableval="$enable_soap"
54689 +  PHP_SOAP=$enableval
54690 +else
54691 +
54692 +  PHP_SOAP=no
54693 +  test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL
54694 +
54695 +fi
54696 +
54697 +
54698 +
54699 +ext_output="yes, shared"
54700 +ext_shared=yes
54701 +case $PHP_SOAP in
54702 +shared,*)
54703 +  PHP_SOAP=`echo "$PHP_SOAP"|$SED 's/^shared,//'`
54704 +  ;;
54705 +shared)
54706 +  PHP_SOAP=yes
54707 +  ;;
54708 +no)
54709 +  ext_output=no
54710 +  ext_shared=no
54711 +  ;;
54712 +*)
54713 +  ext_output=yes
54714 +  ext_shared=no
54715 +  ;;
54716 +esac
54717 +
54718 +
54719 +
54720 +echo "$ac_t""$ext_output" 1>&6
54721 +
54722 +
54723 +
54724 +
54725 +if test -z "$PHP_LIBXML_DIR"; then
54726 +
54727 +php_with_libxml_dir=no
54728 +
54729 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
54730 +echo "configure:87266: checking libxml2 install dir" >&5
54731 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
54732 +if test "${with_libxml_dir+set}" = set; then
54733 +  withval="$with_libxml_dir"
54734 +  PHP_LIBXML_DIR=$withval
54735 +else
54736 +
54737 +  PHP_LIBXML_DIR=no
54738 +
54739 +
54740 +fi
54741 +
54742 +
54743 +ext_output=$PHP_LIBXML_DIR
54744 +echo "$ac_t""$ext_output" 1>&6
54745 +
54746 +
54747 +
54748 +fi
54749 +
54750 +if test "$PHP_SOAP" != "no"; then
54751 +
54752 +  if test "$PHP_LIBXML" = "no"; then
54753 +    { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
54754 +  fi
54755 +
54756 +
54757 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
54758 +echo "configure:87294: checking for xml2-config path" >&5
54759 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
54760 +  echo $ac_n "(cached) $ac_c" 1>&6
54761 +else
54762 +
54763 +  for i in $PHP_LIBXML_DIR /usr/local /usr; do
54764 +    if test -x "$i/bin/xml2-config"; then
54765 +      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
54766 +      break
54767 +    fi
54768 +  done
54769 +
54770 +fi
54771 +
54772 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
54773 +
54774 +  if test -x "$ac_cv_php_xml2_config_path"; then
54775 +    XML2_CONFIG="$ac_cv_php_xml2_config_path"
54776 +    libxml_full_version=`$XML2_CONFIG --version`
54777 +    ac_IFS=$IFS
54778 +    IFS="."
54779 +    set $libxml_full_version
54780 +    IFS=$ac_IFS
54781 +    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
54782 +    if test "$LIBXML_VERSION" -ge "2006011"; then
54783 +      LIBXML_LIBS=`$XML2_CONFIG --libs`
54784 +      LIBXML_INCS=`$XML2_CONFIG --cflags`
54785 +
54786 +  for ac_i in $LIBXML_LIBS; do
54787 +    case $ac_i in
54788 +    -pthread)
54789 +      if test "$ext_shared" = "yes"; then
54790 +        SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread"
54791 +      else
54792 +
54793 +
54794 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
54795 +
54796 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
54797 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
54798 +    eval "EXTRA_LDFLAGS$unique=set"
54799 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
54800 +  fi
54801 +
54802 +      fi
54803 +    ;;
54804 +    -l*)
54805 +      ac_ii=`echo $ac_i|cut -c 3-`
54806 +
54807 +
54808 +  case $ac_ii in
54809 +  c|c_r|pthread*) ;;
54810 +  *)
54811 +    if test "$ext_shared" = "yes"; then
54812 +        SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii"
54813 +    else
54814 +
54815 +
54816 +  case $ac_ii in
54817 +  c|c_r|pthread*) ;;
54818 +  *)
54819 +      LIBS="$LIBS -l$ac_ii"
54820 +   ;;
54821 +  esac
54822 +
54823 +
54824 +    fi
54825 +   ;;
54826 +  esac
54827 +
54828 +
54829 +    ;;
54830 +    -L*)
54831 +      ac_ii=`echo $ac_i|cut -c 3-`
54832 +
54833 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
54834 +
54835 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
54836 +    ai_p=$ac_ii
54837 +  else
54838 +
54839 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
54840 +
54841 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54842 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
54843 +  fi
54844 +
54845 +
54846 +      if test "$ext_shared" = "yes"; then
54847 +        SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD"
54848 +        test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD"
54849 +      else
54850 +
54851 +
54852 +
54853 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
54854 +
54855 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
54856 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
54857 +    eval "LIBPATH$unique=set"
54858 +
54859 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
54860 +    LDFLAGS="$LDFLAGS -L$ai_p"
54861 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
54862 +
54863 +  fi
54864 +
54865 +
54866 +      fi
54867 +
54868 +  fi
54869 +
54870 +    ;;
54871 +    esac
54872 +  done
54873 +
54874 +
54875 +  for ac_i in $LIBXML_INCS; do
54876 +    case $ac_i in
54877 +    -I*)
54878 +      ac_ii=`echo $ac_i|cut -c 3-`
54879 +
54880 +  if test "$ac_ii" != "/usr/include"; then
54881 +
54882 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
54883 +    ai_p=$ac_ii
54884 +  else
54885 +
54886 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
54887 +
54888 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54889 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
54890 +  fi
54891 +
54892 +
54893 +
54894 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
54895 +
54896 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
54897 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
54898 +    eval "INCLUDEPATH$unique=set"
54899 +
54900 +      if test ""; then
54901 +        INCLUDES="-I$ai_p $INCLUDES"
54902 +      else
54903 +        INCLUDES="$INCLUDES -I$ai_p"
54904 +      fi
54905 +
54906 +  fi
54907 +
54908 +  fi
54909 +
54910 +    ;;
54911 +    esac
54912 +  done
54913 +
54914 +
54915 +            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
54916 +echo "configure:87452: checking whether libxml build works" >&5
54917 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
54918 +  echo $ac_n "(cached) $ac_c" 1>&6
54919 +else
54920 +
54921 +
54922 +  old_LIBS=$LIBS
54923 +  LIBS="
54924 +          $SOAP_SHARED_LIBADD
54925 +         $LIBS"
54926 +  if test "$cross_compiling" = yes; then
54927 +
54928 +    LIBS=$old_LIBS
54929 +
54930 +else
54931 +  cat > conftest.$ac_ext <<EOF
54932 +#line 87468 "configure"
54933 +#include "confdefs.h"
54934 +
54935 +
54936 +    char xmlInitParser();
54937 +    int main() {
54938 +      xmlInitParser();
54939 +      return 0;
54940 +    }
54941
54942 +EOF
54943 +if { (eval echo configure:87479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
54944 +then
54945
54946 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
54947 +    LIBS=$old_LIBS
54948 +
54949 +          php_cv_libxml_build_works=yes
54950 +
54951
54952 -
54953 -
54954 -  if test "$ext_builddir" = "."; then
54955 -    PHP_PECL_EXTENSION=recode
54956 +else
54957 +  echo "configure: failed program was:" >&5
54958 +  cat conftest.$ac_ext >&5
54959 +  rm -fr conftest*
54960 +
54961 +    LIBS=$old_LIBS
54962
54963 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
54964 +          echo "$ac_t""no" 1>&6
54965 +          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
54966 +
54967 +
54968 +fi
54969 +rm -fr conftest*
54970 +fi
54971
54972 -  fi
54973
54974 +
54975  fi
54976
54977 -
54978 -cat >> confdefs.h <<\EOF
54979 -#define HAVE_REFLECTION 1
54980 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
54981 +      if test "$php_cv_libxml_build_works" = "yes"; then
54982 +        cat >> confdefs.h <<\EOF
54983 +#define HAVE_LIBXML 1
54984  EOF
54985
54986 +      fi
54987 +
54988 +    cat >> confdefs.h <<\EOF
54989 +#define HAVE_SOAP 1
54990 +EOF
54991
54992 -  ext_builddir=ext/reflection
54993 -  ext_srcdir=$abs_srcdir/ext/reflection
54994 +
54995 +  ext_builddir=ext/soap
54996 +  ext_srcdir=$abs_srcdir/ext/soap
54997
54998    ac_extra=
54999
55000 -  if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
55001 -    PHP_REFLECTION_SHARED=no
55002 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
55003 +    PHP_SOAP_SHARED=no
55004
55005
55006 -  case ext/reflection in
55007 +  case ext/soap in
55008    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55009 -  /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55010 -  *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55011 +  /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55012 +  *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55013    esac
55014
55015
55016 @@ -81242,7 +87542,7 @@ EOF
55017
55018
55019    old_IFS=$IFS
55020 -  for ac_src in php_reflection.c; do
55021 +  for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
55022
55023        IFS=.
55024        set $ac_src
55025 @@ -81265,18 +87565,18 @@ EOF
55026    done
55027
55028
55029 -    EXT_STATIC="$EXT_STATIC reflection"
55030 -    if test "no" != "nocli"; then
55031 -      EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
55032 +    EXT_STATIC="$EXT_STATIC soap"
55033 +    if test "$ext_shared" != "nocli"; then
55034 +      EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
55035      fi
55036    else
55037 -    if test "no" = "shared" || test "no" = "yes"; then
55038 -      PHP_REFLECTION_SHARED=yes
55039 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
55040 +      PHP_SOAP_SHARED=yes
55041
55042 -  case ext/reflection in
55043 +  case ext/soap in
55044    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55045 -  /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55046 -  *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55047 +  /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55048 +  *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55049    esac
55050
55051
55052 @@ -81291,14 +87591,14 @@ EOF
55053
55054
55055    old_IFS=$IFS
55056 -  for ac_src in php_reflection.c; do
55057 +  for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
55058
55059        IFS=.
55060        set $ac_src
55061        ac_obj=$1
55062        IFS=$old_IFS
55063
55064 -      shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo"
55065 +      shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo"
55066
55067        case $ac_src in
55068          *.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" ;;
55069 @@ -81321,31 +87621,31 @@ EOF
55070    case $host_alias in
55071      *aix*)
55072        suffix=so
55073 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreflection.so '$ext_builddir'/phpreflection.so'
55074 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsoap.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(PHPSOAP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsoap.so '$ext_builddir'/phpsoap.so'
55075        ;;
55076      *netware*)
55077        suffix=nlm
55078 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)'
55079 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOAP, 3)_SHARED_LIBADD)'
55080        ;;
55081      *)
55082        suffix=la
55083 -      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_reflection) $(PHPREFLECTION_SHARED_LIBADD)'
55084 +      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_soap) $(PHPSOAP_SHARED_LIBADD)'
55085        ;;
55086    esac
55087
55088    if test "x" = "xyes"; then
55089 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreflection.$suffix"
55090 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix"
55091    else
55092 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix"
55093 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix"
55094    fi
55095
55096 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
55097 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
55098
55099    cat >>Makefile.objects<<EOF
55100 -\$(phplibdir)/phpreflection.$suffix: $ext_builddir/phpreflection.$suffix
55101 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpreflection.$suffix \$(phplibdir)
55102 +\$(phplibdir)/phpsoap.$suffix: $ext_builddir/phpsoap.$suffix
55103 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsoap.$suffix \$(phplibdir)
55104
55105 -$ext_builddir/phpreflection.$suffix: \$(shared_objects_reflection) \$(PHPREFLECTION_SHARED_DEPENDENCIES)
55106 +$ext_builddir/phpsoap.$suffix: \$(shared_objects_soap) \$(PHPSOAP_SHARED_DEPENDENCIES)
55107         $link_cmd
55108
55109  EOF
55110 @@ -81358,31 +87658,31 @@ EOF
55111    case $host_alias in
55112      *aix*)
55113        suffix=so
55114 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/reflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(REFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/reflection.so '$ext_builddir'/reflection.so'
55115 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/soap.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(SOAP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/soap.so '$ext_builddir'/soap.so'
55116        ;;
55117      *netware*)
55118        suffix=nlm
55119 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(REFLECTION, 3)_SHARED_LIBADD)'
55120 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOAP, 3)_SHARED_LIBADD)'
55121        ;;
55122      *)
55123        suffix=la
55124 -      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_reflection) $(REFLECTION_SHARED_LIBADD)'
55125 +      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_soap) $(SOAP_SHARED_LIBADD)'
55126        ;;
55127    esac
55128
55129    if test "x" = "xyes"; then
55130 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/reflection.$suffix"
55131 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/soap.$suffix"
55132    else
55133 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/reflection.$suffix"
55134 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix"
55135    fi
55136
55137 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
55138 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
55139
55140    cat >>Makefile.objects<<EOF
55141 -\$(phplibdir)/reflection.$suffix: $ext_builddir/reflection.$suffix
55142 -       \$(LIBTOOL) --mode=install cp $ext_builddir/reflection.$suffix \$(phplibdir)
55143 +\$(phplibdir)/soap.$suffix: $ext_builddir/soap.$suffix
55144 +       \$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir)
55145
55146 -$ext_builddir/reflection.$suffix: \$(shared_objects_reflection) \$(REFLECTION_SHARED_DEPENDENCIES)
55147 +$ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES)
55148         $link_cmd
55149
55150  EOF
55151 @@ -81390,22 +87690,22 @@ EOF
55152            ;;
55153        esac
55154        cat >> confdefs.h <<EOF
55155 -#define COMPILE_DL_REFLECTION 1
55156 +#define COMPILE_DL_SOAP 1
55157  EOF
55158
55159      fi
55160    fi
55161
55162 -  if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
55163 -    PHP_REFLECTION_SHARED=no
55164 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
55165 +    PHP_SOAP_SHARED=no
55166      case "$PHP_SAPI" in
55167        cgi|embed)
55168
55169
55170 -  case ext/reflection in
55171 +  case ext/soap in
55172    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55173 -  /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55174 -  *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55175 +  /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55176 +  *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55177    esac
55178
55179
55180 @@ -81420,7 +87720,7 @@ EOF
55181
55182
55183    old_IFS=$IFS
55184 -  for ac_src in php_reflection.c; do
55185 +  for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
55186
55187        IFS=.
55188        set $ac_src
55189 @@ -81443,15 +87743,15 @@ EOF
55190    done
55191
55192
55193 -        EXT_STATIC="$EXT_STATIC reflection"
55194 +        EXT_STATIC="$EXT_STATIC soap"
55195          ;;
55196        *)
55197
55198
55199 -  case ext/reflection in
55200 +  case ext/soap in
55201    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55202 -  /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55203 -  *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55204 +  /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55205 +  *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55206    esac
55207
55208
55209 @@ -81466,7 +87766,7 @@ EOF
55210
55211
55212    old_IFS=$IFS
55213 -  for ac_src in php_reflection.c; do
55214 +  for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
55215
55216        IFS=.
55217        set $ac_src
55218 @@ -81491,7 +87791,7 @@ EOF
55219
55220          ;;
55221      esac
55222 -    EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
55223 +    EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
55224    fi
55225
55226
55227 @@ -81500,27 +87800,40 @@ EOF
55228
55229
55230    if test "$ext_builddir" = "."; then
55231 -    PHP_PECL_EXTENSION=reflection
55232 +    PHP_PECL_EXTENSION=soap
55233
55234    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
55235
55236    fi
55237
55238 +
55239 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD"
55240 +
55241 +
55242 +    else
55243 +      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
55244 +    fi
55245 +else
55246 +    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
55247 +
55248 +  fi
55249 +
55250 +fi
55251
55252
55253
55254 -php_enable_session=yes
55255 +php_enable_sockets=no
55256
55257 -echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
55258 -echo "configure:81516: checking whether to enable PHP sessions" >&5
55259 -# Check whether --enable-session or --disable-session was given.
55260 -if test "${enable_session+set}" = set; then
55261 -  enableval="$enable_session"
55262 -  PHP_SESSION=$enableval
55263 +echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
55264 +echo "configure:87829: checking whether to enable sockets support" >&5
55265 +# Check whether --enable-sockets or --disable-sockets was given.
55266 +if test "${enable_sockets+set}" = set; then
55267 +  enableval="$enable_sockets"
55268 +  PHP_SOCKETS=$enableval
55269  else
55270
55271 -  PHP_SESSION=yes
55272 -  test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL
55273 +  PHP_SOCKETS=no
55274 +  test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL
55275
55276  fi
55277
55278 @@ -81528,12 +87841,12 @@ fi
55279
55280  ext_output="yes, shared"
55281  ext_shared=yes
55282 -case $PHP_SESSION in
55283 +case $PHP_SOCKETS in
55284  shared,*)
55285 -  PHP_SESSION=`echo "$PHP_SESSION"|$SED 's/^shared,//'`
55286 +  PHP_SOCKETS=`echo "$PHP_SOCKETS"|$SED 's/^shared,//'`
55287    ;;
55288  shared)
55289 -  PHP_SESSION=yes
55290 +  PHP_SOCKETS=yes
55291    ;;
55292  no)
55293    ext_output=no
55294 @@ -81552,286 +87865,545 @@ echo "$ac_t""$ext_output" 1>&6
55295
55296
55297
55298 -
55299 -php_with_mm=no
55300 -
55301 -echo $ac_n "checking for mm support""... $ac_c" 1>&6
55302 -echo "configure:81560: checking for mm support" >&5
55303 -# Check whether --with-mm or --without-mm was given.
55304 -if test "${with_mm+set}" = set; then
55305 -  withval="$with_mm"
55306 -  PHP_MM=$withval
55307 +if test "$PHP_SOCKETS" != "no"; then
55308 +    echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
55309 +echo "configure:87871: checking for struct cmsghdr" >&5
55310 +if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
55311 +  echo $ac_n "(cached) $ac_c" 1>&6
55312  else
55313
55314 -  PHP_MM=no
55315 -
55316 +    cat > conftest.$ac_ext <<EOF
55317 +#line 87877 "configure"
55318 +#include "confdefs.h"
55319
55320 +#include <sys/types.h>
55321 +#include <sys/socket.h>
55322 +int main() {
55323 +struct cmsghdr s; s
55324 +; return 0; }
55325 +EOF
55326 +if { (eval echo configure:87886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
55327 +  rm -rf conftest*
55328 +  ac_cv_cmsghdr=yes
55329 +else
55330 +  echo "configure: failed program was:" >&5
55331 +  cat conftest.$ac_ext >&5
55332 +  rm -rf conftest*
55333 +  ac_cv_cmsghdr=no
55334 +fi
55335 +rm -f conftest*
55336 +
55337  fi
55338
55339 +echo "$ac_t""$ac_cv_cmsghdr" 1>&6
55340
55341 -ext_output=$PHP_MM
55342 -echo "$ac_t""$ext_output" 1>&6
55343 +  if test "$ac_cv_cmsghdr" = yes; then
55344 +    cat >> confdefs.h <<\EOF
55345 +#define HAVE_CMSGHDR 1
55346 +EOF
55347 +
55348 +  fi
55349
55350 +  for ac_func in hstrerror socketpair
55351 +do
55352 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
55353 +echo "configure:87911: checking for $ac_func" >&5
55354 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
55355 +  echo $ac_n "(cached) $ac_c" 1>&6
55356 +else
55357 +  cat > conftest.$ac_ext <<EOF
55358 +#line 87916 "configure"
55359 +#include "confdefs.h"
55360 +/* System header to define __stub macros and hopefully few prototypes,
55361 +    which can conflict with char $ac_func(); below.  */
55362 +#include <assert.h>
55363 +/* Override any gcc2 internal prototype to avoid an error.  */
55364 +/* We use char because int might match the return type of a gcc2
55365 +    builtin and then its argument prototype would still apply.  */
55366 +char $ac_func();
55367
55368 +int main() {
55369
55370 +/* The GNU C library defines this for functions which it implements
55371 +    to always fail with ENOSYS.  Some functions are actually named
55372 +    something starting with __ and the normal name is an alias.  */
55373 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
55374 +choke me
55375 +#else
55376 +$ac_func();
55377 +#endif
55378
55379 -if test "$PHP_SESSION" != "no"; then
55380 -
55381 -  echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
55382 -echo "configure:81582: checking whether pwrite works" >&5
55383 -if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
55384 +; return 0; }
55385 +EOF
55386 +if { (eval echo configure:87939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
55387 +  rm -rf conftest*
55388 +  eval "ac_cv_func_$ac_func=yes"
55389 +else
55390 +  echo "configure: failed program was:" >&5
55391 +  cat conftest.$ac_ext >&5
55392 +  rm -rf conftest*
55393 +  eval "ac_cv_func_$ac_func=no"
55394 +fi
55395 +rm -f conftest*
55396 +fi
55397 +
55398 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
55399 +  echo "$ac_t""yes" 1>&6
55400 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
55401 +  cat >> confdefs.h <<EOF
55402 +#define $ac_tr_func 1
55403 +EOF
55404 +
55405 +else
55406 +  echo "$ac_t""no" 1>&6
55407 +fi
55408 +done
55409 +
55410 +  for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h
55411 +do
55412 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
55413 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
55414 +echo "configure:87967: checking for $ac_hdr" >&5
55415 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
55416    echo $ac_n "(cached) $ac_c" 1>&6
55417  else
55418 -
55419 -
55420 -  if test "$cross_compiling" = yes; then
55421 -
55422 -    ac_cv_pwrite=no
55423 -
55424 +  cat > conftest.$ac_ext <<EOF
55425 +#line 87972 "configure"
55426 +#include "confdefs.h"
55427 +#include <$ac_hdr>
55428 +EOF
55429 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
55430 +{ (eval echo configure:87977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
55431 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
55432 +if test -z "$ac_err"; then
55433 +  rm -rf conftest*
55434 +  eval "ac_cv_header_$ac_safe=yes"
55435 +else
55436 +  echo "$ac_err" >&5
55437 +  echo "configure: failed program was:" >&5
55438 +  cat conftest.$ac_ext >&5
55439 +  rm -rf conftest*
55440 +  eval "ac_cv_header_$ac_safe=no"
55441 +fi
55442 +rm -f conftest*
55443 +fi
55444 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
55445 +  echo "$ac_t""yes" 1>&6
55446 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
55447 +  cat >> confdefs.h <<EOF
55448 +#define $ac_tr_hdr 1
55449 +EOF
55450 +
55451  else
55452 +  echo "$ac_t""no" 1>&6
55453 +fi
55454 +done
55455 +
55456    cat > conftest.$ac_ext <<EOF
55457 -#line 81594 "configure"
55458 +#line 88004 "configure"
55459  #include "confdefs.h"
55460
55461  #include <sys/types.h>
55462 -#include <sys/stat.h>
55463 -#include <fcntl.h>
55464 -#include <unistd.h>
55465 -#include <errno.h>
55466 +#include <sys/socket.h>
55467 +
55468 +int main() {
55469 +static struct msghdr tp; int n = (int) tp.msg_flags; return n
55470 +; return 0; }
55471 +EOF
55472 +if { (eval echo configure:88014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
55473 +  :
55474 +else
55475 +  echo "configure: failed program was:" >&5
55476 +  cat conftest.$ac_ext >&5
55477 +  rm -rf conftest*
55478 +  cat >> confdefs.h <<\EOF
55479 +#define MISSING_MSGHDR_MSGFLAGS 1
55480 +EOF
55481 +
55482 +
55483 +fi
55484 +rm -f conftest*
55485 +  cat >> confdefs.h <<\EOF
55486 +#define HAVE_SOCKETS 1
55487 +EOF
55488 +
55489 +
55490 +
55491 +  ext_builddir=ext/sockets
55492 +  ext_srcdir=$abs_srcdir/ext/sockets
55493 +
55494 +  ac_extra=
55495 +
55496 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
55497 +    PHP_SOCKETS_SHARED=no
55498 +
55499 +
55500 +  case ext/sockets in
55501 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55502 +  /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55503 +  *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55504 +  esac
55505 +
55506 +
55507 +
55508 +  b_c_pre=$php_c_pre
55509 +  b_cxx_pre=$php_cxx_pre
55510 +  b_c_meta=$php_c_meta
55511 +  b_cxx_meta=$php_cxx_meta
55512 +  b_c_post=$php_c_post
55513 +  b_cxx_post=$php_cxx_post
55514 +  b_lo=$php_lo
55515 +
55516 +
55517 +  old_IFS=$IFS
55518 +  for ac_src in sockets.c; do
55519 +
55520 +      IFS=.
55521 +      set $ac_src
55522 +      ac_obj=$1
55523 +      IFS=$old_IFS
55524 +
55525 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
55526 +
55527 +      case $ac_src in
55528 +        *.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" ;;
55529 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55530 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55531 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
55532 +      esac
55533 +
55534 +    cat >>Makefile.objects<<EOF
55535 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
55536 +       $ac_comp
55537 +EOF
55538 +  done
55539 +
55540 +
55541 +    EXT_STATIC="$EXT_STATIC sockets"
55542 +    if test "$ext_shared" != "nocli"; then
55543 +      EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
55544 +    fi
55545 +  else
55546 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
55547 +      PHP_SOCKETS_SHARED=yes
55548 +
55549 +  case ext/sockets in
55550 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55551 +  /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55552 +  *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55553 +  esac
55554 +
55555 +
55556 +
55557 +  b_c_pre=$shared_c_pre
55558 +  b_cxx_pre=$shared_cxx_pre
55559 +  b_c_meta=$shared_c_meta
55560 +  b_cxx_meta=$shared_cxx_meta
55561 +  b_c_post=$shared_c_post
55562 +  b_cxx_post=$shared_cxx_post
55563 +  b_lo=$shared_lo
55564 +
55565 +
55566 +  old_IFS=$IFS
55567 +  for ac_src in sockets.c; do
55568 +
55569 +      IFS=.
55570 +      set $ac_src
55571 +      ac_obj=$1
55572 +      IFS=$old_IFS
55573 +
55574 +      shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo"
55575 +
55576 +      case $ac_src in
55577 +        *.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" ;;
55578 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55579 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55580 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
55581 +      esac
55582 +
55583 +    cat >>Makefile.objects<<EOF
55584 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
55585 +       $ac_comp
55586 +EOF
55587 +  done
55588 +
55589 +      case $host_alias in
55590 +        *netware*)
55591 +
55592 +  install_modules="install-modules"
55593 +
55594 +  case $host_alias in
55595 +    *aix*)
55596 +      suffix=so
55597 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsockets.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(PHPSOCKETS_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsockets.so '$ext_builddir'/phpsockets.so'
55598 +      ;;
55599 +    *netware*)
55600 +      suffix=nlm
55601 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOCKETS, 3)_SHARED_LIBADD)'
55602 +      ;;
55603 +    *)
55604 +      suffix=la
55605 +      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_sockets) $(PHPSOCKETS_SHARED_LIBADD)'
55606 +      ;;
55607 +  esac
55608 +
55609 +  if test "x" = "xyes"; then
55610 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsockets.$suffix"
55611 +  else
55612 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix"
55613 +  fi
55614 +
55615 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
55616 +
55617 +  cat >>Makefile.objects<<EOF
55618 +\$(phplibdir)/phpsockets.$suffix: $ext_builddir/phpsockets.$suffix
55619 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsockets.$suffix \$(phplibdir)
55620 +
55621 +$ext_builddir/phpsockets.$suffix: \$(shared_objects_sockets) \$(PHPSOCKETS_SHARED_DEPENDENCIES)
55622 +       $link_cmd
55623 +
55624 +EOF
55625 +
55626 +          ;;
55627 +        *)
55628 +
55629 +  install_modules="install-modules"
55630 +
55631 +  case $host_alias in
55632 +    *aix*)
55633 +      suffix=so
55634 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sockets.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(SOCKETS_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sockets.so '$ext_builddir'/sockets.so'
55635 +      ;;
55636 +    *netware*)
55637 +      suffix=nlm
55638 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOCKETS, 3)_SHARED_LIBADD)'
55639 +      ;;
55640 +    *)
55641 +      suffix=la
55642 +      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_sockets) $(SOCKETS_SHARED_LIBADD)'
55643 +      ;;
55644 +  esac
55645 +
55646 +  if test "x" = "xyes"; then
55647 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sockets.$suffix"
55648 +  else
55649 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix"
55650 +  fi
55651 +
55652 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
55653 +
55654 +  cat >>Makefile.objects<<EOF
55655 +\$(phplibdir)/sockets.$suffix: $ext_builddir/sockets.$suffix
55656 +       \$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir)
55657
55658 -    main() {
55659 -    int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600);
55660 +$ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES)
55661 +       $link_cmd
55662
55663 -    if (fd < 0) exit(1);
55664 -    if (pwrite(fd, "text", 4, 0) != 4) exit(1);
55665 -    /* Linux glibc breakage until 2.2.5 */
55666 -    if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1);
55667 -    exit(0);
55668 -    }
55669 +EOF
55670
55671 -
55672 +          ;;
55673 +      esac
55674 +      cat >> confdefs.h <<EOF
55675 +#define COMPILE_DL_SOCKETS 1
55676  EOF
55677 -if { (eval echo configure:81615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
55678 -then
55679 -
55680 -    ac_cv_pwrite=yes
55681 -
55682 -else
55683 -  echo "configure: failed program was:" >&5
55684 -  cat conftest.$ac_ext >&5
55685 -  rm -fr conftest*
55686 -
55687 -    ac_cv_pwrite=no
55688 -
55689 -fi
55690 -rm -fr conftest*
55691 -fi
55692
55693 +    fi
55694 +  fi
55695
55696 -    if test "$ac_cv_pwrite" = "no"; then
55697 -
55698 -  if test "$cross_compiling" = yes; then
55699 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
55700 +    PHP_SOCKETS_SHARED=no
55701 +    case "$PHP_SAPI" in
55702 +      cgi|embed)
55703 +
55704 +
55705 +  case ext/sockets in
55706 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55707 +  /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55708 +  *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55709 +  esac
55710
55711 -    ac_cv_pwrite=no
55712
55713 -else
55714 -  cat > conftest.$ac_ext <<EOF
55715 -#line 81640 "configure"
55716 -#include "confdefs.h"
55717
55718 -#include <sys/types.h>
55719 -#include <sys/stat.h>
55720 -#include <fcntl.h>
55721 -#include <unistd.h>
55722 -#include <errno.h>
55723 -ssize_t pwrite(int, void *, size_t, off64_t);
55724 -    main() {
55725 -    int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600);
55726 +  b_c_pre=$php_c_pre
55727 +  b_cxx_pre=$php_cxx_pre
55728 +  b_c_meta=$php_c_meta
55729 +  b_cxx_meta=$php_cxx_meta
55730 +  b_c_post=$php_c_post
55731 +  b_cxx_post=$php_cxx_post
55732 +  b_lo=$php_lo
55733
55734 -    if (fd < 0) exit(1);
55735 -    if (pwrite(fd, "text", 4, 0) != 4) exit(1);
55736 -    /* Linux glibc breakage until 2.2.5 */
55737 -    if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1);
55738 -    exit(0);
55739 -    }
55740
55741 +  old_IFS=$IFS
55742 +  for ac_src in sockets.c; do
55743
55744 +      IFS=.
55745 +      set $ac_src
55746 +      ac_obj=$1
55747 +      IFS=$old_IFS
55748 +
55749 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
55750 +
55751 +      case $ac_src in
55752 +        *.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" ;;
55753 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55754 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55755 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
55756 +      esac
55757 +
55758 +    cat >>Makefile.objects<<EOF
55759 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
55760 +       $ac_comp
55761  EOF
55762 -if { (eval echo configure:81661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
55763 -then
55764 -
55765 -    ac_cv_pwrite=yes
55766 +  done
55767 +
55768 +
55769 +        EXT_STATIC="$EXT_STATIC sockets"
55770 +        ;;
55771 +      *)
55772 +
55773
55774 -else
55775 -  echo "configure: failed program was:" >&5
55776 -  cat conftest.$ac_ext >&5
55777 -  rm -fr conftest*
55778 +  case ext/sockets in
55779 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55780 +  /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55781 +  *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55782 +  esac
55783
55784 -    ac_cv_pwrite=no
55785
55786 -fi
55787 -rm -fr conftest*
55788 -fi
55789
55790 +  b_c_pre=$php_c_pre
55791 +  b_cxx_pre=$php_cxx_pre
55792 +  b_c_meta=$php_c_meta
55793 +  b_cxx_meta=$php_cxx_meta
55794 +  b_c_post=$php_c_post
55795 +  b_cxx_post=$php_cxx_post
55796 +  b_lo=$php_lo
55797
55798 -      if test "$ac_cv_pwrite" = "yes"; then
55799 -        ac_cv_pwrite=64
55800 -      fi
55801 -    fi
55802 -
55803 -fi
55804
55805 -echo "$ac_t""$ac_cv_pwrite" 1>&6
55806 +  old_IFS=$IFS
55807 +  for ac_src in sockets.c; do
55808 +
55809 +      IFS=.
55810 +      set $ac_src
55811 +      ac_obj=$1
55812 +      IFS=$old_IFS
55813 +
55814 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
55815
55816 -  if test "$ac_cv_pwrite" != "no"; then
55817 -    cat >> confdefs.h <<\EOF
55818 -#define HAVE_PWRITE 1
55819 -EOF
55820 +      case $ac_src in
55821 +        *.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" ;;
55822 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55823 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55824 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
55825 +      esac
55826
55827 -    if test "$ac_cv_pwrite" = "64"; then
55828 -      cat >> confdefs.h <<\EOF
55829 -#define PHP_PWRITE_64 1
55830 +    cat >>Makefile.objects<<EOF
55831 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
55832 +       $ac_comp
55833  EOF
55834 +  done
55835
55836 -    fi
55837 -  fi
55838
55839 +        ;;
55840 +    esac
55841 +    EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
55842 +  fi
55843
55844 -  echo $ac_n "checking whether pread works""... $ac_c" 1>&6
55845 -echo "configure:81702: checking whether pread works" >&5
55846 -if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
55847 -  echo $ac_n "(cached) $ac_c" 1>&6
55848 -else
55849 -
55850 -
55851 -  echo test > conftest_in
55852 -  if test "$cross_compiling" = yes; then
55853
55854 -    ac_cv_pread=no
55855 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
55856
55857 -else
55858 -  cat > conftest.$ac_ext <<EOF
55859 -#line 81715 "configure"
55860 -#include "confdefs.h"
55861
55862 -#include <sys/types.h>
55863 -#include <sys/stat.h>
55864 -#include <fcntl.h>
55865 -#include <unistd.h>
55866 -#include <errno.h>
55867
55868 -    main() {
55869 -    char buf[3];
55870 -    int fd = open("conftest_in", O_RDONLY);
55871 -    if (fd < 0) exit(1);
55872 -    if (pread(fd, buf, 2, 0) != 2) exit(1);
55873 -    /* Linux glibc breakage until 2.2.5 */
55874 -    if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
55875 -    exit(0);
55876 -    }
55877 +  if test "$ext_builddir" = "."; then
55878 +    PHP_PECL_EXTENSION=sockets
55879 +
55880 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
55881 +
55882 +  fi
55883 +
55884
55885 -EOF
55886 -if { (eval echo configure:81735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
55887 -then
55888
55889 -    ac_cv_pread=yes
55890 +    header_path=ext/sockets/
55891 +    for header_file in php_sockets.h; do
55892 +      hp_hf="$header_path/$header_file"
55893 +
55894
55895 -else
55896 -  echo "configure: failed program was:" >&5
55897 -  cat conftest.$ac_ext >&5
55898 -  rm -fr conftest*
55899 +  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
55900
55901 -    ac_cv_pread=no
55902 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
55903 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
55904 +    eval "INSTALLHEADERS$unique=set"
55905 +
55906 +        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
55907 +
55908 +  fi
55909 +
55910 +    done
55911
55912 -fi
55913 -rm -fr conftest*
55914 +
55915  fi
55916
55917 -  rm -f conftest_in
55918
55919 -    if test "$ac_cv_pread" = "no"; then
55920 -
55921 -  echo test > conftest_in
55922 +  echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6
55923 +echo "configure:88348: checking whether zend_object_value is packed" >&5
55924 +  old_CPPFLAGS=$CPPFLAGS
55925 +  CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
55926    if test "$cross_compiling" = yes; then
55927
55928 -    ac_cv_pread=no
55929 +    ac_result=0
55930 +    echo "$ac_t""no" 1>&6
55931
55932  else
55933    cat > conftest.$ac_ext <<EOF
55934 -#line 81762 "configure"
55935 +#line 88358 "configure"
55936  #include "confdefs.h"
55937
55938 -#include <sys/types.h>
55939 -#include <sys/stat.h>
55940 -#include <fcntl.h>
55941 -#include <unistd.h>
55942 -#include <errno.h>
55943 -ssize_t pread(int, void *, size_t, off64_t);
55944 -    main() {
55945 -    char buf[3];
55946 -    int fd = open("conftest_in", O_RDONLY);
55947 -    if (fd < 0) exit(1);
55948 -    if (pread(fd, buf, 2, 0) != 2) exit(1);
55949 -    /* Linux glibc breakage until 2.2.5 */
55950 -    if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
55951 -    exit(0);
55952 -    }
55953 +#include "Zend/zend_types.h"
55954 +int main(int argc, char **argv) {
55955 +       return ((sizeof(zend_object_handle) + sizeof(zend_object_handlers*)) == sizeof(zend_object_value)) ? 0 : 1;
55956 +}
55957
55958  EOF
55959 -if { (eval echo configure:81782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
55960 +if { (eval echo configure:88367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
55961  then
55962
55963 -    ac_cv_pread=yes
55964 +    ac_result=1
55965 +    echo "$ac_t""yes" 1>&6
55966
55967  else
55968    echo "configure: failed program was:" >&5
55969    cat conftest.$ac_ext >&5
55970    rm -fr conftest*
55971
55972 -    ac_cv_pread=no
55973 +    ac_result=0
55974 +    echo "$ac_t""no" 1>&6
55975
55976  fi
55977  rm -fr conftest*
55978  fi
55979
55980 -  rm -f conftest_in
55981 -
55982 -      if test "$ac_cv_pread" = "yes"; then
55983 -        ac_cv_pread=64
55984 -      fi
55985 -    fi
55986 -
55987 -fi
55988 -
55989 -echo "$ac_t""$ac_cv_pread" 1>&6
55990 -
55991 -  if test "$ac_cv_pread" != "no"; then
55992 -    cat >> confdefs.h <<\EOF
55993 -#define HAVE_PREAD 1
55994 +  CPPFLAGS=$old_CPPFLAGS
55995 +  cat >> confdefs.h <<EOF
55996 +#define HAVE_PACKED_OBJECT_VALUE $ac_result
55997  EOF
55998
55999 -    if test "$ac_cv_pread" = "64"; then
56000 -      cat >> confdefs.h <<\EOF
56001 -#define PHP_PREAD_64 1
56002 +  cat >> confdefs.h <<\EOF
56003 +#define HAVE_SPL 1
56004  EOF
56005 -
56006 -    fi
56007 -  fi
56008 -
56009 +
56010
56011 -  ext_builddir=ext/session
56012 -  ext_srcdir=$abs_srcdir/ext/session
56013 +  ext_builddir=ext/spl
56014 +  ext_srcdir=$abs_srcdir/ext/spl
56015
56016    ac_extra=
56017
56018 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
56019 -    PHP_SESSION_SHARED=no
56020 +  if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
56021 +    PHP_SPL_SHARED=no
56022
56023
56024 -  case ext/session in
56025 +  case ext/spl in
56026    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
56027 -  /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56028 -  *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56029 +  /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56030 +  *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56031    esac
56032
56033
56034 @@ -81846,7 +88418,7 @@ EOF
56035
56036
56037    old_IFS=$IFS
56038 -  for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
56039 +  for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
56040
56041        IFS=.
56042        set $ac_src
56043 @@ -81869,18 +88441,18 @@ EOF
56044    done
56045
56046
56047 -    EXT_STATIC="$EXT_STATIC session"
56048 -    if test "$ext_shared" != "nocli"; then
56049 -      EXT_CLI_STATIC="$EXT_CLI_STATIC session"
56050 +    EXT_STATIC="$EXT_STATIC spl"
56051 +    if test "no" != "nocli"; then
56052 +      EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
56053      fi
56054    else
56055 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
56056 -      PHP_SESSION_SHARED=yes
56057 +    if test "no" = "shared" || test "no" = "yes"; then
56058 +      PHP_SPL_SHARED=yes
56059
56060 -  case ext/session in
56061 +  case ext/spl in
56062    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
56063 -  /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56064 -  *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56065 +  /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56066 +  *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56067    esac
56068
56069
56070 @@ -81895,14 +88467,14 @@ EOF
56071
56072
56073    old_IFS=$IFS
56074 -  for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
56075 +  for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
56076
56077        IFS=.
56078        set $ac_src
56079        ac_obj=$1
56080        IFS=$old_IFS
56081
56082 -      shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo"
56083 +      shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo"
56084
56085        case $ac_src in
56086          *.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" ;;
56087 @@ -81925,31 +88497,31 @@ EOF
56088    case $host_alias in
56089      *aix*)
56090        suffix=so
56091 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsession.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsession.so '$ext_builddir'/phpsession.so'
56092 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpspl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpspl.so '$ext_builddir'/phpspl.so'
56093        ;;
56094      *netware*)
56095        suffix=nlm
56096 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSESSION, 3)_SHARED_LIBADD)'
56097 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSPL, 3)_SHARED_LIBADD)'
56098        ;;
56099      *)
56100        suffix=la
56101 -      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_session) $(PHPSESSION_SHARED_LIBADD)'
56102 +      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_spl) $(PHPSPL_SHARED_LIBADD)'
56103        ;;
56104    esac
56105
56106    if test "x" = "xyes"; then
56107 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsession.$suffix"
56108 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix"
56109    else
56110 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix"
56111 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix"
56112    fi
56113
56114 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
56115 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
56116
56117    cat >>Makefile.objects<<EOF
56118 -\$(phplibdir)/phpsession.$suffix: $ext_builddir/phpsession.$suffix
56119 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsession.$suffix \$(phplibdir)
56120 +\$(phplibdir)/phpspl.$suffix: $ext_builddir/phpspl.$suffix
56121 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpspl.$suffix \$(phplibdir)
56122
56123 -$ext_builddir/phpsession.$suffix: \$(shared_objects_session) \$(PHPSESSION_SHARED_DEPENDENCIES)
56124 +$ext_builddir/phpspl.$suffix: \$(shared_objects_spl) \$(PHPSPL_SHARED_DEPENDENCIES)
56125         $link_cmd
56126
56127  EOF
56128 @@ -81962,31 +88534,31 @@ EOF
56129    case $host_alias in
56130      *aix*)
56131        suffix=so
56132 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/session.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(SESSION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/session.so '$ext_builddir'/session.so'
56133 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/spl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/spl.so '$ext_builddir'/spl.so'
56134        ;;
56135      *netware*)
56136        suffix=nlm
56137 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SESSION, 3)_SHARED_LIBADD)'
56138 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 3)_SHARED_LIBADD)'
56139        ;;
56140      *)
56141        suffix=la
56142 -      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_session) $(SESSION_SHARED_LIBADD)'
56143 +      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_spl) $(SPL_SHARED_LIBADD)'
56144        ;;
56145    esac
56146
56147    if test "x" = "xyes"; then
56148 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/session.$suffix"
56149 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix"
56150    else
56151 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/session.$suffix"
56152 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix"
56153    fi
56154
56155 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
56156 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
56157
56158    cat >>Makefile.objects<<EOF
56159 -\$(phplibdir)/session.$suffix: $ext_builddir/session.$suffix
56160 -       \$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir)
56161 +\$(phplibdir)/spl.$suffix: $ext_builddir/spl.$suffix
56162 +       \$(LIBTOOL) --mode=install cp $ext_builddir/spl.$suffix \$(phplibdir)
56163
56164 -$ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES)
56165 +$ext_builddir/spl.$suffix: \$(shared_objects_spl) \$(SPL_SHARED_DEPENDENCIES)
56166         $link_cmd
56167
56168  EOF
56169 @@ -81994,22 +88566,22 @@ EOF
56170            ;;
56171        esac
56172        cat >> confdefs.h <<EOF
56173 -#define COMPILE_DL_SESSION 1
56174 +#define COMPILE_DL_SPL 1
56175  EOF
56176
56177      fi
56178    fi
56179
56180 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
56181 -    PHP_SESSION_SHARED=no
56182 +  if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
56183 +    PHP_SPL_SHARED=no
56184      case "$PHP_SAPI" in
56185        cgi|embed)
56186
56187
56188 -  case ext/session in
56189 +  case ext/spl in
56190    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
56191 -  /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56192 -  *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56193 +  /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56194 +  *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56195    esac
56196
56197
56198 @@ -82024,7 +88596,7 @@ EOF
56199
56200
56201    old_IFS=$IFS
56202 -  for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
56203 +  for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
56204
56205        IFS=.
56206        set $ac_src
56207 @@ -82047,15 +88619,15 @@ EOF
56208    done
56209
56210
56211 -        EXT_STATIC="$EXT_STATIC session"
56212 +        EXT_STATIC="$EXT_STATIC spl"
56213          ;;
56214        *)
56215
56216
56217 -  case ext/session in
56218 +  case ext/spl in
56219    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
56220 -  /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56221 -  *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56222 +  /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56223 +  *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56224    esac
56225
56226
56227 @@ -82070,7 +88642,7 @@ EOF
56228
56229
56230    old_IFS=$IFS
56231 -  for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
56232 +  for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
56233
56234        IFS=.
56235        set $ac_src
56236 @@ -82079,135 +88651,366 @@ EOF
56237
56238        PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
56239
56240 -      case $ac_src in
56241 -        *.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" ;;
56242 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
56243 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
56244 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
56245 -      esac
56246 +      case $ac_src in
56247 +        *.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" ;;
56248 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
56249 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
56250 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
56251 +      esac
56252 +
56253 +    cat >>Makefile.objects<<EOF
56254 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
56255 +       $ac_comp
56256 +EOF
56257 +  done
56258 +
56259 +
56260 +        ;;
56261 +    esac
56262 +    EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
56263 +  fi
56264 +
56265 +
56266 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
56267 +
56268 +
56269 +
56270 +  if test "$ext_builddir" = "."; then
56271 +    PHP_PECL_EXTENSION=spl
56272 +
56273 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
56274 +
56275 +  fi
56276 +
56277 +
56278 +
56279 +    header_path=ext/spl
56280 +    for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do
56281 +      hp_hf="$header_path/$header_file"
56282 +
56283 +
56284 +  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
56285 +
56286 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
56287 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
56288 +    eval "INSTALLHEADERS$unique=set"
56289 +
56290 +        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
56291 +
56292 +  fi
56293 +
56294 +    done
56295 +
56296 +
56297 +
56298 +  am_i_shared=$PHP_SPL_SHARED
56299 +  is_it_shared=$PHP_PCRE_SHARED
56300 +  is_it_enabled=$PHP_PCRE
56301 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
56302 +    { echo "configure: error:
56303 +You've configured extension spl to build statically, but it
56304 +depends on extension pcre, which you've configured to build shared.
56305 +You either need to build spl shared or build pcre statically for the
56306 +build to be successful.
56307 +" 1>&2; exit 1; }
56308 +  fi
56309 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
56310 +    { echo "configure: error:
56311 +You've configured extension spl, which depends on extension pcre,
56312 +but you've either not enabled pcre, or have disabled it.
56313 +" 1>&2; exit 1; }
56314 +  fi
56315 +
56316 +
56317 +
56318 +
56319 +php_with_sqlite=yes
56320 +
56321 +echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
56322 +echo "configure:88731: checking for sqlite support" >&5
56323 +# Check whether --with-sqlite or --without-sqlite was given.
56324 +if test "${with_sqlite+set}" = set; then
56325 +  withval="$with_sqlite"
56326 +  PHP_SQLITE=$withval
56327 +else
56328 +
56329 +  PHP_SQLITE=yes
56330 +  test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL
56331 +
56332 +fi
56333 +
56334 +
56335 +
56336 +ext_output="yes, shared"
56337 +ext_shared=yes
56338 +case $PHP_SQLITE in
56339 +shared,*)
56340 +  PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'`
56341 +  ;;
56342 +shared)
56343 +  PHP_SQLITE=yes
56344 +  ;;
56345 +no)
56346 +  ext_output=no
56347 +  ext_shared=no
56348 +  ;;
56349 +*)
56350 +  ext_output=yes
56351 +  ext_shared=no
56352 +  ;;
56353 +esac
56354 +
56355 +
56356 +
56357 +echo "$ac_t""$ext_output" 1>&6
56358 +
56359 +
56360 +
56361 +
56362 +
56363 +php_enable_sqlite_utf8=no
56364 +
56365 +echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6
56366 +echo "configure:88775: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
56367 +# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given.
56368 +if test "${enable_sqlite_utf8+set}" = set; then
56369 +  enableval="$enable_sqlite_utf8"
56370 +  PHP_SQLITE_UTF8=$enableval
56371 +else
56372 +
56373 +  PHP_SQLITE_UTF8=no
56374 +
56375 +
56376 +fi
56377 +
56378 +
56379 +ext_output=$PHP_SQLITE_UTF8
56380 +echo "$ac_t""$ext_output" 1>&6
56381 +
56382
56383 -    cat >>Makefile.objects<<EOF
56384 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
56385 -       $ac_comp
56386 -EOF
56387 -  done
56388
56389
56390 -        ;;
56391 -    esac
56392 -    EXT_CLI_STATIC="$EXT_CLI_STATIC session"
56393 -  fi
56394 -
56395 -
56396 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
56397 -
56398
56399
56400 -  if test "$ext_builddir" = "."; then
56401 -    PHP_PECL_EXTENSION=session
56402 +
56403 +
56404 +
56405 +if test "$PHP_SQLITE" != "no"; then
56406 +  if test "$PHP_PDO" != "no"; then
56407
56408 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
56409 +  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
56410 +echo "configure:88803: checking for PDO includes" >&5
56411 +if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
56412 +  echo $ac_n "(cached) $ac_c" 1>&6
56413 +else
56414 +
56415 +    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
56416 +echo "configure:88809: checking for PDO includes" >&5
56417 +    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
56418 +      pdo_inc_path=$abs_srcdir/ext
56419 +    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
56420 +      pdo_inc_path=$abs_srcdir/ext
56421 +    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
56422 +      pdo_inc_path=$prefix/include/php/ext
56423 +    fi
56424 +
56425 +fi
56426
56427 +echo "$ac_t""$pdo_inc_path" 1>&6
56428 +  if test -n "$pdo_inc_path"; then
56429 +:
56430 +  else
56431 +echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2
56432    fi
56433
56434 +    if test -n "$pdo_inc_path"; then
56435 +      cat >> confdefs.h <<\EOF
56436 +#define PHP_SQLITE2_HAVE_PDO 1
56437 +EOF
56438 +
56439 +      pdo_inc_path="-I$pdo_inc_path"
56440 +    fi
56441 +  fi
56442 +
56443 +  if test "$PHP_SQLITE" != "yes"; then
56444 +    SEARCH_PATH="/usr/local /usr"
56445 +    SEARCH_FOR="/include/sqlite.h"
56446 +    if test -r $PHP_SQLITE/; then # path given as parameter
56447 +      SQLITE_DIR=$PHP_SQLITE
56448 +    else # search default path list
56449 +      echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
56450 +echo "configure:88843: checking for sqlite files in default path" >&5
56451 +      for i in $SEARCH_PATH ; do
56452 +        if test -r $i/$SEARCH_FOR; then
56453 +          SQLITE_DIR=$i
56454 +          echo "$ac_t""found in $i" 1>&6
56455 +        fi
56456 +      done
56457 +    fi
56458
56459 -  am_i_shared=$PHP_SESSION_SHARED
56460 -  is_it_shared=$PHP_HASH_SHARED
56461 -  is_it_enabled=$PHP_HASH
56462 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
56463 -    { echo "configure: error:
56464 -You've configured extension session to build statically, but it
56465 -depends on extension hash, which you've configured to build shared.
56466 -You either need to build session shared or build hash statically for the
56467 -build to be successful.
56468 -" 1>&2; exit 1; }
56469 -  fi
56470 -  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
56471 -    { echo "configure: error:
56472 -You've configured extension session, which depends on extension hash,
56473 -but you've either not enabled hash, or have disabled it.
56474 -" 1>&2; exit 1; }
56475 -  fi
56476 +    if test -z "$SQLITE_DIR"; then
56477 +      echo "$ac_t""not found" 1>&6
56478 +      { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; }
56479 +    fi
56480 +
56481 +
56482 +  save_old_LDFLAGS=$LDFLAGS
56483 +  ac_stuff="
56484 +      -L$SQLITE_DIR/$PHP_LIBDIR -lm
56485 +    "
56486
56487 +  save_ext_shared=$ext_shared
56488 +  ext_shared=yes
56489
56490 -  am_i_shared=$PHP_SESSION_SHARED
56491 -  is_it_shared=$PHP_SPL_SHARED
56492 -  is_it_enabled=$PHP_SPL
56493 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
56494 -    { echo "configure: error:
56495 -You've configured extension session to build statically, but it
56496 -depends on extension spl, which you've configured to build shared.
56497 -You either need to build session shared or build spl statically for the
56498 -build to be successful.
56499 -" 1>&2; exit 1; }
56500 -  fi
56501 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
56502 -    { echo "configure: error:
56503 -You've configured extension session, which depends on extension spl,
56504 -but you've either not enabled spl, or have disabled it.
56505 -" 1>&2; exit 1; }
56506 -  fi
56507 +  for ac_i in $ac_stuff; do
56508 +    case $ac_i in
56509 +    -pthread)
56510 +      if test "$ext_shared" = "yes"; then
56511 +        LDFLAGS="$LDFLAGS -pthread"
56512 +      else
56513 +
56514
56515 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
56516
56517 -  PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD"
56518 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
56519 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
56520 +    eval "EXTRA_LDFLAGS$unique=set"
56521 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
56522 +  fi
56523
56524 +      fi
56525 +    ;;
56526 +    -l*)
56527 +      ac_ii=`echo $ac_i|cut -c 3-`
56528 +
56529
56530 +  case $ac_ii in
56531 +  c|c_r|pthread*) ;;
56532 +  *)
56533 +    if test "$ext_shared" = "yes"; then
56534 +        LDFLAGS="$LDFLAGS -l$ac_ii"
56535 +    else
56536 +
56537
56538 -    header_path=ext/session
56539 -    for header_file in php_session.h mod_files.h mod_user.h; do
56540 -      hp_hf="$header_path/$header_file"
56541 +  case $ac_ii in
56542 +  c|c_r|pthread*) ;;
56543 +  *)
56544 +      LIBS="$LIBS -l$ac_ii"
56545 +   ;;
56546 +  esac
56547 +
56548 +
56549 +    fi
56550 +   ;;
56551 +  esac
56552 +
56553 +
56554 +    ;;
56555 +    -L*)
56556 +      ac_ii=`echo $ac_i|cut -c 3-`
56557
56558 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
56559 +
56560 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
56561 +    ai_p=$ac_ii
56562 +  else
56563 +
56564 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
56565 +
56566 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
56567 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
56568 +  fi
56569 +
56570 +
56571 +      if test "$ext_shared" = "yes"; then
56572 +        LDFLAGS="-L$ai_p $LDFLAGS"
56573 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
56574 +      else
56575 +
56576
56577 -  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
56578
56579 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
56580 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
56581 +
56582 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
56583    if test -n "$unique" && test "`eval $cmd`" = "" ; then
56584 -    eval "INSTALLHEADERS$unique=set"
56585 +    eval "LIBPATH$unique=set"
56586
56587 -        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
56588 -
56589 -  fi
56590 -
56591 -    done
56592 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
56593 +    LDFLAGS="$LDFLAGS -L$ai_p"
56594 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
56595
56596 +  fi
56597
56598 -  cat >> confdefs.h <<\EOF
56599 -#define HAVE_PHP_SESSION 1
56600 -EOF
56601
56602 -fi
56603 +      fi
56604 +
56605 +  fi
56606
56607 -if test "$PHP_MM" != "no"; then
56608 -  for i in $PHP_MM /usr/local /usr; do
56609 -    test -f "$i/include/mm.h" && MM_DIR=$i && break
56610 +    ;;
56611 +    esac
56612    done
56613
56614 -  if test -z "$MM_DIR" ; then
56615 -    { echo "configure: error: cannot find mm library" 1>&2; exit 1; }
56616 -  fi
56617 -
56618 +  echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
56619 +echo "configure:88955: checking for sqlite_open in -lsqlite" >&5
56620 +ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'`
56621 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
56622 +  echo $ac_n "(cached) $ac_c" 1>&6
56623 +else
56624 +  ac_save_LIBS="$LIBS"
56625 +LIBS="-lsqlite  $LIBS"
56626 +cat > conftest.$ac_ext <<EOF
56627 +#line 88963 "configure"
56628 +#include "confdefs.h"
56629 +/* Override any gcc2 internal prototype to avoid an error.  */
56630 +/* We use char because int might match the return type of a gcc2
56631 +    builtin and then its argument prototype would still apply.  */
56632 +char sqlite_open();
56633 +
56634 +int main() {
56635 +sqlite_open()
56636 +; return 0; }
56637 +EOF
56638 +if { (eval echo configure:88974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56639 +  rm -rf conftest*
56640 +  eval "ac_cv_lib_$ac_lib_var=yes"
56641 +else
56642 +  echo "configure: failed program was:" >&5
56643 +  cat conftest.$ac_ext >&5
56644 +  rm -rf conftest*
56645 +  eval "ac_cv_lib_$ac_lib_var=no"
56646 +fi
56647 +rm -f conftest*
56648 +LIBS="$ac_save_LIBS"
56649 +
56650 +fi
56651 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
56652 +  echo "$ac_t""yes" 1>&6
56653
56654 +    LDFLAGS=$save_old_LDFLAGS
56655 +    ext_shared=$save_ext_shared
56656 +
56657 +
56658
56659    if test "$ext_shared" = "yes"; then
56660 -    SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD"
56661 -    if test -n "$MM_DIR/$PHP_LIBDIR"; then
56662 +    SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD"
56663 +    if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then
56664
56665 -  if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
56666 +  if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
56667
56668 -  if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
56669 -    ai_p=$MM_DIR/$PHP_LIBDIR
56670 +  if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
56671 +    ai_p=$SQLITE_DIR/$PHP_LIBDIR
56672    else
56673
56674 -    ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
56675 +    ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
56676
56677      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
56678 -    ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
56679 +    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
56680    fi
56681
56682
56683        if test "$ext_shared" = "yes"; then
56684 -        SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD"
56685 -        test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD"
56686 +        SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD"
56687 +        test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD"
56688        else
56689
56690
56691 @@ -82233,18 +89036,18 @@ if test "$PHP_MM" != "no"; then
56692    else
56693
56694
56695 -  if test -n "$MM_DIR/$PHP_LIBDIR"; then
56696 +  if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then
56697
56698 -  if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
56699 +  if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
56700
56701 -  if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
56702 -    ai_p=$MM_DIR/$PHP_LIBDIR
56703 +  if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
56704 +    ai_p=$SQLITE_DIR/$PHP_LIBDIR
56705    else
56706
56707 -    ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
56708 +    ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
56709
56710      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
56711 -    ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
56712 +    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
56713    fi
56714
56715
56716 @@ -82270,10 +89073,10 @@ if test "$PHP_MM" != "no"; then
56717    fi
56718
56719
56720 -  case mm in
56721 +  case sqlite in
56722    c|c_r|pthread*) ;;
56723    *)
56724 -      LIBS="-lmm $LIBS"
56725 +      LIBS="-lsqlite $LIBS"
56726     ;;
56727    esac
56728
56729 @@ -82283,17 +89086,17 @@ if test "$PHP_MM" != "no"; then
56730    fi
56731
56732
56733 -
56734 -  if test "$MM_DIR/include" != "/usr/include"; then
56735 +
56736 +  if test "$SQLITE_DIR/include" != "/usr/include"; then
56737
56738 -  if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then
56739 -    ai_p=$MM_DIR/include
56740 +  if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then
56741 +    ai_p=$SQLITE_DIR/include
56742    else
56743
56744 -    ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
56745 +    ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
56746
56747      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
56748 -    ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`"
56749 +    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`"
56750    fi
56751
56752
56753 @@ -82314,93 +89117,121 @@ if test "$PHP_MM" != "no"; then
56754
56755    fi
56756
56757 -
56758 -
56759 -    for header_file in ext/session/mod_mm.h; do
56760 -
56761 -
56762 -  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
56763 -
56764 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
56765 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
56766 -    eval "INSTALLHEADERS$unique=set"
56767
56768 -        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
56769 -
56770 -  fi
56771 -
56772 -    done
56773
56774 +else
56775 +  echo "$ac_t""no" 1>&6
56776
56777 -  cat >> confdefs.h <<\EOF
56778 -#define HAVE_LIBMM 1
56779 -EOF
56780 -
56781 +    LDFLAGS=$save_old_LDFLAGS
56782 +    ext_shared=$save_ext_shared
56783 +    unset ac_cv_lib_sqlite_sqlite_open
56784 +
56785 +      { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
56786 +
56787 +
56788  fi
56789
56790 +    SQLITE_MODULE_TYPE=external
56791 +    PHP_SQLITE_CFLAGS=$pdo_inc_path
56792 +    sqlite_extra_sources="libsqlite/src/encode.c"
56793 +  else
56794 +    # use bundled library
56795 +
56796 +  # we only support certain lemon versions
56797 +  lemon_version_list="1.0"
56798
56799 -php_enable_shmop=no
56800 +  # Extract the first word of "lemon", so it can be a program name with args.
56801 +set dummy lemon; ac_word=$2
56802 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
56803 +echo "configure:89147: checking for $ac_word" >&5
56804 +if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then
56805 +  echo $ac_n "(cached) $ac_c" 1>&6
56806 +else
56807 +  if test -n "$LEMON"; then
56808 +  ac_cv_prog_LEMON="$LEMON" # Let the user override the test.
56809 +else
56810 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
56811 +  ac_dummy="$PATH"
56812 +  for ac_dir in $ac_dummy; do
56813 +    test -z "$ac_dir" && ac_dir=.
56814 +    if test -f $ac_dir/$ac_word; then
56815 +      ac_cv_prog_LEMON="lemon"
56816 +      break
56817 +    fi
56818 +  done
56819 +  IFS="$ac_save_ifs"
56820 +fi
56821 +fi
56822 +LEMON="$ac_cv_prog_LEMON"
56823 +if test -n "$LEMON"; then
56824 +  echo "$ac_t""$LEMON" 1>&6
56825 +else
56826 +  echo "$ac_t""no" 1>&6
56827 +fi
56828
56829 -echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
56830 -echo "configure:82346: checking whether to enable shmop support" >&5
56831 -# Check whether --enable-shmop or --disable-shmop was given.
56832 -if test "${enable_shmop+set}" = set; then
56833 -  enableval="$enable_shmop"
56834 -  PHP_SHMOP=$enableval
56835 +  if test "$LEMON"; then
56836 +    echo $ac_n "checking for lemon version""... $ac_c" 1>&6
56837 +echo "configure:89175: checking for lemon version" >&5
56838 +if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then
56839 +  echo $ac_n "(cached) $ac_c" 1>&6
56840  else
56841
56842 -  PHP_SHMOP=no
56843 -  test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL
56844 -
56845 +      lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'`
56846 +      php_cv_lemon_version=invalid
56847 +      for lemon_check_version in $lemon_version_list; do
56848 +        if test "$lemon_version" = "$lemon_check_version"; then
56849 +          php_cv_lemon_version="$lemon_check_version (ok)"
56850 +        fi
56851 +      done
56852 +
56853  fi
56854
56855 +echo "$ac_t""$php_cv_lemon_version" 1>&6
56856 +  else
56857 +    lemon_version=none
56858 +  fi
56859 +  case $php_cv_lemon_version in
56860 +    ""|invalid)
56861 +      lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)."
56862 +      echo "configure: warning: $lemon_msg" 1>&2
56863 +      LEMON="exit 0;"
56864 +      ;;
56865 +  esac
56866 +
56867 +  PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON"
56868
56869
56870 -ext_output="yes, shared"
56871 -ext_shared=yes
56872 -case $PHP_SHMOP in
56873 -shared,*)
56874 -  PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'`
56875 -  ;;
56876 -shared)
56877 -  PHP_SHMOP=yes
56878 -  ;;
56879 -no)
56880 -  ext_output=no
56881 -  ext_shared=no
56882 -  ;;
56883 -*)
56884 -  ext_output=yes
56885 -  ext_shared=no
56886 -  ;;
56887 -esac
56888 -
56889 -
56890 -
56891 -echo "$ac_t""$ext_output" 1>&6
56892 -
56893 -
56894 -
56895 -
56896 -if test "$PHP_SHMOP" != "no"; then
56897 -  cat >> confdefs.h <<\EOF
56898 -#define HAVE_SHMOP 1
56899 -EOF
56900 -
56901 +    SQLITE_MODULE_TYPE=builtin
56902 +    PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path"
56903 +    sqlite_extra_sources="libsqlite/src/opcodes.c \
56904 +        libsqlite/src/parse.c libsqlite/src/encode.c \
56905 +        libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
56906 +        libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
56907 +        libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
56908 +        libsqlite/src/os.c libsqlite/src/pager.c \
56909 +        libsqlite/src/printf.c libsqlite/src/random.c \
56910 +        libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
56911 +        libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
56912 +        libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \
56913 +        libsqlite/src/vacuum.c libsqlite/src/copy.c \
56914 +        libsqlite/src/vdbeaux.c libsqlite/src/date.c \
56915 +        libsqlite/src/where.c libsqlite/src/trigger.c"
56916 +  fi
56917 +        sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources"
56918
56919 -  ext_builddir=ext/shmop
56920 -  ext_srcdir=$abs_srcdir/ext/shmop
56921 +  ext_builddir=ext/sqlite
56922 +  ext_srcdir=$abs_srcdir/ext/sqlite
56923
56924 -  ac_extra=
56925 +  ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
56926
56927    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
56928 -    PHP_SHMOP_SHARED=no
56929 +    PHP_SQLITE_SHARED=no
56930
56931
56932 -  case ext/shmop in
56933 +  case ext/sqlite in
56934    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
56935 -  /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56936 -  *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56937 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56938 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56939    esac
56940
56941
56942 @@ -82415,7 +89246,7 @@ EOF
56943
56944
56945    old_IFS=$IFS
56946 -  for ac_src in shmop.c; do
56947 +  for ac_src in $sqlite_sources; do
56948
56949        IFS=.
56950        set $ac_src
56951 @@ -82438,18 +89269,18 @@ EOF
56952    done
56953
56954
56955 -    EXT_STATIC="$EXT_STATIC shmop"
56956 +    EXT_STATIC="$EXT_STATIC sqlite"
56957      if test "$ext_shared" != "nocli"; then
56958 -      EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
56959 +      EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
56960      fi
56961    else
56962      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
56963 -      PHP_SHMOP_SHARED=yes
56964 +      PHP_SQLITE_SHARED=yes
56965
56966 -  case ext/shmop in
56967 +  case ext/sqlite in
56968    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
56969 -  /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56970 -  *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56971 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
56972 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
56973    esac
56974
56975
56976 @@ -82464,14 +89295,14 @@ EOF
56977
56978
56979    old_IFS=$IFS
56980 -  for ac_src in shmop.c; do
56981 +  for ac_src in $sqlite_sources; do
56982
56983        IFS=.
56984        set $ac_src
56985        ac_obj=$1
56986        IFS=$old_IFS
56987
56988 -      shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo"
56989 +      shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo"
56990
56991        case $ac_src in
56992          *.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" ;;
56993 @@ -82494,31 +89325,31 @@ EOF
56994    case $host_alias in
56995      *aix*)
56996        suffix=so
56997 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpshmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpshmop.so '$ext_builddir'/phpshmop.so'
56998 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsqlite.so '$ext_builddir'/phpsqlite.so'
56999        ;;
57000      *netware*)
57001        suffix=nlm
57002 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)'
57003 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 3)_SHARED_LIBADD)'
57004        ;;
57005      *)
57006        suffix=la
57007 -      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_shmop) $(PHPSHMOP_SHARED_LIBADD)'
57008 +      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) $(PHPSQLITE_SHARED_LIBADD)'
57009        ;;
57010    esac
57011
57012    if test "x" = "xyes"; then
57013 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix"
57014 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix"
57015    else
57016 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix"
57017 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix"
57018    fi
57019
57020 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
57021 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
57022
57023    cat >>Makefile.objects<<EOF
57024 -\$(phplibdir)/phpshmop.$suffix: $ext_builddir/phpshmop.$suffix
57025 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpshmop.$suffix \$(phplibdir)
57026 +\$(phplibdir)/phpsqlite.$suffix: $ext_builddir/phpsqlite.$suffix
57027 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsqlite.$suffix \$(phplibdir)
57028
57029 -$ext_builddir/phpshmop.$suffix: \$(shared_objects_shmop) \$(PHPSHMOP_SHARED_DEPENDENCIES)
57030 +$ext_builddir/phpsqlite.$suffix: \$(shared_objects_sqlite) \$(PHPSQLITE_SHARED_DEPENDENCIES)
57031         $link_cmd
57032
57033  EOF
57034 @@ -82531,31 +89362,31 @@ EOF
57035    case $host_alias in
57036      *aix*)
57037        suffix=so
57038 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/shmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(SHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/shmop.so '$ext_builddir'/shmop.so'
57039 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sqlite.so '$ext_builddir'/sqlite.so'
57040        ;;
57041      *netware*)
57042        suffix=nlm
57043 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SHMOP, 3)_SHARED_LIBADD)'
57044 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE, 3)_SHARED_LIBADD)'
57045        ;;
57046      *)
57047        suffix=la
57048 -      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_shmop) $(SHMOP_SHARED_LIBADD)'
57049 +      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)'
57050        ;;
57051    esac
57052
57053    if test "x" = "xyes"; then
57054 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/shmop.$suffix"
57055 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sqlite.$suffix"
57056    else
57057 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/shmop.$suffix"
57058 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix"
57059    fi
57060
57061 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
57062 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
57063
57064    cat >>Makefile.objects<<EOF
57065 -\$(phplibdir)/shmop.$suffix: $ext_builddir/shmop.$suffix
57066 -       \$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir)
57067 +\$(phplibdir)/sqlite.$suffix: $ext_builddir/sqlite.$suffix
57068 +       \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite.$suffix \$(phplibdir)
57069
57070 -$ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES)
57071 +$ext_builddir/sqlite.$suffix: \$(shared_objects_sqlite) \$(SQLITE_SHARED_DEPENDENCIES)
57072         $link_cmd
57073
57074  EOF
57075 @@ -82563,22 +89394,22 @@ EOF
57076            ;;
57077        esac
57078        cat >> confdefs.h <<EOF
57079 -#define COMPILE_DL_SHMOP 1
57080 +#define COMPILE_DL_SQLITE 1
57081  EOF
57082
57083      fi
57084    fi
57085
57086    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
57087 -    PHP_SHMOP_SHARED=no
57088 +    PHP_SQLITE_SHARED=no
57089      case "$PHP_SAPI" in
57090        cgi|embed)
57091
57092
57093 -  case ext/shmop in
57094 +  case ext/sqlite in
57095    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
57096 -  /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
57097 -  *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
57098 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
57099 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
57100    esac
57101
57102
57103 @@ -82593,7 +89424,7 @@ EOF
57104
57105
57106    old_IFS=$IFS
57107 -  for ac_src in shmop.c; do
57108 +  for ac_src in $sqlite_sources; do
57109
57110        IFS=.
57111        set $ac_src
57112 @@ -82616,15 +89447,15 @@ EOF
57113    done
57114
57115
57116 -        EXT_STATIC="$EXT_STATIC shmop"
57117 +        EXT_STATIC="$EXT_STATIC sqlite"
57118          ;;
57119        *)
57120
57121
57122 -  case ext/shmop in
57123 +  case ext/sqlite in
57124    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
57125 -  /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
57126 -  *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
57127 +  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
57128 +  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
57129    esac
57130
57131
57132 @@ -82639,7 +89470,7 @@ EOF
57133
57134
57135    old_IFS=$IFS
57136 -  for ac_src in shmop.c; do
57137 +  for ac_src in $sqlite_sources; do
57138
57139        IFS=.
57140        set $ac_src
57141 @@ -82664,7 +89495,7 @@ EOF
57142
57143          ;;
57144      esac
57145 -    EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
57146 +    EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
57147    fi
57148
57149
57150 @@ -82673,554 +89504,841 @@ EOF
57151
57152
57153    if test "$ext_builddir" = "."; then
57154 -    PHP_PECL_EXTENSION=shmop
57155 +    PHP_PECL_EXTENSION=sqlite
57156
57157    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
57158
57159    fi
57160
57161 -fi
57162 +
57163 +  am_i_shared=$PHP_SQLITE_SHARED
57164 +  is_it_shared=$PHP_SPL_SHARED
57165 +  is_it_enabled=$PHP_SPL
57166 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
57167 +    { echo "configure: error:
57168 +You've configured extension sqlite to build statically, but it
57169 +depends on extension spl, which you've configured to build shared.
57170 +You either need to build sqlite shared or build spl statically for the
57171 +build to be successful.
57172 +" 1>&2; exit 1; }
57173 +  fi
57174 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
57175 +    { echo "configure: error:
57176 +You've configured extension sqlite, which depends on extension spl,
57177 +but you've either not enabled spl, or have disabled it.
57178 +" 1>&2; exit 1; }
57179 +  fi
57180 +
57181 +
57182 +  am_i_shared=$PHP_SQLITE_SHARED
57183 +  is_it_shared=$PHP_PDO_SHARED
57184 +  is_it_enabled=$PHP_PDO
57185 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
57186 +    { echo "configure: error:
57187 +You've configured extension sqlite to build statically, but it
57188 +depends on extension pdo, which you've configured to build shared.
57189 +You either need to build sqlite shared or build pdo statically for the
57190 +build to be successful.
57191 +" 1>&2; exit 1; }
57192 +  fi
57193 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
57194 +    { echo "configure: error:
57195 +You've configured extension sqlite, which depends on extension pdo,
57196 +but you've either not enabled pdo, or have disabled it.
57197 +" 1>&2; exit 1; }
57198 +  fi
57199 +
57200 +
57201 +
57202 +  src=$ext_srcdir/Makefile.frag
57203 +  ac_srcdir=$ext_srcdir
57204 +  ac_builddir=$ext_builddir
57205 +  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
57206
57207 +
57208 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD"
57209
57210 +
57211 +
57212 +    for header_file in $ext_builddir/libsqlite/src/sqlite.h; do
57213 +
57214 +
57215 +  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
57216 +
57217 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
57218 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
57219 +    eval "INSTALLHEADERS$unique=set"
57220 +
57221 +        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
57222 +
57223 +  fi
57224
57225 -php_enable_simplexml=yes
57226 +    done
57227 +
57228
57229 -echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6
57230 -echo "configure:82690: checking whether to enable SimpleXML support" >&5
57231 -# Check whether --enable-simplexml or --disable-simplexml was given.
57232 -if test "${enable_simplexml+set}" = set; then
57233 -  enableval="$enable_simplexml"
57234 -  PHP_SIMPLEXML=$enableval
57235 -else
57236
57237 -  PHP_SIMPLEXML=yes
57238 -  test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL
57239 +  if test "$SQLITE_MODULE_TYPE" = "builtin"; then
57240 +
57241 +
57242 +    $php_shtool mkdir -p $ext_builddir/libsqlite/src
57243 +
57244
57245 +    echo $ac_n "checking size of char *""... $ac_c" 1>&6
57246 +echo "configure:89588: checking size of char *" >&5
57247 +if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
57248 +  echo $ac_n "(cached) $ac_c" 1>&6
57249 +else
57250 +  if test "$cross_compiling" = yes; then
57251 +  ac_cv_sizeof_char_p=4
57252 +else
57253 +  cat > conftest.$ac_ext <<EOF
57254 +#line 89596 "configure"
57255 +#include "confdefs.h"
57256 +#include <stdio.h>
57257 +#include <sys/types.h>
57258 +main()
57259 +{
57260 +  FILE *f=fopen("conftestval", "w");
57261 +  if (!f) exit(1);
57262 +  fprintf(f, "%d\n", sizeof(char *));
57263 +  exit(0);
57264 +}
57265 +EOF
57266 +if { (eval echo configure:89608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57267 +then
57268 +  ac_cv_sizeof_char_p=`cat conftestval`
57269 +else
57270 +  echo "configure: failed program was:" >&5
57271 +  cat conftest.$ac_ext >&5
57272 +  rm -fr conftest*
57273 +  ac_cv_sizeof_char_p=0
57274 +fi
57275 +rm -fr conftest*
57276  fi
57277
57278 +fi
57279 +echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
57280 +cat >> confdefs.h <<EOF
57281 +#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
57282 +EOF
57283
57284
57285 -ext_output="yes, shared"
57286 -ext_shared=yes
57287 -case $PHP_SIMPLEXML in
57288 -shared,*)
57289 -  PHP_SIMPLEXML=`echo "$PHP_SIMPLEXML"|$SED 's/^shared,//'`
57290 -  ;;
57291 -shared)
57292 -  PHP_SIMPLEXML=yes
57293 -  ;;
57294 -no)
57295 -  ext_output=no
57296 -  ext_shared=no
57297 -  ;;
57298 -*)
57299 -  ext_output=yes
57300 -  ext_shared=no
57301 -  ;;
57302 -esac
57303 +    cat >> confdefs.h <<\EOF
57304 +#define SQLITE_PTR_SZ SIZEOF_CHAR_P
57305 +EOF
57306
57307 +                if test "$PHP_SQLITE_UTF8" = "yes"; then
57308 +      SQLITE_ENCODING="UTF8"
57309 +      cat >> confdefs.h <<\EOF
57310 +#define SQLITE_UTF8 1
57311 +EOF
57312
57313 +    else
57314 +      SQLITE_ENCODING="ISO8859"
57315 +    fi
57316 +
57317 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING"
57318
57319 -echo "$ac_t""$ext_output" 1>&6
57320
57321 +    SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
57322 +
57323 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION"
57324
57325
57326 +    sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h
57327
57328 -if test -z "$PHP_LIBXML_DIR"; then
57329 +    if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then
57330 +      echo '#include <php_config.h>' > $ext_builddir/libsqlite/src/config.h
57331 +    else
57332 +      echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h
57333 +    fi
57334 +
57335 +    cat >> $ext_builddir/libsqlite/src/config.h <<EOF
57336 +#if ZTS
57337 +# define THREADSAFE 1
57338 +#endif
57339 +#if !ZEND_DEBUG
57340 +# define NDEBUG
57341 +#endif
57342 +EOF
57343 +  fi
57344
57345 -php_with_libxml_dir=no
57346 +  for ac_func in usleep nanosleep
57347 +do
57348 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
57349 +echo "configure:89670: checking for $ac_func" >&5
57350 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
57351 +  echo $ac_n "(cached) $ac_c" 1>&6
57352 +else
57353 +  cat > conftest.$ac_ext <<EOF
57354 +#line 89675 "configure"
57355 +#include "confdefs.h"
57356 +/* System header to define __stub macros and hopefully few prototypes,
57357 +    which can conflict with char $ac_func(); below.  */
57358 +#include <assert.h>
57359 +/* Override any gcc2 internal prototype to avoid an error.  */
57360 +/* We use char because int might match the return type of a gcc2
57361 +    builtin and then its argument prototype would still apply.  */
57362 +char $ac_func();
57363
57364 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
57365 -echo "configure:82735: checking libxml2 install dir" >&5
57366 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
57367 -if test "${with_libxml_dir+set}" = set; then
57368 -  withval="$with_libxml_dir"
57369 -  PHP_LIBXML_DIR=$withval
57370 +int main() {
57371 +
57372 +/* The GNU C library defines this for functions which it implements
57373 +    to always fail with ENOSYS.  Some functions are actually named
57374 +    something starting with __ and the normal name is an alias.  */
57375 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
57376 +choke me
57377 +#else
57378 +$ac_func();
57379 +#endif
57380 +
57381 +; return 0; }
57382 +EOF
57383 +if { (eval echo configure:89698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57384 +  rm -rf conftest*
57385 +  eval "ac_cv_func_$ac_func=yes"
57386 +else
57387 +  echo "configure: failed program was:" >&5
57388 +  cat conftest.$ac_ext >&5
57389 +  rm -rf conftest*
57390 +  eval "ac_cv_func_$ac_func=no"
57391 +fi
57392 +rm -f conftest*
57393 +fi
57394 +
57395 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
57396 +  echo "$ac_t""yes" 1>&6
57397 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
57398 +  cat >> confdefs.h <<EOF
57399 +#define $ac_tr_func 1
57400 +EOF
57401 +
57402 +else
57403 +  echo "$ac_t""no" 1>&6
57404 +fi
57405 +done
57406 +
57407 +  for ac_hdr in time.h
57408 +do
57409 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
57410 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
57411 +echo "configure:89726: checking for $ac_hdr" >&5
57412 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
57413 +  echo $ac_n "(cached) $ac_c" 1>&6
57414 +else
57415 +  cat > conftest.$ac_ext <<EOF
57416 +#line 89731 "configure"
57417 +#include "confdefs.h"
57418 +#include <$ac_hdr>
57419 +EOF
57420 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
57421 +{ (eval echo configure:89736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
57422 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
57423 +if test -z "$ac_err"; then
57424 +  rm -rf conftest*
57425 +  eval "ac_cv_header_$ac_safe=yes"
57426 +else
57427 +  echo "$ac_err" >&5
57428 +  echo "configure: failed program was:" >&5
57429 +  cat conftest.$ac_ext >&5
57430 +  rm -rf conftest*
57431 +  eval "ac_cv_header_$ac_safe=no"
57432 +fi
57433 +rm -f conftest*
57434 +fi
57435 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
57436 +  echo "$ac_t""yes" 1>&6
57437 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
57438 +  cat >> confdefs.h <<EOF
57439 +#define $ac_tr_hdr 1
57440 +EOF
57441 +
57442 +else
57443 +  echo "$ac_t""no" 1>&6
57444 +fi
57445 +done
57446 +
57447 +fi
57448 +
57449 +
57450 +
57451 +echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
57452 +echo "configure:89767: checking whether flush should be called explicitly after a buffered io" >&5
57453 +if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then
57454 +  echo $ac_n "(cached) $ac_c" 1>&6
57455  else
57456
57457 -  PHP_LIBXML_DIR=no
57458 +if test "$cross_compiling" = yes; then
57459 +
57460 +  ac_cv_flush_io=no
57461 +
57462 +else
57463 +  cat > conftest.$ac_ext <<EOF
57464 +#line 89778 "configure"
57465 +#include "confdefs.h"
57466 +
57467 +#include <stdio.h>
57468 +#include <stdlib.h>
57469 +
57470 +int main(int argc, char **argv)
57471 +{
57472 +       char *filename = tmpnam(NULL);
57473 +       char buffer[64];
57474 +       int result = 0;
57475 +
57476 +       FILE *fp = fopen(filename, "wb");
57477 +       if (NULL == fp)
57478 +               return 0;
57479 +       fputs("line 1\n", fp);
57480 +       fputs("line 2\n", fp);
57481 +       fclose(fp);
57482 +
57483 +       fp = fopen(filename, "rb+");
57484 +       if (NULL == fp)
57485 +               return 0;
57486 +       fgets(buffer, sizeof(buffer), fp);
57487 +       fputs("line 3\n", fp);
57488 +       rewind(fp);
57489 +       fgets(buffer, sizeof(buffer), fp);
57490 +       if (0 != strcmp(buffer, "line 1\n"))
57491 +               result = 1;
57492 +       fgets(buffer, sizeof(buffer), fp);
57493 +       if (0 != strcmp(buffer, "line 3\n"))
57494 +               result = 1;
57495 +       fclose(fp);
57496 +       unlink(filename);
57497 +
57498 +       exit(result);
57499 +}
57500 +
57501 +EOF
57502 +if { (eval echo configure:89816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57503 +then
57504 +
57505 +  ac_cv_flush_io=no
57506 +
57507 +else
57508 +  echo "configure: failed program was:" >&5
57509 +  cat conftest.$ac_ext >&5
57510 +  rm -fr conftest*
57511
57512 +  ac_cv_flush_io=yes
57513
57514  fi
57515 +rm -fr conftest*
57516 +fi
57517
57518 +fi
57519
57520 -ext_output=$PHP_LIBXML_DIR
57521 -echo "$ac_t""$ext_output" 1>&6
57522 +echo "$ac_t""$ac_cv_flush_io" 1>&6
57523 +if test "$ac_cv_flush_io" = "yes"; then
57524 +  cat >> confdefs.h <<\EOF
57525 +#define HAVE_FLUSHIO 1
57526 +EOF
57527
57528 +fi
57529
57530 +if test "$ac_cv_func_crypt" = "no"; then
57531 +  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
57532 +echo "configure:89844: checking for crypt in -lcrypt" >&5
57533 +ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
57534 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
57535 +  echo $ac_n "(cached) $ac_c" 1>&6
57536 +else
57537 +  ac_save_LIBS="$LIBS"
57538 +LIBS="-lcrypt  $LIBS"
57539 +cat > conftest.$ac_ext <<EOF
57540 +#line 89852 "configure"
57541 +#include "confdefs.h"
57542 +/* Override any gcc2 internal prototype to avoid an error.  */
57543 +/* We use char because int might match the return type of a gcc2
57544 +    builtin and then its argument prototype would still apply.  */
57545 +char crypt();
57546
57547 +int main() {
57548 +crypt()
57549 +; return 0; }
57550 +EOF
57551 +if { (eval echo configure:89863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57552 +  rm -rf conftest*
57553 +  eval "ac_cv_lib_$ac_lib_var=yes"
57554 +else
57555 +  echo "configure: failed program was:" >&5
57556 +  cat conftest.$ac_ext >&5
57557 +  rm -rf conftest*
57558 +  eval "ac_cv_lib_$ac_lib_var=no"
57559  fi
57560 +rm -f conftest*
57561 +LIBS="$ac_save_LIBS"
57562
57563 -if test "$PHP_SIMPLEXML" != "no"; then
57564 +fi
57565 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
57566 +  echo "$ac_t""yes" 1>&6
57567 +
57568 +    LIBS="-lcrypt $LIBS -lcrypt"
57569 +    cat >> confdefs.h <<\EOF
57570 +#define HAVE_CRYPT 1
57571 +EOF
57572
57573 -  if test "$PHP_LIBXML" = "no"; then
57574 -    { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
57575 -  fi
57576 +
57577 +else
57578 +  echo "$ac_t""no" 1>&6
57579 +fi
57580
57581 +fi
57582
57583 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
57584 -echo "configure:82763: checking for xml2-config path" >&5
57585 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
57586 +echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
57587 +echo "configure:89892: checking for standard DES crypt" >&5
57588 +if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then
57589    echo $ac_n "(cached) $ac_c" 1>&6
57590  else
57591
57592 -  for i in $PHP_LIBXML_DIR /usr/local /usr; do
57593 -    if test -x "$i/bin/xml2-config"; then
57594 -      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
57595 -      break
57596 -    fi
57597 -  done
57598 +  if test "$cross_compiling" = yes; then
57599 +
57600 +  ac_cv_crypt_des=yes
57601
57602 -fi
57603 +else
57604 +  cat > conftest.$ac_ext <<EOF
57605 +#line 89903 "configure"
57606 +#include "confdefs.h"
57607
57608 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
57609 +#if HAVE_UNISTD_H
57610 +#include <unistd.h>
57611 +#endif
57612
57613 -  if test -x "$ac_cv_php_xml2_config_path"; then
57614 -    XML2_CONFIG="$ac_cv_php_xml2_config_path"
57615 -    libxml_full_version=`$XML2_CONFIG --version`
57616 -    ac_IFS=$IFS
57617 -    IFS="."
57618 -    set $libxml_full_version
57619 -    IFS=$ac_IFS
57620 -    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
57621 -    if test "$LIBXML_VERSION" -ge "2006011"; then
57622 -      LIBXML_LIBS=`$XML2_CONFIG --libs`
57623 -      LIBXML_INCS=`$XML2_CONFIG --cflags`
57624 -
57625 -  for ac_i in $LIBXML_LIBS; do
57626 -    case $ac_i in
57627 -    -pthread)
57628 -      if test "$ext_shared" = "yes"; then
57629 -        SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread"
57630 -      else
57631 -
57632 +#if HAVE_CRYPT_H
57633 +#include <crypt.h>
57634 +#endif
57635 +
57636 +main() {
57637 +#if HAVE_CRYPT
57638 +    exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M"));
57639 +#else
57640 +       exit(0);
57641 +#endif
57642 +}
57643 +EOF
57644 +if { (eval echo configure:89922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57645 +then
57646
57647 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
57648 +  ac_cv_crypt_des=yes
57649 +
57650 +else
57651 +  echo "configure: failed program was:" >&5
57652 +  cat conftest.$ac_ext >&5
57653 +  rm -fr conftest*
57654
57655 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
57656 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
57657 -    eval "EXTRA_LDFLAGS$unique=set"
57658 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
57659 -  fi
57660 +  ac_cv_crypt_des=no
57661
57662 -      fi
57663 -    ;;
57664 -    -l*)
57665 -      ac_ii=`echo $ac_i|cut -c 3-`
57666 -
57667 +fi
57668 +rm -fr conftest*
57669 +fi
57670 +
57671 +fi
57672 +
57673 +echo "$ac_t""$ac_cv_crypt_des" 1>&6
57674 +
57675 +echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
57676 +echo "configure:89943: checking for extended DES crypt" >&5
57677 +if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then
57678 +  echo $ac_n "(cached) $ac_c" 1>&6
57679 +else
57680
57681 -  case $ac_ii in
57682 -  c|c_r|pthread*) ;;
57683 -  *)
57684 -    if test "$ext_shared" = "yes"; then
57685 -        SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii"
57686 -    else
57687 -
57688 +  if test "$cross_compiling" = yes; then
57689
57690 -  case $ac_ii in
57691 -  c|c_r|pthread*) ;;
57692 -  *)
57693 -      LIBS="$LIBS -l$ac_ii"
57694 -   ;;
57695 -  esac
57696 +  ac_cv_crypt_ext_des=no
57697 +
57698 +else
57699 +  cat > conftest.$ac_ext <<EOF
57700 +#line 89954 "configure"
57701 +#include "confdefs.h"
57702 +
57703 +#if HAVE_UNISTD_H
57704 +#include <unistd.h>
57705 +#endif
57706 +
57707 +#if HAVE_CRYPT_H
57708 +#include <crypt.h>
57709 +#endif
57710 +
57711 +main() {
57712 +#if HAVE_CRYPT
57713 +  exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc"));
57714 +#else
57715 +  exit(0);
57716 +#endif
57717 +}
57718 +EOF
57719 +if { (eval echo configure:89973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57720 +then
57721 +
57722 +  ac_cv_crypt_ext_des=yes
57723
57724 +else
57725 +  echo "configure: failed program was:" >&5
57726 +  cat conftest.$ac_ext >&5
57727 +  rm -fr conftest*
57728 +
57729 +  ac_cv_crypt_ext_des=no
57730
57731 -    fi
57732 -   ;;
57733 -  esac
57734 +fi
57735 +rm -fr conftest*
57736 +fi
57737
57738 +fi
57739
57740 -    ;;
57741 -    -L*)
57742 -      ac_ii=`echo $ac_i|cut -c 3-`
57743 -
57744 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
57745 -
57746 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
57747 -    ai_p=$ac_ii
57748 -  else
57749 -
57750 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
57751 -
57752 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
57753 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
57754 -  fi
57755 +echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6
57756
57757 -
57758 -      if test "$ext_shared" = "yes"; then
57759 -        SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD"
57760 -        test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD"
57761 -      else
57762 -
57763 -
57764 -
57765 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
57766 +echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
57767 +echo "configure:89994: checking for MD5 crypt" >&5
57768 +if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then
57769 +  echo $ac_n "(cached) $ac_c" 1>&6
57770 +else
57771
57772 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
57773 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
57774 -    eval "LIBPATH$unique=set"
57775 -
57776 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
57777 -    LDFLAGS="$LDFLAGS -L$ai_p"
57778 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
57779 +if test "$cross_compiling" = yes; then
57780
57781 -  fi
57782 +  ac_cv_crypt_md5=no
57783
57784 +else
57785 +  cat > conftest.$ac_ext <<EOF
57786 +#line 90005 "configure"
57787 +#include "confdefs.h"
57788
57789 -      fi
57790 -
57791 -  fi
57792 +#if HAVE_UNISTD_H
57793 +#include <unistd.h>
57794 +#endif
57795
57796 -    ;;
57797 -    esac
57798 -  done
57799 +#if HAVE_CRYPT_H
57800 +#include <crypt.h>
57801 +#endif
57802
57803 -
57804 -  for ac_i in $LIBXML_INCS; do
57805 -    case $ac_i in
57806 -    -I*)
57807 -      ac_ii=`echo $ac_i|cut -c 3-`
57808 -
57809 -  if test "$ac_ii" != "/usr/include"; then
57810 -
57811 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
57812 -    ai_p=$ac_ii
57813 -  else
57814 -
57815 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
57816 -
57817 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
57818 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
57819 -  fi
57820 +main() {
57821 +#if HAVE_CRYPT
57822 +    char salt[15], answer[40];
57823
57824 -
57825 +    salt[0]='$'; salt[1]='1'; salt[2]='$';
57826 +    salt[3]='r'; salt[4]='a'; salt[5]='s';
57827 +    salt[6]='m'; salt[7]='u'; salt[8]='s';
57828 +    salt[9]='l'; salt[10]='e'; salt[11]='$';
57829 +    salt[12]='\0';
57830 +    strcpy(answer,salt);
57831 +    strcat(answer,"rISCgZzpwk3UhDidwXvin0");
57832 +    exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
57833 +#else
57834 +       exit(0);
57835 +#endif
57836 +}
57837 +EOF
57838 +if { (eval echo configure:90033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57839 +then
57840
57841 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
57842 +  ac_cv_crypt_md5=yes
57843 +
57844 +else
57845 +  echo "configure: failed program was:" >&5
57846 +  cat conftest.$ac_ext >&5
57847 +  rm -fr conftest*
57848
57849 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
57850 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
57851 -    eval "INCLUDEPATH$unique=set"
57852 -
57853 -      if test ""; then
57854 -        INCLUDES="-I$ai_p $INCLUDES"
57855 -      else
57856 -        INCLUDES="$INCLUDES -I$ai_p"
57857 -      fi
57858 -
57859 -  fi
57860 +  ac_cv_crypt_md5=no
57861
57862 -  fi
57863 +fi
57864 +rm -fr conftest*
57865 +fi
57866
57867 -    ;;
57868 -    esac
57869 -  done
57870 +fi
57871
57872 +echo "$ac_t""$ac_cv_crypt_md5" 1>&6
57873
57874 -            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
57875 -echo "configure:82921: checking whether libxml build works" >&5
57876 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
57877 +echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
57878 +echo "configure:90054: checking for Blowfish crypt" >&5
57879 +if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then
57880    echo $ac_n "(cached) $ac_c" 1>&6
57881  else
57882
57883 -
57884 -  old_LIBS=$LIBS
57885 -  LIBS="
57886 -          $SIMPLEXML_SHARED_LIBADD
57887 -         $LIBS"
57888 -  if test "$cross_compiling" = yes; then
57889 -
57890 -    LIBS=$old_LIBS
57891 +if test "$cross_compiling" = yes; then
57892
57893 +  ac_cv_crypt_blowfish=no
57894 +
57895  else
57896    cat > conftest.$ac_ext <<EOF
57897 -#line 82937 "configure"
57898 +#line 90065 "configure"
57899  #include "confdefs.h"
57900
57901 +#if HAVE_UNISTD_H
57902 +#include <unistd.h>
57903 +#endif
57904 +
57905 +#if HAVE_CRYPT_H
57906 +#include <crypt.h>
57907 +#endif
57908 +
57909 +main() {
57910 +#if HAVE_CRYPT
57911 +    char salt[30], answer[70];
57912
57913 -    char xmlInitParser();
57914 -    int main() {
57915 -      xmlInitParser();
57916 -      return 0;
57917 -    }
57918 -
57919 +    salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
57920 +    strcat(salt,"rasmuslerd............");
57921 +    strcpy(answer,salt);
57922 +    strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra");
57923 +    exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
57924 +#else
57925 +       exit(0);
57926 +#endif
57927 +}
57928  EOF
57929 -if { (eval echo configure:82948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57930 +if { (eval echo configure:90090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57931  then
57932
57933 -    LIBS=$old_LIBS
57934 -
57935 -          php_cv_libxml_build_works=yes
57936 -
57937 -
57938 +  ac_cv_crypt_blowfish=yes
57939 +
57940  else
57941    echo "configure: failed program was:" >&5
57942    cat conftest.$ac_ext >&5
57943    rm -fr conftest*
57944
57945 -    LIBS=$old_LIBS
57946 -
57947 -          echo "$ac_t""no" 1>&6
57948 -          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
57949 -
57950 -
57951 +  ac_cv_crypt_blowfish=no
57952 +
57953  fi
57954  rm -fr conftest*
57955  fi
57956
57957 -
57958 -
57959  fi
57960
57961 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
57962 -      if test "$php_cv_libxml_build_works" = "yes"; then
57963 -        cat >> confdefs.h <<\EOF
57964 -#define HAVE_LIBXML 1
57965 -EOF
57966 +echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6
57967
57968 -      fi
57969 -
57970 -    cat >> confdefs.h <<\EOF
57971 -#define HAVE_SIMPLEXML 1
57972 -EOF
57973 +echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6
57974 +echo "configure:90111: checking for SHA512 crypt" >&5
57975 +if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then
57976 +  echo $ac_n "(cached) $ac_c" 1>&6
57977 +else
57978 +
57979 +if test "$cross_compiling" = yes; then
57980 +
57981 +  ac_cv_crypt_SHA512=no
57982
57983 -
57984 -  ext_builddir=ext/simplexml
57985 -  ext_srcdir=$abs_srcdir/ext/simplexml
57986 +else
57987 +  cat > conftest.$ac_ext <<EOF
57988 +#line 90122 "configure"
57989 +#include "confdefs.h"
57990
57991 -  ac_extra=
57992 +#if HAVE_UNISTD_H
57993 +#include <unistd.h>
57994 +#endif
57995
57996 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
57997 -    PHP_SIMPLEXML_SHARED=no
57998 +#if HAVE_CRYPT_H
57999 +#include <crypt.h>
58000 +#endif
58001 +
58002 +main() {
58003 +#if HAVE_CRYPT
58004 +    char salt[30], answer[80];
58005
58006 +    salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0';
58007 +    strcpy(answer, salt);
58008 +    strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.");
58009 +    exit (strcmp((char *)crypt("foo",salt),answer));
58010 +#else
58011 +       exit(0);
58012 +#endif
58013 +}
58014 +EOF
58015 +if { (eval echo configure:90146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
58016 +then
58017
58018 -  case ext/simplexml in
58019 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
58020 -  /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
58021 -  *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
58022 -  esac
58023 -
58024 -
58025 -
58026 -  b_c_pre=$php_c_pre
58027 -  b_cxx_pre=$php_cxx_pre
58028 -  b_c_meta=$php_c_meta
58029 -  b_cxx_meta=$php_cxx_meta
58030 -  b_c_post=$php_c_post
58031 -  b_cxx_post=$php_cxx_post
58032 -  b_lo=$php_lo
58033 -
58034 +  ac_cv_crypt_SHA512=yes
58035
58036 -  old_IFS=$IFS
58037 -  for ac_src in simplexml.c sxe.c; do
58038 +else
58039 +  echo "configure: failed program was:" >&5
58040 +  cat conftest.$ac_ext >&5
58041 +  rm -fr conftest*
58042
58043 -      IFS=.
58044 -      set $ac_src
58045 -      ac_obj=$1
58046 -      IFS=$old_IFS
58047 -
58048 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
58049 +  ac_cv_crypt_SHA512=no
58050
58051 -      case $ac_src in
58052 -        *.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" ;;
58053 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58054 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58055 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
58056 -      esac
58057 +fi
58058 +rm -fr conftest*
58059 +fi
58060
58061 -    cat >>Makefile.objects<<EOF
58062 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
58063 -       $ac_comp
58064 -EOF
58065 -  done
58066 +fi
58067
58068 +echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6
58069
58070 -    EXT_STATIC="$EXT_STATIC simplexml"
58071 -    if test "$ext_shared" != "nocli"; then
58072 -      EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
58073 -    fi
58074 -  else
58075 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
58076 -      PHP_SIMPLEXML_SHARED=yes
58077 -
58078 -  case ext/simplexml in
58079 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
58080 -  /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
58081 -  *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
58082 -  esac
58083 +echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6
58084 +echo "configure:90167: checking for SHA256 crypt" >&5
58085 +if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then
58086 +  echo $ac_n "(cached) $ac_c" 1>&6
58087 +else
58088
58089 +if test "$cross_compiling" = yes; then
58090
58091 +  ac_cv_crypt_SHA256=no
58092
58093 -  b_c_pre=$shared_c_pre
58094 -  b_cxx_pre=$shared_cxx_pre
58095 -  b_c_meta=$shared_c_meta
58096 -  b_cxx_meta=$shared_cxx_meta
58097 -  b_c_post=$shared_c_post
58098 -  b_cxx_post=$shared_cxx_post
58099 -  b_lo=$shared_lo
58100 -
58101 +else
58102 +  cat > conftest.$ac_ext <<EOF
58103 +#line 90178 "configure"
58104 +#include "confdefs.h"
58105
58106 -  old_IFS=$IFS
58107 -  for ac_src in simplexml.c sxe.c; do
58108 -
58109 -      IFS=.
58110 -      set $ac_src
58111 -      ac_obj=$1
58112 -      IFS=$old_IFS
58113 -
58114 -      shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo"
58115 +#if HAVE_UNISTD_H
58116 +#include <unistd.h>
58117 +#endif
58118
58119 -      case $ac_src in
58120 -        *.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" ;;
58121 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58122 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58123 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
58124 -      esac
58125 +#if HAVE_CRYPT_H
58126 +#include <crypt.h>
58127 +#endif
58128
58129 -    cat >>Makefile.objects<<EOF
58130 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
58131 -       $ac_comp
58132 +main() {
58133 +#if HAVE_CRYPT
58134 +    char salt[30], answer[80];
58135 +    salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t';  salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0';
58136 +    strcat(salt,"");
58137 +    strcpy(answer, salt);
58138 +    strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5");
58139 +    exit (strcmp((char *)crypt("foo",salt),answer));
58140 +#else
58141 +       exit(0);
58142 +#endif
58143 +}
58144  EOF
58145 -  done
58146 -
58147 -      case $host_alias in
58148 -        *netware*)
58149 -
58150 -  install_modules="install-modules"
58151 -
58152 -  case $host_alias in
58153 -    *aix*)
58154 -      suffix=so
58155 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsimplexml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsimplexml.so '$ext_builddir'/phpsimplexml.so'
58156 -      ;;
58157 -    *netware*)
58158 -      suffix=nlm
58159 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSIMPLEXML, 3)_SHARED_LIBADD)'
58160 -      ;;
58161 -    *)
58162 -      suffix=la
58163 -      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_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD)'
58164 -      ;;
58165 -  esac
58166 +if { (eval echo configure:90202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
58167 +then
58168 +
58169 +  ac_cv_crypt_SHA256=yes
58170
58171 -  if test "x" = "xyes"; then
58172 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsimplexml.$suffix"
58173 -  else
58174 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix"
58175 -  fi
58176 +else
58177 +  echo "configure: failed program was:" >&5
58178 +  cat conftest.$ac_ext >&5
58179 +  rm -fr conftest*
58180
58181 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
58182 +  ac_cv_crypt_SHA256=no
58183
58184 -  cat >>Makefile.objects<<EOF
58185 -\$(phplibdir)/phpsimplexml.$suffix: $ext_builddir/phpsimplexml.$suffix
58186 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsimplexml.$suffix \$(phplibdir)
58187 +fi
58188 +rm -fr conftest*
58189 +fi
58190
58191 -$ext_builddir/phpsimplexml.$suffix: \$(shared_objects_simplexml) \$(PHPSIMPLEXML_SHARED_DEPENDENCIES)
58192 -       $link_cmd
58193 +fi
58194
58195 -EOF
58196 +echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6
58197
58198 -          ;;
58199 -        *)
58200 -
58201 -  install_modules="install-modules"
58202
58203 -  case $host_alias in
58204 -    *aix*)
58205 -      suffix=so
58206 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/simplexml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(SIMPLEXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/simplexml.so '$ext_builddir'/simplexml.so'
58207 -      ;;
58208 -    *netware*)
58209 -      suffix=nlm
58210 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SIMPLEXML, 3)_SHARED_LIBADD)'
58211 -      ;;
58212 -    *)
58213 -      suffix=la
58214 -      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_simplexml) $(SIMPLEXML_SHARED_LIBADD)'
58215 -      ;;
58216 -  esac
58217 +if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
58218
58219 -  if test "x" = "xyes"; then
58220 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/simplexml.$suffix"
58221 -  else
58222 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/simplexml.$suffix"
58223 -  fi
58224 +        echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6
58225 +echo "configure:90226: checking whether the compiler supports __alignof__" >&5
58226 +if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then
58227 +  echo $ac_n "(cached) $ac_c" 1>&6
58228 +else
58229
58230 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
58231 -
58232 -  cat >>Makefile.objects<<EOF
58233 -\$(phplibdir)/simplexml.$suffix: $ext_builddir/simplexml.$suffix
58234 -       \$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir)
58235 +  cat > conftest.$ac_ext <<EOF
58236 +#line 90232 "configure"
58237 +#include "confdefs.h"
58238
58239 -$ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES)
58240 -       $link_cmd
58241 +
58242 +int main() {
58243
58244 +    int align = __alignof__(int);
58245 +
58246 +; return 0; }
58247  EOF
58248 +if { (eval echo configure:90242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
58249 +  rm -rf conftest*
58250 +
58251 +    ac_cv_alignof_exists=yes
58252 +
58253 +else
58254 +  echo "configure: failed program was:" >&5
58255 +  cat conftest.$ac_ext >&5
58256 +  rm -rf conftest*
58257 +
58258 +    ac_cv_alignof_exists=no
58259 +
58260 +fi
58261 +rm -f conftest*
58262 +fi
58263
58264 -          ;;
58265 -      esac
58266 -      cat >> confdefs.h <<EOF
58267 -#define COMPILE_DL_SIMPLEXML 1
58268 +echo "$ac_t""$ac_cv_alignof_exists" 1>&6
58269 +  if test "$ac_cv_alignof_exists" = "yes"; then
58270 +    cat >> confdefs.h <<\EOF
58271 +#define HAVE_ALIGNOF 1
58272  EOF
58273
58274 -    fi
58275    fi
58276
58277 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
58278 -    PHP_SIMPLEXML_SHARED=no
58279 -    case "$PHP_SAPI" in
58280 -      cgi|embed)
58281 -
58282 +        echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6
58283 +echo "configure:90267: checking whether the compiler supports aligned attribute" >&5
58284 +if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then
58285 +  echo $ac_n "(cached) $ac_c" 1>&6
58286 +else
58287
58288 -  case ext/simplexml in
58289 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
58290 -  /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
58291 -  *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
58292 -  esac
58293 +  cat > conftest.$ac_ext <<EOF
58294 +#line 90273 "configure"
58295 +#include "confdefs.h"
58296 +
58297 +
58298 +int main() {
58299 +
58300 +    unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int))));
58301
58302 +; return 0; }
58303 +EOF
58304 +if { (eval echo configure:90283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
58305 +  rm -rf conftest*
58306 +
58307 +    ac_cv_attribute_aligned=yes
58308 +
58309 +else
58310 +  echo "configure: failed program was:" >&5
58311 +  cat conftest.$ac_ext >&5
58312 +  rm -rf conftest*
58313 +
58314 +    ac_cv_attribute_aligned=no
58315
58316 +fi
58317 +rm -f conftest*
58318 +fi
58319 +
58320 +echo "$ac_t""$ac_cv_attribute_aligned" 1>&6
58321 +  if test "$ac_cv_attribute_aligned" = "yes"; then
58322 +    cat >> confdefs.h <<\EOF
58323 +#define HAVE_ATTRIBUTE_ALIGNED 1
58324 +EOF
58325 +
58326 +  fi
58327 +
58328 +
58329 +  cat >> confdefs.h <<EOF
58330 +#define PHP_USE_PHP_CRYPT_R 1
58331 +EOF
58332 +
58333 +  cat >> confdefs.h <<EOF
58334 +#define PHP_STD_DES_CRYPT 1
58335 +EOF
58336
58337 -  b_c_pre=$php_c_pre
58338 -  b_cxx_pre=$php_cxx_pre
58339 -  b_c_meta=$php_c_meta
58340 -  b_cxx_meta=$php_cxx_meta
58341 -  b_c_post=$php_c_post
58342 -  b_cxx_post=$php_cxx_post
58343 -  b_lo=$php_lo
58344 +  cat >> confdefs.h <<EOF
58345 +#define PHP_BLOWFISH_CRYPT 1
58346 +EOF
58347
58348 +  cat >> confdefs.h <<EOF
58349 +#define PHP_EXT_DES_CRYPT 1
58350 +EOF
58351
58352 -  old_IFS=$IFS
58353 -  for ac_src in simplexml.c sxe.c; do
58354 -
58355 -      IFS=.
58356 -      set $ac_src
58357 -      ac_obj=$1
58358 -      IFS=$old_IFS
58359 -
58360 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
58361 +  cat >> confdefs.h <<EOF
58362 +#define PHP_MD5_CRYPT 1
58363 +EOF
58364
58365 -      case $ac_src in
58366 -        *.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" ;;
58367 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58368 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58369 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
58370 -      esac
58371 +  cat >> confdefs.h <<EOF
58372 +#define PHP_SHA512_CRYPT 1
58373 +EOF
58374
58375 -    cat >>Makefile.objects<<EOF
58376 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
58377 -       $ac_comp
58378 +  cat >> confdefs.h <<EOF
58379 +#define PHP_SHA256_CRYPT 1
58380  EOF
58381 -  done
58382
58383
58384 -        EXT_STATIC="$EXT_STATIC simplexml"
58385 -        ;;
58386 -      *)
58387 -
58388
58389 -  case ext/simplexml in
58390 +
58391 +  case ext/standard in
58392    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
58393 -  /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
58394 -  *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
58395 +  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
58396 +  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
58397    esac
58398
58399
58400 @@ -83235,20 +90353,20 @@ EOF
58401
58402
58403    old_IFS=$IFS
58404 -  for ac_src in simplexml.c sxe.c; do
58405 +  for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c; do
58406
58407        IFS=.
58408        set $ac_src
58409        ac_obj=$1
58410        IFS=$old_IFS
58411
58412 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
58413 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
58414
58415        case $ac_src in
58416 -        *.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" ;;
58417 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58418 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58419 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
58420 +        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58421 +        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58422 +        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58423 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
58424        esac
58425
58426      cat >>Makefile.objects<<EOF
58427 @@ -83258,850 +90376,572 @@ EOF
58428    done
58429
58430
58431 -        ;;
58432 -    esac
58433 -    EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
58434 +else
58435 +  if test "$ac_cv_crypt_des" = "yes"; then
58436 +    ac_result=1
58437 +    ac_crypt_des=1
58438 +  else
58439 +    ac_result=0
58440 +    ac_crypt_des=0
58441    fi
58442 -
58443 -
58444 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
58445 -
58446 -
58447 +  cat >> confdefs.h <<EOF
58448 +#define PHP_STD_DES_CRYPT $ac_result
58449 +EOF
58450
58451 -  if test "$ext_builddir" = "."; then
58452 -    PHP_PECL_EXTENSION=simplexml
58453 -
58454 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
58455
58456 +  if test "$ac_cv_crypt_blowfish" = "yes"; then
58457 +    ac_result=1
58458 +    ac_crypt_blowfish=1
58459 +  else
58460 +    ac_result=0
58461 +    ac_crypt_blowfish=0
58462    fi
58463 +  cat >> confdefs.h <<EOF
58464 +#define PHP_BLOWFISH_CRYPT $ac_result
58465 +EOF
58466
58467 -
58468 -  PHP_VAR_SUBST="$PHP_VAR_SUBST SIMPLEXML_SHARED_LIBADD"
58469
58470 -
58471 -    else
58472 -      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
58473 -    fi
58474 -else
58475 -    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
58476 -
58477 +  if test "$ac_cv_crypt_ext_des" = "yes"; then
58478 +    ac_result=1
58479 +    ac_crypt_edes=1
58480 +  else
58481 +    ac_result=0
58482 +    ac_crypt_edes=0
58483    fi
58484 +  cat >> confdefs.h <<EOF
58485 +#define PHP_EXT_DES_CRYPT $ac_result
58486 +EOF
58487
58488 -
58489 -  am_i_shared=$PHP_SIMPLEXML_SHARED
58490 -  is_it_shared=$PHP_LIBXML_SHARED
58491 -  is_it_enabled=$PHP_LIBXML
58492 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
58493 -    { echo "configure: error:
58494 -You've configured extension simplexml to build statically, but it
58495 -depends on extension libxml, which you've configured to build shared.
58496 -You either need to build simplexml shared or build libxml statically for the
58497 -build to be successful.
58498 -" 1>&2; exit 1; }
58499 -  fi
58500 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
58501 -    { echo "configure: error:
58502 -You've configured extension simplexml, which depends on extension libxml,
58503 -but you've either not enabled libxml, or have disabled it.
58504 -" 1>&2; exit 1; }
58505 +
58506 +  if test "$ac_cv_crypt_md5" = "yes"; then
58507 +    ac_result=1
58508 +    ac_crypt_md5=1
58509 +  else
58510 +    ac_result=0
58511 +    ac_crypt_md5=0
58512    fi
58513 +  cat >> confdefs.h <<EOF
58514 +#define PHP_MD5_CRYPT $ac_result
58515 +EOF
58516
58517
58518 -  am_i_shared=$PHP_SIMPLEXML_SHARED
58519 -  is_it_shared=$PHP_SPL_SHARED
58520 -  is_it_enabled=$PHP_SPL
58521 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
58522 -    { echo "configure: error:
58523 -You've configured extension simplexml to build statically, but it
58524 -depends on extension spl, which you've configured to build shared.
58525 -You either need to build simplexml shared or build spl statically for the
58526 -build to be successful.
58527 -" 1>&2; exit 1; }
58528 -  fi
58529 -  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
58530 -    { echo "configure: error:
58531 -You've configured extension simplexml, which depends on extension spl,
58532 -but you've either not enabled spl, or have disabled it.
58533 -" 1>&2; exit 1; }
58534 +  if test "$ac_cv_crypt_sha512" = "yes"; then
58535 +    ac_result=1
58536 +    ac_crypt_sha512=1
58537 +  else
58538 +    ac_result=0
58539 +    ac_crypt_sha512=0
58540    fi
58541 -
58542 -fi
58543 +  cat >> confdefs.h <<EOF
58544 +#define PHP_SHA512_CRYPT $ac_result
58545 +EOF
58546
58547
58548 +  if test "$ac_cv_crypt_sha256" = "yes"; then
58549 +    ac_result=1
58550 +    ac_crypt_sha256=1
58551 +  else
58552 +    ac_result=0
58553 +    ac_crypt_sha256=0
58554 +  fi
58555 +  cat >> confdefs.h <<EOF
58556 +#define PHP_SHA256_CRYPT $ac_result
58557 +EOF
58558
58559 -php_with_snmp=no
58560
58561 -echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
58562 -echo "configure:83336: checking for SNMP support" >&5
58563 -# Check whether --with-snmp or --without-snmp was given.
58564 -if test "${with_snmp+set}" = set; then
58565 -  withval="$with_snmp"
58566 -  PHP_SNMP=$withval
58567 -else
58568 -
58569 -  PHP_SNMP=no
58570 -  test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL
58571 +  cat >> confdefs.h <<EOF
58572 +#define PHP_USE_PHP_CRYPT_R 0
58573 +EOF
58574
58575  fi
58576
58577 +for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy
58578 +do
58579 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
58580 +echo "configure:90462: checking for $ac_func" >&5
58581 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
58582 +  echo $ac_n "(cached) $ac_c" 1>&6
58583 +else
58584 +  cat > conftest.$ac_ext <<EOF
58585 +#line 90467 "configure"
58586 +#include "confdefs.h"
58587 +/* System header to define __stub macros and hopefully few prototypes,
58588 +    which can conflict with char $ac_func(); below.  */
58589 +#include <assert.h>
58590 +/* Override any gcc2 internal prototype to avoid an error.  */
58591 +/* We use char because int might match the return type of a gcc2
58592 +    builtin and then its argument prototype would still apply.  */
58593 +char $ac_func();
58594
58595 +int main() {
58596
58597 -ext_output="yes, shared"
58598 -ext_shared=yes
58599 -case $PHP_SNMP in
58600 -shared,*)
58601 -  PHP_SNMP=`echo "$PHP_SNMP"|$SED 's/^shared,//'`
58602 -  ;;
58603 -shared)
58604 -  PHP_SNMP=yes
58605 -  ;;
58606 -no)
58607 -  ext_output=no
58608 -  ext_shared=no
58609 -  ;;
58610 -*)
58611 -  ext_output=yes
58612 -  ext_shared=no
58613 -  ;;
58614 -esac
58615 -
58616 -
58617 -
58618 -echo "$ac_t""$ext_output" 1>&6
58619 -
58620 -
58621 -
58622 -
58623 -
58624 -php_with_openssl_dir=no
58625 +/* The GNU C library defines this for functions which it implements
58626 +    to always fail with ENOSYS.  Some functions are actually named
58627 +    something starting with __ and the normal name is an alias.  */
58628 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
58629 +choke me
58630 +#else
58631 +$ac_func();
58632 +#endif
58633
58634 -echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
58635 -echo "configure:83380: checking OpenSSL dir for SNMP" >&5
58636 -# Check whether --with-openssl-dir or --without-openssl-dir was given.
58637 -if test "${with_openssl_dir+set}" = set; then
58638 -  withval="$with_openssl_dir"
58639 -  PHP_OPENSSL_DIR=$withval
58640 +; return 0; }
58641 +EOF
58642 +if { (eval echo configure:90490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
58643 +  rm -rf conftest*
58644 +  eval "ac_cv_func_$ac_func=yes"
58645  else
58646 -
58647 -  PHP_OPENSSL_DIR=no
58648 -
58649 -
58650 +  echo "configure: failed program was:" >&5
58651 +  cat conftest.$ac_ext >&5
58652 +  rm -rf conftest*
58653 +  eval "ac_cv_func_$ac_func=no"
58654 +fi
58655 +rm -f conftest*
58656  fi
58657
58658 -
58659 -ext_output=$PHP_OPENSSL_DIR
58660 -echo "$ac_t""$ext_output" 1>&6
58661 -
58662 -
58663 -
58664 -
58665 -
58666 -php_enable_ucd_snmp_hack=no
58667 -
58668 -echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
58669 -echo "configure:83403: checking whether to enable UCD SNMP hack" >&5
58670 -# Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
58671 -if test "${enable_ucd_snmp_hack+set}" = set; then
58672 -  enableval="$enable_ucd_snmp_hack"
58673 -  PHP_UCD_SNMP_HACK=$enableval
58674 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
58675 +  echo "$ac_t""yes" 1>&6
58676 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
58677 +  cat >> confdefs.h <<EOF
58678 +#define $ac_tr_func 1
58679 +EOF
58680 +
58681  else
58682 -
58683 -  PHP_UCD_SNMP_HACK=no
58684 -
58685 -
58686 +  echo "$ac_t""no" 1>&6
58687  fi
58688 +done
58689
58690 -
58691 -ext_output=$PHP_UCD_SNMP_HACK
58692 -echo "$ac_t""$ext_output" 1>&6
58693 -
58694 -
58695 -
58696 -
58697 -if test "$PHP_SNMP" != "no"; then
58698 -
58699 -        if test "$PHP_SNMP" = "yes"; then
58700 -    # Extract the first word of "net-snmp-config", so it can be a program name with args.
58701 -set dummy net-snmp-config; ac_word=$2
58702 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
58703 -echo "configure:83428: checking for $ac_word" >&5
58704 -if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then
58705 +echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
58706 +echo "configure:90515: checking for working fnmatch" >&5
58707 +if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
58708    echo $ac_n "(cached) $ac_c" 1>&6
58709  else
58710 -  case "$SNMP_CONFIG" in
58711 -  /*)
58712 -  ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
58713 -  ;;
58714 -  ?:/*)
58715 -  ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path.
58716 -  ;;
58717 -  *)
58718 -  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
58719 -  ac_dummy="/usr/local/bin:$PATH"
58720 -  for ac_dir in $ac_dummy; do
58721 -    test -z "$ac_dir" && ac_dir=.
58722 -    if test -f $ac_dir/$ac_word; then
58723 -      ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word"
58724 -      break
58725 -    fi
58726 -  done
58727 -  IFS="$ac_save_ifs"
58728 -  ;;
58729 -esac
58730 -fi
58731 -SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG"
58732 -if test -n "$SNMP_CONFIG"; then
58733 -  echo "$ac_t""$SNMP_CONFIG" 1>&6
58734 +  # Some versions of Solaris or SCO have a broken fnmatch function.
58735 +# So we run a test program.  If we are cross-compiling, take no chance.
58736 +# Thanks to John Oleynick and Franc,ois Pinard for this test.
58737 +if test "$cross_compiling" = yes; then
58738 +  ac_cv_func_fnmatch_works=no
58739  else
58740 -  echo "$ac_t""no" 1>&6
58741 +  cat > conftest.$ac_ext <<EOF
58742 +#line 90526 "configure"
58743 +#include "confdefs.h"
58744 +main() { exit (fnmatch ("a*", "abc", 0) != 0); }
58745 +EOF
58746 +if { (eval echo configure:90530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
58747 +then
58748 +  ac_cv_func_fnmatch_works=yes
58749 +else
58750 +  echo "configure: failed program was:" >&5
58751 +  cat conftest.$ac_ext >&5
58752 +  rm -fr conftest*
58753 +  ac_cv_func_fnmatch_works=no
58754 +fi
58755 +rm -fr conftest*
58756  fi
58757
58758 -  else
58759 -    SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config"
58760 -  fi
58761 -
58762 -  if test -x "$SNMP_CONFIG"; then
58763 -    SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs`
58764 -    SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`"
58765 -    SNMP_PREFIX=`$SNMP_CONFIG --prefix`
58766 -
58767 -    if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
58768 -
58769 -  if test "${SNMP_PREFIX}/include" != "/usr/include"; then
58770 -
58771 -  if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then
58772 -    ai_p=${SNMP_PREFIX}/include
58773 -  else
58774 -
58775 -    ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`"
58776 -
58777 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
58778 -    ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`"
58779 -  fi
58780 -
58781 -
58782 -
58783 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
58784 -
58785 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
58786 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
58787 -    eval "INCLUDEPATH$unique=set"
58788 -
58789 -      if test ""; then
58790 -        INCLUDES="-I$ai_p $INCLUDES"
58791 -      else
58792 -        INCLUDES="$INCLUDES -I$ai_p"
58793 -      fi
58794 -
58795 -  fi
58796 -
58797 -  fi
58798 -
58799 -
58800 -  for ac_i in $SNMP_LIBS; do
58801 -    case $ac_i in
58802 -    -pthread)
58803 -      if test "$ext_shared" = "yes"; then
58804 -        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread"
58805 -      else
58806 -
58807 -
58808 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
58809 -
58810 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
58811 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
58812 -    eval "EXTRA_LDFLAGS$unique=set"
58813 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
58814 -  fi
58815 -
58816 -      fi
58817 -    ;;
58818 -    -l*)
58819 -      ac_ii=`echo $ac_i|cut -c 3-`
58820 -
58821 -
58822 -  case $ac_ii in
58823 -  c|c_r|pthread*) ;;
58824 -  *)
58825 -    if test "$ext_shared" = "yes"; then
58826 -        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
58827 -    else
58828 -
58829 -
58830 -  case $ac_ii in
58831 -  c|c_r|pthread*) ;;
58832 -  *)
58833 -      LIBS="$LIBS -l$ac_ii"
58834 -   ;;
58835 -  esac
58836 -
58837 -
58838 -    fi
58839 -   ;;
58840 -  esac
58841 -
58842 -
58843 -    ;;
58844 -    -L*)
58845 -      ac_ii=`echo $ac_i|cut -c 3-`
58846 -
58847 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
58848 -
58849 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
58850 -    ai_p=$ac_ii
58851 -  else
58852 -
58853 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
58854 -
58855 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
58856 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
58857 -  fi
58858 -
58859 -
58860 -      if test "$ext_shared" = "yes"; then
58861 -        SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
58862 -        test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
58863 -      else
58864 -
58865 -
58866 -
58867 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
58868 -
58869 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
58870 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
58871 -    eval "LIBPATH$unique=set"
58872 -
58873 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
58874 -    LDFLAGS="$LDFLAGS -L$ai_p"
58875 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
58876 -
58877 -  fi
58878 -
58879 -
58880 -      fi
58881 -
58882 -  fi
58883 -
58884 -    ;;
58885 -    esac
58886 -  done
58887 +fi
58888
58889 -      cat >> confdefs.h <<\EOF
58890 -#define HAVE_NET_SNMP 1
58891 +echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6
58892 +if test $ac_cv_func_fnmatch_works = yes; then
58893 +  cat >> confdefs.h <<\EOF
58894 +#define HAVE_FNMATCH 1
58895  EOF
58896
58897 -      SNMP_LIBNAME=netsnmp
58898 -    else
58899 -      { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; }
58900 -    fi
58901 -  else
58902 -
58903 -
58904 -    if test "$PHP_SNMP" = "yes"; then
58905 -      for i in /usr/include /usr/local/include; do
58906 -        test -f $i/snmp.h                       && SNMP_INCDIR=$i
58907 -        test -f $i/ucd-snmp/snmp.h              && SNMP_INCDIR=$i/ucd-snmp
58908 -        test -f $i/snmp/snmp.h                  && SNMP_INCDIR=$i/snmp
58909 -        test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
58910 -      done
58911 -      for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do
58912 -        test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i
58913 -      done
58914 -    else
58915 -      SNMP_INCDIR=$PHP_SNMP/include
58916 -      test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp
58917 -      SNMP_LIBDIR=$PHP_SNMP/lib
58918 -    fi
58919 -
58920 -    if test -z "$SNMP_INCDIR"; then
58921 -      { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; }
58922 -    elif test -z "$SNMP_LIBDIR"; then
58923 -      { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; }
58924 -    fi
58925 +fi
58926 +
58927
58928 -    old_CPPFLAGS=$CPPFLAGS
58929 -    CPPFLAGS=-I$SNMP_INCDIR
58930 -    for ac_hdr in default_store.h
58931 +
58932 +for ac_func in fork CreateProcess
58933  do
58934 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
58935 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
58936 -echo "configure:83629: checking for $ac_hdr" >&5
58937 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
58938 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
58939 +echo "configure:90557: checking for $ac_func" >&5
58940 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
58941    echo $ac_n "(cached) $ac_c" 1>&6
58942  else
58943    cat > conftest.$ac_ext <<EOF
58944 -#line 83634 "configure"
58945 +#line 90562 "configure"
58946  #include "confdefs.h"
58947 -#include <$ac_hdr>
58948 +/* System header to define __stub macros and hopefully few prototypes,
58949 +    which can conflict with char $ac_func(); below.  */
58950 +#include <assert.h>
58951 +/* Override any gcc2 internal prototype to avoid an error.  */
58952 +/* We use char because int might match the return type of a gcc2
58953 +    builtin and then its argument prototype would still apply.  */
58954 +char $ac_func();
58955 +
58956 +int main() {
58957 +
58958 +/* The GNU C library defines this for functions which it implements
58959 +    to always fail with ENOSYS.  Some functions are actually named
58960 +    something starting with __ and the normal name is an alias.  */
58961 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
58962 +choke me
58963 +#else
58964 +$ac_func();
58965 +#endif
58966 +
58967 +; return 0; }
58968  EOF
58969 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
58970 -{ (eval echo configure:83639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
58971 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
58972 -if test -z "$ac_err"; then
58973 +if { (eval echo configure:90585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
58974    rm -rf conftest*
58975 -  eval "ac_cv_header_$ac_safe=yes"
58976 +  eval "ac_cv_func_$ac_func=yes"
58977  else
58978 -  echo "$ac_err" >&5
58979    echo "configure: failed program was:" >&5
58980    cat conftest.$ac_ext >&5
58981    rm -rf conftest*
58982 -  eval "ac_cv_header_$ac_safe=no"
58983 +  eval "ac_cv_func_$ac_func=no"
58984  fi
58985  rm -f conftest*
58986  fi
58987 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
58988 +
58989 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
58990    echo "$ac_t""yes" 1>&6
58991 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
58992 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
58993    cat >> confdefs.h <<EOF
58994 -#define $ac_tr_hdr 1
58995 +#define $ac_tr_func 1
58996  EOF
58997
58998 +  php_can_support_proc_open=yes
58999 +  break
59000 +
59001  else
59002    echo "$ac_t""no" 1>&6
59003 +php_can_support_proc_open=no
59004 +
59005  fi
59006  done
59007
59008 -    if test "$ac_cv_header_default_store_h" = "yes"; then
59009 -      echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
59010 -echo "configure:83667: checking for OpenSSL support in SNMP libraries" >&5
59011 -      cat > conftest.$ac_ext <<EOF
59012 -#line 83669 "configure"
59013 +echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6
59014 +echo "configure:90615: checking if your OS can spawn processes with inherited handles" >&5
59015 +if test "$php_can_support_proc_open" = "yes"; then
59016 +  echo "$ac_t""yes" 1>&6
59017 +  cat >> confdefs.h <<\EOF
59018 +#define PHP_CAN_SUPPORT_PROC_OPEN 1
59019 +EOF
59020 +
59021 +else
59022 +  echo "$ac_t""no" 1>&6
59023 +fi
59024 +
59025 +if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then
59026 +  cat >> confdefs.h <<\EOF
59027 +#define ENABLE_CHROOT_FUNC 1
59028 +EOF
59029 +
59030 +fi
59031 +
59032 +
59033 +  unset ac_cv_func_res_nsearch
59034 +  unset ac_cv_func___res_nsearch
59035 +  unset found
59036 +
59037 +  echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6
59038 +echo "configure:90639: checking for res_nsearch" >&5
59039 +if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then
59040 +  echo $ac_n "(cached) $ac_c" 1>&6
59041 +else
59042 +  cat > conftest.$ac_ext <<EOF
59043 +#line 90644 "configure"
59044  #include "confdefs.h"
59045 +/* System header to define __stub macros and hopefully few prototypes,
59046 +    which can conflict with char res_nsearch(); below.  */
59047 +#include <assert.h>
59048 +/* Override any gcc2 internal prototype to avoid an error.  */
59049 +/* We use char because int might match the return type of a gcc2
59050 +    builtin and then its argument prototype would still apply.  */
59051 +char res_nsearch();
59052
59053 -#include <ucd-snmp-config.h>
59054 -#if USE_OPENSSL
59055 -        yes
59056 +int main() {
59057 +
59058 +/* The GNU C library defines this for functions which it implements
59059 +    to always fail with ENOSYS.  Some functions are actually named
59060 +    something starting with __ and the normal name is an alias.  */
59061 +#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch)
59062 +choke me
59063 +#else
59064 +res_nsearch();
59065  #endif
59066 -
59067 +
59068 +; return 0; }
59069  EOF
59070 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
59071 -  egrep "yes" >/dev/null 2>&1; then
59072 +if { (eval echo configure:90667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59073    rm -rf conftest*
59074 -
59075 -        SNMP_SSL=yes
59076 -
59077 +  eval "ac_cv_func_res_nsearch=yes"
59078  else
59079 +  echo "configure: failed program was:" >&5
59080 +  cat conftest.$ac_ext >&5
59081    rm -rf conftest*
59082 -
59083 -        SNMP_SSL=no
59084 -
59085 +  eval "ac_cv_func_res_nsearch=no"
59086  fi
59087  rm -f conftest*
59088 +fi
59089
59090 -    fi
59091 -    CPPFLAGS=$old_CPPFLAGS
59092 -    echo "$ac_t""$SNMP_SSL" 1>&6
59093 -
59094 -    if test "$SNMP_SSL" = "yes"; then
59095 -      if test "$PHP_OPENSSL_DIR" != "no"; then
59096 -        PHP_OPENSSL=$PHP_OPENSSL_DIR
59097 -      fi
59098 -
59099 -      if test "$PHP_OPENSSL" = "no"; then
59100 -        { echo "configure: error: The UCD-SNMP in this system is built with SSL support.
59101 -
59102 -        Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; }
59103 -      else
59104 -
59105 -  found_openssl=no
59106 -  unset OPENSSL_INCDIR
59107 -  unset OPENSSL_LIBDIR
59108 +if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then
59109 +  echo "$ac_t""yes" 1>&6
59110 +  found=yes
59111 +else
59112 +  echo "$ac_t""no" 1>&6
59113 + echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6
59114 +echo "configure:90685: checking for __res_nsearch" >&5
59115 +if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then
59116 +  echo $ac_n "(cached) $ac_c" 1>&6
59117 +else
59118 +  cat > conftest.$ac_ext <<EOF
59119 +#line 90690 "configure"
59120 +#include "confdefs.h"
59121 +/* System header to define __stub macros and hopefully few prototypes,
59122 +    which can conflict with char __res_nsearch(); below.  */
59123 +#include <assert.h>
59124 +/* Override any gcc2 internal prototype to avoid an error.  */
59125 +/* We use char because int might match the return type of a gcc2
59126 +    builtin and then its argument prototype would still apply.  */
59127 +char __res_nsearch();
59128
59129 -    test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
59130 -  test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
59131 +int main() {
59132
59133 -    if test "$PHP_OPENSSL" != "no"; then
59134 -    PHP_OPENSSL_DIR=$PHP_OPENSSL
59135 -  elif test "$PHP_IMAP_SSL" != "no"; then
59136 -    PHP_OPENSSL_DIR=$PHP_IMAP_SSL
59137 -  fi
59138 +/* The GNU C library defines this for functions which it implements
59139 +    to always fail with ENOSYS.  Some functions are actually named
59140 +    something starting with __ and the normal name is an alias.  */
59141 +#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch)
59142 +choke me
59143 +#else
59144 +__res_nsearch();
59145 +#endif
59146
59147 -    if test -z "$PKG_CONFIG"; then
59148 -    # Extract the first word of "pkg-config", so it can be a program name with args.
59149 -set dummy pkg-config; ac_word=$2
59150 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
59151 -echo "configure:83724: checking for $ac_word" >&5
59152 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
59153 -  echo $ac_n "(cached) $ac_c" 1>&6
59154 +; return 0; }
59155 +EOF
59156 +if { (eval echo configure:90713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59157 +  rm -rf conftest*
59158 +  eval "ac_cv_func___res_nsearch=yes"
59159  else
59160 -  case "$PKG_CONFIG" in
59161 -  /*)
59162 -  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
59163 -  ;;
59164 -  ?:/*)
59165 -  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
59166 -  ;;
59167 -  *)
59168 -  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
59169 -  ac_dummy="$PATH"
59170 -  for ac_dir in $ac_dummy; do
59171 -    test -z "$ac_dir" && ac_dir=.
59172 -    if test -f $ac_dir/$ac_word; then
59173 -      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
59174 -      break
59175 -    fi
59176 -  done
59177 -  IFS="$ac_save_ifs"
59178 -  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
59179 -  ;;
59180 -esac
59181 +  echo "configure: failed program was:" >&5
59182 +  cat conftest.$ac_ext >&5
59183 +  rm -rf conftest*
59184 +  eval "ac_cv_func___res_nsearch=no"
59185  fi
59186 -PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
59187 -if test -n "$PKG_CONFIG"; then
59188 -  echo "$ac_t""$PKG_CONFIG" 1>&6
59189 +rm -f conftest*
59190 +fi
59191 +
59192 +if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then
59193 +  echo "$ac_t""yes" 1>&6
59194 +  found=yes
59195  else
59196    echo "$ac_t""no" 1>&6
59197 +found=no
59198 +fi
59199 +
59200  fi
59201
59202 -  fi
59203 -
59204 -    if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
59205 -    if $PKG_CONFIG --atleast-version=0.9.6 openssl; then
59206 -      found_openssl=yes
59207 -      OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
59208 -      OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
59209 -      OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
59210 -    else
59211 -      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
59212 -    fi
59213 -
59214 -    if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
59215 -
59216 -  for ac_i in $OPENSSL_LIBS; do
59217 -    case $ac_i in
59218 -    -pthread)
59219 -      if test "$ext_shared" = "yes"; then
59220 -        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread"
59221 -      else
59222 -
59223 -
59224 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
59225 -
59226 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
59227 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
59228 -    eval "EXTRA_LDFLAGS$unique=set"
59229 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
59230 -  fi
59231 -
59232 -      fi
59233 -    ;;
59234 -    -l*)
59235 -      ac_ii=`echo $ac_i|cut -c 3-`
59236 -
59237 -
59238 -  case $ac_ii in
59239 -  c|c_r|pthread*) ;;
59240 -  *)
59241 -    if test "$ext_shared" = "yes"; then
59242 -        SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
59243 -    else
59244 -
59245 -
59246 -  case $ac_ii in
59247 -  c|c_r|pthread*) ;;
59248 -  *)
59249 -      LIBS="$LIBS -l$ac_ii"
59250 -   ;;
59251 -  esac
59252 -
59253 -
59254 -    fi
59255 -   ;;
59256 -  esac
59257 -
59258 -
59259 -    ;;
59260 -    -L*)
59261 -      ac_ii=`echo $ac_i|cut -c 3-`
59262 -
59263 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
59264 -
59265 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
59266 -    ai_p=$ac_ii
59267 -  else
59268 -
59269 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
59270 -
59271 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59272 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
59273 -  fi
59274 -
59275 -
59276 -      if test "$ext_shared" = "yes"; then
59277 -        SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
59278 -        test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
59279 -      else
59280 -
59281 -
59282 -
59283 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
59284 -
59285 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
59286 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
59287 -    eval "LIBPATH$unique=set"
59288 -
59289 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
59290 -    LDFLAGS="$LDFLAGS -L$ai_p"
59291 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
59292 -
59293 -  fi
59294 -
59295 -
59296 -      fi
59297 -
59298 -  fi
59299 -
59300 -    ;;
59301 -    esac
59302 -  done
59303
59304 -
59305 -  for ac_i in $OPENSSL_INCS; do
59306 -    case $ac_i in
59307 -    -I*)
59308 -      ac_ii=`echo $ac_i|cut -c 3-`
59309 -
59310 -  if test "$ac_ii" != "/usr/include"; then
59311 -
59312 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
59313 -    ai_p=$ac_ii
59314 -  else
59315 -
59316 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
59317 -
59318 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59319 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
59320 -  fi
59321 +  case $found in
59322 +  yes)
59323 +    cat >> confdefs.h <<\EOF
59324 +#define HAVE_RES_NSEARCH 1
59325 +EOF
59326
59327 -
59328 -
59329 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
59330 +    ac_cv_func_res_nsearch=yes
59331 +  ;;
59332
59333 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
59334 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
59335 -    eval "INCLUDEPATH$unique=set"
59336 -
59337 -      if test ""; then
59338 -        INCLUDES="-I$ai_p $INCLUDES"
59339 -      else
59340 -        INCLUDES="$INCLUDES -I$ai_p"
59341 -      fi
59342 -
59343 -  fi
59344 -
59345 -  fi
59346 -
59347 -    ;;
59348 -    esac
59349 -  done
59350 -
59351 -    fi
59352 -  fi
59353 -
59354 -    if test "$found_openssl" = "no"; then
59355 +    *)
59356
59357 -    if test "$PHP_OPENSSL_DIR" = "yes"; then
59358 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
59359 -    fi
59360 -
59361 -    for i in $PHP_OPENSSL_DIR; do
59362 -      if test -r $i/include/openssl/evp.h; then
59363 -        OPENSSL_INCDIR=$i/include
59364 -      fi
59365 -      if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then
59366 -        OPENSSL_LIBDIR=$i/$PHP_LIBDIR
59367 -      fi
59368 -      test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
59369 -    done
59370 +  unset ac_cv_lib_resolv_res_nsearch
59371 +  unset ac_cv_lib_resolv___res_nsearch
59372 +  unset found
59373 +  echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6
59374 +echo "configure:90751: checking for res_nsearch in -lresolv" >&5
59375 +ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'`
59376 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59377 +  echo $ac_n "(cached) $ac_c" 1>&6
59378 +else
59379 +  ac_save_LIBS="$LIBS"
59380 +LIBS="-lresolv  $LIBS"
59381 +cat > conftest.$ac_ext <<EOF
59382 +#line 90759 "configure"
59383 +#include "confdefs.h"
59384 +/* Override any gcc2 internal prototype to avoid an error.  */
59385 +/* We use char because int might match the return type of a gcc2
59386 +    builtin and then its argument prototype would still apply.  */
59387 +char res_nsearch();
59388
59389 -    if test -z "$OPENSSL_INCDIR"; then
59390 -      { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; }
59391 -    fi
59392 +int main() {
59393 +res_nsearch()
59394 +; return 0; }
59395 +EOF
59396 +if { (eval echo configure:90770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59397 +  rm -rf conftest*
59398 +  eval "ac_cv_lib_$ac_lib_var=yes"
59399 +else
59400 +  echo "configure: failed program was:" >&5
59401 +  cat conftest.$ac_ext >&5
59402 +  rm -rf conftest*
59403 +  eval "ac_cv_lib_$ac_lib_var=no"
59404 +fi
59405 +rm -f conftest*
59406 +LIBS="$ac_save_LIBS"
59407
59408 -    if test -z "$OPENSSL_LIBDIR"; then
59409 -      { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; }
59410 -    fi
59411 +fi
59412 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
59413 +  echo "$ac_t""yes" 1>&6
59414 +  found=yes
59415 +else
59416 +  echo "$ac_t""no" 1>&6
59417
59418 -    old_CPPFLAGS=$CPPFLAGS
59419 -    CPPFLAGS=-I$OPENSSL_INCDIR
59420 -    echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
59421 -echo "configure:83929: checking for OpenSSL version" >&5
59422 -    cat > conftest.$ac_ext <<EOF
59423 -#line 83931 "configure"
59424 +    echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6
59425 +echo "configure:90790: checking for __res_nsearch in -lresolv" >&5
59426 +ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'`
59427 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59428 +  echo $ac_n "(cached) $ac_c" 1>&6
59429 +else
59430 +  ac_save_LIBS="$LIBS"
59431 +LIBS="-lresolv  $LIBS"
59432 +cat > conftest.$ac_ext <<EOF
59433 +#line 90798 "configure"
59434  #include "confdefs.h"
59435 +/* Override any gcc2 internal prototype to avoid an error.  */
59436 +/* We use char because int might match the return type of a gcc2
59437 +    builtin and then its argument prototype would still apply.  */
59438 +char __res_nsearch();
59439
59440 -#include <openssl/opensslv.h>
59441 -#if OPENSSL_VERSION_NUMBER >= 0x0090600fL
59442 -  yes
59443 -#endif
59444 -
59445 +int main() {
59446 +__res_nsearch()
59447 +; return 0; }
59448  EOF
59449 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
59450 -  egrep "yes" >/dev/null 2>&1; then
59451 +if { (eval echo configure:90809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59452    rm -rf conftest*
59453 -
59454 -      echo "$ac_t"">= 0.9.6" 1>&6
59455 -
59456 +  eval "ac_cv_lib_$ac_lib_var=yes"
59457  else
59458 +  echo "configure: failed program was:" >&5
59459 +  cat conftest.$ac_ext >&5
59460    rm -rf conftest*
59461 -
59462 -      { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
59463 -
59464 +  eval "ac_cv_lib_$ac_lib_var=no"
59465  fi
59466  rm -f conftest*
59467 +LIBS="$ac_save_LIBS"
59468
59469 -    CPPFLAGS=$old_CPPFLAGS
59470 -
59471 -
59472 -  if test "$OPENSSL_INCDIR" != "/usr/include"; then
59473 -
59474 -  if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then
59475 -    ai_p=$OPENSSL_INCDIR
59476 -  else
59477 -
59478 -    ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
59479 -
59480 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59481 -    ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`"
59482 -  fi
59483 +fi
59484 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
59485 +  echo "$ac_t""yes" 1>&6
59486 +  found=yes
59487 +else
59488 +  echo "$ac_t""no" 1>&6
59489 +found=no
59490 +fi
59491
59492 -
59493
59494 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
59495 -
59496 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
59497 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
59498 -    eval "INCLUDEPATH$unique=set"
59499 -
59500 -      if test ""; then
59501 -        INCLUDES="-I$ai_p $INCLUDES"
59502 -      else
59503 -        INCLUDES="$INCLUDES -I$ai_p"
59504 -      fi
59505 -
59506 -  fi
59507 +fi
59508 +
59509 +
59510 +  if test "$found" = "yes"; then
59511 +    ac_libs=$LIBS
59512 +    LIBS="$LIBS -lresolv"
59513 +    if test "$cross_compiling" = yes; then
59514 +  found=no
59515 +else
59516 +  cat > conftest.$ac_ext <<EOF
59517 +#line 90841 "configure"
59518 +#include "confdefs.h"
59519 +main() { return (0); }
59520 +EOF
59521 +if { (eval echo configure:90845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
59522 +then
59523 +  found=yes
59524 +else
59525 +  echo "configure: failed program was:" >&5
59526 +  cat conftest.$ac_ext >&5
59527 +  rm -fr conftest*
59528 +  found=no
59529 +fi
59530 +rm -fr conftest*
59531 +fi
59532
59533 +    LIBS=$ac_libs
59534    fi
59535
59536 -
59537 +  if test "$found" = "yes"; then
59538
59539 -  save_old_LDFLAGS=$LDFLAGS
59540 -  ac_stuff="
59541 -      -L$OPENSSL_LIBDIR
59542 -    "
59543 -
59544 -  save_ext_shared=$ext_shared
59545 -  ext_shared=yes
59546 -
59547 -  for ac_i in $ac_stuff; do
59548 -    case $ac_i in
59549 -    -pthread)
59550 -      if test "$ext_shared" = "yes"; then
59551 -        LDFLAGS="$LDFLAGS -pthread"
59552 -      else
59553 -
59554 -
59555 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
59556 -
59557 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
59558 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
59559 -    eval "EXTRA_LDFLAGS$unique=set"
59560 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
59561 -  fi
59562 -
59563 -      fi
59564 -    ;;
59565 -    -l*)
59566 -      ac_ii=`echo $ac_i|cut -c 3-`
59567 -
59568 -
59569 -  case $ac_ii in
59570 -  c|c_r|pthread*) ;;
59571 -  *)
59572 -    if test "$ext_shared" = "yes"; then
59573 -        LDFLAGS="$LDFLAGS -l$ac_ii"
59574 -    else
59575 -
59576
59577 -  case $ac_ii in
59578 +  case resolv in
59579    c|c_r|pthread*) ;;
59580    *)
59581 -      LIBS="$LIBS -l$ac_ii"
59582 +      LIBS="-lresolv $LIBS"
59583     ;;
59584    esac
59585
59586
59587 -    fi
59588 -   ;;
59589 -  esac
59590 +    cat >> confdefs.h <<\EOF
59591 +#define HAVE_RES_NSEARCH 1
59592 +EOF
59593
59594 +    cat >> confdefs.h <<\EOF
59595 +#define HAVE_LIBRESOLV 1
59596 +EOF
59597
59598 -    ;;
59599 -    -L*)
59600 -      ac_ii=`echo $ac_i|cut -c 3-`
59601 -
59602 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
59603 -
59604 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
59605 -    ai_p=$ac_ii
59606 +    ac_cv_func_res_nsearch=yes
59607    else
59608
59609 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
59610 -
59611 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59612 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
59613 -  fi
59614 -
59615 -
59616 -      if test "$ext_shared" = "yes"; then
59617 -        LDFLAGS="-L$ai_p $LDFLAGS"
59618 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
59619 -      else
59620 -
59621 -
59622 -
59623 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
59624 -
59625 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
59626 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
59627 -    eval "LIBPATH$unique=set"
59628 -
59629 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
59630 -    LDFLAGS="$LDFLAGS -L$ai_p"
59631 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
59632
59633 -  fi
59634 -
59635 +  unset ac_cv_lib_bind_res_nsearch
59636 +  unset ac_cv_lib_bind___res_nsearch
59637 +  unset found
59638 +  echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6
59639 +echo "configure:90887: checking for res_nsearch in -lbind" >&5
59640 +ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'`
59641 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59642 +  echo $ac_n "(cached) $ac_c" 1>&6
59643 +else
59644 +  ac_save_LIBS="$LIBS"
59645 +LIBS="-lbind  $LIBS"
59646 +cat > conftest.$ac_ext <<EOF
59647 +#line 90895 "configure"
59648 +#include "confdefs.h"
59649 +/* Override any gcc2 internal prototype to avoid an error.  */
59650 +/* We use char because int might match the return type of a gcc2
59651 +    builtin and then its argument prototype would still apply.  */
59652 +char res_nsearch();
59653
59654 -      fi
59655 -
59656 -  fi
59657 +int main() {
59658 +res_nsearch()
59659 +; return 0; }
59660 +EOF
59661 +if { (eval echo configure:90906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59662 +  rm -rf conftest*
59663 +  eval "ac_cv_lib_$ac_lib_var=yes"
59664 +else
59665 +  echo "configure: failed program was:" >&5
59666 +  cat conftest.$ac_ext >&5
59667 +  rm -rf conftest*
59668 +  eval "ac_cv_lib_$ac_lib_var=no"
59669 +fi
59670 +rm -f conftest*
59671 +LIBS="$ac_save_LIBS"
59672
59673 -    ;;
59674 -    esac
59675 -  done
59676 +fi
59677 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
59678 +  echo "$ac_t""yes" 1>&6
59679 +  found=yes
59680 +else
59681 +  echo "$ac_t""no" 1>&6
59682
59683 -  echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
59684 -echo "configure:84086: checking for CRYPTO_free in -lcrypto" >&5
59685 -ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
59686 +    echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6
59687 +echo "configure:90926: checking for __res_nsearch in -lbind" >&5
59688 +ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'`
59689  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59690    echo $ac_n "(cached) $ac_c" 1>&6
59691  else
59692    ac_save_LIBS="$LIBS"
59693 -LIBS="-lcrypto  $LIBS"
59694 +LIBS="-lbind  $LIBS"
59695  cat > conftest.$ac_ext <<EOF
59696 -#line 84094 "configure"
59697 +#line 90934 "configure"
59698  #include "confdefs.h"
59699  /* Override any gcc2 internal prototype to avoid an error.  */
59700  /* We use char because int might match the return type of a gcc2
59701      builtin and then its argument prototype would still apply.  */
59702 -char CRYPTO_free();
59703 +char __res_nsearch();
59704
59705  int main() {
59706 -CRYPTO_free()
59707 +__res_nsearch()
59708  ; return 0; }
59709  EOF
59710 -if { (eval echo configure:84105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59711 +if { (eval echo configure:90945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59712    rm -rf conftest*
59713    eval "ac_cv_lib_$ac_lib_var=yes"
59714  else
59715 @@ -84116,168 +90956,352 @@ LIBS="$ac_save_LIBS"
59716  fi
59717  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
59718    echo "$ac_t""yes" 1>&6
59719 +  found=yes
59720 +else
59721 +  echo "$ac_t""no" 1>&6
59722 +found=no
59723 +fi
59724 +
59725
59726 -    LDFLAGS=$save_old_LDFLAGS
59727 -    ext_shared=$save_ext_shared
59728 +fi
59729 +
59730 +
59731 +  if test "$found" = "yes"; then
59732 +    ac_libs=$LIBS
59733 +    LIBS="$LIBS -lbind"
59734 +    if test "$cross_compiling" = yes; then
59735 +  found=no
59736 +else
59737 +  cat > conftest.$ac_ext <<EOF
59738 +#line 90977 "configure"
59739 +#include "confdefs.h"
59740 +main() { return (0); }
59741 +EOF
59742 +if { (eval echo configure:90981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
59743 +then
59744 +  found=yes
59745 +else
59746 +  echo "configure: failed program was:" >&5
59747 +  cat conftest.$ac_ext >&5
59748 +  rm -fr conftest*
59749 +  found=no
59750 +fi
59751 +rm -fr conftest*
59752 +fi
59753 +
59754 +    LIBS=$ac_libs
59755 +  fi
59756 +
59757 +  if test "$found" = "yes"; then
59758
59759 -
59760 -
59761 -  case crypto in
59762 -  c|c_r|pthread*) ;;
59763 -  *)
59764 -    if test "$ext_shared" = "yes"; then
59765 -        SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD"
59766 -    else
59767 -
59768
59769 -  case crypto in
59770 +  case bind in
59771    c|c_r|pthread*) ;;
59772    *)
59773 -      LIBS="-lcrypto $LIBS"
59774 +      LIBS="-lbind $LIBS"
59775     ;;
59776    esac
59777
59778
59779 -    fi
59780 -   ;;
59781 -  esac
59782 +    cat >> confdefs.h <<\EOF
59783 +#define HAVE_RES_NSEARCH 1
59784 +EOF
59785
59786 +    cat >> confdefs.h <<\EOF
59787 +#define HAVE_LIBBIND 1
59788 +EOF
59789
59790 +    ac_cv_func_res_nsearch=yes
59791 +  else
59792
59793
59794 +  unset ac_cv_lib_socket_res_nsearch
59795 +  unset ac_cv_lib_socket___res_nsearch
59796 +  unset found
59797 +  echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6
59798 +echo "configure:91023: checking for res_nsearch in -lsocket" >&5
59799 +ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'`
59800 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59801 +  echo $ac_n "(cached) $ac_c" 1>&6
59802 +else
59803 +  ac_save_LIBS="$LIBS"
59804 +LIBS="-lsocket  $LIBS"
59805 +cat > conftest.$ac_ext <<EOF
59806 +#line 91031 "configure"
59807 +#include "confdefs.h"
59808 +/* Override any gcc2 internal prototype to avoid an error.  */
59809 +/* We use char because int might match the return type of a gcc2
59810 +    builtin and then its argument prototype would still apply.  */
59811 +char res_nsearch();
59812 +
59813 +int main() {
59814 +res_nsearch()
59815 +; return 0; }
59816 +EOF
59817 +if { (eval echo configure:91042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59818 +  rm -rf conftest*
59819 +  eval "ac_cv_lib_$ac_lib_var=yes"
59820 +else
59821 +  echo "configure: failed program was:" >&5
59822 +  cat conftest.$ac_ext >&5
59823 +  rm -rf conftest*
59824 +  eval "ac_cv_lib_$ac_lib_var=no"
59825 +fi
59826 +rm -f conftest*
59827 +LIBS="$ac_save_LIBS"
59828 +
59829 +fi
59830 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
59831 +  echo "$ac_t""yes" 1>&6
59832 +  found=yes
59833  else
59834    echo "$ac_t""no" 1>&6
59835
59836 -    LDFLAGS=$save_old_LDFLAGS
59837 -    ext_shared=$save_ext_shared
59838 -    unset ac_cv_lib_crypto_CRYPTO_free
59839 -
59840 -      { echo "configure: error: libcrypto not found!" 1>&2; exit 1; }
59841 -
59842 -
59843 +    echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6
59844 +echo "configure:91062: checking for __res_nsearch in -lsocket" >&5
59845 +ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'`
59846 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59847 +  echo $ac_n "(cached) $ac_c" 1>&6
59848 +else
59849 +  ac_save_LIBS="$LIBS"
59850 +LIBS="-lsocket  $LIBS"
59851 +cat > conftest.$ac_ext <<EOF
59852 +#line 91070 "configure"
59853 +#include "confdefs.h"
59854 +/* Override any gcc2 internal prototype to avoid an error.  */
59855 +/* We use char because int might match the return type of a gcc2
59856 +    builtin and then its argument prototype would still apply.  */
59857 +char __res_nsearch();
59858 +
59859 +int main() {
59860 +__res_nsearch()
59861 +; return 0; }
59862 +EOF
59863 +if { (eval echo configure:91081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59864 +  rm -rf conftest*
59865 +  eval "ac_cv_lib_$ac_lib_var=yes"
59866 +else
59867 +  echo "configure: failed program was:" >&5
59868 +  cat conftest.$ac_ext >&5
59869 +  rm -rf conftest*
59870 +  eval "ac_cv_lib_$ac_lib_var=no"
59871  fi
59872 +rm -f conftest*
59873 +LIBS="$ac_save_LIBS"
59874
59875 +fi
59876 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
59877 +  echo "$ac_t""yes" 1>&6
59878 +  found=yes
59879 +else
59880 +  echo "$ac_t""no" 1>&6
59881 +found=no
59882 +fi
59883
59884 -    old_LIBS=$LIBS
59885 -    LIBS="$LIBS -lcrypto"
59886 -
59887 -  save_old_LDFLAGS=$LDFLAGS
59888 -  ac_stuff="
59889 -      -L$OPENSSL_LIBDIR
59890 -    "
59891 -
59892 -  save_ext_shared=$ext_shared
59893 -  ext_shared=yes
59894 -
59895 -  for ac_i in $ac_stuff; do
59896 -    case $ac_i in
59897 -    -pthread)
59898 -      if test "$ext_shared" = "yes"; then
59899 -        LDFLAGS="$LDFLAGS -pthread"
59900 -      else
59901 -
59902 -
59903 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
59904
59905 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
59906 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
59907 -    eval "EXTRA_LDFLAGS$unique=set"
59908 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
59909 +fi
59910 +
59911 +
59912 +  if test "$found" = "yes"; then
59913 +    ac_libs=$LIBS
59914 +    LIBS="$LIBS -lsocket"
59915 +    if test "$cross_compiling" = yes; then
59916 +  found=no
59917 +else
59918 +  cat > conftest.$ac_ext <<EOF
59919 +#line 91113 "configure"
59920 +#include "confdefs.h"
59921 +main() { return (0); }
59922 +EOF
59923 +if { (eval echo configure:91117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
59924 +then
59925 +  found=yes
59926 +else
59927 +  echo "configure: failed program was:" >&5
59928 +  cat conftest.$ac_ext >&5
59929 +  rm -fr conftest*
59930 +  found=no
59931 +fi
59932 +rm -fr conftest*
59933 +fi
59934 +
59935 +    LIBS=$ac_libs
59936    fi
59937
59938 -      fi
59939 -    ;;
59940 -    -l*)
59941 -      ac_ii=`echo $ac_i|cut -c 3-`
59942 -
59943 -
59944 -  case $ac_ii in
59945 -  c|c_r|pthread*) ;;
59946 -  *)
59947 -    if test "$ext_shared" = "yes"; then
59948 -        LDFLAGS="$LDFLAGS -l$ac_ii"
59949 -    else
59950 -
59951 +  if test "$found" = "yes"; then
59952 +
59953
59954 -  case $ac_ii in
59955 +  case socket in
59956    c|c_r|pthread*) ;;
59957    *)
59958 -      LIBS="$LIBS -l$ac_ii"
59959 +      LIBS="-lsocket $LIBS"
59960     ;;
59961    esac
59962
59963
59964 -    fi
59965 -   ;;
59966 -  esac
59967 +    cat >> confdefs.h <<\EOF
59968 +#define HAVE_RES_NSEARCH 1
59969 +EOF
59970
59971 +    cat >> confdefs.h <<\EOF
59972 +#define HAVE_LIBSOCKET 1
59973 +EOF
59974
59975 -    ;;
59976 -    -L*)
59977 -      ac_ii=`echo $ac_i|cut -c 3-`
59978 -
59979 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
59980 -
59981 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
59982 -    ai_p=$ac_ii
59983 +    ac_cv_func_res_nsearch=yes
59984    else
59985
59986 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
59987 -
59988 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59989 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
59990 +  :
59991 +
59992    fi
59993 +
59994
59995 -
59996 -      if test "$ext_shared" = "yes"; then
59997 -        LDFLAGS="-L$ai_p $LDFLAGS"
59998 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
59999 -      else
60000 -
60001 +  fi
60002
60003 +
60004 +  fi
60005
60006 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60007 + ;;
60008
60009 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
60010 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
60011 -    eval "LIBPATH$unique=set"
60012 -
60013 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
60014 -    LDFLAGS="$LDFLAGS -L$ai_p"
60015 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
60016 +  esac
60017 +
60018 +
60019 +  unset ac_cv_func_dns_search
60020 +  unset ac_cv_func___dns_search
60021 +  unset found
60022
60023 -  fi
60024 +  echo $ac_n "checking for dns_search""... $ac_c" 1>&6
60025 +echo "configure:91174: checking for dns_search" >&5
60026 +if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then
60027 +  echo $ac_n "(cached) $ac_c" 1>&6
60028 +else
60029 +  cat > conftest.$ac_ext <<EOF
60030 +#line 91179 "configure"
60031 +#include "confdefs.h"
60032 +/* System header to define __stub macros and hopefully few prototypes,
60033 +    which can conflict with char dns_search(); below.  */
60034 +#include <assert.h>
60035 +/* Override any gcc2 internal prototype to avoid an error.  */
60036 +/* We use char because int might match the return type of a gcc2
60037 +    builtin and then its argument prototype would still apply.  */
60038 +char dns_search();
60039
60040 +int main() {
60041
60042 -      fi
60043 -
60044 -  fi
60045 +/* The GNU C library defines this for functions which it implements
60046 +    to always fail with ENOSYS.  Some functions are actually named
60047 +    something starting with __ and the normal name is an alias.  */
60048 +#if defined (__stub_dns_search) || defined (__stub___dns_search)
60049 +choke me
60050 +#else
60051 +dns_search();
60052 +#endif
60053
60054 -    ;;
60055 -    esac
60056 -  done
60057 +; return 0; }
60058 +EOF
60059 +if { (eval echo configure:91202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60060 +  rm -rf conftest*
60061 +  eval "ac_cv_func_dns_search=yes"
60062 +else
60063 +  echo "configure: failed program was:" >&5
60064 +  cat conftest.$ac_ext >&5
60065 +  rm -rf conftest*
60066 +  eval "ac_cv_func_dns_search=no"
60067 +fi
60068 +rm -f conftest*
60069 +fi
60070
60071 -  echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
60072 -echo "configure:84262: checking for SSL_CTX_set_ssl_version in -lssl" >&5
60073 -ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
60074 +if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then
60075 +  echo "$ac_t""yes" 1>&6
60076 +  found=yes
60077 +else
60078 +  echo "$ac_t""no" 1>&6
60079 + echo $ac_n "checking for __dns_search""... $ac_c" 1>&6
60080 +echo "configure:91220: checking for __dns_search" >&5
60081 +if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then
60082 +  echo $ac_n "(cached) $ac_c" 1>&6
60083 +else
60084 +  cat > conftest.$ac_ext <<EOF
60085 +#line 91225 "configure"
60086 +#include "confdefs.h"
60087 +/* System header to define __stub macros and hopefully few prototypes,
60088 +    which can conflict with char __dns_search(); below.  */
60089 +#include <assert.h>
60090 +/* Override any gcc2 internal prototype to avoid an error.  */
60091 +/* We use char because int might match the return type of a gcc2
60092 +    builtin and then its argument prototype would still apply.  */
60093 +char __dns_search();
60094 +
60095 +int main() {
60096 +
60097 +/* The GNU C library defines this for functions which it implements
60098 +    to always fail with ENOSYS.  Some functions are actually named
60099 +    something starting with __ and the normal name is an alias.  */
60100 +#if defined (__stub___dns_search) || defined (__stub_____dns_search)
60101 +choke me
60102 +#else
60103 +__dns_search();
60104 +#endif
60105 +
60106 +; return 0; }
60107 +EOF
60108 +if { (eval echo configure:91248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60109 +  rm -rf conftest*
60110 +  eval "ac_cv_func___dns_search=yes"
60111 +else
60112 +  echo "configure: failed program was:" >&5
60113 +  cat conftest.$ac_ext >&5
60114 +  rm -rf conftest*
60115 +  eval "ac_cv_func___dns_search=no"
60116 +fi
60117 +rm -f conftest*
60118 +fi
60119 +
60120 +if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then
60121 +  echo "$ac_t""yes" 1>&6
60122 +  found=yes
60123 +else
60124 +  echo "$ac_t""no" 1>&6
60125 +found=no
60126 +fi
60127 +
60128 +fi
60129 +
60130 +
60131 +  case $found in
60132 +  yes)
60133 +    cat >> confdefs.h <<\EOF
60134 +#define HAVE_DNS_SEARCH 1
60135 +EOF
60136 +
60137 +    ac_cv_func_dns_search=yes
60138 +  ;;
60139 +
60140 +    *)
60141 +
60142 +  unset ac_cv_lib_resolv_dns_search
60143 +  unset ac_cv_lib_resolv___dns_search
60144 +  unset found
60145 +  echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6
60146 +echo "configure:91286: checking for dns_search in -lresolv" >&5
60147 +ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'`
60148  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60149    echo $ac_n "(cached) $ac_c" 1>&6
60150  else
60151    ac_save_LIBS="$LIBS"
60152 -LIBS="-lssl  $LIBS"
60153 +LIBS="-lresolv  $LIBS"
60154  cat > conftest.$ac_ext <<EOF
60155 -#line 84270 "configure"
60156 +#line 91294 "configure"
60157  #include "confdefs.h"
60158  /* Override any gcc2 internal prototype to avoid an error.  */
60159  /* We use char because int might match the return type of a gcc2
60160      builtin and then its argument prototype would still apply.  */
60161 -char SSL_CTX_set_ssl_version();
60162 +char dns_search();
60163
60164  int main() {
60165 -SSL_CTX_set_ssl_version()
60166 +dns_search()
60167  ; return 0; }
60168  EOF
60169 -if { (eval echo configure:84281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60170 +if { (eval echo configure:91305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60171    rm -rf conftest*
60172    eval "ac_cv_lib_$ac_lib_var=yes"
60173  else
60174 @@ -84292,124 +91316,31 @@ LIBS="$ac_save_LIBS"
60175  fi
60176  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
60177    echo "$ac_t""yes" 1>&6
60178 -
60179 -    LDFLAGS=$save_old_LDFLAGS
60180 -    ext_shared=$save_ext_shared
60181 -
60182 -      found_openssl=yes
60183 -
60184 -
60185 +  found=yes
60186  else
60187    echo "$ac_t""no" 1>&6
60188
60189 -    LDFLAGS=$save_old_LDFLAGS
60190 -    ext_shared=$save_ext_shared
60191 -    unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
60192 -
60193 -      { echo "configure: error: libssl not found!" 1>&2; exit 1; }
60194 -
60195 -
60196 -fi
60197 -
60198 -    LIBS=$old_LIBS
60199 -
60200 -
60201 -  case ssl in
60202 -  c|c_r|pthread*) ;;
60203 -  *)
60204 -    if test "$ext_shared" = "yes"; then
60205 -        SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD"
60206 -    else
60207 -
60208 -
60209 -  case ssl in
60210 -  c|c_r|pthread*) ;;
60211 -  *)
60212 -      LIBS="-lssl $LIBS"
60213 -   ;;
60214 -  esac
60215 -
60216 -
60217 -    fi
60218 -   ;;
60219 -  esac
60220 -
60221 -
60222 -
60223 -
60224 -  if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then
60225 -
60226 -  if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then
60227 -    ai_p=$OPENSSL_LIBDIR
60228 -  else
60229 -
60230 -    ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
60231 -
60232 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60233 -    ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
60234 -  fi
60235 -
60236 -
60237 -      if test "$ext_shared" = "yes"; then
60238 -        SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
60239 -        test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
60240 -      else
60241 -
60242 -
60243 -
60244 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60245 -
60246 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
60247 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
60248 -    eval "LIBPATH$unique=set"
60249 -
60250 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
60251 -    LDFLAGS="$LDFLAGS -L$ai_p"
60252 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
60253 -
60254 -  fi
60255 -
60256 -
60257 -      fi
60258 -
60259 -  fi
60260 -
60261 -  fi
60262 -
60263 -  if test "$found_openssl" = "yes"; then
60264 -    OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
60265 -
60266 -
60267 -:
60268 -else
60269 -          { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; }
60270 -
60271 -  fi
60272 -
60273 -      fi
60274 -    fi
60275 -
60276 -    echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
60277 -echo "configure:84394: checking for kstat_read in -lkstat" >&5
60278 -ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
60279 +    echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6
60280 +echo "configure:91325: checking for __dns_search in -lresolv" >&5
60281 +ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'`
60282  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60283    echo $ac_n "(cached) $ac_c" 1>&6
60284  else
60285    ac_save_LIBS="$LIBS"
60286 -LIBS="-lkstat  $LIBS"
60287 +LIBS="-lresolv  $LIBS"
60288  cat > conftest.$ac_ext <<EOF
60289 -#line 84402 "configure"
60290 +#line 91333 "configure"
60291  #include "confdefs.h"
60292  /* Override any gcc2 internal prototype to avoid an error.  */
60293  /* We use char because int might match the return type of a gcc2
60294      builtin and then its argument prototype would still apply.  */
60295 -char kstat_read();
60296 +char __dns_search();
60297
60298  int main() {
60299 -kstat_read()
60300 +__dns_search()
60301  ; return 0; }
60302  EOF
60303 -if { (eval echo configure:84413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60304 +if { (eval echo configure:91344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60305    rm -rf conftest*
60306    eval "ac_cv_lib_$ac_lib_var=yes"
60307  else
60308 @@ -84424,282 +91355,89 @@ LIBS="$ac_save_LIBS"
60309  fi
60310  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
60311    echo "$ac_t""yes" 1>&6
60312 -
60313 -
60314 -  case kstat in
60315 -  c|c_r|pthread*) ;;
60316 -  *)
60317 -    if test "$ext_shared" = "yes"; then
60318 -        SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD"
60319 -    else
60320 -
60321 -
60322 -  case kstat in
60323 -  c|c_r|pthread*) ;;
60324 -  *)
60325 -      LIBS="-lkstat $LIBS"
60326 -   ;;
60327 -  esac
60328 -
60329 -
60330 -    fi
60331 -   ;;
60332 -  esac
60333 -
60334 -
60335 +  found=yes
60336  else
60337    echo "$ac_t""no" 1>&6
60338 +found=no
60339  fi
60340
60341 -
60342 -  if test "$SNMP_INCDIR" != "/usr/include"; then
60343 -
60344 -  if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then
60345 -    ai_p=$SNMP_INCDIR
60346 -  else
60347 -
60348 -    ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
60349 -
60350 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60351 -    ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`"
60352 -  fi
60353 -
60354 -
60355 -
60356 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60357 -
60358 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
60359 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
60360 -    eval "INCLUDEPATH$unique=set"
60361 -
60362 -      if test ""; then
60363 -        INCLUDES="-I$ai_p $INCLUDES"
60364 -      else
60365 -        INCLUDES="$INCLUDES -I$ai_p"
60366 -      fi
60367 -
60368 -  fi
60369 -
60370 -  fi
60371 -
60372 -
60373 -
60374 -  if test "$ext_shared" = "yes"; then
60375 -    SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD"
60376 -    if test -n "$SNMP_LIBDIR"; then
60377 -
60378 -  if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
60379 -
60380 -  if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
60381 -    ai_p=$SNMP_LIBDIR
60382 -  else
60383 -
60384 -    ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
60385 -
60386 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60387 -    ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`"
60388 -  fi
60389 -
60390 -
60391 -      if test "$ext_shared" = "yes"; then
60392 -        SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
60393 -        test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
60394 -      else
60395 -
60396 -
60397 -
60398 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60399 -
60400 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
60401 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
60402 -    eval "LIBPATH$unique=set"
60403 -
60404 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
60405 -    LDFLAGS="$LDFLAGS -L$ai_p"
60406 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
60407 -
60408 -  fi
60409 -
60410 -
60411 -      fi
60412 -
60413 -  fi
60414 -
60415 -    fi
60416 -  else
60417 -
60418 -
60419 -  if test -n "$SNMP_LIBDIR"; then
60420 -
60421 -  if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
60422 -
60423 -  if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
60424 -    ai_p=$SNMP_LIBDIR
60425 -  else
60426 -
60427 -    ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
60428 -
60429 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60430 -    ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`"
60431 -  fi
60432 -
60433 -
60434 -
60435 -
60436 -
60437 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60438 -
60439 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
60440 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
60441 -    eval "LIBPATH$unique=set"
60442 -
60443 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
60444 -    LDFLAGS="$LDFLAGS -L$ai_p"
60445 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
60446 -
60447 -  fi
60448 -
60449 -
60450 -
60451 -  fi
60452 -
60453 -  fi
60454
60455 -
60456 -  case snmp in
60457 -  c|c_r|pthread*) ;;
60458 -  *)
60459 -      LIBS="-lsnmp $LIBS"
60460 -   ;;
60461 -  esac
60462 -
60463 -
60464 -
60465 +fi
60466
60467 -  fi
60468
60469 +  if test "$found" = "yes"; then
60470 +    ac_libs=$LIBS
60471 +    LIBS="$LIBS -lresolv"
60472 +    if test "$cross_compiling" = yes; then
60473 +  found=no
60474 +else
60475 +  cat > conftest.$ac_ext <<EOF
60476 +#line 91376 "configure"
60477 +#include "confdefs.h"
60478 +main() { return (0); }
60479 +EOF
60480 +if { (eval echo configure:91380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
60481 +then
60482 +  found=yes
60483 +else
60484 +  echo "configure: failed program was:" >&5
60485 +  cat conftest.$ac_ext >&5
60486 +  rm -fr conftest*
60487 +  found=no
60488 +fi
60489 +rm -fr conftest*
60490 +fi
60491
60492 -    SNMP_LIBNAME=snmp
60493 +    LIBS=$ac_libs
60494    fi
60495
60496 +  if test "$found" = "yes"; then
60497
60498 -  save_old_LDFLAGS=$LDFLAGS
60499 -  ac_stuff="
60500 -    $SNMP_SHARED_LIBADD
60501 -  "
60502 -
60503 -  save_ext_shared=$ext_shared
60504 -  ext_shared=yes
60505 -
60506 -  for ac_i in $ac_stuff; do
60507 -    case $ac_i in
60508 -    -pthread)
60509 -      if test "$ext_shared" = "yes"; then
60510 -        LDFLAGS="$LDFLAGS -pthread"
60511 -      else
60512 -
60513 -
60514 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
60515 -
60516 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
60517 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
60518 -    eval "EXTRA_LDFLAGS$unique=set"
60519 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
60520 -  fi
60521 -
60522 -      fi
60523 -    ;;
60524 -    -l*)
60525 -      ac_ii=`echo $ac_i|cut -c 3-`
60526 -
60527 -
60528 -  case $ac_ii in
60529 -  c|c_r|pthread*) ;;
60530 -  *)
60531 -    if test "$ext_shared" = "yes"; then
60532 -        LDFLAGS="$LDFLAGS -l$ac_ii"
60533 -    else
60534 -
60535
60536 -  case $ac_ii in
60537 +  case resolv in
60538    c|c_r|pthread*) ;;
60539    *)
60540 -      LIBS="$LIBS -l$ac_ii"
60541 +      LIBS="-lresolv $LIBS"
60542     ;;
60543    esac
60544
60545
60546 -    fi
60547 -   ;;
60548 -  esac
60549 +    cat >> confdefs.h <<\EOF
60550 +#define HAVE_DNS_SEARCH 1
60551 +EOF
60552
60553 +    cat >> confdefs.h <<\EOF
60554 +#define HAVE_LIBRESOLV 1
60555 +EOF
60556
60557 -    ;;
60558 -    -L*)
60559 -      ac_ii=`echo $ac_i|cut -c 3-`
60560 -
60561 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
60562 -
60563 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
60564 -    ai_p=$ac_ii
60565 +    ac_cv_func_dns_search=yes
60566    else
60567
60568 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
60569 -
60570 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60571 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
60572 -  fi
60573 -
60574 -
60575 -      if test "$ext_shared" = "yes"; then
60576 -        LDFLAGS="-L$ai_p $LDFLAGS"
60577 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
60578 -      else
60579 -
60580 -
60581 -
60582 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60583 -
60584 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
60585 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
60586 -    eval "LIBPATH$unique=set"
60587 -
60588 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
60589 -    LDFLAGS="$LDFLAGS -L$ai_p"
60590 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
60591
60592 -  fi
60593 -
60594 -
60595 -      fi
60596 -
60597 -  fi
60598 -
60599 -    ;;
60600 -    esac
60601 -  done
60602 -
60603 -  echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
60604 -echo "configure:84684: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
60605 -ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'`
60606 +  unset ac_cv_lib_bind_dns_search
60607 +  unset ac_cv_lib_bind___dns_search
60608 +  unset found
60609 +  echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6
60610 +echo "configure:91422: checking for dns_search in -lbind" >&5
60611 +ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'`
60612  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60613    echo $ac_n "(cached) $ac_c" 1>&6
60614  else
60615    ac_save_LIBS="$LIBS"
60616 -LIBS="-l$SNMP_LIBNAME  $LIBS"
60617 +LIBS="-lbind  $LIBS"
60618  cat > conftest.$ac_ext <<EOF
60619 -#line 84692 "configure"
60620 +#line 91430 "configure"
60621  #include "confdefs.h"
60622  /* Override any gcc2 internal prototype to avoid an error.  */
60623  /* We use char because int might match the return type of a gcc2
60624      builtin and then its argument prototype would still apply.  */
60625 -char snmp_parse_oid();
60626 +char dns_search();
60627
60628  int main() {
60629 -snmp_parse_oid()
60630 +dns_search()
60631  ; return 0; }
60632  EOF
60633 -if { (eval echo configure:84703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60634 +if { (eval echo configure:91441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60635    rm -rf conftest*
60636    eval "ac_cv_lib_$ac_lib_var=yes"
60637  else
60638 @@ -84708,151 +91446,37 @@ else
60639    rm -rf conftest*
60640    eval "ac_cv_lib_$ac_lib_var=no"
60641  fi
60642 -rm -f conftest*
60643 -LIBS="$ac_save_LIBS"
60644 -
60645 -fi
60646 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
60647 -  echo "$ac_t""yes" 1>&6
60648 -
60649 -    LDFLAGS=$save_old_LDFLAGS
60650 -    ext_shared=$save_ext_shared
60651 -
60652 -    cat >> confdefs.h <<\EOF
60653 -#define HAVE_SNMP_PARSE_OID 1
60654 -EOF
60655 -
60656 -
60657 -
60658 -else
60659 -  echo "$ac_t""no" 1>&6
60660 -
60661 -    LDFLAGS=$save_old_LDFLAGS
60662 -    ext_shared=$save_ext_shared
60663 -    unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid
60664 -
60665 -
60666 -fi
60667 -
60668 -
60669 -
60670 -  save_old_LDFLAGS=$LDFLAGS
60671 -  ac_stuff="
60672 -    $SNMP_SHARED_LIBADD
60673 -  "
60674 -
60675 -  save_ext_shared=$ext_shared
60676 -  ext_shared=yes
60677 -
60678 -  for ac_i in $ac_stuff; do
60679 -    case $ac_i in
60680 -    -pthread)
60681 -      if test "$ext_shared" = "yes"; then
60682 -        LDFLAGS="$LDFLAGS -pthread"
60683 -      else
60684 -
60685 -
60686 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
60687 -
60688 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
60689 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
60690 -    eval "EXTRA_LDFLAGS$unique=set"
60691 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
60692 -  fi
60693 -
60694 -      fi
60695 -    ;;
60696 -    -l*)
60697 -      ac_ii=`echo $ac_i|cut -c 3-`
60698 -
60699 -
60700 -  case $ac_ii in
60701 -  c|c_r|pthread*) ;;
60702 -  *)
60703 -    if test "$ext_shared" = "yes"; then
60704 -        LDFLAGS="$LDFLAGS -l$ac_ii"
60705 -    else
60706 -
60707 -
60708 -  case $ac_ii in
60709 -  c|c_r|pthread*) ;;
60710 -  *)
60711 -      LIBS="$LIBS -l$ac_ii"
60712 -   ;;
60713 -  esac
60714 -
60715 -
60716 -    fi
60717 -   ;;
60718 -  esac
60719 -
60720 -
60721 -    ;;
60722 -    -L*)
60723 -      ac_ii=`echo $ac_i|cut -c 3-`
60724 -
60725 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
60726 -
60727 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
60728 -    ai_p=$ac_ii
60729 -  else
60730 -
60731 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
60732 -
60733 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60734 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
60735 -  fi
60736 -
60737 -
60738 -      if test "$ext_shared" = "yes"; then
60739 -        LDFLAGS="-L$ai_p $LDFLAGS"
60740 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
60741 -      else
60742 -
60743 -
60744 -
60745 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60746 -
60747 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
60748 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
60749 -    eval "LIBPATH$unique=set"
60750 -
60751 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
60752 -    LDFLAGS="$LDFLAGS -L$ai_p"
60753 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
60754 -
60755 -  fi
60756 -
60757 -
60758 -      fi
60759 -
60760 -  fi
60761 +rm -f conftest*
60762 +LIBS="$ac_save_LIBS"
60763
60764 -    ;;
60765 -    esac
60766 -  done
60767 +fi
60768 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
60769 +  echo "$ac_t""yes" 1>&6
60770 +  found=yes
60771 +else
60772 +  echo "$ac_t""no" 1>&6
60773
60774 -  echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
60775 -echo "configure:84837: checking for init_snmp in -l$SNMP_LIBNAME" >&5
60776 -ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'`
60777 +    echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6
60778 +echo "configure:91461: checking for __dns_search in -lbind" >&5
60779 +ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'`
60780  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60781    echo $ac_n "(cached) $ac_c" 1>&6
60782  else
60783    ac_save_LIBS="$LIBS"
60784 -LIBS="-l$SNMP_LIBNAME  $LIBS"
60785 +LIBS="-lbind  $LIBS"
60786  cat > conftest.$ac_ext <<EOF
60787 -#line 84845 "configure"
60788 +#line 91469 "configure"
60789  #include "confdefs.h"
60790  /* Override any gcc2 internal prototype to avoid an error.  */
60791  /* We use char because int might match the return type of a gcc2
60792      builtin and then its argument prototype would still apply.  */
60793 -char init_snmp();
60794 +char __dns_search();
60795
60796  int main() {
60797 -init_snmp()
60798 +__dns_search()
60799  ; return 0; }
60800  EOF
60801 -if { (eval echo configure:84856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60802 +if { (eval echo configure:91480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60803    rm -rf conftest*
60804    eval "ac_cv_lib_$ac_lib_var=yes"
60805  else
60806 @@ -84867,2353 +91491,2361 @@ LIBS="$ac_save_LIBS"
60807  fi
60808  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
60809    echo "$ac_t""yes" 1>&6
60810 -
60811 -    LDFLAGS=$save_old_LDFLAGS
60812 -    ext_shared=$save_ext_shared
60813 -
60814 -    cat >> confdefs.h <<\EOF
60815 -#define HAVE_SNMP 1
60816 -EOF
60817 -
60818 -
60819 -
60820 +  found=yes
60821  else
60822    echo "$ac_t""no" 1>&6
60823 +found=no
60824 +fi
60825
60826 -    LDFLAGS=$save_old_LDFLAGS
60827 -    ext_shared=$save_ext_shared
60828 -    unset ac_cv_lib_$SNMP_LIBNAME_init_snmp
60829 -
60830 -    { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; }
60831 -
60832
60833  fi
60834
60835
60836 -  if test "$PHP_UCD_SNMP_HACK" = "yes" ; then
60837 -    cat >> confdefs.h <<\EOF
60838 -#define UCD_SNMP_HACK 1
60839 +  if test "$found" = "yes"; then
60840 +    ac_libs=$LIBS
60841 +    LIBS="$LIBS -lbind"
60842 +    if test "$cross_compiling" = yes; then
60843 +  found=no
60844 +else
60845 +  cat > conftest.$ac_ext <<EOF
60846 +#line 91512 "configure"
60847 +#include "confdefs.h"
60848 +main() { return (0); }
60849  EOF
60850 +if { (eval echo configure:91516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
60851 +then
60852 +  found=yes
60853 +else
60854 +  echo "configure: failed program was:" >&5
60855 +  cat conftest.$ac_ext >&5
60856 +  rm -fr conftest*
60857 +  found=no
60858 +fi
60859 +rm -fr conftest*
60860 +fi
60861
60862 +    LIBS=$ac_libs
60863    fi
60864 -
60865 -
60866 -  ext_builddir=ext/snmp
60867 -  ext_srcdir=$abs_srcdir/ext/snmp
60868 -
60869 -  ac_extra=
60870
60871 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
60872 -    PHP_SNMP_SHARED=no
60873 +  if test "$found" = "yes"; then
60874
60875
60876 -  case ext/snmp in
60877 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
60878 -  /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
60879 -  *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
60880 -  esac
60881 -
60882 -
60883 -
60884 -  b_c_pre=$php_c_pre
60885 -  b_cxx_pre=$php_cxx_pre
60886 -  b_c_meta=$php_c_meta
60887 -  b_cxx_meta=$php_cxx_meta
60888 -  b_c_post=$php_c_post
60889 -  b_cxx_post=$php_cxx_post
60890 -  b_lo=$php_lo
60891 -
60892 -
60893 -  old_IFS=$IFS
60894 -  for ac_src in snmp.c; do
60895 -
60896 -      IFS=.
60897 -      set $ac_src
60898 -      ac_obj=$1
60899 -      IFS=$old_IFS
60900 -
60901 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
60902 -
60903 -      case $ac_src in
60904 -        *.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" ;;
60905 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60906 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60907 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
60908 -      esac
60909 -
60910 -    cat >>Makefile.objects<<EOF
60911 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
60912 -       $ac_comp
60913 -EOF
60914 -  done
60915 -
60916 -
60917 -    EXT_STATIC="$EXT_STATIC snmp"
60918 -    if test "$ext_shared" != "nocli"; then
60919 -      EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
60920 -    fi
60921 -  else
60922 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
60923 -      PHP_SNMP_SHARED=yes
60924 -
60925 -  case ext/snmp in
60926 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
60927 -  /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
60928 -  *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
60929 +  case bind in
60930 +  c|c_r|pthread*) ;;
60931 +  *)
60932 +      LIBS="-lbind $LIBS"
60933 +   ;;
60934    esac
60935 -
60936 -
60937 -
60938 -  b_c_pre=$shared_c_pre
60939 -  b_cxx_pre=$shared_cxx_pre
60940 -  b_c_meta=$shared_c_meta
60941 -  b_cxx_meta=$shared_cxx_meta
60942 -  b_c_post=$shared_c_post
60943 -  b_cxx_post=$shared_cxx_post
60944 -  b_lo=$shared_lo
60945 -
60946 -
60947 -  old_IFS=$IFS
60948 -  for ac_src in snmp.c; do
60949 -
60950 -      IFS=.
60951 -      set $ac_src
60952 -      ac_obj=$1
60953 -      IFS=$old_IFS
60954 -
60955 -      shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo"
60956
60957 -      case $ac_src in
60958 -        *.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" ;;
60959 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60960 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60961 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
60962 -      esac
60963
60964 -    cat >>Makefile.objects<<EOF
60965 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
60966 -       $ac_comp
60967 +    cat >> confdefs.h <<\EOF
60968 +#define HAVE_DNS_SEARCH 1
60969  EOF
60970 -  done
60971 -
60972 -      case $host_alias in
60973 -        *netware*)
60974 -
60975 -  install_modules="install-modules"
60976 -
60977 -  case $host_alias in
60978 -    *aix*)
60979 -      suffix=so
60980 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsnmp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsnmp.so '$ext_builddir'/phpsnmp.so'
60981 -      ;;
60982 -    *netware*)
60983 -      suffix=nlm
60984 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)'
60985 -      ;;
60986 -    *)
60987 -      suffix=la
60988 -      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_snmp) $(PHPSNMP_SHARED_LIBADD)'
60989 -      ;;
60990 -  esac
60991 -
60992 -  if test "x" = "xyes"; then
60993 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsnmp.$suffix"
60994 -  else
60995 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix"
60996 -  fi
60997 -
60998 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
60999 -
61000 -  cat >>Makefile.objects<<EOF
61001 -\$(phplibdir)/phpsnmp.$suffix: $ext_builddir/phpsnmp.$suffix
61002 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsnmp.$suffix \$(phplibdir)
61003 -
61004 -$ext_builddir/phpsnmp.$suffix: \$(shared_objects_snmp) \$(PHPSNMP_SHARED_DEPENDENCIES)
61005 -       $link_cmd
61006
61007 +    cat >> confdefs.h <<\EOF
61008 +#define HAVE_LIBBIND 1
61009  EOF
61010
61011 -          ;;
61012 -        *)
61013 -
61014 -  install_modules="install-modules"
61015 -
61016 -  case $host_alias in
61017 -    *aix*)
61018 -      suffix=so
61019 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/snmp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(SNMP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/snmp.so '$ext_builddir'/snmp.so'
61020 -      ;;
61021 -    *netware*)
61022 -      suffix=nlm
61023 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SNMP, 3)_SHARED_LIBADD)'
61024 -      ;;
61025 -    *)
61026 -      suffix=la
61027 -      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_snmp) $(SNMP_SHARED_LIBADD)'
61028 -      ;;
61029 -  esac
61030 -
61031 -  if test "x" = "xyes"; then
61032 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/snmp.$suffix"
61033 +    ac_cv_func_dns_search=yes
61034    else
61035 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/snmp.$suffix"
61036 -  fi
61037 -
61038 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
61039 -
61040 -  cat >>Makefile.objects<<EOF
61041 -\$(phplibdir)/snmp.$suffix: $ext_builddir/snmp.$suffix
61042 -       \$(LIBTOOL) --mode=install cp $ext_builddir/snmp.$suffix \$(phplibdir)
61043 -
61044 -$ext_builddir/snmp.$suffix: \$(shared_objects_snmp) \$(SNMP_SHARED_DEPENDENCIES)
61045 -       $link_cmd
61046 -
61047 -EOF
61048 -
61049 -          ;;
61050 -      esac
61051 -      cat >> confdefs.h <<EOF
61052 -#define COMPILE_DL_SNMP 1
61053 -EOF
61054 -
61055 -    fi
61056 -  fi
61057 -
61058 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
61059 -    PHP_SNMP_SHARED=no
61060 -    case "$PHP_SAPI" in
61061 -      cgi|embed)
61062 -
61063 -
61064 -  case ext/snmp in
61065 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
61066 -  /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
61067 -  *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
61068 -  esac
61069 -
61070 -
61071 -
61072 -  b_c_pre=$php_c_pre
61073 -  b_cxx_pre=$php_cxx_pre
61074 -  b_c_meta=$php_c_meta
61075 -  b_cxx_meta=$php_cxx_meta
61076 -  b_c_post=$php_c_post
61077 -  b_cxx_post=$php_cxx_post
61078 -  b_lo=$php_lo
61079 -
61080 -
61081 -  old_IFS=$IFS
61082 -  for ac_src in snmp.c; do
61083 -
61084 -      IFS=.
61085 -      set $ac_src
61086 -      ac_obj=$1
61087 -      IFS=$old_IFS
61088 -
61089 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
61090 -
61091 -      case $ac_src in
61092 -        *.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" ;;
61093 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61094 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61095 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
61096 -      esac
61097 -
61098 -    cat >>Makefile.objects<<EOF
61099 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
61100 -       $ac_comp
61101 -EOF
61102 -  done
61103 -
61104 -
61105 -        EXT_STATIC="$EXT_STATIC snmp"
61106 -        ;;
61107 -      *)
61108 -
61109 -
61110 -  case ext/snmp in
61111 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
61112 -  /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
61113 -  *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
61114 -  esac
61115 -
61116 -
61117 -
61118 -  b_c_pre=$php_c_pre
61119 -  b_cxx_pre=$php_cxx_pre
61120 -  b_c_meta=$php_c_meta
61121 -  b_cxx_meta=$php_cxx_meta
61122 -  b_c_post=$php_c_post
61123 -  b_cxx_post=$php_cxx_post
61124 -  b_lo=$php_lo
61125 -
61126 -
61127 -  old_IFS=$IFS
61128 -  for ac_src in snmp.c; do
61129 -
61130 -      IFS=.
61131 -      set $ac_src
61132 -      ac_obj=$1
61133 -      IFS=$old_IFS
61134 -
61135 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
61136 -
61137 -      case $ac_src in
61138 -        *.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" ;;
61139 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61140 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61141 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
61142 -      esac
61143 -
61144 -    cat >>Makefile.objects<<EOF
61145 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
61146 -       $ac_comp
61147 -EOF
61148 -  done
61149 -
61150 -
61151 -        ;;
61152 -    esac
61153 -    EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
61154 -  fi
61155 -
61156 -
61157 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
61158 -
61159 -
61160 -
61161 -  if test "$ext_builddir" = "."; then
61162 -    PHP_PECL_EXTENSION=snmp
61163
61164 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
61165 -
61166 -  fi
61167 -
61168
61169 -  PHP_VAR_SUBST="$PHP_VAR_SUBST SNMP_SHARED_LIBADD"
61170 +  unset ac_cv_lib_socket_dns_search
61171 +  unset ac_cv_lib_socket___dns_search
61172 +  unset found
61173 +  echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6
61174 +echo "configure:91558: checking for dns_search in -lsocket" >&5
61175 +ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'`
61176 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
61177 +  echo $ac_n "(cached) $ac_c" 1>&6
61178 +else
61179 +  ac_save_LIBS="$LIBS"
61180 +LIBS="-lsocket  $LIBS"
61181 +cat > conftest.$ac_ext <<EOF
61182 +#line 91566 "configure"
61183 +#include "confdefs.h"
61184 +/* Override any gcc2 internal prototype to avoid an error.  */
61185 +/* We use char because int might match the return type of a gcc2
61186 +    builtin and then its argument prototype would still apply.  */
61187 +char dns_search();
61188
61189 +int main() {
61190 +dns_search()
61191 +; return 0; }
61192 +EOF
61193 +if { (eval echo configure:91577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61194 +  rm -rf conftest*
61195 +  eval "ac_cv_lib_$ac_lib_var=yes"
61196 +else
61197 +  echo "configure: failed program was:" >&5
61198 +  cat conftest.$ac_ext >&5
61199 +  rm -rf conftest*
61200 +  eval "ac_cv_lib_$ac_lib_var=no"
61201  fi
61202 +rm -f conftest*
61203 +LIBS="$ac_save_LIBS"
61204
61205 +fi
61206 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
61207 +  echo "$ac_t""yes" 1>&6
61208 +  found=yes
61209 +else
61210 +  echo "$ac_t""no" 1>&6
61211
61212 -
61213 -php_enable_soap=no
61214 -
61215 -echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6
61216 -echo "configure:85203: checking whether to enable SOAP support" >&5
61217 -# Check whether --enable-soap or --disable-soap was given.
61218 -if test "${enable_soap+set}" = set; then
61219 -  enableval="$enable_soap"
61220 -  PHP_SOAP=$enableval
61221 +    echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6
61222 +echo "configure:91597: checking for __dns_search in -lsocket" >&5
61223 +ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'`
61224 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
61225 +  echo $ac_n "(cached) $ac_c" 1>&6
61226  else
61227 -
61228 -  PHP_SOAP=no
61229 -  test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL
61230 +  ac_save_LIBS="$LIBS"
61231 +LIBS="-lsocket  $LIBS"
61232 +cat > conftest.$ac_ext <<EOF
61233 +#line 91605 "configure"
61234 +#include "confdefs.h"
61235 +/* Override any gcc2 internal prototype to avoid an error.  */
61236 +/* We use char because int might match the return type of a gcc2
61237 +    builtin and then its argument prototype would still apply.  */
61238 +char __dns_search();
61239
61240 +int main() {
61241 +__dns_search()
61242 +; return 0; }
61243 +EOF
61244 +if { (eval echo configure:91616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61245 +  rm -rf conftest*
61246 +  eval "ac_cv_lib_$ac_lib_var=yes"
61247 +else
61248 +  echo "configure: failed program was:" >&5
61249 +  cat conftest.$ac_ext >&5
61250 +  rm -rf conftest*
61251 +  eval "ac_cv_lib_$ac_lib_var=no"
61252  fi
61253 +rm -f conftest*
61254 +LIBS="$ac_save_LIBS"
61255
61256 -
61257 -
61258 -ext_output="yes, shared"
61259 -ext_shared=yes
61260 -case $PHP_SOAP in
61261 -shared,*)
61262 -  PHP_SOAP=`echo "$PHP_SOAP"|$SED 's/^shared,//'`
61263 -  ;;
61264 -shared)
61265 -  PHP_SOAP=yes
61266 -  ;;
61267 -no)
61268 -  ext_output=no
61269 -  ext_shared=no
61270 -  ;;
61271 -*)
61272 -  ext_output=yes
61273 -  ext_shared=no
61274 -  ;;
61275 -esac
61276 -
61277 -
61278 -
61279 -echo "$ac_t""$ext_output" 1>&6
61280 -
61281 -
61282 -
61283 -
61284 -if test -z "$PHP_LIBXML_DIR"; then
61285 -
61286 -php_with_libxml_dir=no
61287 -
61288 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
61289 -echo "configure:85248: checking libxml2 install dir" >&5
61290 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
61291 -if test "${with_libxml_dir+set}" = set; then
61292 -  withval="$with_libxml_dir"
61293 -  PHP_LIBXML_DIR=$withval
61294 +fi
61295 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
61296 +  echo "$ac_t""yes" 1>&6
61297 +  found=yes
61298  else
61299 -
61300 -  PHP_LIBXML_DIR=no
61301 -
61302 -
61303 +  echo "$ac_t""no" 1>&6
61304 +found=no
61305  fi
61306
61307 -
61308 -ext_output=$PHP_LIBXML_DIR
61309 -echo "$ac_t""$ext_output" 1>&6
61310 -
61311 -
61312 -
61313 +
61314  fi
61315
61316 -if test "$PHP_SOAP" != "no"; then
61317 -
61318 -  if test "$PHP_LIBXML" = "no"; then
61319 -    { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
61320 -  fi
61321
61322 -
61323 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
61324 -echo "configure:85276: checking for xml2-config path" >&5
61325 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
61326 -  echo $ac_n "(cached) $ac_c" 1>&6
61327 +  if test "$found" = "yes"; then
61328 +    ac_libs=$LIBS
61329 +    LIBS="$LIBS -lsocket"
61330 +    if test "$cross_compiling" = yes; then
61331 +  found=no
61332  else
61333 -
61334 -  for i in $PHP_LIBXML_DIR /usr/local /usr; do
61335 -    if test -x "$i/bin/xml2-config"; then
61336 -      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
61337 -      break
61338 -    fi
61339 -  done
61340 -
61341 +  cat > conftest.$ac_ext <<EOF
61342 +#line 91648 "configure"
61343 +#include "confdefs.h"
61344 +main() { return (0); }
61345 +EOF
61346 +if { (eval echo configure:91652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
61347 +then
61348 +  found=yes
61349 +else
61350 +  echo "configure: failed program was:" >&5
61351 +  cat conftest.$ac_ext >&5
61352 +  rm -fr conftest*
61353 +  found=no
61354 +fi
61355 +rm -fr conftest*
61356  fi
61357
61358 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
61359 -
61360 -  if test -x "$ac_cv_php_xml2_config_path"; then
61361 -    XML2_CONFIG="$ac_cv_php_xml2_config_path"
61362 -    libxml_full_version=`$XML2_CONFIG --version`
61363 -    ac_IFS=$IFS
61364 -    IFS="."
61365 -    set $libxml_full_version
61366 -    IFS=$ac_IFS
61367 -    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
61368 -    if test "$LIBXML_VERSION" -ge "2006011"; then
61369 -      LIBXML_LIBS=`$XML2_CONFIG --libs`
61370 -      LIBXML_INCS=`$XML2_CONFIG --cflags`
61371 -
61372 -  for ac_i in $LIBXML_LIBS; do
61373 -    case $ac_i in
61374 -    -pthread)
61375 -      if test "$ext_shared" = "yes"; then
61376 -        SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread"
61377 -      else
61378 -
61379 -
61380 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
61381 -
61382 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
61383 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
61384 -    eval "EXTRA_LDFLAGS$unique=set"
61385 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
61386 +    LIBS=$ac_libs
61387    fi
61388
61389 -      fi
61390 -    ;;
61391 -    -l*)
61392 -      ac_ii=`echo $ac_i|cut -c 3-`
61393 -
61394 -
61395 -  case $ac_ii in
61396 -  c|c_r|pthread*) ;;
61397 -  *)
61398 -    if test "$ext_shared" = "yes"; then
61399 -        SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii"
61400 -    else
61401 -
61402 +  if test "$found" = "yes"; then
61403 +
61404
61405 -  case $ac_ii in
61406 +  case socket in
61407    c|c_r|pthread*) ;;
61408    *)
61409 -      LIBS="$LIBS -l$ac_ii"
61410 +      LIBS="-lsocket $LIBS"
61411     ;;
61412    esac
61413
61414
61415 -    fi
61416 -   ;;
61417 -  esac
61418 +    cat >> confdefs.h <<\EOF
61419 +#define HAVE_DNS_SEARCH 1
61420 +EOF
61421
61422 +    cat >> confdefs.h <<\EOF
61423 +#define HAVE_LIBSOCKET 1
61424 +EOF
61425
61426 -    ;;
61427 -    -L*)
61428 -      ac_ii=`echo $ac_i|cut -c 3-`
61429 -
61430 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
61431 -
61432 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
61433 -    ai_p=$ac_ii
61434 +    ac_cv_func_dns_search=yes
61435    else
61436
61437 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
61438 -
61439 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
61440 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
61441 -  fi
61442 +  :
61443
61444 -
61445 -      if test "$ext_shared" = "yes"; then
61446 -        SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD"
61447 -        test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD"
61448 -      else
61449 -
61450 -
61451 -
61452 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
61453 -
61454 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
61455 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
61456 -    eval "LIBPATH$unique=set"
61457 -
61458 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
61459 -    LDFLAGS="$LDFLAGS -L$ai_p"
61460 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
61461 -
61462    fi
61463 +
61464
61465 -
61466 -      fi
61467 -
61468    fi
61469 +
61470
61471 -    ;;
61472 -    esac
61473 -  done
61474 -
61475 -
61476 -  for ac_i in $LIBXML_INCS; do
61477 -    case $ac_i in
61478 -    -I*)
61479 -      ac_ii=`echo $ac_i|cut -c 3-`
61480 -
61481 -  if test "$ac_ii" != "/usr/include"; then
61482 -
61483 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
61484 -    ai_p=$ac_ii
61485 -  else
61486 -
61487 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
61488 -
61489 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
61490 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
61491    fi
61492 -
61493 -
61494
61495 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
61496 + ;;
61497
61498 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
61499 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
61500 -    eval "INCLUDEPATH$unique=set"
61501 -
61502 -      if test ""; then
61503 -        INCLUDES="-I$ai_p $INCLUDES"
61504 -      else
61505 -        INCLUDES="$INCLUDES -I$ai_p"
61506 -      fi
61507 -
61508 -  fi
61509 +  esac
61510
61511 -  fi
61512
61513 -    ;;
61514 -    esac
61515 -  done
61516 +  unset ac_cv_func_dn_expand
61517 +  unset ac_cv_func___dn_expand
61518 +  unset found
61519 +
61520 +  echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
61521 +echo "configure:91709: checking for dn_expand" >&5
61522 +if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then
61523 +  echo $ac_n "(cached) $ac_c" 1>&6
61524 +else
61525 +  cat > conftest.$ac_ext <<EOF
61526 +#line 91714 "configure"
61527 +#include "confdefs.h"
61528 +/* System header to define __stub macros and hopefully few prototypes,
61529 +    which can conflict with char dn_expand(); below.  */
61530 +#include <assert.h>
61531 +/* Override any gcc2 internal prototype to avoid an error.  */
61532 +/* We use char because int might match the return type of a gcc2
61533 +    builtin and then its argument prototype would still apply.  */
61534 +char dn_expand();
61535
61536 +int main() {
61537
61538 -            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
61539 -echo "configure:85434: checking whether libxml build works" >&5
61540 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
61541 -  echo $ac_n "(cached) $ac_c" 1>&6
61542 +/* The GNU C library defines this for functions which it implements
61543 +    to always fail with ENOSYS.  Some functions are actually named
61544 +    something starting with __ and the normal name is an alias.  */
61545 +#if defined (__stub_dn_expand) || defined (__stub___dn_expand)
61546 +choke me
61547 +#else
61548 +dn_expand();
61549 +#endif
61550 +
61551 +; return 0; }
61552 +EOF
61553 +if { (eval echo configure:91737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61554 +  rm -rf conftest*
61555 +  eval "ac_cv_func_dn_expand=yes"
61556  else
61557 -
61558 -
61559 -  old_LIBS=$LIBS
61560 -  LIBS="
61561 -          $SOAP_SHARED_LIBADD
61562 -         $LIBS"
61563 -  if test "$cross_compiling" = yes; then
61564 -
61565 -    LIBS=$old_LIBS
61566 -
61567 +  echo "configure: failed program was:" >&5
61568 +  cat conftest.$ac_ext >&5
61569 +  rm -rf conftest*
61570 +  eval "ac_cv_func_dn_expand=no"
61571 +fi
61572 +rm -f conftest*
61573 +fi
61574 +
61575 +if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then
61576 +  echo "$ac_t""yes" 1>&6
61577 +  found=yes
61578 +else
61579 +  echo "$ac_t""no" 1>&6
61580 + echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
61581 +echo "configure:91755: checking for __dn_expand" >&5
61582 +if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then
61583 +  echo $ac_n "(cached) $ac_c" 1>&6
61584  else
61585    cat > conftest.$ac_ext <<EOF
61586 -#line 85450 "configure"
61587 +#line 91760 "configure"
61588  #include "confdefs.h"
61589 +/* System header to define __stub macros and hopefully few prototypes,
61590 +    which can conflict with char __dn_expand(); below.  */
61591 +#include <assert.h>
61592 +/* Override any gcc2 internal prototype to avoid an error.  */
61593 +/* We use char because int might match the return type of a gcc2
61594 +    builtin and then its argument prototype would still apply.  */
61595 +char __dn_expand();
61596
61597 -
61598 -    char xmlInitParser();
61599 -    int main() {
61600 -      xmlInitParser();
61601 -      return 0;
61602 -    }
61603 -
61604 +int main() {
61605 +
61606 +/* The GNU C library defines this for functions which it implements
61607 +    to always fail with ENOSYS.  Some functions are actually named
61608 +    something starting with __ and the normal name is an alias.  */
61609 +#if defined (__stub___dn_expand) || defined (__stub_____dn_expand)
61610 +choke me
61611 +#else
61612 +__dn_expand();
61613 +#endif
61614 +
61615 +; return 0; }
61616  EOF
61617 -if { (eval echo configure:85461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
61618 -then
61619 -
61620 -    LIBS=$old_LIBS
61621 -
61622 -          php_cv_libxml_build_works=yes
61623 -
61624 -
61625 +if { (eval echo configure:91783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61626 +  rm -rf conftest*
61627 +  eval "ac_cv_func___dn_expand=yes"
61628  else
61629    echo "configure: failed program was:" >&5
61630    cat conftest.$ac_ext >&5
61631 -  rm -fr conftest*
61632 -
61633 -    LIBS=$old_LIBS
61634 -
61635 -          echo "$ac_t""no" 1>&6
61636 -          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
61637 -
61638 -
61639 +  rm -rf conftest*
61640 +  eval "ac_cv_func___dn_expand=no"
61641  fi
61642 -rm -fr conftest*
61643 +rm -f conftest*
61644  fi
61645
61646 -
61647 -
61648 +if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then
61649 +  echo "$ac_t""yes" 1>&6
61650 +  found=yes
61651 +else
61652 +  echo "$ac_t""no" 1>&6
61653 +found=no
61654 +fi
61655 +
61656  fi
61657
61658 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
61659 -      if test "$php_cv_libxml_build_works" = "yes"; then
61660 -        cat >> confdefs.h <<\EOF
61661 -#define HAVE_LIBXML 1
61662 -EOF
61663
61664 -      fi
61665 -
61666 +  case $found in
61667 +  yes)
61668      cat >> confdefs.h <<\EOF
61669 -#define HAVE_SOAP 1
61670 +#define HAVE_DN_EXPAND 1
61671  EOF
61672
61673 -
61674 -  ext_builddir=ext/soap
61675 -  ext_srcdir=$abs_srcdir/ext/soap
61676 -
61677 -  ac_extra=
61678 -
61679 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
61680 -    PHP_SOAP_SHARED=no
61681 -
61682 -
61683 -  case ext/soap in
61684 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
61685 -  /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
61686 -  *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
61687 -  esac
61688 +    ac_cv_func_dn_expand=yes
61689 +  ;;
61690
61691 +    *)
61692
61693 +  unset ac_cv_lib_resolv_dn_expand
61694 +  unset ac_cv_lib_resolv___dn_expand
61695 +  unset found
61696 +  echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
61697 +echo "configure:91821: checking for dn_expand in -lresolv" >&5
61698 +ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
61699 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
61700 +  echo $ac_n "(cached) $ac_c" 1>&6
61701 +else
61702 +  ac_save_LIBS="$LIBS"
61703 +LIBS="-lresolv  $LIBS"
61704 +cat > conftest.$ac_ext <<EOF
61705 +#line 91829 "configure"
61706 +#include "confdefs.h"
61707 +/* Override any gcc2 internal prototype to avoid an error.  */
61708 +/* We use char because int might match the return type of a gcc2
61709 +    builtin and then its argument prototype would still apply.  */
61710 +char dn_expand();
61711
61712 -  b_c_pre=$php_c_pre
61713 -  b_cxx_pre=$php_cxx_pre
61714 -  b_c_meta=$php_c_meta
61715 -  b_cxx_meta=$php_cxx_meta
61716 -  b_c_post=$php_c_post
61717 -  b_cxx_post=$php_cxx_post
61718 -  b_lo=$php_lo
61719 -
61720 +int main() {
61721 +dn_expand()
61722 +; return 0; }
61723 +EOF
61724 +if { (eval echo configure:91840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61725 +  rm -rf conftest*
61726 +  eval "ac_cv_lib_$ac_lib_var=yes"
61727 +else
61728 +  echo "configure: failed program was:" >&5
61729 +  cat conftest.$ac_ext >&5
61730 +  rm -rf conftest*
61731 +  eval "ac_cv_lib_$ac_lib_var=no"
61732 +fi
61733 +rm -f conftest*
61734 +LIBS="$ac_save_LIBS"
61735
61736 -  old_IFS=$IFS
61737 -  for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
61738 -
61739 -      IFS=.
61740 -      set $ac_src
61741 -      ac_obj=$1
61742 -      IFS=$old_IFS
61743 -
61744 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
61745 +fi
61746 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
61747 +  echo "$ac_t""yes" 1>&6
61748 +  found=yes
61749 +else
61750 +  echo "$ac_t""no" 1>&6
61751
61752 -      case $ac_src in
61753 -        *.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" ;;
61754 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61755 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61756 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
61757 -      esac
61758 +    echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
61759 +echo "configure:91860: checking for __dn_expand in -lresolv" >&5
61760 +ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
61761 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
61762 +  echo $ac_n "(cached) $ac_c" 1>&6
61763 +else
61764 +  ac_save_LIBS="$LIBS"
61765 +LIBS="-lresolv  $LIBS"
61766 +cat > conftest.$ac_ext <<EOF
61767 +#line 91868 "configure"
61768 +#include "confdefs.h"
61769 +/* Override any gcc2 internal prototype to avoid an error.  */
61770 +/* We use char because int might match the return type of a gcc2
61771 +    builtin and then its argument prototype would still apply.  */
61772 +char __dn_expand();
61773
61774 -    cat >>Makefile.objects<<EOF
61775 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
61776 -       $ac_comp
61777 +int main() {
61778 +__dn_expand()
61779 +; return 0; }
61780  EOF
61781 -  done
61782 +if { (eval echo configure:91879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61783 +  rm -rf conftest*
61784 +  eval "ac_cv_lib_$ac_lib_var=yes"
61785 +else
61786 +  echo "configure: failed program was:" >&5
61787 +  cat conftest.$ac_ext >&5
61788 +  rm -rf conftest*
61789 +  eval "ac_cv_lib_$ac_lib_var=no"
61790 +fi
61791 +rm -f conftest*
61792 +LIBS="$ac_save_LIBS"
61793
61794 +fi
61795 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
61796 +  echo "$ac_t""yes" 1>&6
61797 +  found=yes
61798 +else
61799 +  echo "$ac_t""no" 1>&6
61800 +found=no
61801 +fi
61802
61803 -    EXT_STATIC="$EXT_STATIC soap"
61804 -    if test "$ext_shared" != "nocli"; then
61805 -      EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
61806 -    fi
61807 -  else
61808 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
61809 -      PHP_SOAP_SHARED=yes
61810 -
61811 -  case ext/soap in
61812 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
61813 -  /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
61814 -  *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
61815 -  esac
61816 -
61817
61818 +fi
61819
61820 -  b_c_pre=$shared_c_pre
61821 -  b_cxx_pre=$shared_cxx_pre
61822 -  b_c_meta=$shared_c_meta
61823 -  b_cxx_meta=$shared_cxx_meta
61824 -  b_c_post=$shared_c_post
61825 -  b_cxx_post=$shared_cxx_post
61826 -  b_lo=$shared_lo
61827
61828 +  if test "$found" = "yes"; then
61829 +    ac_libs=$LIBS
61830 +    LIBS="$LIBS -lresolv"
61831 +    if test "$cross_compiling" = yes; then
61832 +  found=no
61833 +else
61834 +  cat > conftest.$ac_ext <<EOF
61835 +#line 91911 "configure"
61836 +#include "confdefs.h"
61837 +main() { return (0); }
61838 +EOF
61839 +if { (eval echo configure:91915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
61840 +then
61841 +  found=yes
61842 +else
61843 +  echo "configure: failed program was:" >&5
61844 +  cat conftest.$ac_ext >&5
61845 +  rm -fr conftest*
61846 +  found=no
61847 +fi
61848 +rm -fr conftest*
61849 +fi
61850 +
61851 +    LIBS=$ac_libs
61852 +  fi
61853
61854 -  old_IFS=$IFS
61855 -  for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
61856 +  if test "$found" = "yes"; then
61857 +
61858
61859 -      IFS=.
61860 -      set $ac_src
61861 -      ac_obj=$1
61862 -      IFS=$old_IFS
61863 -
61864 -      shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo"
61865 +  case resolv in
61866 +  c|c_r|pthread*) ;;
61867 +  *)
61868 +      LIBS="-lresolv $LIBS"
61869 +   ;;
61870 +  esac
61871
61872 -      case $ac_src in
61873 -        *.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" ;;
61874 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61875 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61876 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
61877 -      esac
61878
61879 -    cat >>Makefile.objects<<EOF
61880 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
61881 -       $ac_comp
61882 +    cat >> confdefs.h <<\EOF
61883 +#define HAVE_DN_EXPAND 1
61884  EOF
61885 -  done
61886 -
61887 -      case $host_alias in
61888 -        *netware*)
61889 -
61890 -  install_modules="install-modules"
61891
61892 -  case $host_alias in
61893 -    *aix*)
61894 -      suffix=so
61895 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsoap.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(PHPSOAP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsoap.so '$ext_builddir'/phpsoap.so'
61896 -      ;;
61897 -    *netware*)
61898 -      suffix=nlm
61899 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOAP, 3)_SHARED_LIBADD)'
61900 -      ;;
61901 -    *)
61902 -      suffix=la
61903 -      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_soap) $(PHPSOAP_SHARED_LIBADD)'
61904 -      ;;
61905 -  esac
61906 +    cat >> confdefs.h <<\EOF
61907 +#define HAVE_LIBRESOLV 1
61908 +EOF
61909
61910 -  if test "x" = "xyes"; then
61911 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix"
61912 +    ac_cv_func_dn_expand=yes
61913    else
61914 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix"
61915 -  fi
61916 +
61917
61918 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
61919 +  unset ac_cv_lib_bind_dn_expand
61920 +  unset ac_cv_lib_bind___dn_expand
61921 +  unset found
61922 +  echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6
61923 +echo "configure:91957: checking for dn_expand in -lbind" >&5
61924 +ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'`
61925 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
61926 +  echo $ac_n "(cached) $ac_c" 1>&6
61927 +else
61928 +  ac_save_LIBS="$LIBS"
61929 +LIBS="-lbind  $LIBS"
61930 +cat > conftest.$ac_ext <<EOF
61931 +#line 91965 "configure"
61932 +#include "confdefs.h"
61933 +/* Override any gcc2 internal prototype to avoid an error.  */
61934 +/* We use char because int might match the return type of a gcc2
61935 +    builtin and then its argument prototype would still apply.  */
61936 +char dn_expand();
61937 +
61938 +int main() {
61939 +dn_expand()
61940 +; return 0; }
61941 +EOF
61942 +if { (eval echo configure:91976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61943 +  rm -rf conftest*
61944 +  eval "ac_cv_lib_$ac_lib_var=yes"
61945 +else
61946 +  echo "configure: failed program was:" >&5
61947 +  cat conftest.$ac_ext >&5
61948 +  rm -rf conftest*
61949 +  eval "ac_cv_lib_$ac_lib_var=no"
61950 +fi
61951 +rm -f conftest*
61952 +LIBS="$ac_save_LIBS"
61953
61954 -  cat >>Makefile.objects<<EOF
61955 -\$(phplibdir)/phpsoap.$suffix: $ext_builddir/phpsoap.$suffix
61956 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsoap.$suffix \$(phplibdir)
61957 +fi
61958 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
61959 +  echo "$ac_t""yes" 1>&6
61960 +  found=yes
61961 +else
61962 +  echo "$ac_t""no" 1>&6
61963
61964 -$ext_builddir/phpsoap.$suffix: \$(shared_objects_soap) \$(PHPSOAP_SHARED_DEPENDENCIES)
61965 -       $link_cmd
61966 +    echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6
61967 +echo "configure:91996: checking for __dn_expand in -lbind" >&5
61968 +ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'`
61969 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
61970 +  echo $ac_n "(cached) $ac_c" 1>&6
61971 +else
61972 +  ac_save_LIBS="$LIBS"
61973 +LIBS="-lbind  $LIBS"
61974 +cat > conftest.$ac_ext <<EOF
61975 +#line 92004 "configure"
61976 +#include "confdefs.h"
61977 +/* Override any gcc2 internal prototype to avoid an error.  */
61978 +/* We use char because int might match the return type of a gcc2
61979 +    builtin and then its argument prototype would still apply.  */
61980 +char __dn_expand();
61981
61982 +int main() {
61983 +__dn_expand()
61984 +; return 0; }
61985  EOF
61986 +if { (eval echo configure:92015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61987 +  rm -rf conftest*
61988 +  eval "ac_cv_lib_$ac_lib_var=yes"
61989 +else
61990 +  echo "configure: failed program was:" >&5
61991 +  cat conftest.$ac_ext >&5
61992 +  rm -rf conftest*
61993 +  eval "ac_cv_lib_$ac_lib_var=no"
61994 +fi
61995 +rm -f conftest*
61996 +LIBS="$ac_save_LIBS"
61997
61998 -          ;;
61999 -        *)
62000 -
62001 -  install_modules="install-modules"
62002 -
62003 -  case $host_alias in
62004 -    *aix*)
62005 -      suffix=so
62006 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/soap.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(SOAP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/soap.so '$ext_builddir'/soap.so'
62007 -      ;;
62008 -    *netware*)
62009 -      suffix=nlm
62010 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOAP, 3)_SHARED_LIBADD)'
62011 -      ;;
62012 -    *)
62013 -      suffix=la
62014 -      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_soap) $(SOAP_SHARED_LIBADD)'
62015 -      ;;
62016 -  esac
62017 +fi
62018 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
62019 +  echo "$ac_t""yes" 1>&6
62020 +  found=yes
62021 +else
62022 +  echo "$ac_t""no" 1>&6
62023 +found=no
62024 +fi
62025
62026 -  if test "x" = "xyes"; then
62027 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/soap.$suffix"
62028 -  else
62029 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix"
62030 -  fi
62031
62032 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
62033 -
62034 -  cat >>Makefile.objects<<EOF
62035 -\$(phplibdir)/soap.$suffix: $ext_builddir/soap.$suffix
62036 -       \$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir)
62037 -
62038 -$ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES)
62039 -       $link_cmd
62040 +fi
62041
62042 -EOF
62043
62044 -          ;;
62045 -      esac
62046 -      cat >> confdefs.h <<EOF
62047 -#define COMPILE_DL_SOAP 1
62048 +  if test "$found" = "yes"; then
62049 +    ac_libs=$LIBS
62050 +    LIBS="$LIBS -lbind"
62051 +    if test "$cross_compiling" = yes; then
62052 +  found=no
62053 +else
62054 +  cat > conftest.$ac_ext <<EOF
62055 +#line 92047 "configure"
62056 +#include "confdefs.h"
62057 +main() { return (0); }
62058  EOF
62059 +if { (eval echo configure:92051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
62060 +then
62061 +  found=yes
62062 +else
62063 +  echo "configure: failed program was:" >&5
62064 +  cat conftest.$ac_ext >&5
62065 +  rm -fr conftest*
62066 +  found=no
62067 +fi
62068 +rm -fr conftest*
62069 +fi
62070
62071 -    fi
62072 +    LIBS=$ac_libs
62073    fi
62074
62075 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
62076 -    PHP_SOAP_SHARED=no
62077 -    case "$PHP_SAPI" in
62078 -      cgi|embed)
62079 -
62080 +  if test "$found" = "yes"; then
62081 +
62082
62083 -  case ext/soap in
62084 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
62085 -  /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62086 -  *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62087 +  case bind in
62088 +  c|c_r|pthread*) ;;
62089 +  *)
62090 +      LIBS="-lbind $LIBS"
62091 +   ;;
62092    esac
62093 -
62094 -
62095
62096 -  b_c_pre=$php_c_pre
62097 -  b_cxx_pre=$php_cxx_pre
62098 -  b_c_meta=$php_c_meta
62099 -  b_cxx_meta=$php_cxx_meta
62100 -  b_c_post=$php_c_post
62101 -  b_cxx_post=$php_cxx_post
62102 -  b_lo=$php_lo
62103
62104 +    cat >> confdefs.h <<\EOF
62105 +#define HAVE_DN_EXPAND 1
62106 +EOF
62107
62108 -  old_IFS=$IFS
62109 -  for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
62110 -
62111 -      IFS=.
62112 -      set $ac_src
62113 -      ac_obj=$1
62114 -      IFS=$old_IFS
62115 -
62116 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
62117 +    cat >> confdefs.h <<\EOF
62118 +#define HAVE_LIBBIND 1
62119 +EOF
62120
62121 -      case $ac_src in
62122 -        *.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" ;;
62123 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
62124 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
62125 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
62126 -      esac
62127 +    ac_cv_func_dn_expand=yes
62128 +  else
62129 +
62130 +
62131 +  unset ac_cv_lib_socket_dn_expand
62132 +  unset ac_cv_lib_socket___dn_expand
62133 +  unset found
62134 +  echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6
62135 +echo "configure:92093: checking for dn_expand in -lsocket" >&5
62136 +ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'`
62137 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62138 +  echo $ac_n "(cached) $ac_c" 1>&6
62139 +else
62140 +  ac_save_LIBS="$LIBS"
62141 +LIBS="-lsocket  $LIBS"
62142 +cat > conftest.$ac_ext <<EOF
62143 +#line 92101 "configure"
62144 +#include "confdefs.h"
62145 +/* Override any gcc2 internal prototype to avoid an error.  */
62146 +/* We use char because int might match the return type of a gcc2
62147 +    builtin and then its argument prototype would still apply.  */
62148 +char dn_expand();
62149
62150 -    cat >>Makefile.objects<<EOF
62151 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
62152 -       $ac_comp
62153 +int main() {
62154 +dn_expand()
62155 +; return 0; }
62156  EOF
62157 -  done
62158 +if { (eval echo configure:92112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62159 +  rm -rf conftest*
62160 +  eval "ac_cv_lib_$ac_lib_var=yes"
62161 +else
62162 +  echo "configure: failed program was:" >&5
62163 +  cat conftest.$ac_ext >&5
62164 +  rm -rf conftest*
62165 +  eval "ac_cv_lib_$ac_lib_var=no"
62166 +fi
62167 +rm -f conftest*
62168 +LIBS="$ac_save_LIBS"
62169
62170 +fi
62171 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
62172 +  echo "$ac_t""yes" 1>&6
62173 +  found=yes
62174 +else
62175 +  echo "$ac_t""no" 1>&6
62176
62177 -        EXT_STATIC="$EXT_STATIC soap"
62178 -        ;;
62179 -      *)
62180 -
62181 -
62182 -  case ext/soap in
62183 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
62184 -  /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62185 -  *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62186 -  esac
62187 -
62188 -
62189 +    echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6
62190 +echo "configure:92132: checking for __dn_expand in -lsocket" >&5
62191 +ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'`
62192 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62193 +  echo $ac_n "(cached) $ac_c" 1>&6
62194 +else
62195 +  ac_save_LIBS="$LIBS"
62196 +LIBS="-lsocket  $LIBS"
62197 +cat > conftest.$ac_ext <<EOF
62198 +#line 92140 "configure"
62199 +#include "confdefs.h"
62200 +/* Override any gcc2 internal prototype to avoid an error.  */
62201 +/* We use char because int might match the return type of a gcc2
62202 +    builtin and then its argument prototype would still apply.  */
62203 +char __dn_expand();
62204
62205 -  b_c_pre=$php_c_pre
62206 -  b_cxx_pre=$php_cxx_pre
62207 -  b_c_meta=$php_c_meta
62208 -  b_cxx_meta=$php_cxx_meta
62209 -  b_c_post=$php_c_post
62210 -  b_cxx_post=$php_cxx_post
62211 -  b_lo=$php_lo
62212 +int main() {
62213 +__dn_expand()
62214 +; return 0; }
62215 +EOF
62216 +if { (eval echo configure:92151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62217 +  rm -rf conftest*
62218 +  eval "ac_cv_lib_$ac_lib_var=yes"
62219 +else
62220 +  echo "configure: failed program was:" >&5
62221 +  cat conftest.$ac_ext >&5
62222 +  rm -rf conftest*
62223 +  eval "ac_cv_lib_$ac_lib_var=no"
62224 +fi
62225 +rm -f conftest*
62226 +LIBS="$ac_save_LIBS"
62227
62228 +fi
62229 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
62230 +  echo "$ac_t""yes" 1>&6
62231 +  found=yes
62232 +else
62233 +  echo "$ac_t""no" 1>&6
62234 +found=no
62235 +fi
62236
62237 -  old_IFS=$IFS
62238 -  for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do
62239
62240 -      IFS=.
62241 -      set $ac_src
62242 -      ac_obj=$1
62243 -      IFS=$old_IFS
62244 -
62245 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
62246 +fi
62247
62248 -      case $ac_src in
62249 -        *.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" ;;
62250 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
62251 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
62252 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
62253 -      esac
62254
62255 -    cat >>Makefile.objects<<EOF
62256 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
62257 -       $ac_comp
62258 +  if test "$found" = "yes"; then
62259 +    ac_libs=$LIBS
62260 +    LIBS="$LIBS -lsocket"
62261 +    if test "$cross_compiling" = yes; then
62262 +  found=no
62263 +else
62264 +  cat > conftest.$ac_ext <<EOF
62265 +#line 92183 "configure"
62266 +#include "confdefs.h"
62267 +main() { return (0); }
62268  EOF
62269 -  done
62270 -
62271 +if { (eval echo configure:92187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
62272 +then
62273 +  found=yes
62274 +else
62275 +  echo "configure: failed program was:" >&5
62276 +  cat conftest.$ac_ext >&5
62277 +  rm -fr conftest*
62278 +  found=no
62279 +fi
62280 +rm -fr conftest*
62281 +fi
62282
62283 -        ;;
62284 -    esac
62285 -    EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
62286 +    LIBS=$ac_libs
62287    fi
62288 +
62289 +  if test "$found" = "yes"; then
62290 +
62291
62292 -
62293 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
62294 -
62295 +  case socket in
62296 +  c|c_r|pthread*) ;;
62297 +  *)
62298 +      LIBS="-lsocket $LIBS"
62299 +   ;;
62300 +  esac
62301
62302
62303 -  if test "$ext_builddir" = "."; then
62304 -    PHP_PECL_EXTENSION=soap
62305 -
62306 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
62307 +    cat >> confdefs.h <<\EOF
62308 +#define HAVE_DN_EXPAND 1
62309 +EOF
62310
62311 -  fi
62312 +    cat >> confdefs.h <<\EOF
62313 +#define HAVE_LIBSOCKET 1
62314 +EOF
62315
62316 +    ac_cv_func_dn_expand=yes
62317 +  else
62318
62319 -  PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD"
62320 +  :
62321
62322 +  fi
62323
62324 -    else
62325 -      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
62326 -    fi
62327 -else
62328 -    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
62329 +
62330 +  fi
62331
62332 +
62333    fi
62334 +
62335 + ;;
62336 +
62337 +  esac
62338
62339 -fi
62340
62341 +  unset ac_cv_func_dn_skipname
62342 +  unset ac_cv_func___dn_skipname
62343 +  unset found
62344 +
62345 +  echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
62346 +echo "configure:92244: checking for dn_skipname" >&5
62347 +if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
62348 +  echo $ac_n "(cached) $ac_c" 1>&6
62349 +else
62350 +  cat > conftest.$ac_ext <<EOF
62351 +#line 92249 "configure"
62352 +#include "confdefs.h"
62353 +/* System header to define __stub macros and hopefully few prototypes,
62354 +    which can conflict with char dn_skipname(); below.  */
62355 +#include <assert.h>
62356 +/* Override any gcc2 internal prototype to avoid an error.  */
62357 +/* We use char because int might match the return type of a gcc2
62358 +    builtin and then its argument prototype would still apply.  */
62359 +char dn_skipname();
62360
62361 +int main() {
62362
62363 -php_enable_sockets=no
62364 +/* The GNU C library defines this for functions which it implements
62365 +    to always fail with ENOSYS.  Some functions are actually named
62366 +    something starting with __ and the normal name is an alias.  */
62367 +#if defined (__stub_dn_skipname) || defined (__stub___dn_skipname)
62368 +choke me
62369 +#else
62370 +dn_skipname();
62371 +#endif
62372
62373 -echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
62374 -echo "configure:85811: checking whether to enable sockets support" >&5
62375 -# Check whether --enable-sockets or --disable-sockets was given.
62376 -if test "${enable_sockets+set}" = set; then
62377 -  enableval="$enable_sockets"
62378 -  PHP_SOCKETS=$enableval
62379 +; return 0; }
62380 +EOF
62381 +if { (eval echo configure:92272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62382 +  rm -rf conftest*
62383 +  eval "ac_cv_func_dn_skipname=yes"
62384  else
62385 -
62386 -  PHP_SOCKETS=no
62387 -  test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL
62388 -
62389 +  echo "configure: failed program was:" >&5
62390 +  cat conftest.$ac_ext >&5
62391 +  rm -rf conftest*
62392 +  eval "ac_cv_func_dn_skipname=no"
62393 +fi
62394 +rm -f conftest*
62395  fi
62396
62397 +if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then
62398 +  echo "$ac_t""yes" 1>&6
62399 +  found=yes
62400 +else
62401 +  echo "$ac_t""no" 1>&6
62402 + echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
62403 +echo "configure:92290: checking for __dn_skipname" >&5
62404 +if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
62405 +  echo $ac_n "(cached) $ac_c" 1>&6
62406 +else
62407 +  cat > conftest.$ac_ext <<EOF
62408 +#line 92295 "configure"
62409 +#include "confdefs.h"
62410 +/* System header to define __stub macros and hopefully few prototypes,
62411 +    which can conflict with char __dn_skipname(); below.  */
62412 +#include <assert.h>
62413 +/* Override any gcc2 internal prototype to avoid an error.  */
62414 +/* We use char because int might match the return type of a gcc2
62415 +    builtin and then its argument prototype would still apply.  */
62416 +char __dn_skipname();
62417 +
62418 +int main() {
62419
62420 +/* The GNU C library defines this for functions which it implements
62421 +    to always fail with ENOSYS.  Some functions are actually named
62422 +    something starting with __ and the normal name is an alias.  */
62423 +#if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname)
62424 +choke me
62425 +#else
62426 +__dn_skipname();
62427 +#endif
62428
62429 -ext_output="yes, shared"
62430 -ext_shared=yes
62431 -case $PHP_SOCKETS in
62432 -shared,*)
62433 -  PHP_SOCKETS=`echo "$PHP_SOCKETS"|$SED 's/^shared,//'`
62434 -  ;;
62435 -shared)
62436 -  PHP_SOCKETS=yes
62437 -  ;;
62438 -no)
62439 -  ext_output=no
62440 -  ext_shared=no
62441 -  ;;
62442 -*)
62443 -  ext_output=yes
62444 -  ext_shared=no
62445 -  ;;
62446 -esac
62447 +; return 0; }
62448 +EOF
62449 +if { (eval echo configure:92318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62450 +  rm -rf conftest*
62451 +  eval "ac_cv_func___dn_skipname=yes"
62452 +else
62453 +  echo "configure: failed program was:" >&5
62454 +  cat conftest.$ac_ext >&5
62455 +  rm -rf conftest*
62456 +  eval "ac_cv_func___dn_skipname=no"
62457 +fi
62458 +rm -f conftest*
62459 +fi
62460
62461 +if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then
62462 +  echo "$ac_t""yes" 1>&6
62463 +  found=yes
62464 +else
62465 +  echo "$ac_t""no" 1>&6
62466 +found=no
62467 +fi
62468 +
62469 +fi
62470
62471
62472 -echo "$ac_t""$ext_output" 1>&6
62473 +  case $found in
62474 +  yes)
62475 +    cat >> confdefs.h <<\EOF
62476 +#define HAVE_DN_SKIPNAME 1
62477 +EOF
62478
62479 +    ac_cv_func_dn_skipname=yes
62480 +  ;;
62481 +
62482 +    *)
62483 +
62484 +  unset ac_cv_lib_resolv_dn_skipname
62485 +  unset ac_cv_lib_resolv___dn_skipname
62486 +  unset found
62487 +  echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
62488 +echo "configure:92356: checking for dn_skipname in -lresolv" >&5
62489 +ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'`
62490 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62491 +  echo $ac_n "(cached) $ac_c" 1>&6
62492 +else
62493 +  ac_save_LIBS="$LIBS"
62494 +LIBS="-lresolv  $LIBS"
62495 +cat > conftest.$ac_ext <<EOF
62496 +#line 92364 "configure"
62497 +#include "confdefs.h"
62498 +/* Override any gcc2 internal prototype to avoid an error.  */
62499 +/* We use char because int might match the return type of a gcc2
62500 +    builtin and then its argument prototype would still apply.  */
62501 +char dn_skipname();
62502
62503 +int main() {
62504 +dn_skipname()
62505 +; return 0; }
62506 +EOF
62507 +if { (eval echo configure:92375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62508 +  rm -rf conftest*
62509 +  eval "ac_cv_lib_$ac_lib_var=yes"
62510 +else
62511 +  echo "configure: failed program was:" >&5
62512 +  cat conftest.$ac_ext >&5
62513 +  rm -rf conftest*
62514 +  eval "ac_cv_lib_$ac_lib_var=no"
62515 +fi
62516 +rm -f conftest*
62517 +LIBS="$ac_save_LIBS"
62518
62519 +fi
62520 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
62521 +  echo "$ac_t""yes" 1>&6
62522 +  found=yes
62523 +else
62524 +  echo "$ac_t""no" 1>&6
62525
62526 -if test "$PHP_SOCKETS" != "no"; then
62527 -    echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
62528 -echo "configure:85853: checking for struct cmsghdr" >&5
62529 -if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
62530 +    echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
62531 +echo "configure:92395: checking for __dn_skipname in -lresolv" >&5
62532 +ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'`
62533 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62534    echo $ac_n "(cached) $ac_c" 1>&6
62535  else
62536 -
62537 -    cat > conftest.$ac_ext <<EOF
62538 -#line 85859 "configure"
62539 +  ac_save_LIBS="$LIBS"
62540 +LIBS="-lresolv  $LIBS"
62541 +cat > conftest.$ac_ext <<EOF
62542 +#line 92403 "configure"
62543  #include "confdefs.h"
62544 +/* Override any gcc2 internal prototype to avoid an error.  */
62545 +/* We use char because int might match the return type of a gcc2
62546 +    builtin and then its argument prototype would still apply.  */
62547 +char __dn_skipname();
62548
62549 -#include <sys/types.h>
62550 -#include <sys/socket.h>
62551  int main() {
62552 -struct cmsghdr s; s
62553 +__dn_skipname()
62554  ; return 0; }
62555  EOF
62556 -if { (eval echo configure:85868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
62557 +if { (eval echo configure:92414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62558    rm -rf conftest*
62559 -  ac_cv_cmsghdr=yes
62560 +  eval "ac_cv_lib_$ac_lib_var=yes"
62561  else
62562    echo "configure: failed program was:" >&5
62563    cat conftest.$ac_ext >&5
62564    rm -rf conftest*
62565 -  ac_cv_cmsghdr=no
62566 +  eval "ac_cv_lib_$ac_lib_var=no"
62567  fi
62568  rm -f conftest*
62569 +LIBS="$ac_save_LIBS"
62570 +
62571 +fi
62572 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
62573 +  echo "$ac_t""yes" 1>&6
62574 +  found=yes
62575 +else
62576 +  echo "$ac_t""no" 1>&6
62577 +found=no
62578 +fi
62579 +
62580
62581  fi
62582
62583 -echo "$ac_t""$ac_cv_cmsghdr" 1>&6
62584
62585 -  if test "$ac_cv_cmsghdr" = yes; then
62586 +  if test "$found" = "yes"; then
62587 +    ac_libs=$LIBS
62588 +    LIBS="$LIBS -lresolv"
62589 +    if test "$cross_compiling" = yes; then
62590 +  found=no
62591 +else
62592 +  cat > conftest.$ac_ext <<EOF
62593 +#line 92446 "configure"
62594 +#include "confdefs.h"
62595 +main() { return (0); }
62596 +EOF
62597 +if { (eval echo configure:92450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
62598 +then
62599 +  found=yes
62600 +else
62601 +  echo "configure: failed program was:" >&5
62602 +  cat conftest.$ac_ext >&5
62603 +  rm -fr conftest*
62604 +  found=no
62605 +fi
62606 +rm -fr conftest*
62607 +fi
62608 +
62609 +    LIBS=$ac_libs
62610 +  fi
62611 +
62612 +  if test "$found" = "yes"; then
62613 +
62614 +
62615 +  case resolv in
62616 +  c|c_r|pthread*) ;;
62617 +  *)
62618 +      LIBS="-lresolv $LIBS"
62619 +   ;;
62620 +  esac
62621 +
62622 +
62623      cat >> confdefs.h <<\EOF
62624 -#define HAVE_CMSGHDR 1
62625 +#define HAVE_DN_SKIPNAME 1
62626  EOF
62627
62628 -  fi
62629 +    cat >> confdefs.h <<\EOF
62630 +#define HAVE_LIBRESOLV 1
62631 +EOF
62632
62633 -  for ac_func in hstrerror socketpair
62634 -do
62635 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
62636 -echo "configure:85893: checking for $ac_func" >&5
62637 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
62638 +    ac_cv_func_dn_skipname=yes
62639 +  else
62640 +
62641 +
62642 +  unset ac_cv_lib_bind_dn_skipname
62643 +  unset ac_cv_lib_bind___dn_skipname
62644 +  unset found
62645 +  echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
62646 +echo "configure:92492: checking for dn_skipname in -lbind" >&5
62647 +ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'`
62648 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62649    echo $ac_n "(cached) $ac_c" 1>&6
62650  else
62651 -  cat > conftest.$ac_ext <<EOF
62652 -#line 85898 "configure"
62653 +  ac_save_LIBS="$LIBS"
62654 +LIBS="-lbind  $LIBS"
62655 +cat > conftest.$ac_ext <<EOF
62656 +#line 92500 "configure"
62657  #include "confdefs.h"
62658 -/* System header to define __stub macros and hopefully few prototypes,
62659 -    which can conflict with char $ac_func(); below.  */
62660 -#include <assert.h>
62661  /* Override any gcc2 internal prototype to avoid an error.  */
62662  /* We use char because int might match the return type of a gcc2
62663      builtin and then its argument prototype would still apply.  */
62664 -char $ac_func();
62665 +char dn_skipname();
62666
62667  int main() {
62668 -
62669 -/* The GNU C library defines this for functions which it implements
62670 -    to always fail with ENOSYS.  Some functions are actually named
62671 -    something starting with __ and the normal name is an alias.  */
62672 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
62673 -choke me
62674 -#else
62675 -$ac_func();
62676 -#endif
62677 -
62678 +dn_skipname()
62679  ; return 0; }
62680  EOF
62681 -if { (eval echo configure:85921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62682 +if { (eval echo configure:92511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62683    rm -rf conftest*
62684 -  eval "ac_cv_func_$ac_func=yes"
62685 +  eval "ac_cv_lib_$ac_lib_var=yes"
62686  else
62687    echo "configure: failed program was:" >&5
62688    cat conftest.$ac_ext >&5
62689    rm -rf conftest*
62690 -  eval "ac_cv_func_$ac_func=no"
62691 +  eval "ac_cv_lib_$ac_lib_var=no"
62692  fi
62693  rm -f conftest*
62694 -fi
62695 +LIBS="$ac_save_LIBS"
62696
62697 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
62698 +fi
62699 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
62700    echo "$ac_t""yes" 1>&6
62701 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
62702 -  cat >> confdefs.h <<EOF
62703 -#define $ac_tr_func 1
62704 -EOF
62705 -
62706 +  found=yes
62707  else
62708    echo "$ac_t""no" 1>&6
62709 -fi
62710 -done
62711
62712 -  for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h
62713 -do
62714 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
62715 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
62716 -echo "configure:85949: checking for $ac_hdr" >&5
62717 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
62718 +    echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
62719 +echo "configure:92531: checking for __dn_skipname in -lbind" >&5
62720 +ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
62721 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62722    echo $ac_n "(cached) $ac_c" 1>&6
62723  else
62724 -  cat > conftest.$ac_ext <<EOF
62725 -#line 85954 "configure"
62726 +  ac_save_LIBS="$LIBS"
62727 +LIBS="-lbind  $LIBS"
62728 +cat > conftest.$ac_ext <<EOF
62729 +#line 92539 "configure"
62730  #include "confdefs.h"
62731 -#include <$ac_hdr>
62732 +/* Override any gcc2 internal prototype to avoid an error.  */
62733 +/* We use char because int might match the return type of a gcc2
62734 +    builtin and then its argument prototype would still apply.  */
62735 +char __dn_skipname();
62736 +
62737 +int main() {
62738 +__dn_skipname()
62739 +; return 0; }
62740  EOF
62741 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
62742 -{ (eval echo configure:85959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
62743 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
62744 -if test -z "$ac_err"; then
62745 +if { (eval echo configure:92550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62746    rm -rf conftest*
62747 -  eval "ac_cv_header_$ac_safe=yes"
62748 +  eval "ac_cv_lib_$ac_lib_var=yes"
62749  else
62750 -  echo "$ac_err" >&5
62751    echo "configure: failed program was:" >&5
62752    cat conftest.$ac_ext >&5
62753    rm -rf conftest*
62754 -  eval "ac_cv_header_$ac_safe=no"
62755 +  eval "ac_cv_lib_$ac_lib_var=no"
62756  fi
62757  rm -f conftest*
62758 +LIBS="$ac_save_LIBS"
62759 +
62760  fi
62761 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
62762 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
62763    echo "$ac_t""yes" 1>&6
62764 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
62765 -  cat >> confdefs.h <<EOF
62766 -#define $ac_tr_hdr 1
62767 -EOF
62768 -
62769 +  found=yes
62770  else
62771    echo "$ac_t""no" 1>&6
62772 +found=no
62773 +fi
62774 +
62775 +
62776  fi
62777 -done
62778
62779 +
62780 +  if test "$found" = "yes"; then
62781 +    ac_libs=$LIBS
62782 +    LIBS="$LIBS -lbind"
62783 +    if test "$cross_compiling" = yes; then
62784 +  found=no
62785 +else
62786    cat > conftest.$ac_ext <<EOF
62787 -#line 85986 "configure"
62788 +#line 92582 "configure"
62789  #include "confdefs.h"
62790 -
62791 -#include <sys/types.h>
62792 -#include <sys/socket.h>
62793 -
62794 -int main() {
62795 -static struct msghdr tp; int n = (int) tp.msg_flags; return n
62796 -; return 0; }
62797 +main() { return (0); }
62798  EOF
62799 -if { (eval echo configure:85996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
62800 -  :
62801 +if { (eval echo configure:92586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
62802 +then
62803 +  found=yes
62804  else
62805    echo "configure: failed program was:" >&5
62806    cat conftest.$ac_ext >&5
62807 -  rm -rf conftest*
62808 -  cat >> confdefs.h <<\EOF
62809 -#define MISSING_MSGHDR_MSGFLAGS 1
62810 -EOF
62811 -
62812 -
62813 +  rm -fr conftest*
62814 +  found=no
62815 +fi
62816 +rm -fr conftest*
62817  fi
62818 -rm -f conftest*
62819 -  cat >> confdefs.h <<\EOF
62820 -#define HAVE_SOCKETS 1
62821 -EOF
62822 -
62823 -
62824 -
62825 -  ext_builddir=ext/sockets
62826 -  ext_srcdir=$abs_srcdir/ext/sockets
62827
62828 -  ac_extra=
62829 +    LIBS=$ac_libs
62830 +  fi
62831
62832 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
62833 -    PHP_SOCKETS_SHARED=no
62834 +  if test "$found" = "yes"; then
62835
62836
62837 -  case ext/sockets in
62838 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
62839 -  /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62840 -  *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62841 +  case bind in
62842 +  c|c_r|pthread*) ;;
62843 +  *)
62844 +      LIBS="-lbind $LIBS"
62845 +   ;;
62846    esac
62847 -
62848 -
62849 -
62850 -  b_c_pre=$php_c_pre
62851 -  b_cxx_pre=$php_cxx_pre
62852 -  b_c_meta=$php_c_meta
62853 -  b_cxx_meta=$php_cxx_meta
62854 -  b_c_post=$php_c_post
62855 -  b_cxx_post=$php_cxx_post
62856 -  b_lo=$php_lo
62857 -
62858 -
62859 -  old_IFS=$IFS
62860 -  for ac_src in sockets.c; do
62861 -
62862 -      IFS=.
62863 -      set $ac_src
62864 -      ac_obj=$1
62865 -      IFS=$old_IFS
62866 -
62867 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
62868
62869 -      case $ac_src in
62870 -        *.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" ;;
62871 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
62872 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
62873 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
62874 -      esac
62875
62876 -    cat >>Makefile.objects<<EOF
62877 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
62878 -       $ac_comp
62879 +    cat >> confdefs.h <<\EOF
62880 +#define HAVE_DN_SKIPNAME 1
62881  EOF
62882 -  done
62883 -
62884 -
62885 -    EXT_STATIC="$EXT_STATIC sockets"
62886 -    if test "$ext_shared" != "nocli"; then
62887 -      EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
62888 -    fi
62889 -  else
62890 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
62891 -      PHP_SOCKETS_SHARED=yes
62892 -
62893 -  case ext/sockets in
62894 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
62895 -  /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62896 -  *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62897 -  esac
62898 -
62899 -
62900
62901 -  b_c_pre=$shared_c_pre
62902 -  b_cxx_pre=$shared_cxx_pre
62903 -  b_c_meta=$shared_c_meta
62904 -  b_cxx_meta=$shared_cxx_meta
62905 -  b_c_post=$shared_c_post
62906 -  b_cxx_post=$shared_cxx_post
62907 -  b_lo=$shared_lo
62908 -
62909 -
62910 -  old_IFS=$IFS
62911 -  for ac_src in sockets.c; do
62912 -
62913 -      IFS=.
62914 -      set $ac_src
62915 -      ac_obj=$1
62916 -      IFS=$old_IFS
62917 -
62918 -      shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo"
62919 -
62920 -      case $ac_src in
62921 -        *.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" ;;
62922 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
62923 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
62924 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
62925 -      esac
62926 -
62927 -    cat >>Makefile.objects<<EOF
62928 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
62929 -       $ac_comp
62930 +    cat >> confdefs.h <<\EOF
62931 +#define HAVE_LIBBIND 1
62932  EOF
62933 -  done
62934
62935 -      case $host_alias in
62936 -        *netware*)
62937 -
62938 -  install_modules="install-modules"
62939 -
62940 -  case $host_alias in
62941 -    *aix*)
62942 -      suffix=so
62943 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsockets.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(PHPSOCKETS_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsockets.so '$ext_builddir'/phpsockets.so'
62944 -      ;;
62945 -    *netware*)
62946 -      suffix=nlm
62947 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOCKETS, 3)_SHARED_LIBADD)'
62948 -      ;;
62949 -    *)
62950 -      suffix=la
62951 -      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_sockets) $(PHPSOCKETS_SHARED_LIBADD)'
62952 -      ;;
62953 -  esac
62954 -
62955 -  if test "x" = "xyes"; then
62956 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsockets.$suffix"
62957 +    ac_cv_func_dn_skipname=yes
62958    else
62959 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix"
62960 -  fi
62961 +
62962
62963 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
62964 -
62965 -  cat >>Makefile.objects<<EOF
62966 -\$(phplibdir)/phpsockets.$suffix: $ext_builddir/phpsockets.$suffix
62967 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsockets.$suffix \$(phplibdir)
62968 -
62969 -$ext_builddir/phpsockets.$suffix: \$(shared_objects_sockets) \$(PHPSOCKETS_SHARED_DEPENDENCIES)
62970 -       $link_cmd
62971 +  unset ac_cv_lib_socket_dn_skipname
62972 +  unset ac_cv_lib_socket___dn_skipname
62973 +  unset found
62974 +  echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6
62975 +echo "configure:92628: checking for dn_skipname in -lsocket" >&5
62976 +ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'`
62977 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62978 +  echo $ac_n "(cached) $ac_c" 1>&6
62979 +else
62980 +  ac_save_LIBS="$LIBS"
62981 +LIBS="-lsocket  $LIBS"
62982 +cat > conftest.$ac_ext <<EOF
62983 +#line 92636 "configure"
62984 +#include "confdefs.h"
62985 +/* Override any gcc2 internal prototype to avoid an error.  */
62986 +/* We use char because int might match the return type of a gcc2
62987 +    builtin and then its argument prototype would still apply.  */
62988 +char dn_skipname();
62989
62990 +int main() {
62991 +dn_skipname()
62992 +; return 0; }
62993  EOF
62994 +if { (eval echo configure:92647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62995 +  rm -rf conftest*
62996 +  eval "ac_cv_lib_$ac_lib_var=yes"
62997 +else
62998 +  echo "configure: failed program was:" >&5
62999 +  cat conftest.$ac_ext >&5
63000 +  rm -rf conftest*
63001 +  eval "ac_cv_lib_$ac_lib_var=no"
63002 +fi
63003 +rm -f conftest*
63004 +LIBS="$ac_save_LIBS"
63005
63006 -          ;;
63007 -        *)
63008 -
63009 -  install_modules="install-modules"
63010 -
63011 -  case $host_alias in
63012 -    *aix*)
63013 -      suffix=so
63014 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sockets.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(SOCKETS_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sockets.so '$ext_builddir'/sockets.so'
63015 -      ;;
63016 -    *netware*)
63017 -      suffix=nlm
63018 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOCKETS, 3)_SHARED_LIBADD)'
63019 -      ;;
63020 -    *)
63021 -      suffix=la
63022 -      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_sockets) $(SOCKETS_SHARED_LIBADD)'
63023 -      ;;
63024 -  esac
63025 -
63026 -  if test "x" = "xyes"; then
63027 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sockets.$suffix"
63028 -  else
63029 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix"
63030 -  fi
63031 -
63032 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
63033 -
63034 -  cat >>Makefile.objects<<EOF
63035 -\$(phplibdir)/sockets.$suffix: $ext_builddir/sockets.$suffix
63036 -       \$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir)
63037 -
63038 -$ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES)
63039 -       $link_cmd
63040 +fi
63041 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
63042 +  echo "$ac_t""yes" 1>&6
63043 +  found=yes
63044 +else
63045 +  echo "$ac_t""no" 1>&6
63046
63047 -EOF
63048 +    echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6
63049 +echo "configure:92667: checking for __dn_skipname in -lsocket" >&5
63050 +ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'`
63051 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
63052 +  echo $ac_n "(cached) $ac_c" 1>&6
63053 +else
63054 +  ac_save_LIBS="$LIBS"
63055 +LIBS="-lsocket  $LIBS"
63056 +cat > conftest.$ac_ext <<EOF
63057 +#line 92675 "configure"
63058 +#include "confdefs.h"
63059 +/* Override any gcc2 internal prototype to avoid an error.  */
63060 +/* We use char because int might match the return type of a gcc2
63061 +    builtin and then its argument prototype would still apply.  */
63062 +char __dn_skipname();
63063
63064 -          ;;
63065 -      esac
63066 -      cat >> confdefs.h <<EOF
63067 -#define COMPILE_DL_SOCKETS 1
63068 +int main() {
63069 +__dn_skipname()
63070 +; return 0; }
63071  EOF
63072 +if { (eval echo configure:92686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63073 +  rm -rf conftest*
63074 +  eval "ac_cv_lib_$ac_lib_var=yes"
63075 +else
63076 +  echo "configure: failed program was:" >&5
63077 +  cat conftest.$ac_ext >&5
63078 +  rm -rf conftest*
63079 +  eval "ac_cv_lib_$ac_lib_var=no"
63080 +fi
63081 +rm -f conftest*
63082 +LIBS="$ac_save_LIBS"
63083
63084 -    fi
63085 -  fi
63086 -
63087 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
63088 -    PHP_SOCKETS_SHARED=no
63089 -    case "$PHP_SAPI" in
63090 -      cgi|embed)
63091 -
63092 -
63093 -  case ext/sockets in
63094 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
63095 -  /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
63096 -  *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
63097 -  esac
63098 -
63099 -
63100 -
63101 -  b_c_pre=$php_c_pre
63102 -  b_cxx_pre=$php_cxx_pre
63103 -  b_c_meta=$php_c_meta
63104 -  b_cxx_meta=$php_cxx_meta
63105 -  b_c_post=$php_c_post
63106 -  b_cxx_post=$php_cxx_post
63107 -  b_lo=$php_lo
63108 -
63109 +fi
63110 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
63111 +  echo "$ac_t""yes" 1>&6
63112 +  found=yes
63113 +else
63114 +  echo "$ac_t""no" 1>&6
63115 +found=no
63116 +fi
63117
63118 -  old_IFS=$IFS
63119 -  for ac_src in sockets.c; do
63120
63121 -      IFS=.
63122 -      set $ac_src
63123 -      ac_obj=$1
63124 -      IFS=$old_IFS
63125 -
63126 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
63127 +fi
63128
63129 -      case $ac_src in
63130 -        *.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" ;;
63131 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63132 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63133 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
63134 -      esac
63135
63136 -    cat >>Makefile.objects<<EOF
63137 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
63138 -       $ac_comp
63139 +  if test "$found" = "yes"; then
63140 +    ac_libs=$LIBS
63141 +    LIBS="$LIBS -lsocket"
63142 +    if test "$cross_compiling" = yes; then
63143 +  found=no
63144 +else
63145 +  cat > conftest.$ac_ext <<EOF
63146 +#line 92718 "configure"
63147 +#include "confdefs.h"
63148 +main() { return (0); }
63149  EOF
63150 -  done
63151 -
63152 -
63153 -        EXT_STATIC="$EXT_STATIC sockets"
63154 -        ;;
63155 -      *)
63156 -
63157 -
63158 -  case ext/sockets in
63159 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
63160 -  /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
63161 -  *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
63162 -  esac
63163 -
63164 -
63165 -
63166 -  b_c_pre=$php_c_pre
63167 -  b_cxx_pre=$php_cxx_pre
63168 -  b_c_meta=$php_c_meta
63169 -  b_cxx_meta=$php_cxx_meta
63170 -  b_c_post=$php_c_post
63171 -  b_cxx_post=$php_cxx_post
63172 -  b_lo=$php_lo
63173 +if { (eval echo configure:92722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63174 +then
63175 +  found=yes
63176 +else
63177 +  echo "configure: failed program was:" >&5
63178 +  cat conftest.$ac_ext >&5
63179 +  rm -fr conftest*
63180 +  found=no
63181 +fi
63182 +rm -fr conftest*
63183 +fi
63184
63185 +    LIBS=$ac_libs
63186 +  fi
63187
63188 -  old_IFS=$IFS
63189 -  for ac_src in sockets.c; do
63190 +  if test "$found" = "yes"; then
63191 +
63192
63193 -      IFS=.
63194 -      set $ac_src
63195 -      ac_obj=$1
63196 -      IFS=$old_IFS
63197 -
63198 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
63199 +  case socket in
63200 +  c|c_r|pthread*) ;;
63201 +  *)
63202 +      LIBS="-lsocket $LIBS"
63203 +   ;;
63204 +  esac
63205
63206 -      case $ac_src in
63207 -        *.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" ;;
63208 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63209 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63210 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
63211 -      esac
63212
63213 -    cat >>Makefile.objects<<EOF
63214 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
63215 -       $ac_comp
63216 +    cat >> confdefs.h <<\EOF
63217 +#define HAVE_DN_SKIPNAME 1
63218  EOF
63219 -  done
63220 -
63221 -
63222 -        ;;
63223 -    esac
63224 -    EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
63225 -  fi
63226 -
63227 -
63228 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
63229 -
63230
63231 +    cat >> confdefs.h <<\EOF
63232 +#define HAVE_LIBSOCKET 1
63233 +EOF
63234
63235 -  if test "$ext_builddir" = "."; then
63236 -    PHP_PECL_EXTENSION=sockets
63237 +    ac_cv_func_dn_skipname=yes
63238 +  else
63239
63240 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
63241 +  :
63242
63243    fi
63244 -
63245
63246 +
63247 +  fi
63248
63249 -    header_path=ext/sockets/
63250 -    for header_file in php_sockets.h; do
63251 -      hp_hf="$header_path/$header_file"
63252 -
63253 +
63254 +  fi
63255
63256 -  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
63257 + ;;
63258
63259 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
63260 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
63261 -    eval "INSTALLHEADERS$unique=set"
63262 -
63263 -        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
63264 -
63265 -  fi
63266 +  esac
63267
63268 -    done
63269 -
63270
63271 -fi
63272
63273
63274 -  echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6
63275 -echo "configure:86330: checking whether zend_object_value is packed" >&5
63276 -  old_CPPFLAGS=$CPPFLAGS
63277 -  CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
63278 -  if test "$cross_compiling" = yes; then
63279 -
63280 -    ac_result=0
63281 -    echo "$ac_t""no" 1>&6
63282 +  unset ac_cv_func_res_search
63283 +  unset ac_cv_func___res_search
63284 +  unset found
63285
63286 +  echo $ac_n "checking for res_search""... $ac_c" 1>&6
63287 +echo "configure:92781: checking for res_search" >&5
63288 +if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
63289 +  echo $ac_n "(cached) $ac_c" 1>&6
63290  else
63291    cat > conftest.$ac_ext <<EOF
63292 -#line 86340 "configure"
63293 +#line 92786 "configure"
63294  #include "confdefs.h"
63295 +/* System header to define __stub macros and hopefully few prototypes,
63296 +    which can conflict with char res_search(); below.  */
63297 +#include <assert.h>
63298 +/* Override any gcc2 internal prototype to avoid an error.  */
63299 +/* We use char because int might match the return type of a gcc2
63300 +    builtin and then its argument prototype would still apply.  */
63301 +char res_search();
63302
63303 -#include "Zend/zend_types.h"
63304 -int main(int argc, char **argv) {
63305 -       return ((sizeof(zend_object_handle) + sizeof(zend_object_handlers*)) == sizeof(zend_object_value)) ? 0 : 1;
63306 -}
63307 -
63308 +int main() {
63309 +
63310 +/* The GNU C library defines this for functions which it implements
63311 +    to always fail with ENOSYS.  Some functions are actually named
63312 +    something starting with __ and the normal name is an alias.  */
63313 +#if defined (__stub_res_search) || defined (__stub___res_search)
63314 +choke me
63315 +#else
63316 +res_search();
63317 +#endif
63318 +
63319 +; return 0; }
63320  EOF
63321 -if { (eval echo configure:86349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63322 -then
63323 -
63324 -    ac_result=1
63325 -    echo "$ac_t""yes" 1>&6
63326 -
63327 +if { (eval echo configure:92809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63328 +  rm -rf conftest*
63329 +  eval "ac_cv_func_res_search=yes"
63330  else
63331    echo "configure: failed program was:" >&5
63332    cat conftest.$ac_ext >&5
63333 -  rm -fr conftest*
63334 -
63335 -    ac_result=0
63336 -    echo "$ac_t""no" 1>&6
63337 -
63338 +  rm -rf conftest*
63339 +  eval "ac_cv_func_res_search=no"
63340  fi
63341 -rm -fr conftest*
63342 +rm -f conftest*
63343  fi
63344
63345 -  CPPFLAGS=$old_CPPFLAGS
63346 -  cat >> confdefs.h <<EOF
63347 -#define HAVE_PACKED_OBJECT_VALUE $ac_result
63348 -EOF
63349 +if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then
63350 +  echo "$ac_t""yes" 1>&6
63351 +  found=yes
63352 +else
63353 +  echo "$ac_t""no" 1>&6
63354 + echo $ac_n "checking for __res_search""... $ac_c" 1>&6
63355 +echo "configure:92827: checking for __res_search" >&5
63356 +if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
63357 +  echo $ac_n "(cached) $ac_c" 1>&6
63358 +else
63359 +  cat > conftest.$ac_ext <<EOF
63360 +#line 92832 "configure"
63361 +#include "confdefs.h"
63362 +/* System header to define __stub macros and hopefully few prototypes,
63363 +    which can conflict with char __res_search(); below.  */
63364 +#include <assert.h>
63365 +/* Override any gcc2 internal prototype to avoid an error.  */
63366 +/* We use char because int might match the return type of a gcc2
63367 +    builtin and then its argument prototype would still apply.  */
63368 +char __res_search();
63369
63370 -  cat >> confdefs.h <<\EOF
63371 -#define HAVE_SPL 1
63372 +int main() {
63373 +
63374 +/* The GNU C library defines this for functions which it implements
63375 +    to always fail with ENOSYS.  Some functions are actually named
63376 +    something starting with __ and the normal name is an alias.  */
63377 +#if defined (__stub___res_search) || defined (__stub_____res_search)
63378 +choke me
63379 +#else
63380 +__res_search();
63381 +#endif
63382 +
63383 +; return 0; }
63384  EOF
63385 +if { (eval echo configure:92855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63386 +  rm -rf conftest*
63387 +  eval "ac_cv_func___res_search=yes"
63388 +else
63389 +  echo "configure: failed program was:" >&5
63390 +  cat conftest.$ac_ext >&5
63391 +  rm -rf conftest*
63392 +  eval "ac_cv_func___res_search=no"
63393 +fi
63394 +rm -f conftest*
63395 +fi
63396 +
63397 +if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then
63398 +  echo "$ac_t""yes" 1>&6
63399 +  found=yes
63400 +else
63401 +  echo "$ac_t""no" 1>&6
63402 +found=no
63403 +fi
63404
63405 -
63406 -  ext_builddir=ext/spl
63407 -  ext_srcdir=$abs_srcdir/ext/spl
63408 +fi
63409
63410 -  ac_extra=
63411
63412 -  if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
63413 -    PHP_SPL_SHARED=no
63414 -
63415 -
63416 -  case ext/spl in
63417 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
63418 -  /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
63419 -  *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
63420 -  esac
63421 +  case $found in
63422 +  yes)
63423 +    cat >> confdefs.h <<\EOF
63424 +#define HAVE_RES_SEARCH 1
63425 +EOF
63426 +
63427 +    ac_cv_func_res_search=yes
63428 +  ;;
63429
63430 +    *)
63431
63432 +  unset ac_cv_lib_resolv_res_search
63433 +  unset ac_cv_lib_resolv___res_search
63434 +  unset found
63435 +  echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
63436 +echo "configure:92893: checking for res_search in -lresolv" >&5
63437 +ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
63438 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
63439 +  echo $ac_n "(cached) $ac_c" 1>&6
63440 +else
63441 +  ac_save_LIBS="$LIBS"
63442 +LIBS="-lresolv  $LIBS"
63443 +cat > conftest.$ac_ext <<EOF
63444 +#line 92901 "configure"
63445 +#include "confdefs.h"
63446 +/* Override any gcc2 internal prototype to avoid an error.  */
63447 +/* We use char because int might match the return type of a gcc2
63448 +    builtin and then its argument prototype would still apply.  */
63449 +char res_search();
63450
63451 -  b_c_pre=$php_c_pre
63452 -  b_cxx_pre=$php_cxx_pre
63453 -  b_c_meta=$php_c_meta
63454 -  b_cxx_meta=$php_cxx_meta
63455 -  b_c_post=$php_c_post
63456 -  b_cxx_post=$php_cxx_post
63457 -  b_lo=$php_lo
63458 -
63459 +int main() {
63460 +res_search()
63461 +; return 0; }
63462 +EOF
63463 +if { (eval echo configure:92912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63464 +  rm -rf conftest*
63465 +  eval "ac_cv_lib_$ac_lib_var=yes"
63466 +else
63467 +  echo "configure: failed program was:" >&5
63468 +  cat conftest.$ac_ext >&5
63469 +  rm -rf conftest*
63470 +  eval "ac_cv_lib_$ac_lib_var=no"
63471 +fi
63472 +rm -f conftest*
63473 +LIBS="$ac_save_LIBS"
63474
63475 -  old_IFS=$IFS
63476 -  for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
63477 -
63478 -      IFS=.
63479 -      set $ac_src
63480 -      ac_obj=$1
63481 -      IFS=$old_IFS
63482 -
63483 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
63484 +fi
63485 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
63486 +  echo "$ac_t""yes" 1>&6
63487 +  found=yes
63488 +else
63489 +  echo "$ac_t""no" 1>&6
63490
63491 -      case $ac_src in
63492 -        *.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" ;;
63493 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63494 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63495 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
63496 -      esac
63497 +    echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
63498 +echo "configure:92932: checking for __res_search in -lresolv" >&5
63499 +ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'`
63500 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
63501 +  echo $ac_n "(cached) $ac_c" 1>&6
63502 +else
63503 +  ac_save_LIBS="$LIBS"
63504 +LIBS="-lresolv  $LIBS"
63505 +cat > conftest.$ac_ext <<EOF
63506 +#line 92940 "configure"
63507 +#include "confdefs.h"
63508 +/* Override any gcc2 internal prototype to avoid an error.  */
63509 +/* We use char because int might match the return type of a gcc2
63510 +    builtin and then its argument prototype would still apply.  */
63511 +char __res_search();
63512
63513 -    cat >>Makefile.objects<<EOF
63514 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
63515 -       $ac_comp
63516 +int main() {
63517 +__res_search()
63518 +; return 0; }
63519  EOF
63520 -  done
63521 +if { (eval echo configure:92951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63522 +  rm -rf conftest*
63523 +  eval "ac_cv_lib_$ac_lib_var=yes"
63524 +else
63525 +  echo "configure: failed program was:" >&5
63526 +  cat conftest.$ac_ext >&5
63527 +  rm -rf conftest*
63528 +  eval "ac_cv_lib_$ac_lib_var=no"
63529 +fi
63530 +rm -f conftest*
63531 +LIBS="$ac_save_LIBS"
63532
63533 +fi
63534 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
63535 +  echo "$ac_t""yes" 1>&6
63536 +  found=yes
63537 +else
63538 +  echo "$ac_t""no" 1>&6
63539 +found=no
63540 +fi
63541
63542 -    EXT_STATIC="$EXT_STATIC spl"
63543 -    if test "no" != "nocli"; then
63544 -      EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
63545 -    fi
63546 -  else
63547 -    if test "no" = "shared" || test "no" = "yes"; then
63548 -      PHP_SPL_SHARED=yes
63549 -
63550 -  case ext/spl in
63551 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
63552 -  /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
63553 -  *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
63554 -  esac
63555 -
63556
63557 +fi
63558
63559 -  b_c_pre=$shared_c_pre
63560 -  b_cxx_pre=$shared_cxx_pre
63561 -  b_c_meta=$shared_c_meta
63562 -  b_cxx_meta=$shared_cxx_meta
63563 -  b_c_post=$shared_c_post
63564 -  b_cxx_post=$shared_cxx_post
63565 -  b_lo=$shared_lo
63566
63567 +  if test "$found" = "yes"; then
63568 +    ac_libs=$LIBS
63569 +    LIBS="$LIBS -lresolv"
63570 +    if test "$cross_compiling" = yes; then
63571 +  found=no
63572 +else
63573 +  cat > conftest.$ac_ext <<EOF
63574 +#line 92983 "configure"
63575 +#include "confdefs.h"
63576 +main() { return (0); }
63577 +EOF
63578 +if { (eval echo configure:92987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63579 +then
63580 +  found=yes
63581 +else
63582 +  echo "configure: failed program was:" >&5
63583 +  cat conftest.$ac_ext >&5
63584 +  rm -fr conftest*
63585 +  found=no
63586 +fi
63587 +rm -fr conftest*
63588 +fi
63589 +
63590 +    LIBS=$ac_libs
63591 +  fi
63592
63593 -  old_IFS=$IFS
63594 -  for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
63595 +  if test "$found" = "yes"; then
63596 +
63597
63598 -      IFS=.
63599 -      set $ac_src
63600 -      ac_obj=$1
63601 -      IFS=$old_IFS
63602 -
63603 -      shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo"
63604 +  case resolv in
63605 +  c|c_r|pthread*) ;;
63606 +  *)
63607 +      LIBS="-lresolv $LIBS"
63608 +   ;;
63609 +  esac
63610
63611 -      case $ac_src in
63612 -        *.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" ;;
63613 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63614 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63615 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
63616 -      esac
63617
63618 -    cat >>Makefile.objects<<EOF
63619 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
63620 -       $ac_comp
63621 +    cat >> confdefs.h <<\EOF
63622 +#define HAVE_RES_SEARCH 1
63623  EOF
63624 -  done
63625 -
63626 -      case $host_alias in
63627 -        *netware*)
63628 -
63629 -  install_modules="install-modules"
63630
63631 -  case $host_alias in
63632 -    *aix*)
63633 -      suffix=so
63634 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpspl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpspl.so '$ext_builddir'/phpspl.so'
63635 -      ;;
63636 -    *netware*)
63637 -      suffix=nlm
63638 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSPL, 3)_SHARED_LIBADD)'
63639 -      ;;
63640 -    *)
63641 -      suffix=la
63642 -      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_spl) $(PHPSPL_SHARED_LIBADD)'
63643 -      ;;
63644 -  esac
63645 +    cat >> confdefs.h <<\EOF
63646 +#define HAVE_LIBRESOLV 1
63647 +EOF
63648
63649 -  if test "x" = "xyes"; then
63650 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix"
63651 +    ac_cv_func_res_search=yes
63652    else
63653 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix"
63654 -  fi
63655 +
63656
63657 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
63658 -
63659 -  cat >>Makefile.objects<<EOF
63660 -\$(phplibdir)/phpspl.$suffix: $ext_builddir/phpspl.$suffix
63661 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpspl.$suffix \$(phplibdir)
63662 -
63663 -$ext_builddir/phpspl.$suffix: \$(shared_objects_spl) \$(PHPSPL_SHARED_DEPENDENCIES)
63664 -       $link_cmd
63665 +  unset ac_cv_lib_bind_res_search
63666 +  unset ac_cv_lib_bind___res_search
63667 +  unset found
63668 +  echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
63669 +echo "configure:93029: checking for res_search in -lbind" >&5
63670 +ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'`
63671 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
63672 +  echo $ac_n "(cached) $ac_c" 1>&6
63673 +else
63674 +  ac_save_LIBS="$LIBS"
63675 +LIBS="-lbind  $LIBS"
63676 +cat > conftest.$ac_ext <<EOF
63677 +#line 93037 "configure"
63678 +#include "confdefs.h"
63679 +/* Override any gcc2 internal prototype to avoid an error.  */
63680 +/* We use char because int might match the return type of a gcc2
63681 +    builtin and then its argument prototype would still apply.  */
63682 +char res_search();
63683
63684 +int main() {
63685 +res_search()
63686 +; return 0; }
63687  EOF
63688 +if { (eval echo configure:93048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63689 +  rm -rf conftest*
63690 +  eval "ac_cv_lib_$ac_lib_var=yes"
63691 +else
63692 +  echo "configure: failed program was:" >&5
63693 +  cat conftest.$ac_ext >&5
63694 +  rm -rf conftest*
63695 +  eval "ac_cv_lib_$ac_lib_var=no"
63696 +fi
63697 +rm -f conftest*
63698 +LIBS="$ac_save_LIBS"
63699
63700 -          ;;
63701 -        *)
63702 -
63703 -  install_modules="install-modules"
63704 +fi
63705 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
63706 +  echo "$ac_t""yes" 1>&6
63707 +  found=yes
63708 +else
63709 +  echo "$ac_t""no" 1>&6
63710
63711 -  case $host_alias in
63712 -    *aix*)
63713 -      suffix=so
63714 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/spl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/spl.so '$ext_builddir'/spl.so'
63715 -      ;;
63716 -    *netware*)
63717 -      suffix=nlm
63718 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 3)_SHARED_LIBADD)'
63719 -      ;;
63720 -    *)
63721 -      suffix=la
63722 -      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_spl) $(SPL_SHARED_LIBADD)'
63723 -      ;;
63724 -  esac
63725 +    echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
63726 +echo "configure:93068: checking for __res_search in -lbind" >&5
63727 +ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'`
63728 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
63729 +  echo $ac_n "(cached) $ac_c" 1>&6
63730 +else
63731 +  ac_save_LIBS="$LIBS"
63732 +LIBS="-lbind  $LIBS"
63733 +cat > conftest.$ac_ext <<EOF
63734 +#line 93076 "configure"
63735 +#include "confdefs.h"
63736 +/* Override any gcc2 internal prototype to avoid an error.  */
63737 +/* We use char because int might match the return type of a gcc2
63738 +    builtin and then its argument prototype would still apply.  */
63739 +char __res_search();
63740
63741 -  if test "x" = "xyes"; then
63742 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix"
63743 -  else
63744 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix"
63745 -  fi
63746 -
63747 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
63748 +int main() {
63749 +__res_search()
63750 +; return 0; }
63751 +EOF
63752 +if { (eval echo configure:93087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63753 +  rm -rf conftest*
63754 +  eval "ac_cv_lib_$ac_lib_var=yes"
63755 +else
63756 +  echo "configure: failed program was:" >&5
63757 +  cat conftest.$ac_ext >&5
63758 +  rm -rf conftest*
63759 +  eval "ac_cv_lib_$ac_lib_var=no"
63760 +fi
63761 +rm -f conftest*
63762 +LIBS="$ac_save_LIBS"
63763
63764 -  cat >>Makefile.objects<<EOF
63765 -\$(phplibdir)/spl.$suffix: $ext_builddir/spl.$suffix
63766 -       \$(LIBTOOL) --mode=install cp $ext_builddir/spl.$suffix \$(phplibdir)
63767 +fi
63768 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
63769 +  echo "$ac_t""yes" 1>&6
63770 +  found=yes
63771 +else
63772 +  echo "$ac_t""no" 1>&6
63773 +found=no
63774 +fi
63775
63776 -$ext_builddir/spl.$suffix: \$(shared_objects_spl) \$(SPL_SHARED_DEPENDENCIES)
63777 -       $link_cmd
63778 +
63779 +fi
63780
63781 -EOF
63782
63783 -          ;;
63784 -      esac
63785 -      cat >> confdefs.h <<EOF
63786 -#define COMPILE_DL_SPL 1
63787 +  if test "$found" = "yes"; then
63788 +    ac_libs=$LIBS
63789 +    LIBS="$LIBS -lbind"
63790 +    if test "$cross_compiling" = yes; then
63791 +  found=no
63792 +else
63793 +  cat > conftest.$ac_ext <<EOF
63794 +#line 93119 "configure"
63795 +#include "confdefs.h"
63796 +main() { return (0); }
63797  EOF
63798 +if { (eval echo configure:93123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63799 +then
63800 +  found=yes
63801 +else
63802 +  echo "configure: failed program was:" >&5
63803 +  cat conftest.$ac_ext >&5
63804 +  rm -fr conftest*
63805 +  found=no
63806 +fi
63807 +rm -fr conftest*
63808 +fi
63809
63810 -    fi
63811 +    LIBS=$ac_libs
63812    fi
63813
63814 -  if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
63815 -    PHP_SPL_SHARED=no
63816 -    case "$PHP_SAPI" in
63817 -      cgi|embed)
63818 -
63819 +  if test "$found" = "yes"; then
63820 +
63821
63822 -  case ext/spl in
63823 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
63824 -  /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
63825 -  *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
63826 +  case bind in
63827 +  c|c_r|pthread*) ;;
63828 +  *)
63829 +      LIBS="-lbind $LIBS"
63830 +   ;;
63831    esac
63832 -
63833 -
63834
63835 -  b_c_pre=$php_c_pre
63836 -  b_cxx_pre=$php_cxx_pre
63837 -  b_c_meta=$php_c_meta
63838 -  b_cxx_meta=$php_cxx_meta
63839 -  b_c_post=$php_c_post
63840 -  b_cxx_post=$php_cxx_post
63841 -  b_lo=$php_lo
63842
63843 +    cat >> confdefs.h <<\EOF
63844 +#define HAVE_RES_SEARCH 1
63845 +EOF
63846
63847 -  old_IFS=$IFS
63848 -  for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
63849 -
63850 -      IFS=.
63851 -      set $ac_src
63852 -      ac_obj=$1
63853 -      IFS=$old_IFS
63854 -
63855 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
63856 +    cat >> confdefs.h <<\EOF
63857 +#define HAVE_LIBBIND 1
63858 +EOF
63859
63860 -      case $ac_src in
63861 -        *.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" ;;
63862 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63863 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63864 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
63865 -      esac
63866 +    ac_cv_func_res_search=yes
63867 +  else
63868 +
63869 +
63870 +  unset ac_cv_lib_socket_res_search
63871 +  unset ac_cv_lib_socket___res_search
63872 +  unset found
63873 +  echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
63874 +echo "configure:93165: checking for res_search in -lsocket" >&5
63875 +ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'`
63876 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
63877 +  echo $ac_n "(cached) $ac_c" 1>&6
63878 +else
63879 +  ac_save_LIBS="$LIBS"
63880 +LIBS="-lsocket  $LIBS"
63881 +cat > conftest.$ac_ext <<EOF
63882 +#line 93173 "configure"
63883 +#include "confdefs.h"
63884 +/* Override any gcc2 internal prototype to avoid an error.  */
63885 +/* We use char because int might match the return type of a gcc2
63886 +    builtin and then its argument prototype would still apply.  */
63887 +char res_search();
63888
63889 -    cat >>Makefile.objects<<EOF
63890 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
63891 -       $ac_comp
63892 +int main() {
63893 +res_search()
63894 +; return 0; }
63895  EOF
63896 -  done
63897 +if { (eval echo configure:93184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63898 +  rm -rf conftest*
63899 +  eval "ac_cv_lib_$ac_lib_var=yes"
63900 +else
63901 +  echo "configure: failed program was:" >&5
63902 +  cat conftest.$ac_ext >&5
63903 +  rm -rf conftest*
63904 +  eval "ac_cv_lib_$ac_lib_var=no"
63905 +fi
63906 +rm -f conftest*
63907 +LIBS="$ac_save_LIBS"
63908
63909 +fi
63910 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
63911 +  echo "$ac_t""yes" 1>&6
63912 +  found=yes
63913 +else
63914 +  echo "$ac_t""no" 1>&6
63915
63916 -        EXT_STATIC="$EXT_STATIC spl"
63917 -        ;;
63918 -      *)
63919 -
63920 -
63921 -  case ext/spl in
63922 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
63923 -  /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
63924 -  *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
63925 -  esac
63926 -
63927 -
63928 +    echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
63929 +echo "configure:93204: checking for __res_search in -lsocket" >&5
63930 +ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'`
63931 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
63932 +  echo $ac_n "(cached) $ac_c" 1>&6
63933 +else
63934 +  ac_save_LIBS="$LIBS"
63935 +LIBS="-lsocket  $LIBS"
63936 +cat > conftest.$ac_ext <<EOF
63937 +#line 93212 "configure"
63938 +#include "confdefs.h"
63939 +/* Override any gcc2 internal prototype to avoid an error.  */
63940 +/* We use char because int might match the return type of a gcc2
63941 +    builtin and then its argument prototype would still apply.  */
63942 +char __res_search();
63943
63944 -  b_c_pre=$php_c_pre
63945 -  b_cxx_pre=$php_cxx_pre
63946 -  b_c_meta=$php_c_meta
63947 -  b_cxx_meta=$php_cxx_meta
63948 -  b_c_post=$php_c_post
63949 -  b_cxx_post=$php_cxx_post
63950 -  b_lo=$php_lo
63951 +int main() {
63952 +__res_search()
63953 +; return 0; }
63954 +EOF
63955 +if { (eval echo configure:93223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63956 +  rm -rf conftest*
63957 +  eval "ac_cv_lib_$ac_lib_var=yes"
63958 +else
63959 +  echo "configure: failed program was:" >&5
63960 +  cat conftest.$ac_ext >&5
63961 +  rm -rf conftest*
63962 +  eval "ac_cv_lib_$ac_lib_var=no"
63963 +fi
63964 +rm -f conftest*
63965 +LIBS="$ac_save_LIBS"
63966
63967 +fi
63968 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
63969 +  echo "$ac_t""yes" 1>&6
63970 +  found=yes
63971 +else
63972 +  echo "$ac_t""no" 1>&6
63973 +found=no
63974 +fi
63975
63976 -  old_IFS=$IFS
63977 -  for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do
63978
63979 -      IFS=.
63980 -      set $ac_src
63981 -      ac_obj=$1
63982 -      IFS=$old_IFS
63983 -
63984 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
63985 +fi
63986
63987 -      case $ac_src in
63988 -        *.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" ;;
63989 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63990 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
63991 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
63992 -      esac
63993
63994 -    cat >>Makefile.objects<<EOF
63995 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
63996 -       $ac_comp
63997 +  if test "$found" = "yes"; then
63998 +    ac_libs=$LIBS
63999 +    LIBS="$LIBS -lsocket"
64000 +    if test "$cross_compiling" = yes; then
64001 +  found=no
64002 +else
64003 +  cat > conftest.$ac_ext <<EOF
64004 +#line 93255 "configure"
64005 +#include "confdefs.h"
64006 +main() { return (0); }
64007  EOF
64008 -  done
64009 -
64010 +if { (eval echo configure:93259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
64011 +then
64012 +  found=yes
64013 +else
64014 +  echo "configure: failed program was:" >&5
64015 +  cat conftest.$ac_ext >&5
64016 +  rm -fr conftest*
64017 +  found=no
64018 +fi
64019 +rm -fr conftest*
64020 +fi
64021
64022 -        ;;
64023 -    esac
64024 -    EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
64025 +    LIBS=$ac_libs
64026    fi
64027 +
64028 +  if test "$found" = "yes"; then
64029 +
64030
64031 -
64032 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
64033 -
64034 +  case socket in
64035 +  c|c_r|pthread*) ;;
64036 +  *)
64037 +      LIBS="-lsocket $LIBS"
64038 +   ;;
64039 +  esac
64040
64041
64042 -  if test "$ext_builddir" = "."; then
64043 -    PHP_PECL_EXTENSION=spl
64044 -
64045 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
64046 +    cat >> confdefs.h <<\EOF
64047 +#define HAVE_RES_SEARCH 1
64048 +EOF
64049
64050 -  fi
64051 +    cat >> confdefs.h <<\EOF
64052 +#define HAVE_LIBSOCKET 1
64053 +EOF
64054
64055 -
64056 -
64057 -    header_path=ext/spl
64058 -    for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do
64059 -      hp_hf="$header_path/$header_file"
64060 -
64061 -
64062 -  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
64063 -
64064 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
64065 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
64066 -    eval "INSTALLHEADERS$unique=set"
64067 +    ac_cv_func_res_search=yes
64068 +  else
64069
64070 -        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
64071 -
64072 -  fi
64073 +  :
64074
64075 -    done
64076 +  fi
64077
64078
64079 -
64080 -  am_i_shared=$PHP_SPL_SHARED
64081 -  is_it_shared=$PHP_PCRE_SHARED
64082 -  is_it_enabled=$PHP_PCRE
64083 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
64084 -    { echo "configure: error:
64085 -You've configured extension spl to build statically, but it
64086 -depends on extension pcre, which you've configured to build shared.
64087 -You either need to build spl shared or build pcre statically for the
64088 -build to be successful.
64089 -" 1>&2; exit 1; }
64090 -  fi
64091 -  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
64092 -    { echo "configure: error:
64093 -You've configured extension spl, which depends on extension pcre,
64094 -but you've either not enabled pcre, or have disabled it.
64095 -" 1>&2; exit 1; }
64096    fi
64097
64098
64099 +  fi
64100 +
64101 + ;;
64102 +
64103 +  esac
64104
64105
64106 -php_with_sqlite=yes
64107 -
64108 -echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
64109 -echo "configure:86713: checking for sqlite support" >&5
64110 -# Check whether --with-sqlite or --without-sqlite was given.
64111 -if test "${with_sqlite+set}" = set; then
64112 -  withval="$with_sqlite"
64113 -  PHP_SQLITE=$withval
64114 +echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
64115 +echo "configure:93312: checking whether atof() accepts NAN" >&5
64116 +if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then
64117 +  echo $ac_n "(cached) $ac_c" 1>&6
64118  else
64119
64120 -  PHP_SQLITE=yes
64121 -  test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL
64122 -
64123 -fi
64124 -
64125 +if test "$cross_compiling" = yes; then
64126 +
64127 +  ac_cv_atof_accept_nan=no
64128
64129 +else
64130 +  cat > conftest.$ac_ext <<EOF
64131 +#line 93323 "configure"
64132 +#include "confdefs.h"
64133
64134 -ext_output="yes, shared"
64135 -ext_shared=yes
64136 -case $PHP_SQLITE in
64137 -shared,*)
64138 -  PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'`
64139 -  ;;
64140 -shared)
64141 -  PHP_SQLITE=yes
64142 -  ;;
64143 -no)
64144 -  ext_output=no
64145 -  ext_shared=no
64146 -  ;;
64147 -*)
64148 -  ext_output=yes
64149 -  ext_shared=no
64150 -  ;;
64151 -esac
64152 +#include <math.h>
64153 +#include <stdlib.h>
64154
64155 +#ifdef HAVE_ISNAN
64156 +#define zend_isnan(a) isnan(a)
64157 +#elif defined(HAVE_FPCLASS)
64158 +#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
64159 +#else
64160 +#define zend_isnan(a) 0
64161 +#endif
64162
64163 +int main(int argc, char** argv)
64164 +{
64165 +       return zend_isnan(atof("NAN")) ? 0 : 1;
64166 +}
64167
64168 -echo "$ac_t""$ext_output" 1>&6
64169 +EOF
64170 +if { (eval echo configure:93343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
64171 +then
64172 +
64173 +  ac_cv_atof_accept_nan=yes
64174
64175 +else
64176 +  echo "configure: failed program was:" >&5
64177 +  cat conftest.$ac_ext >&5
64178 +  rm -fr conftest*
64179 +
64180 +  ac_cv_atof_accept_nan=no
64181
64182 +fi
64183 +rm -fr conftest*
64184 +fi
64185
64186 +fi
64187
64188 +echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6
64189 +if test "$ac_cv_atof_accept_nan" = "yes"; then
64190 +  cat >> confdefs.h <<\EOF
64191 +#define HAVE_ATOF_ACCEPTS_NAN 1
64192 +EOF
64193
64194 -php_enable_sqlite_utf8=no
64195 +fi
64196
64197 -echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6
64198 -echo "configure:86757: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
64199 -# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given.
64200 -if test "${enable_sqlite_utf8+set}" = set; then
64201 -  enableval="$enable_sqlite_utf8"
64202 -  PHP_SQLITE_UTF8=$enableval
64203 +echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
64204 +echo "configure:93370: checking whether atof() accepts INF" >&5
64205 +if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then
64206 +  echo $ac_n "(cached) $ac_c" 1>&6
64207  else
64208
64209 -  PHP_SQLITE_UTF8=no
64210 +if test "$cross_compiling" = yes; then
64211
64212 +  ac_cv_atof_accept_inf=no
64213
64214 -fi
64215 -
64216 +else
64217 +  cat > conftest.$ac_ext <<EOF
64218 +#line 93381 "configure"
64219 +#include "confdefs.h"
64220
64221 -ext_output=$PHP_SQLITE_UTF8
64222 -echo "$ac_t""$ext_output" 1>&6
64223 +#include <math.h>
64224 +#include <stdlib.h>
64225
64226 +#ifdef HAVE_ISINF
64227 +#define zend_isinf(a) isinf(a)
64228 +#elif defined(INFINITY)
64229 +/* Might not work, but is required by ISO C99 */
64230 +#define zend_isinf(a) (((a)==INFINITY)?1:0)
64231 +#elif defined(HAVE_FPCLASS)
64232 +#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
64233 +#else
64234 +#define zend_isinf(a) 0
64235 +#endif
64236
64237 +int main(int argc, char** argv)
64238 +{
64239 +       return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1;
64240 +}
64241
64242 +EOF
64243 +if { (eval echo configure:93404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
64244 +then
64245 +
64246 +  ac_cv_atof_accept_inf=yes
64247
64248 +else
64249 +  echo "configure: failed program was:" >&5
64250 +  cat conftest.$ac_ext >&5
64251 +  rm -fr conftest*
64252 +
64253 +  ac_cv_atof_accept_inf=no
64254
64255 +fi
64256 +rm -fr conftest*
64257 +fi
64258
64259 +fi
64260
64261 +echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6
64262 +if test "$ac_cv_atof_accept_inf" = "yes"; then
64263 +  cat >> confdefs.h <<\EOF
64264 +#define HAVE_ATOF_ACCEPTS_INF 1
64265 +EOF
64266
64267 +fi
64268
64269 -if test "$PHP_SQLITE" != "no"; then
64270 -  if test "$PHP_PDO" != "no"; then
64271 -
64272 -  echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
64273 -echo "configure:86785: checking for PDO includes" >&5
64274 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
64275 +echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
64276 +echo "configure:93431: checking whether HUGE_VAL == INF" >&5
64277 +if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then
64278    echo $ac_n "(cached) $ac_c" 1>&6
64279  else
64280
64281 -    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
64282 -echo "configure:86791: checking for PDO includes" >&5
64283 -    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
64284 -      pdo_inc_path=$abs_srcdir/ext
64285 -    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
64286 -      pdo_inc_path=$abs_srcdir/ext
64287 -    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
64288 -      pdo_inc_path=$prefix/include/php/ext
64289 -    fi
64290 +if test "$cross_compiling" = yes; then
64291
64292 -fi
64293 -
64294 -echo "$ac_t""$pdo_inc_path" 1>&6
64295 -  if test -n "$pdo_inc_path"; then
64296 -:
64297 -  else
64298 -echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2
64299 -  fi
64300 +  ac_cv_huge_val_inf=yes
64301
64302 -    if test -n "$pdo_inc_path"; then
64303 -      cat >> confdefs.h <<\EOF
64304 -#define PHP_SQLITE2_HAVE_PDO 1
64305 -EOF
64306 +else
64307 +  cat > conftest.$ac_ext <<EOF
64308 +#line 93442 "configure"
64309 +#include "confdefs.h"
64310
64311 -      pdo_inc_path="-I$pdo_inc_path"
64312 -    fi
64313 -  fi
64314 +#include <math.h>
64315 +#include <stdlib.h>
64316
64317 -  if test "$PHP_SQLITE" != "yes"; then
64318 -    SEARCH_PATH="/usr/local /usr"
64319 -    SEARCH_FOR="/include/sqlite.h"
64320 -    if test -r $PHP_SQLITE/; then # path given as parameter
64321 -      SQLITE_DIR=$PHP_SQLITE
64322 -    else # search default path list
64323 -      echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
64324 -echo "configure:86825: checking for sqlite files in default path" >&5
64325 -      for i in $SEARCH_PATH ; do
64326 -        if test -r $i/$SEARCH_FOR; then
64327 -          SQLITE_DIR=$i
64328 -          echo "$ac_t""found in $i" 1>&6
64329 -        fi
64330 -      done
64331 -    fi
64332 -
64333 -    if test -z "$SQLITE_DIR"; then
64334 -      echo "$ac_t""not found" 1>&6
64335 -      { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; }
64336 -    fi
64337 +#ifdef HAVE_ISINF
64338 +#define zend_isinf(a) isinf(a)
64339 +#elif defined(INFINITY)
64340 +/* Might not work, but is required by ISO C99 */
64341 +#define zend_isinf(a) (((a)==INFINITY)?1:0)
64342 +#elif defined(HAVE_FPCLASS)
64343 +#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
64344 +#else
64345 +#define zend_isinf(a) 0
64346 +#endif
64347
64348 -
64349 -  save_old_LDFLAGS=$LDFLAGS
64350 -  ac_stuff="
64351 -      -L$SQLITE_DIR/$PHP_LIBDIR -lm
64352 -    "
64353 -
64354 -  save_ext_shared=$ext_shared
64355 -  ext_shared=yes
64356 -
64357 -  for ac_i in $ac_stuff; do
64358 -    case $ac_i in
64359 -    -pthread)
64360 -      if test "$ext_shared" = "yes"; then
64361 -        LDFLAGS="$LDFLAGS -pthread"
64362 -      else
64363 -
64364 -
64365 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
64366 -
64367 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
64368 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
64369 -    eval "EXTRA_LDFLAGS$unique=set"
64370 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
64371 -  fi
64372 +int main(int argc, char** argv)
64373 +{
64374 +       return zend_isinf(HUGE_VAL) ? 0 : 1;
64375 +}
64376
64377 -      fi
64378 -    ;;
64379 -    -l*)
64380 -      ac_ii=`echo $ac_i|cut -c 3-`
64381 -
64382 -
64383 -  case $ac_ii in
64384 -  c|c_r|pthread*) ;;
64385 -  *)
64386 -    if test "$ext_shared" = "yes"; then
64387 -        LDFLAGS="$LDFLAGS -l$ac_ii"
64388 -    else
64389 -
64390 +EOF
64391 +if { (eval echo configure:93465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
64392 +then
64393
64394 -  case $ac_ii in
64395 -  c|c_r|pthread*) ;;
64396 -  *)
64397 -      LIBS="$LIBS -l$ac_ii"
64398 -   ;;
64399 -  esac
64400 +  ac_cv_huge_val_inf=yes
64401
64402 +else
64403 +  echo "configure: failed program was:" >&5
64404 +  cat conftest.$ac_ext >&5
64405 +  rm -fr conftest*
64406 +
64407 +  ac_cv_huge_val_inf=no
64408
64409 -    fi
64410 -   ;;
64411 -  esac
64412 +fi
64413 +rm -fr conftest*
64414 +fi
64415
64416 +fi
64417
64418 -    ;;
64419 -    -L*)
64420 -      ac_ii=`echo $ac_i|cut -c 3-`
64421 -
64422 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
64423 -
64424 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
64425 -    ai_p=$ac_ii
64426 -  else
64427 -
64428 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
64429 -
64430 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
64431 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
64432 -  fi
64433 +echo "$ac_t""$ac_cv_huge_val_inf" 1>&6
64434 +if test "$ac_cv_huge_val_inf" = "yes"; then
64435 +  cat >> confdefs.h <<\EOF
64436 +#define HAVE_HUGE_VAL_INF 1
64437 +EOF
64438
64439 -
64440 -      if test "$ext_shared" = "yes"; then
64441 -        LDFLAGS="-L$ai_p $LDFLAGS"
64442 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
64443 -      else
64444 -
64445 +fi
64446 +
64447 +echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
64448 +echo "configure:93492: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
64449 +if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then
64450 +  echo $ac_n "(cached) $ac_c" 1>&6
64451 +else
64452
64453 +if test "$cross_compiling" = yes; then
64454
64455 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
64456 +  ac_cv_huge_val_nan=yes
64457 +
64458 +else
64459 +  cat > conftest.$ac_ext <<EOF
64460 +#line 93503 "configure"
64461 +#include "confdefs.h"
64462 +
64463 +#include <math.h>
64464 +#include <stdlib.h>
64465 +
64466 +#ifdef HAVE_ISNAN
64467 +#define zend_isnan(a) isnan(a)
64468 +#elif defined(HAVE_FPCLASS)
64469 +#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
64470 +#else
64471 +#define zend_isnan(a) 0
64472 +#endif
64473 +
64474 +int main(int argc, char** argv)
64475 +{
64476 +#if defined(__sparc__) && !(__GNUC__ >= 3)
64477 +       /* prevent bug #27830 */
64478 +       return 1;
64479 +#else
64480 +       return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1;
64481 +#endif
64482 +}
64483 +
64484 +EOF
64485 +if { (eval echo configure:93528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
64486 +then
64487
64488 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
64489 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
64490 -    eval "LIBPATH$unique=set"
64491 -
64492 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
64493 -    LDFLAGS="$LDFLAGS -L$ai_p"
64494 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
64495 +  ac_cv_huge_val_nan=yes
64496 +
64497 +else
64498 +  echo "configure: failed program was:" >&5
64499 +  cat conftest.$ac_ext >&5
64500 +  rm -fr conftest*
64501
64502 -  fi
64503 +  ac_cv_huge_val_nan=no
64504
64505 +fi
64506 +rm -fr conftest*
64507 +fi
64508
64509 -      fi
64510 -
64511 -  fi
64512 +fi
64513
64514 -    ;;
64515 -    esac
64516 -  done
64517 +echo "$ac_t""$ac_cv_huge_val_nan" 1>&6
64518 +if test "$ac_cv_huge_val_nan" = "yes"; then
64519 +  cat >> confdefs.h <<\EOF
64520 +#define HAVE_HUGE_VAL_NAN 1
64521 +EOF
64522
64523 -  echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
64524 -echo "configure:86937: checking for sqlite_open in -lsqlite" >&5
64525 -ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'`
64526 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
64527 +fi
64528 +
64529 +echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6
64530 +echo "configure:93555: checking whether strptime() declaration fails" >&5
64531 +if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then
64532    echo $ac_n "(cached) $ac_c" 1>&6
64533  else
64534 -  ac_save_LIBS="$LIBS"
64535 -LIBS="-lsqlite  $LIBS"
64536 +
64537  cat > conftest.$ac_ext <<EOF
64538 -#line 86945 "configure"
64539 +#line 93561 "configure"
64540  #include "confdefs.h"
64541 -/* Override any gcc2 internal prototype to avoid an error.  */
64542 -/* We use char because int might match the return type of a gcc2
64543 -    builtin and then its argument prototype would still apply.  */
64544 -char sqlite_open();
64545 +
64546 +#include <time.h>
64547
64548  int main() {
64549 -sqlite_open()
64550 +
64551 +#ifndef HAVE_STRPTIME
64552 +#error no strptime() on this platform
64553 +#else
64554 +/* use invalid strptime() declaration to see if it fails to compile */
64555 +int strptime(const char *s, const char *format, struct tm *tm);
64556 +#endif
64557 +
64558  ; return 0; }
64559  EOF
64560 -if { (eval echo configure:86956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64561 +if { (eval echo configure:93577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64562    rm -rf conftest*
64563 -  eval "ac_cv_lib_$ac_lib_var=yes"
64564 +
64565 +  ac_cv_strptime_decl_fails=no
64566 +
64567  else
64568    echo "configure: failed program was:" >&5
64569    cat conftest.$ac_ext >&5
64570    rm -rf conftest*
64571 -  eval "ac_cv_lib_$ac_lib_var=no"
64572 +
64573 +  ac_cv_strptime_decl_fails=yes
64574 +
64575  fi
64576  rm -f conftest*
64577 -LIBS="$ac_save_LIBS"
64578 -
64579  fi
64580 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
64581 -  echo "$ac_t""yes" 1>&6
64582 -
64583 -    LDFLAGS=$save_old_LDFLAGS
64584 -    ext_shared=$save_ext_shared
64585 -
64586 -
64587 -
64588 -  if test "$ext_shared" = "yes"; then
64589 -    SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD"
64590 -    if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then
64591 -
64592 -  if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
64593 -
64594 -  if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
64595 -    ai_p=$SQLITE_DIR/$PHP_LIBDIR
64596 -  else
64597 -
64598 -    ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
64599 -
64600 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
64601 -    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
64602 -  fi
64603
64604 -
64605 -      if test "$ext_shared" = "yes"; then
64606 -        SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD"
64607 -        test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD"
64608 -      else
64609 -
64610 -
64611 -
64612 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
64613 -
64614 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
64615 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
64616 -    eval "LIBPATH$unique=set"
64617 -
64618 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
64619 -    LDFLAGS="$LDFLAGS -L$ai_p"
64620 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
64621 -
64622 -  fi
64623 +echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6
64624 +if test "$ac_cv_strptime_decl_fails" = "yes"; then
64625 +  cat >> confdefs.h <<\EOF
64626 +#define HAVE_STRPTIME_DECL_FAILS 1
64627 +EOF
64628
64629 +fi
64630
64631 -      fi
64632 -
64633 -  fi
64634 +for ac_hdr in wchar.h
64635 +do
64636 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
64637 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
64638 +echo "configure:93605: checking for $ac_hdr" >&5
64639 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
64640 +  echo $ac_n "(cached) $ac_c" 1>&6
64641 +else
64642 +  cat > conftest.$ac_ext <<EOF
64643 +#line 93610 "configure"
64644 +#include "confdefs.h"
64645 +#include <$ac_hdr>
64646 +EOF
64647 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
64648 +{ (eval echo configure:93615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
64649 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
64650 +if test -z "$ac_err"; then
64651 +  rm -rf conftest*
64652 +  eval "ac_cv_header_$ac_safe=yes"
64653 +else
64654 +  echo "$ac_err" >&5
64655 +  echo "configure: failed program was:" >&5
64656 +  cat conftest.$ac_ext >&5
64657 +  rm -rf conftest*
64658 +  eval "ac_cv_header_$ac_safe=no"
64659 +fi
64660 +rm -f conftest*
64661 +fi
64662 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
64663 +  echo "$ac_t""yes" 1>&6
64664 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
64665 +  cat >> confdefs.h <<EOF
64666 +#define $ac_tr_hdr 1
64667 +EOF
64668 +
64669 +else
64670 +  echo "$ac_t""no" 1>&6
64671 +fi
64672 +done
64673
64674 -    fi
64675 -  else
64676 -
64677 +for ac_func in mblen
64678 +do
64679 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
64680 +echo "configure:93644: checking for $ac_func" >&5
64681 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
64682 +  echo $ac_n "(cached) $ac_c" 1>&6
64683 +else
64684 +  cat > conftest.$ac_ext <<EOF
64685 +#line 93649 "configure"
64686 +#include "confdefs.h"
64687 +/* System header to define __stub macros and hopefully few prototypes,
64688 +    which can conflict with char $ac_func(); below.  */
64689 +#include <assert.h>
64690 +/* Override any gcc2 internal prototype to avoid an error.  */
64691 +/* We use char because int might match the return type of a gcc2
64692 +    builtin and then its argument prototype would still apply.  */
64693 +char $ac_func();
64694
64695 -  if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then
64696 -
64697 -  if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
64698 -
64699 -  if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
64700 -    ai_p=$SQLITE_DIR/$PHP_LIBDIR
64701 -  else
64702 -
64703 -    ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
64704 -
64705 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
64706 -    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
64707 -  fi
64708 +int main() {
64709
64710 -
64711 -
64712 -
64713 -
64714 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
64715 -
64716 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
64717 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
64718 -    eval "LIBPATH$unique=set"
64719 -
64720 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
64721 -    LDFLAGS="$LDFLAGS -L$ai_p"
64722 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
64723 -
64724 -  fi
64725 +/* The GNU C library defines this for functions which it implements
64726 +    to always fail with ENOSYS.  Some functions are actually named
64727 +    something starting with __ and the normal name is an alias.  */
64728 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
64729 +choke me
64730 +#else
64731 +$ac_func();
64732 +#endif
64733
64734 +; return 0; }
64735 +EOF
64736 +if { (eval echo configure:93672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64737 +  rm -rf conftest*
64738 +  eval "ac_cv_func_$ac_func=yes"
64739 +else
64740 +  echo "configure: failed program was:" >&5
64741 +  cat conftest.$ac_ext >&5
64742 +  rm -rf conftest*
64743 +  eval "ac_cv_func_$ac_func=no"
64744 +fi
64745 +rm -f conftest*
64746 +fi
64747
64748 -
64749 -  fi
64750 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
64751 +  echo "$ac_t""yes" 1>&6
64752 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
64753 +  cat >> confdefs.h <<EOF
64754 +#define $ac_tr_func 1
64755 +EOF
64756 +
64757 +else
64758 +  echo "$ac_t""no" 1>&6
64759 +fi
64760 +done
64761
64762 -  fi
64763 -
64764 -
64765 -  case sqlite in
64766 -  c|c_r|pthread*) ;;
64767 -  *)
64768 -      LIBS="-lsqlite $LIBS"
64769 -   ;;
64770 -  esac
64771 +for ac_func in mbrlen mbsinit
64772 +do
64773 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
64774 +echo "configure:93699: checking for $ac_func" >&5
64775 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
64776 +  echo $ac_n "(cached) $ac_c" 1>&6
64777 +else
64778 +  cat > conftest.$ac_ext <<EOF
64779 +#line 93704 "configure"
64780 +#include "confdefs.h"
64781 +/* System header to define __stub macros and hopefully few prototypes,
64782 +    which can conflict with char $ac_func(); below.  */
64783 +#include <assert.h>
64784 +/* Override any gcc2 internal prototype to avoid an error.  */
64785 +/* We use char because int might match the return type of a gcc2
64786 +    builtin and then its argument prototype would still apply.  */
64787 +char $ac_func();
64788
64789 +int main() {
64790
64791 +/* The GNU C library defines this for functions which it implements
64792 +    to always fail with ENOSYS.  Some functions are actually named
64793 +    something starting with __ and the normal name is an alias.  */
64794 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
64795 +choke me
64796 +#else
64797 +$ac_func();
64798 +#endif
64799
64800 +; return 0; }
64801 +EOF
64802 +if { (eval echo configure:93727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64803 +  rm -rf conftest*
64804 +  eval "ac_cv_func_$ac_func=yes"
64805 +else
64806 +  echo "configure: failed program was:" >&5
64807 +  cat conftest.$ac_ext >&5
64808 +  rm -rf conftest*
64809 +  eval "ac_cv_func_$ac_func=no"
64810 +fi
64811 +rm -f conftest*
64812 +fi
64813
64814 -  fi
64815 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
64816 +  echo "$ac_t""yes" 1>&6
64817 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
64818 +  cat >> confdefs.h <<EOF
64819 +#define $ac_tr_func 1
64820 +EOF
64821 +
64822 +else
64823 +  echo "$ac_t""no" 1>&6
64824 +fi
64825 +done
64826
64827 +echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
64828 +echo "configure:93752: checking for mbstate_t" >&5
64829 +if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
64830 +  echo $ac_n "(cached) $ac_c" 1>&6
64831 +else
64832 +
64833 +cat > conftest.$ac_ext <<EOF
64834 +#line 93758 "configure"
64835 +#include "confdefs.h"
64836
64837 -
64838 -  if test "$SQLITE_DIR/include" != "/usr/include"; then
64839 -
64840 -  if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then
64841 -    ai_p=$SQLITE_DIR/include
64842 -  else
64843 -
64844 -    ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
64845 -
64846 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
64847 -    ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`"
64848 -  fi
64849 +#ifdef HAVE_WCHAR_H
64850 +# include <wchar.h>
64851 +#endif
64852
64853 -
64854 -
64855 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
64856 -
64857 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
64858 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
64859 -    eval "INCLUDEPATH$unique=set"
64860 -
64861 -      if test ""; then
64862 -        INCLUDES="-I$ai_p $INCLUDES"
64863 -      else
64864 -        INCLUDES="$INCLUDES -I$ai_p"
64865 -      fi
64866 -
64867 -  fi
64868 +int main() {
64869
64870 -  fi
64871 +int __tmp__() { mbstate_t a; }
64872
64873 -
64874 +; return 0; }
64875 +EOF
64876 +if { (eval echo configure:93771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64877 +  rm -rf conftest*
64878
64879 -else
64880 -  echo "$ac_t""no" 1>&6
64881 +  ac_cv_type_mbstate_t=yes
64882
64883 -    LDFLAGS=$save_old_LDFLAGS
64884 -    ext_shared=$save_ext_shared
64885 -    unset ac_cv_lib_sqlite_sqlite_open
64886 -
64887 -      { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
64888 -
64889 +else
64890 +  echo "configure: failed program was:" >&5
64891 +  cat conftest.$ac_ext >&5
64892 +  rm -rf conftest*
64893
64894 +  ac_cv_type_mbstate_t=no
64895 +
64896 +fi
64897 +rm -f conftest*
64898  fi
64899
64900 -    SQLITE_MODULE_TYPE=external
64901 -    PHP_SQLITE_CFLAGS=$pdo_inc_path
64902 -    sqlite_extra_sources="libsqlite/src/encode.c"
64903 -  else
64904 -    # use bundled library
64905 -
64906 -  # we only support certain lemon versions
64907 -  lemon_version_list="1.0"
64908 +echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6
64909 +if test "$ac_cv_type_mbstate_t" = "yes"; then
64910 +  cat >> confdefs.h <<\EOF
64911 +#define HAVE_MBSTATE_T 1
64912 +EOF
64913
64914 -  # Extract the first word of "lemon", so it can be a program name with args.
64915 -set dummy lemon; ac_word=$2
64916 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64917 -echo "configure:87129: checking for $ac_word" >&5
64918 -if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then
64919 +fi
64920 +
64921 +for ac_hdr in atomic.h
64922 +do
64923 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
64924 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
64925 +echo "configure:93799: checking for $ac_hdr" >&5
64926 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
64927    echo $ac_n "(cached) $ac_c" 1>&6
64928  else
64929 -  if test -n "$LEMON"; then
64930 -  ac_cv_prog_LEMON="$LEMON" # Let the user override the test.
64931 +  cat > conftest.$ac_ext <<EOF
64932 +#line 93804 "configure"
64933 +#include "confdefs.h"
64934 +#include <$ac_hdr>
64935 +EOF
64936 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
64937 +{ (eval echo configure:93809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
64938 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
64939 +if test -z "$ac_err"; then
64940 +  rm -rf conftest*
64941 +  eval "ac_cv_header_$ac_safe=yes"
64942  else
64943 -  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
64944 -  ac_dummy="$PATH"
64945 -  for ac_dir in $ac_dummy; do
64946 -    test -z "$ac_dir" && ac_dir=.
64947 -    if test -f $ac_dir/$ac_word; then
64948 -      ac_cv_prog_LEMON="lemon"
64949 -      break
64950 -    fi
64951 -  done
64952 -  IFS="$ac_save_ifs"
64953 -fi
64954 +  echo "$ac_err" >&5
64955 +  echo "configure: failed program was:" >&5
64956 +  cat conftest.$ac_ext >&5
64957 +  rm -rf conftest*
64958 +  eval "ac_cv_header_$ac_safe=no"
64959  fi
64960 -LEMON="$ac_cv_prog_LEMON"
64961 -if test -n "$LEMON"; then
64962 -  echo "$ac_t""$LEMON" 1>&6
64963 -else
64964 -  echo "$ac_t""no" 1>&6
64965 +rm -f conftest*
64966  fi
64967 -
64968 -  if test "$LEMON"; then
64969 -    echo $ac_n "checking for lemon version""... $ac_c" 1>&6
64970 -echo "configure:87157: checking for lemon version" >&5
64971 -if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then
64972 -  echo $ac_n "(cached) $ac_c" 1>&6
64973 -else
64974 -
64975 -      lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'`
64976 -      php_cv_lemon_version=invalid
64977 -      for lemon_check_version in $lemon_version_list; do
64978 -        if test "$lemon_version" = "$lemon_check_version"; then
64979 -          php_cv_lemon_version="$lemon_check_version (ok)"
64980 -        fi
64981 -      done
64982 -
64983 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
64984 +  echo "$ac_t""yes" 1>&6
64985 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
64986 +  cat >> confdefs.h <<EOF
64987 +#define $ac_tr_hdr 1
64988 +EOF
64989 +
64990 +else
64991 +  echo "$ac_t""no" 1>&6
64992  fi
64993 +done
64994
64995 -echo "$ac_t""$php_cv_lemon_version" 1>&6
64996 -  else
64997 -    lemon_version=none
64998 -  fi
64999 -  case $php_cv_lemon_version in
65000 -    ""|invalid)
65001 -      lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)."
65002 -      echo "configure: warning: $lemon_msg" 1>&2
65003 -      LEMON="exit 0;"
65004 -      ;;
65005 -  esac
65006 -
65007 -  PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON"
65008
65009
65010 -    SQLITE_MODULE_TYPE=builtin
65011 -    PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path"
65012 -    sqlite_extra_sources="libsqlite/src/opcodes.c \
65013 -        libsqlite/src/parse.c libsqlite/src/encode.c \
65014 -        libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
65015 -        libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
65016 -        libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
65017 -        libsqlite/src/os.c libsqlite/src/pager.c \
65018 -        libsqlite/src/printf.c libsqlite/src/random.c \
65019 -        libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
65020 -        libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
65021 -        libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \
65022 -        libsqlite/src/vacuum.c libsqlite/src/copy.c \
65023 -        libsqlite/src/vdbeaux.c libsqlite/src/date.c \
65024 -        libsqlite/src/where.c libsqlite/src/trigger.c"
65025 -  fi
65026 -        sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources"
65027 -
65028 -  ext_builddir=ext/sqlite
65029 -  ext_srcdir=$abs_srcdir/ext/sqlite
65030 +  ext_builddir=ext/standard
65031 +  ext_srcdir=$abs_srcdir/ext/standard
65032
65033 -  ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
65034 +  ac_extra=
65035
65036 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
65037 -    PHP_SQLITE_SHARED=no
65038 +  if test "" != "shared" && test "" != "yes" && test "" != "cli"; then
65039 +    PHP_STANDARD_SHARED=no
65040
65041
65042 -  case ext/sqlite in
65043 +  case ext/standard in
65044    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
65045 -  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
65046 -  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
65047 +  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
65048 +  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
65049    esac
65050
65051
65052 @@ -87228,7 +93860,17 @@ echo "$ac_t""$php_cv_lemon_version" 1>&6
65053
65054
65055    old_IFS=$IFS
65056 -  for ac_src in $sqlite_sources; do
65057 +  for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
65058 +                            cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
65059 +                            flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
65060 +                            info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
65061 +                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
65062 +                            soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
65063 +                            var.c versioning.c assert.c strnatcmp.c levenshtein.c \
65064 +                            incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
65065 +                            http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
65066 +                            var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
65067 +                            filters.c proc_open.c streamsfuncs.c http.c; do
65068
65069        IFS=.
65070        set $ac_src
65071 @@ -87251,18 +93893,18 @@ EOF
65072    done
65073
65074
65075 -    EXT_STATIC="$EXT_STATIC sqlite"
65076 -    if test "$ext_shared" != "nocli"; then
65077 -      EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
65078 +    EXT_STATIC="$EXT_STATIC standard"
65079 +    if test "" != "nocli"; then
65080 +      EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
65081      fi
65082    else
65083 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
65084 -      PHP_SQLITE_SHARED=yes
65085 +    if test "" = "shared" || test "" = "yes"; then
65086 +      PHP_STANDARD_SHARED=yes
65087
65088 -  case ext/sqlite in
65089 +  case ext/standard in
65090    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
65091 -  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
65092 -  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
65093 +  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
65094 +  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
65095    esac
65096
65097
65098 @@ -87277,14 +93919,24 @@ EOF
65099
65100
65101    old_IFS=$IFS
65102 -  for ac_src in $sqlite_sources; do
65103 +  for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
65104 +                            cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
65105 +                            flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
65106 +                            info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
65107 +                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
65108 +                            soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
65109 +                            var.c versioning.c assert.c strnatcmp.c levenshtein.c \
65110 +                            incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
65111 +                            http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
65112 +                            var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
65113 +                            filters.c proc_open.c streamsfuncs.c http.c; do
65114
65115        IFS=.
65116        set $ac_src
65117        ac_obj=$1
65118        IFS=$old_IFS
65119
65120 -      shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo"
65121 +      shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo"
65122
65123        case $ac_src in
65124          *.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" ;;
65125 @@ -87307,31 +93959,31 @@ EOF
65126    case $host_alias in
65127      *aix*)
65128        suffix=so
65129 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsqlite.so '$ext_builddir'/phpsqlite.so'
65130 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpstandard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpstandard.so '$ext_builddir'/phpstandard.so'
65131        ;;
65132      *netware*)
65133        suffix=nlm
65134 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 3)_SHARED_LIBADD)'
65135 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)'
65136        ;;
65137      *)
65138        suffix=la
65139 -      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) $(PHPSQLITE_SHARED_LIBADD)'
65140 +      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_standard) $(PHPSTANDARD_SHARED_LIBADD)'
65141        ;;
65142    esac
65143
65144    if test "x" = "xyes"; then
65145 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix"
65146 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix"
65147    else
65148 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix"
65149 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix"
65150    fi
65151
65152 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
65153 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
65154
65155    cat >>Makefile.objects<<EOF
65156 -\$(phplibdir)/phpsqlite.$suffix: $ext_builddir/phpsqlite.$suffix
65157 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsqlite.$suffix \$(phplibdir)
65158 +\$(phplibdir)/phpstandard.$suffix: $ext_builddir/phpstandard.$suffix
65159 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpstandard.$suffix \$(phplibdir)
65160
65161 -$ext_builddir/phpsqlite.$suffix: \$(shared_objects_sqlite) \$(PHPSQLITE_SHARED_DEPENDENCIES)
65162 +$ext_builddir/phpstandard.$suffix: \$(shared_objects_standard) \$(PHPSTANDARD_SHARED_DEPENDENCIES)
65163         $link_cmd
65164
65165  EOF
65166 @@ -87344,31 +93996,31 @@ EOF
65167    case $host_alias in
65168      *aix*)
65169        suffix=so
65170 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sqlite.so '$ext_builddir'/sqlite.so'
65171 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/standard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(STANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/standard.so '$ext_builddir'/standard.so'
65172        ;;
65173      *netware*)
65174        suffix=nlm
65175 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE, 3)_SHARED_LIBADD)'
65176 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(STANDARD, 3)_SHARED_LIBADD)'
65177        ;;
65178      *)
65179        suffix=la
65180 -      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)'
65181 +      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_standard) $(STANDARD_SHARED_LIBADD)'
65182        ;;
65183    esac
65184
65185    if test "x" = "xyes"; then
65186 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sqlite.$suffix"
65187 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/standard.$suffix"
65188    else
65189 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix"
65190 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix"
65191    fi
65192
65193 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
65194 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
65195
65196    cat >>Makefile.objects<<EOF
65197 -\$(phplibdir)/sqlite.$suffix: $ext_builddir/sqlite.$suffix
65198 -       \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite.$suffix \$(phplibdir)
65199 +\$(phplibdir)/standard.$suffix: $ext_builddir/standard.$suffix
65200 +       \$(LIBTOOL) --mode=install cp $ext_builddir/standard.$suffix \$(phplibdir)
65201
65202 -$ext_builddir/sqlite.$suffix: \$(shared_objects_sqlite) \$(SQLITE_SHARED_DEPENDENCIES)
65203 +$ext_builddir/standard.$suffix: \$(shared_objects_standard) \$(STANDARD_SHARED_DEPENDENCIES)
65204         $link_cmd
65205
65206  EOF
65207 @@ -87376,22 +94028,22 @@ EOF
65208            ;;
65209        esac
65210        cat >> confdefs.h <<EOF
65211 -#define COMPILE_DL_SQLITE 1
65212 +#define COMPILE_DL_STANDARD 1
65213  EOF
65214
65215      fi
65216    fi
65217
65218 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
65219 -    PHP_SQLITE_SHARED=no
65220 +  if test "" != "shared" && test "" != "yes" && test "" = "cli"; then
65221 +    PHP_STANDARD_SHARED=no
65222      case "$PHP_SAPI" in
65223        cgi|embed)
65224
65225
65226 -  case ext/sqlite in
65227 +  case ext/standard in
65228    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
65229 -  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
65230 -  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
65231 +  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
65232 +  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
65233    esac
65234
65235
65236 @@ -87406,7 +94058,17 @@ EOF
65237
65238
65239    old_IFS=$IFS
65240 -  for ac_src in $sqlite_sources; do
65241 +  for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
65242 +                            cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
65243 +                            flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
65244 +                            info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
65245 +                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
65246 +                            soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
65247 +                            var.c versioning.c assert.c strnatcmp.c levenshtein.c \
65248 +                            incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
65249 +                            http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
65250 +                            var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
65251 +                            filters.c proc_open.c streamsfuncs.c http.c; do
65252
65253        IFS=.
65254        set $ac_src
65255 @@ -87420,906 +94082,407 @@ EOF
65256          *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
65257          *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
65258          *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
65259 -      esac
65260 -
65261 -    cat >>Makefile.objects<<EOF
65262 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
65263 -       $ac_comp
65264 -EOF
65265 -  done
65266 -
65267 -
65268 -        EXT_STATIC="$EXT_STATIC sqlite"
65269 -        ;;
65270 -      *)
65271 -
65272 -
65273 -  case ext/sqlite in
65274 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
65275 -  /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
65276 -  *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
65277 -  esac
65278 -
65279 -
65280 -
65281 -  b_c_pre=$php_c_pre
65282 -  b_cxx_pre=$php_cxx_pre
65283 -  b_c_meta=$php_c_meta
65284 -  b_cxx_meta=$php_cxx_meta
65285 -  b_c_post=$php_c_post
65286 -  b_cxx_post=$php_cxx_post
65287 -  b_lo=$php_lo
65288 -
65289 -
65290 -  old_IFS=$IFS
65291 -  for ac_src in $sqlite_sources; do
65292 -
65293 -      IFS=.
65294 -      set $ac_src
65295 -      ac_obj=$1
65296 -      IFS=$old_IFS
65297 -
65298 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
65299 -
65300 -      case $ac_src in
65301 -        *.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" ;;
65302 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
65303 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
65304 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
65305 -      esac
65306 -
65307 -    cat >>Makefile.objects<<EOF
65308 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
65309 -       $ac_comp
65310 -EOF
65311 -  done
65312 -
65313 -
65314 -        ;;
65315 -    esac
65316 -    EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
65317 -  fi
65318 -
65319 -
65320 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
65321 -
65322 -
65323 -
65324 -  if test "$ext_builddir" = "."; then
65325 -    PHP_PECL_EXTENSION=sqlite
65326 -
65327 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
65328 -
65329 -  fi
65330 -
65331 -
65332 -  am_i_shared=$PHP_SQLITE_SHARED
65333 -  is_it_shared=$PHP_SPL_SHARED
65334 -  is_it_enabled=$PHP_SPL
65335 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
65336 -    { echo "configure: error:
65337 -You've configured extension sqlite to build statically, but it
65338 -depends on extension spl, which you've configured to build shared.
65339 -You either need to build sqlite shared or build spl statically for the
65340 -build to be successful.
65341 -" 1>&2; exit 1; }
65342 -  fi
65343 -  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
65344 -    { echo "configure: error:
65345 -You've configured extension sqlite, which depends on extension spl,
65346 -but you've either not enabled spl, or have disabled it.
65347 -" 1>&2; exit 1; }
65348 -  fi
65349 -
65350 -
65351 -  am_i_shared=$PHP_SQLITE_SHARED
65352 -  is_it_shared=$PHP_PDO_SHARED
65353 -  is_it_enabled=$PHP_PDO
65354 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
65355 -    { echo "configure: error:
65356 -You've configured extension sqlite to build statically, but it
65357 -depends on extension pdo, which you've configured to build shared.
65358 -You either need to build sqlite shared or build pdo statically for the
65359 -build to be successful.
65360 -" 1>&2; exit 1; }
65361 -  fi
65362 -  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
65363 -    { echo "configure: error:
65364 -You've configured extension sqlite, which depends on extension pdo,
65365 -but you've either not enabled pdo, or have disabled it.
65366 -" 1>&2; exit 1; }
65367 -  fi
65368 -
65369 -
65370 -
65371 -  src=$ext_srcdir/Makefile.frag
65372 -  ac_srcdir=$ext_srcdir
65373 -  ac_builddir=$ext_builddir
65374 -  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
65375 -
65376 -
65377 -  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD"
65378 -
65379 -
65380 -
65381 -    for header_file in $ext_builddir/libsqlite/src/sqlite.h; do
65382 -
65383 -
65384 -  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
65385 -
65386 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
65387 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
65388 -    eval "INSTALLHEADERS$unique=set"
65389 -
65390 -        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
65391 -
65392 -  fi
65393 -
65394 -    done
65395 -
65396 -
65397 -
65398 -  if test "$SQLITE_MODULE_TYPE" = "builtin"; then
65399 -
65400 -
65401 -    $php_shtool mkdir -p $ext_builddir/libsqlite/src
65402 -
65403 -
65404 -    echo $ac_n "checking size of char *""... $ac_c" 1>&6
65405 -echo "configure:87570: checking size of char *" >&5
65406 -if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
65407 -  echo $ac_n "(cached) $ac_c" 1>&6
65408 -else
65409 -  if test "$cross_compiling" = yes; then
65410 -  ac_cv_sizeof_char_p=4
65411 -else
65412 -  cat > conftest.$ac_ext <<EOF
65413 -#line 87578 "configure"
65414 -#include "confdefs.h"
65415 -#include <stdio.h>
65416 -int main()
65417 -{
65418 -  FILE *f=fopen("conftestval", "w");
65419 -  if (!f) return(1);
65420 -  fprintf(f, "%d\n", sizeof(char *));
65421 -  return(0);
65422 -}
65423 -EOF
65424 -if { (eval echo configure:87589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
65425 -then
65426 -  ac_cv_sizeof_char_p=`cat conftestval`
65427 -else
65428 -  echo "configure: failed program was:" >&5
65429 -  cat conftest.$ac_ext >&5
65430 -  rm -fr conftest*
65431 -  ac_cv_sizeof_char_p=0
65432 -fi
65433 -rm -fr conftest*
65434 -fi
65435 -
65436 -fi
65437 -echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
65438 -cat >> confdefs.h <<EOF
65439 -#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
65440 -EOF
65441 -
65442 -
65443 -    cat >> confdefs.h <<\EOF
65444 -#define SQLITE_PTR_SZ SIZEOF_CHAR_P
65445 -EOF
65446 -
65447 -                if test "$PHP_SQLITE_UTF8" = "yes"; then
65448 -      SQLITE_ENCODING="UTF8"
65449 -      cat >> confdefs.h <<\EOF
65450 -#define SQLITE_UTF8 1
65451 -EOF
65452 -
65453 -    else
65454 -      SQLITE_ENCODING="ISO8859"
65455 -    fi
65456 -
65457 -  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING"
65458 -
65459 -
65460 -    SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
65461 -
65462 -  PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION"
65463 -
65464 -
65465 -    sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h
65466 -
65467 -    if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then
65468 -      echo '#include <php_config.h>' > $ext_builddir/libsqlite/src/config.h
65469 -    else
65470 -      echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h
65471 -    fi
65472 -
65473 -    cat >> $ext_builddir/libsqlite/src/config.h <<EOF
65474 -#if ZTS
65475 -# define THREADSAFE 1
65476 -#endif
65477 -#if !ZEND_DEBUG
65478 -# define NDEBUG
65479 -#endif
65480 -EOF
65481 -  fi
65482 -
65483 -  for ac_func in usleep nanosleep
65484 -do
65485 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
65486 -echo "configure:87651: checking for $ac_func" >&5
65487 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
65488 -  echo $ac_n "(cached) $ac_c" 1>&6
65489 -else
65490 -  cat > conftest.$ac_ext <<EOF
65491 -#line 87656 "configure"
65492 -#include "confdefs.h"
65493 -/* System header to define __stub macros and hopefully few prototypes,
65494 -    which can conflict with char $ac_func(); below.  */
65495 -#include <assert.h>
65496 -/* Override any gcc2 internal prototype to avoid an error.  */
65497 -/* We use char because int might match the return type of a gcc2
65498 -    builtin and then its argument prototype would still apply.  */
65499 -char $ac_func();
65500 -
65501 -int main() {
65502 -
65503 -/* The GNU C library defines this for functions which it implements
65504 -    to always fail with ENOSYS.  Some functions are actually named
65505 -    something starting with __ and the normal name is an alias.  */
65506 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
65507 -choke me
65508 -#else
65509 -$ac_func();
65510 -#endif
65511 -
65512 -; return 0; }
65513 -EOF
65514 -if { (eval echo configure:87679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
65515 -  rm -rf conftest*
65516 -  eval "ac_cv_func_$ac_func=yes"
65517 -else
65518 -  echo "configure: failed program was:" >&5
65519 -  cat conftest.$ac_ext >&5
65520 -  rm -rf conftest*
65521 -  eval "ac_cv_func_$ac_func=no"
65522 -fi
65523 -rm -f conftest*
65524 -fi
65525 -
65526 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
65527 -  echo "$ac_t""yes" 1>&6
65528 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
65529 -  cat >> confdefs.h <<EOF
65530 -#define $ac_tr_func 1
65531 -EOF
65532 -
65533 -else
65534 -  echo "$ac_t""no" 1>&6
65535 -fi
65536 -done
65537 -
65538 -  for ac_hdr in time.h
65539 -do
65540 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
65541 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
65542 -echo "configure:87707: checking for $ac_hdr" >&5
65543 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
65544 -  echo $ac_n "(cached) $ac_c" 1>&6
65545 -else
65546 -  cat > conftest.$ac_ext <<EOF
65547 -#line 87712 "configure"
65548 -#include "confdefs.h"
65549 -#include <$ac_hdr>
65550 -EOF
65551 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
65552 -{ (eval echo configure:87717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
65553 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
65554 -if test -z "$ac_err"; then
65555 -  rm -rf conftest*
65556 -  eval "ac_cv_header_$ac_safe=yes"
65557 -else
65558 -  echo "$ac_err" >&5
65559 -  echo "configure: failed program was:" >&5
65560 -  cat conftest.$ac_ext >&5
65561 -  rm -rf conftest*
65562 -  eval "ac_cv_header_$ac_safe=no"
65563 -fi
65564 -rm -f conftest*
65565 -fi
65566 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
65567 -  echo "$ac_t""yes" 1>&6
65568 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
65569 -  cat >> confdefs.h <<EOF
65570 -#define $ac_tr_hdr 1
65571 -EOF
65572 -
65573 -else
65574 -  echo "$ac_t""no" 1>&6
65575 -fi
65576 -done
65577 -
65578 -fi
65579 -
65580 -
65581 -
65582 -echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
65583 -echo "configure:87748: checking whether flush should be called explicitly after a buffered io" >&5
65584 -if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then
65585 -  echo $ac_n "(cached) $ac_c" 1>&6
65586 -else
65587 -
65588 -if test "$cross_compiling" = yes; then
65589 -
65590 -  ac_cv_flush_io=no
65591 -
65592 -else
65593 -  cat > conftest.$ac_ext <<EOF
65594 -#line 87759 "configure"
65595 -#include "confdefs.h"
65596 -
65597 -#include <stdio.h>
65598 -#include <stdlib.h>
65599 -
65600 -int main(int argc, char **argv)
65601 -{
65602 -       char *filename = tmpnam(NULL);
65603 -       char buffer[64];
65604 -       int result = 0;
65605 -
65606 -       FILE *fp = fopen(filename, "wb");
65607 -       if (NULL == fp)
65608 -               return 0;
65609 -       fputs("line 1\n", fp);
65610 -       fputs("line 2\n", fp);
65611 -       fclose(fp);
65612 -
65613 -       fp = fopen(filename, "rb+");
65614 -       if (NULL == fp)
65615 -               return 0;
65616 -       fgets(buffer, sizeof(buffer), fp);
65617 -       fputs("line 3\n", fp);
65618 -       rewind(fp);
65619 -       fgets(buffer, sizeof(buffer), fp);
65620 -       if (0 != strcmp(buffer, "line 1\n"))
65621 -               result = 1;
65622 -       fgets(buffer, sizeof(buffer), fp);
65623 -       if (0 != strcmp(buffer, "line 3\n"))
65624 -               result = 1;
65625 -       fclose(fp);
65626 -       unlink(filename);
65627 -
65628 -       exit(result);
65629 -}
65630 +      esac
65631
65632 +    cat >>Makefile.objects<<EOF
65633 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
65634 +       $ac_comp
65635  EOF
65636 -if { (eval echo configure:87797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
65637 -then
65638 -
65639 -  ac_cv_flush_io=no
65640 -
65641 -else
65642 -  echo "configure: failed program was:" >&5
65643 -  cat conftest.$ac_ext >&5
65644 -  rm -fr conftest*
65645 -
65646 -  ac_cv_flush_io=yes
65647 +  done
65648
65649 -fi
65650 -rm -fr conftest*
65651 -fi
65652
65653 -fi
65654 +        EXT_STATIC="$EXT_STATIC standard"
65655 +        ;;
65656 +      *)
65657 +
65658 +
65659 +  case ext/standard in
65660 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
65661 +  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
65662 +  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
65663 +  esac
65664 +
65665 +
65666
65667 -echo "$ac_t""$ac_cv_flush_io" 1>&6
65668 -if test "$ac_cv_flush_io" = "yes"; then
65669 -  cat >> confdefs.h <<\EOF
65670 -#define HAVE_FLUSHIO 1
65671 -EOF
65672 +  b_c_pre=$php_c_pre
65673 +  b_cxx_pre=$php_cxx_pre
65674 +  b_c_meta=$php_c_meta
65675 +  b_cxx_meta=$php_cxx_meta
65676 +  b_c_post=$php_c_post
65677 +  b_cxx_post=$php_cxx_post
65678 +  b_lo=$php_lo
65679
65680 -fi
65681
65682 -if test "$ac_cv_func_crypt" = "no"; then
65683 -  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
65684 -echo "configure:87825: checking for crypt in -lcrypt" >&5
65685 -ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
65686 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
65687 -  echo $ac_n "(cached) $ac_c" 1>&6
65688 -else
65689 -  ac_save_LIBS="$LIBS"
65690 -LIBS="-lcrypt  $LIBS"
65691 -cat > conftest.$ac_ext <<EOF
65692 -#line 87833 "configure"
65693 -#include "confdefs.h"
65694 -/* Override any gcc2 internal prototype to avoid an error.  */
65695 -/* We use char because int might match the return type of a gcc2
65696 -    builtin and then its argument prototype would still apply.  */
65697 -char crypt();
65698 +  old_IFS=$IFS
65699 +  for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
65700 +                            cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
65701 +                            flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
65702 +                            info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
65703 +                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
65704 +                            soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
65705 +                            var.c versioning.c assert.c strnatcmp.c levenshtein.c \
65706 +                            incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
65707 +                            http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
65708 +                            var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
65709 +                            filters.c proc_open.c streamsfuncs.c http.c; do
65710 +
65711 +      IFS=.
65712 +      set $ac_src
65713 +      ac_obj=$1
65714 +      IFS=$old_IFS
65715 +
65716 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
65717
65718 -int main() {
65719 -crypt()
65720 -; return 0; }
65721 -EOF
65722 -if { (eval echo configure:87844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
65723 -  rm -rf conftest*
65724 -  eval "ac_cv_lib_$ac_lib_var=yes"
65725 -else
65726 -  echo "configure: failed program was:" >&5
65727 -  cat conftest.$ac_ext >&5
65728 -  rm -rf conftest*
65729 -  eval "ac_cv_lib_$ac_lib_var=no"
65730 -fi
65731 -rm -f conftest*
65732 -LIBS="$ac_save_LIBS"
65733 +      case $ac_src in
65734 +        *.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" ;;
65735 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
65736 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
65737 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
65738 +      esac
65739
65740 -fi
65741 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
65742 -  echo "$ac_t""yes" 1>&6
65743 -
65744 -    LIBS="-lcrypt $LIBS -lcrypt"
65745 -    cat >> confdefs.h <<\EOF
65746 -#define HAVE_CRYPT 1
65747 +    cat >>Makefile.objects<<EOF
65748 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
65749 +       $ac_comp
65750  EOF
65751 +  done
65752
65753 -
65754 -else
65755 -  echo "$ac_t""no" 1>&6
65756 -fi
65757
65758 -fi
65759 +        ;;
65760 +    esac
65761 +    EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
65762 +  fi
65763
65764 -echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
65765 -echo "configure:87873: checking for standard DES crypt" >&5
65766 -if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then
65767 -  echo $ac_n "(cached) $ac_c" 1>&6
65768 -else
65769
65770 -  if test "$cross_compiling" = yes; then
65771 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
65772
65773 -  ac_cv_crypt_des=yes
65774 -
65775 -else
65776 -  cat > conftest.$ac_ext <<EOF
65777 -#line 87884 "configure"
65778 -#include "confdefs.h"
65779
65780 -#if HAVE_UNISTD_H
65781 -#include <unistd.h>
65782 -#endif
65783
65784 -#if HAVE_CRYPT_H
65785 -#include <crypt.h>
65786 -#endif
65787 +  if test "$ext_builddir" = "."; then
65788 +    PHP_PECL_EXTENSION=standard
65789 +
65790 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
65791
65792 -main() {
65793 -#if HAVE_CRYPT
65794 -    exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M"));
65795 -#else
65796 -       exit(0);
65797 -#endif
65798 -}
65799 -EOF
65800 -if { (eval echo configure:87903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
65801 -then
65802 -
65803 -  ac_cv_crypt_des=yes
65804 +  fi
65805
65806 -else
65807 -  echo "configure: failed program was:" >&5
65808 -  cat conftest.$ac_ext >&5
65809 -  rm -fr conftest*
65810 -
65811 -  ac_cv_crypt_des=no
65812
65813 -fi
65814 -rm -fr conftest*
65815 -fi
65816
65817 -fi
65818 +  src=$ext_srcdir/Makefile.frag
65819 +  ac_srcdir=$ext_srcdir
65820 +  ac_builddir=$ext_builddir
65821 +  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
65822
65823 -echo "$ac_t""$ac_cv_crypt_des" 1>&6
65824
65825 -echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
65826 -echo "configure:87924: checking for extended DES crypt" >&5
65827 -if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then
65828 -  echo $ac_n "(cached) $ac_c" 1>&6
65829 -else
65830
65831 -  if test "$cross_compiling" = yes; then
65832 +    for header_file in ext/standard/; do
65833 +
65834
65835 -  ac_cv_crypt_ext_des=no
65836 +  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
65837 +
65838 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
65839 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
65840 +    eval "INSTALLHEADERS$unique=set"
65841 +
65842 +        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
65843 +
65844 +  fi
65845
65846 -else
65847 -  cat > conftest.$ac_ext <<EOF
65848 -#line 87935 "configure"
65849 -#include "confdefs.h"
65850 +    done
65851 +
65852
65853 -#if HAVE_UNISTD_H
65854 -#include <unistd.h>
65855 -#endif
65856
65857 -#if HAVE_CRYPT_H
65858 -#include <crypt.h>
65859 -#endif
65860
65861 -main() {
65862 -#if HAVE_CRYPT
65863 -  exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc"));
65864 -#else
65865 -  exit(0);
65866 -#endif
65867 -}
65868 -EOF
65869 -if { (eval echo configure:87954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
65870 -then
65871 -
65872 -  ac_cv_crypt_ext_des=yes
65873
65874 +php_with_sybase_ct=no
65875 +
65876 +echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
65877 +echo "configure:94199: checking for Sybase-CT support" >&5
65878 +# Check whether --with-sybase-ct or --without-sybase-ct was given.
65879 +if test "${with_sybase_ct+set}" = set; then
65880 +  withval="$with_sybase_ct"
65881 +  PHP_SYBASE_CT=$withval
65882  else
65883 -  echo "configure: failed program was:" >&5
65884 -  cat conftest.$ac_ext >&5
65885 -  rm -fr conftest*
65886
65887 -  ac_cv_crypt_ext_des=no
65888 +  PHP_SYBASE_CT=no
65889 +  test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL
65890
65891  fi
65892 -rm -fr conftest*
65893 -fi
65894
65895 -fi
65896
65897 -echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6
65898
65899 -echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
65900 -echo "configure:87975: checking for MD5 crypt" >&5
65901 -if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then
65902 -  echo $ac_n "(cached) $ac_c" 1>&6
65903 -else
65904 -
65905 -if test "$cross_compiling" = yes; then
65906 -
65907 -  ac_cv_crypt_md5=no
65908 +ext_output="yes, shared"
65909 +ext_shared=yes
65910 +case $PHP_SYBASE_CT in
65911 +shared,*)
65912 +  PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'`
65913 +  ;;
65914 +shared)
65915 +  PHP_SYBASE_CT=yes
65916 +  ;;
65917 +no)
65918 +  ext_output=no
65919 +  ext_shared=no
65920 +  ;;
65921 +*)
65922 +  ext_output=yes
65923 +  ext_shared=no
65924 +  ;;
65925 +esac
65926
65927 -else
65928 -  cat > conftest.$ac_ext <<EOF
65929 -#line 87986 "configure"
65930 -#include "confdefs.h"
65931
65932 -#if HAVE_UNISTD_H
65933 -#include <unistd.h>
65934 -#endif
65935
65936 -#if HAVE_CRYPT_H
65937 -#include <crypt.h>
65938 -#endif
65939 +echo "$ac_t""$ext_output" 1>&6
65940
65941 -main() {
65942 -#if HAVE_CRYPT
65943 -    char salt[15], answer[40];
65944
65945 -    salt[0]='$'; salt[1]='1'; salt[2]='$';
65946 -    salt[3]='r'; salt[4]='a'; salt[5]='s';
65947 -    salt[6]='m'; salt[7]='u'; salt[8]='s';
65948 -    salt[9]='l'; salt[10]='e'; salt[11]='$';
65949 -    salt[12]='\0';
65950 -    strcpy(answer,salt);
65951 -    strcat(answer,"rISCgZzpwk3UhDidwXvin0");
65952 -    exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
65953 -#else
65954 -       exit(0);
65955 -#endif
65956 -}
65957 -EOF
65958 -if { (eval echo configure:88014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
65959 -then
65960 -
65961 -  ac_cv_crypt_md5=yes
65962
65963 -else
65964 -  echo "configure: failed program was:" >&5
65965 -  cat conftest.$ac_ext >&5
65966 -  rm -fr conftest*
65967 -
65968 -  ac_cv_crypt_md5=no
65969
65970 -fi
65971 -rm -fr conftest*
65972 -fi
65973 +if test "$PHP_SYBASE_CT" != "no"; then
65974
65975 -fi
65976 +  if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then
65977 +    { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; }
65978 +  fi
65979
65980 -echo "$ac_t""$ac_cv_crypt_md5" 1>&6
65981 +  cat >> confdefs.h <<\EOF
65982 +#define HAVE_SYBASE_CT 1
65983 +EOF
65984
65985 -echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
65986 -echo "configure:88035: checking for Blowfish crypt" >&5
65987 -if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then
65988 -  echo $ac_n "(cached) $ac_c" 1>&6
65989 -else
65990 -
65991 -if test "$cross_compiling" = yes; then
65992
65993 -  ac_cv_crypt_blowfish=no
65994 -
65995 -else
65996 -  cat > conftest.$ac_ext <<EOF
65997 -#line 88046 "configure"
65998 -#include "confdefs.h"
65999 -
66000 -#if HAVE_UNISTD_H
66001 -#include <unistd.h>
66002 -#endif
66003 +  ext_builddir=ext/sybase_ct
66004 +  ext_srcdir=$abs_srcdir/ext/sybase_ct
66005
66006 -#if HAVE_CRYPT_H
66007 -#include <crypt.h>
66008 -#endif
66009 +  ac_extra=
66010
66011 -main() {
66012 -#if HAVE_CRYPT
66013 -    char salt[30], answer[70];
66014 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
66015 +    PHP_SYBASE_CT_SHARED=no
66016
66017 -    salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
66018 -    strcat(salt,"rasmuslerd............");
66019 -    strcpy(answer,salt);
66020 -    strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra");
66021 -    exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
66022 -#else
66023 -       exit(0);
66024 -#endif
66025 -}
66026 -EOF
66027 -if { (eval echo configure:88071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
66028 -then
66029
66030 -  ac_cv_crypt_blowfish=yes
66031 -
66032 -else
66033 -  echo "configure: failed program was:" >&5
66034 -  cat conftest.$ac_ext >&5
66035 -  rm -fr conftest*
66036 +  case ext/sybase_ct in
66037 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
66038 +  /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
66039 +  *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
66040 +  esac
66041 +
66042
66043 -  ac_cv_crypt_blowfish=no
66044 -
66045 -fi
66046 -rm -fr conftest*
66047 -fi
66048
66049 -fi
66050 +  b_c_pre=$php_c_pre
66051 +  b_cxx_pre=$php_cxx_pre
66052 +  b_c_meta=$php_c_meta
66053 +  b_cxx_meta=$php_cxx_meta
66054 +  b_c_post=$php_c_post
66055 +  b_cxx_post=$php_cxx_post
66056 +  b_lo=$php_lo
66057
66058 -echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6
66059
66060 -echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6
66061 -echo "configure:88092: checking for SHA512 crypt" >&5
66062 -if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then
66063 -  echo $ac_n "(cached) $ac_c" 1>&6
66064 -else
66065 -
66066 -if test "$cross_compiling" = yes; then
66067 +  old_IFS=$IFS
66068 +  for ac_src in php_sybase_ct.c; do
66069
66070 -  ac_cv_crypt_SHA512=no
66071 +      IFS=.
66072 +      set $ac_src
66073 +      ac_obj=$1
66074 +      IFS=$old_IFS
66075 +
66076 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
66077
66078 -else
66079 -  cat > conftest.$ac_ext <<EOF
66080 -#line 88103 "configure"
66081 -#include "confdefs.h"
66082 +      case $ac_src in
66083 +        *.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" ;;
66084 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66085 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66086 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
66087 +      esac
66088
66089 -#if HAVE_UNISTD_H
66090 -#include <unistd.h>
66091 -#endif
66092 +    cat >>Makefile.objects<<EOF
66093 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
66094 +       $ac_comp
66095 +EOF
66096 +  done
66097
66098 -#if HAVE_CRYPT_H
66099 -#include <crypt.h>
66100 -#endif
66101
66102 -main() {
66103 -#if HAVE_CRYPT
66104 -    char salt[30], answer[80];
66105 -
66106 -    salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0';
66107 -    strcpy(answer, salt);
66108 -    strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.");
66109 -    exit (strcmp((char *)crypt("foo",salt),answer));
66110 -#else
66111 -       exit(0);
66112 -#endif
66113 -}
66114 -EOF
66115 -if { (eval echo configure:88127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
66116 -then
66117 +    EXT_STATIC="$EXT_STATIC sybase_ct"
66118 +    if test "$ext_shared" != "nocli"; then
66119 +      EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
66120 +    fi
66121 +  else
66122 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
66123 +      PHP_SYBASE_CT_SHARED=yes
66124 +
66125 +  case ext/sybase_ct in
66126 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
66127 +  /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
66128 +  *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
66129 +  esac
66130
66131 -  ac_cv_crypt_SHA512=yes
66132 -
66133 -else
66134 -  echo "configure: failed program was:" >&5
66135 -  cat conftest.$ac_ext >&5
66136 -  rm -fr conftest*
66137
66138 -  ac_cv_crypt_SHA512=no
66139 -
66140 -fi
66141 -rm -fr conftest*
66142 -fi
66143
66144 -fi
66145 +  b_c_pre=$shared_c_pre
66146 +  b_cxx_pre=$shared_cxx_pre
66147 +  b_c_meta=$shared_c_meta
66148 +  b_cxx_meta=$shared_cxx_meta
66149 +  b_c_post=$shared_c_post
66150 +  b_cxx_post=$shared_cxx_post
66151 +  b_lo=$shared_lo
66152
66153 -echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6
66154
66155 -echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6
66156 -echo "configure:88148: checking for SHA256 crypt" >&5
66157 -if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then
66158 -  echo $ac_n "(cached) $ac_c" 1>&6
66159 -else
66160 -
66161 -if test "$cross_compiling" = yes; then
66162 +  old_IFS=$IFS
66163 +  for ac_src in php_sybase_ct.c; do
66164
66165 -  ac_cv_crypt_SHA256=no
66166 +      IFS=.
66167 +      set $ac_src
66168 +      ac_obj=$1
66169 +      IFS=$old_IFS
66170 +
66171 +      shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo"
66172
66173 -else
66174 -  cat > conftest.$ac_ext <<EOF
66175 -#line 88159 "configure"
66176 -#include "confdefs.h"
66177 +      case $ac_src in
66178 +        *.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" ;;
66179 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66180 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66181 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
66182 +      esac
66183
66184 -#if HAVE_UNISTD_H
66185 -#include <unistd.h>
66186 -#endif
66187 +    cat >>Makefile.objects<<EOF
66188 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
66189 +       $ac_comp
66190 +EOF
66191 +  done
66192
66193 -#if HAVE_CRYPT_H
66194 -#include <crypt.h>
66195 -#endif
66196 +      case $host_alias in
66197 +        *netware*)
66198 +
66199 +  install_modules="install-modules"
66200
66201 -main() {
66202 -#if HAVE_CRYPT
66203 -    char salt[30], answer[80];
66204 -    salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t';  salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0';
66205 -    strcat(salt,"");
66206 -    strcpy(answer, salt);
66207 -    strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5");
66208 -    exit (strcmp((char *)crypt("foo",salt),answer));
66209 -#else
66210 -       exit(0);
66211 -#endif
66212 -}
66213 -EOF
66214 -if { (eval echo configure:88183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
66215 -then
66216 -
66217 -  ac_cv_crypt_SHA256=yes
66218 +  case $host_alias in
66219 +    *aix*)
66220 +      suffix=so
66221 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsybase_ct.so '$ext_builddir'/phpsybase_ct.so'
66222 +      ;;
66223 +    *netware*)
66224 +      suffix=nlm
66225 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)'
66226 +      ;;
66227 +    *)
66228 +      suffix=la
66229 +      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_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD)'
66230 +      ;;
66231 +  esac
66232
66233 -else
66234 -  echo "configure: failed program was:" >&5
66235 -  cat conftest.$ac_ext >&5
66236 -  rm -fr conftest*
66237 +  if test "x" = "xyes"; then
66238 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix"
66239 +  else
66240 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix"
66241 +  fi
66242
66243 -  ac_cv_crypt_SHA256=no
66244 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
66245
66246 -fi
66247 -rm -fr conftest*
66248 -fi
66249 +  cat >>Makefile.objects<<EOF
66250 +\$(phplibdir)/phpsybase_ct.$suffix: $ext_builddir/phpsybase_ct.$suffix
66251 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsybase_ct.$suffix \$(phplibdir)
66252
66253 -fi
66254 +$ext_builddir/phpsybase_ct.$suffix: \$(shared_objects_sybase_ct) \$(PHPSYBASE_CT_SHARED_DEPENDENCIES)
66255 +       $link_cmd
66256
66257 -echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6
66258 +EOF
66259
66260 +          ;;
66261 +        *)
66262 +
66263 +  install_modules="install-modules"
66264
66265 -if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
66266 +  case $host_alias in
66267 +    *aix*)
66268 +      suffix=so
66269 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(SYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sybase_ct.so '$ext_builddir'/sybase_ct.so'
66270 +      ;;
66271 +    *netware*)
66272 +      suffix=nlm
66273 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYBASE_CT, 3)_SHARED_LIBADD)'
66274 +      ;;
66275 +    *)
66276 +      suffix=la
66277 +      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_sybase_ct) $(SYBASE_CT_SHARED_LIBADD)'
66278 +      ;;
66279 +  esac
66280
66281 -        echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6
66282 -echo "configure:88207: checking whether the compiler supports __alignof__" >&5
66283 -if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then
66284 -  echo $ac_n "(cached) $ac_c" 1>&6
66285 -else
66286 +  if test "x" = "xyes"; then
66287 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sybase_ct.$suffix"
66288 +  else
66289 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix"
66290 +  fi
66291
66292 -  cat > conftest.$ac_ext <<EOF
66293 -#line 88213 "configure"
66294 -#include "confdefs.h"
66295 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
66296
66297 -
66298 -int main() {
66299 +  cat >>Makefile.objects<<EOF
66300 +\$(phplibdir)/sybase_ct.$suffix: $ext_builddir/sybase_ct.$suffix
66301 +       \$(LIBTOOL) --mode=install cp $ext_builddir/sybase_ct.$suffix \$(phplibdir)
66302 +
66303 +$ext_builddir/sybase_ct.$suffix: \$(shared_objects_sybase_ct) \$(SYBASE_CT_SHARED_DEPENDENCIES)
66304 +       $link_cmd
66305
66306 -    int align = __alignof__(int);
66307 -
66308 -; return 0; }
66309  EOF
66310 -if { (eval echo configure:88223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
66311 -  rm -rf conftest*
66312 -
66313 -    ac_cv_alignof_exists=yes
66314 -
66315 -else
66316 -  echo "configure: failed program was:" >&5
66317 -  cat conftest.$ac_ext >&5
66318 -  rm -rf conftest*
66319 -
66320 -    ac_cv_alignof_exists=no
66321 -
66322 -fi
66323 -rm -f conftest*
66324 -fi
66325
66326 -echo "$ac_t""$ac_cv_alignof_exists" 1>&6
66327 -  if test "$ac_cv_alignof_exists" = "yes"; then
66328 -    cat >> confdefs.h <<\EOF
66329 -#define HAVE_ALIGNOF 1
66330 +          ;;
66331 +      esac
66332 +      cat >> confdefs.h <<EOF
66333 +#define COMPILE_DL_SYBASE_CT 1
66334  EOF
66335
66336 +    fi
66337    fi
66338
66339 -        echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6
66340 -echo "configure:88248: checking whether the compiler supports aligned attribute" >&5
66341 -if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then
66342 -  echo $ac_n "(cached) $ac_c" 1>&6
66343 -else
66344 -
66345 -  cat > conftest.$ac_ext <<EOF
66346 -#line 88254 "configure"
66347 -#include "confdefs.h"
66348 -
66349 -
66350 -int main() {
66351 -
66352 -    unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int))));
66353 -
66354 -; return 0; }
66355 -EOF
66356 -if { (eval echo configure:88264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
66357 -  rm -rf conftest*
66358 -
66359 -    ac_cv_attribute_aligned=yes
66360 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
66361 +    PHP_SYBASE_CT_SHARED=no
66362 +    case "$PHP_SAPI" in
66363 +      cgi|embed)
66364 +
66365
66366 -else
66367 -  echo "configure: failed program was:" >&5
66368 -  cat conftest.$ac_ext >&5
66369 -  rm -rf conftest*
66370 +  case ext/sybase_ct in
66371 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
66372 +  /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
66373 +  *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
66374 +  esac
66375
66376 -    ac_cv_attribute_aligned=no
66377
66378 -fi
66379 -rm -f conftest*
66380 -fi
66381 -
66382 -echo "$ac_t""$ac_cv_attribute_aligned" 1>&6
66383 -  if test "$ac_cv_attribute_aligned" = "yes"; then
66384 -    cat >> confdefs.h <<\EOF
66385 -#define HAVE_ATTRIBUTE_ALIGNED 1
66386 -EOF
66387 -
66388 -  fi
66389 -
66390
66391 -  cat >> confdefs.h <<EOF
66392 -#define PHP_USE_PHP_CRYPT_R 1
66393 -EOF
66394 -
66395 -  cat >> confdefs.h <<EOF
66396 -#define PHP_STD_DES_CRYPT 1
66397 -EOF
66398 -
66399 -  cat >> confdefs.h <<EOF
66400 -#define PHP_BLOWFISH_CRYPT 1
66401 -EOF
66402 +  b_c_pre=$php_c_pre
66403 +  b_cxx_pre=$php_cxx_pre
66404 +  b_c_meta=$php_c_meta
66405 +  b_cxx_meta=$php_cxx_meta
66406 +  b_c_post=$php_c_post
66407 +  b_cxx_post=$php_cxx_post
66408 +  b_lo=$php_lo
66409
66410 -  cat >> confdefs.h <<EOF
66411 -#define PHP_EXT_DES_CRYPT 1
66412 -EOF
66413
66414 -  cat >> confdefs.h <<EOF
66415 -#define PHP_MD5_CRYPT 1
66416 -EOF
66417 +  old_IFS=$IFS
66418 +  for ac_src in php_sybase_ct.c; do
66419 +
66420 +      IFS=.
66421 +      set $ac_src
66422 +      ac_obj=$1
66423 +      IFS=$old_IFS
66424 +
66425 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
66426
66427 -  cat >> confdefs.h <<EOF
66428 -#define PHP_SHA512_CRYPT 1
66429 -EOF
66430 +      case $ac_src in
66431 +        *.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" ;;
66432 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66433 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66434 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
66435 +      esac
66436
66437 -  cat >> confdefs.h <<EOF
66438 -#define PHP_SHA256_CRYPT 1
66439 +    cat >>Makefile.objects<<EOF
66440 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
66441 +       $ac_comp
66442  EOF
66443 +  done
66444
66445
66446 +        EXT_STATIC="$EXT_STATIC sybase_ct"
66447 +        ;;
66448 +      *)
66449 +
66450
66451 -
66452 -  case ext/standard in
66453 +  case ext/sybase_ct in
66454    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
66455 -  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
66456 -  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
66457 +  /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
66458 +  *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
66459    esac
66460
66461
66462 @@ -88334,20 +94497,20 @@ EOF
66463
66464
66465    old_IFS=$IFS
66466 -  for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c; do
66467 +  for ac_src in php_sybase_ct.c; do
66468
66469        IFS=.
66470        set $ac_src
66471        ac_obj=$1
66472        IFS=$old_IFS
66473
66474 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
66475 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
66476
66477        case $ac_src in
66478 -        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66479 -        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66480 -        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66481 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
66482 +        *.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" ;;
66483 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66484 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
66485 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
66486        esac
66487
66488      cat >>Makefile.objects<<EOF
66489 @@ -88357,397 +94520,714 @@ EOF
66490    done
66491
66492
66493 -else
66494 -  if test "$ac_cv_crypt_des" = "yes"; then
66495 -    ac_result=1
66496 -    ac_crypt_des=1
66497 -  else
66498 -    ac_result=0
66499 -    ac_crypt_des=0
66500 +        ;;
66501 +    esac
66502 +    EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
66503    fi
66504 -  cat >> confdefs.h <<EOF
66505 -#define PHP_STD_DES_CRYPT $ac_result
66506 -EOF
66507 +
66508 +
66509 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
66510 +
66511
66512
66513 -  if test "$ac_cv_crypt_blowfish" = "yes"; then
66514 -    ac_result=1
66515 -    ac_crypt_blowfish=1
66516 +  if test "$ext_builddir" = "."; then
66517 +    PHP_PECL_EXTENSION=sybase_ct
66518 +
66519 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
66520 +
66521 +  fi
66522 +
66523 +
66524 +  PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD"
66525 +
66526 +
66527 +  if test "$PHP_SYBASE_CT" = "yes"; then
66528 +    SYBASE_CT_INCDIR=/home/sybase/include
66529 +    SYBASE_CT_LIBDIR=/home/sybase/lib
66530    else
66531 -    ac_result=0
66532 -    ac_crypt_blowfish=0
66533 +    SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include
66534 +    SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
66535    fi
66536 -  cat >> confdefs.h <<EOF
66537 -#define PHP_BLOWFISH_CRYPT $ac_result
66538 -EOF
66539
66540 +  if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
66541 +
66542 +  if test "$SYBASE_CT_INCDIR" != "/usr/include"; then
66543 +
66544 +  if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then
66545 +    ai_p=$SYBASE_CT_INCDIR
66546 +  else
66547 +
66548 +    ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
66549 +
66550 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
66551 +    ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`"
66552 +  fi
66553 +
66554 +
66555 +
66556 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
66557 +
66558 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
66559 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
66560 +    eval "INCLUDEPATH$unique=set"
66561 +
66562 +      if test ""; then
66563 +        INCLUDES="-I$ai_p $INCLUDES"
66564 +      else
66565 +        INCLUDES="$INCLUDES -I$ai_p"
66566 +      fi
66567 +
66568 +  fi
66569 +
66570 +  fi
66571
66572 -  if test "$ac_cv_crypt_ext_des" = "yes"; then
66573 -    ac_result=1
66574 -    ac_crypt_edes=1
66575    else
66576 -    ac_result=0
66577 -    ac_crypt_edes=0
66578 +    { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; }
66579 +  fi
66580 +
66581 +
66582 +  if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then
66583 +
66584 +  if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then
66585 +    ai_p=$SYBASE_CT_LIBDIR
66586 +  else
66587 +
66588 +    ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
66589 +
66590 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
66591 +    ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`"
66592 +  fi
66593 +
66594 +
66595 +      if test "$ext_shared" = "yes"; then
66596 +        SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD"
66597 +        test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD"
66598 +      else
66599 +
66600 +
66601 +
66602 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
66603 +
66604 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
66605 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
66606 +    eval "LIBPATH$unique=set"
66607 +
66608 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
66609 +    LDFLAGS="$LDFLAGS -L$ai_p"
66610 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
66611 +
66612    fi
66613 -  cat >> confdefs.h <<EOF
66614 -#define PHP_EXT_DES_CRYPT $ac_result
66615 -EOF
66616
66617
66618 -  if test "$ac_cv_crypt_md5" = "yes"; then
66619 -    ac_result=1
66620 -    ac_crypt_md5=1
66621 +      fi
66622 +
66623 +  fi
66624 +
66625 +  if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
66626 +
66627 +
66628 +  case ct in
66629 +  c|c_r|pthread*) ;;
66630 +  *)
66631 +    if test "$ext_shared" = "yes"; then
66632 +        SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
66633 +    else
66634 +
66635 +
66636 +  case ct in
66637 +  c|c_r|pthread*) ;;
66638 +  *)
66639 +      LIBS="-lct $LIBS"
66640 +   ;;
66641 +  esac
66642 +
66643 +
66644 +    fi
66645 +   ;;
66646 +  esac
66647 +
66648 +
66649 +    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
66650 +  elif test -f $SYBASE_CT_INCDIR/libsybct64.so; then
66651 +
66652 +
66653 +  case sybcs64 in
66654 +  c|c_r|pthread*) ;;
66655 +  *)
66656 +    if test "$ext_shared" = "yes"; then
66657 +        SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD"
66658 +    else
66659 +
66660 +
66661 +  case sybcs64 in
66662 +  c|c_r|pthread*) ;;
66663 +  *)
66664 +      LIBS="-lsybcs64 $LIBS"
66665 +   ;;
66666 +  esac
66667 +
66668 +
66669 +    fi
66670 +   ;;
66671 +  esac
66672 +
66673 +
66674 +
66675 +
66676 +  case sybct64 in
66677 +  c|c_r|pthread*) ;;
66678 +  *)
66679 +    if test "$ext_shared" = "yes"; then
66680 +        SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD"
66681 +    else
66682 +
66683 +
66684 +  case sybct64 in
66685 +  c|c_r|pthread*) ;;
66686 +  *)
66687 +      LIBS="-lsybct64 $LIBS"
66688 +   ;;
66689 +  esac
66690 +
66691 +
66692 +    fi
66693 +   ;;
66694 +  esac
66695 +
66696 +
66697 +
66698 +
66699 +  case sybcomn64 in
66700 +  c|c_r|pthread*) ;;
66701 +  *)
66702 +    if test "$ext_shared" = "yes"; then
66703 +        SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD"
66704 +    else
66705 +
66706 +
66707 +  case sybcomn64 in
66708 +  c|c_r|pthread*) ;;
66709 +  *)
66710 +      LIBS="-lsybcomn64 $LIBS"
66711 +   ;;
66712 +  esac
66713 +
66714 +
66715 +    fi
66716 +   ;;
66717 +  esac
66718 +
66719 +
66720 +
66721 +
66722 +  case sybintl64 in
66723 +  c|c_r|pthread*) ;;
66724 +  *)
66725 +    if test "$ext_shared" = "yes"; then
66726 +        SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD"
66727 +    else
66728 +
66729 +
66730 +  case sybintl64 in
66731 +  c|c_r|pthread*) ;;
66732 +  *)
66733 +      LIBS="-lsybintl64 $LIBS"
66734 +   ;;
66735 +  esac
66736 +
66737 +
66738 +    fi
66739 +   ;;
66740 +  esac
66741 +
66742 +
66743 +
66744 +    ac_solid_uname_s=`uname -s 2>/dev/null`
66745 +    case $ac_solid_uname_s in
66746 +      *OSF*)                            ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define
66747 +      *) CFLAGS="${CFLAGS} -DSYB_LP64"  ;; #
66748 +    esac
66749 +    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64"
66750 +
66751 +
66752 +  save_old_LDFLAGS=$LDFLAGS
66753 +  ac_stuff="
66754 +      $SYBASE_CT_LIBS
66755 +    "
66756 +
66757 +  save_ext_shared=$ext_shared
66758 +  ext_shared=yes
66759 +
66760 +  for ac_i in $ac_stuff; do
66761 +    case $ac_i in
66762 +    -pthread)
66763 +      if test "$ext_shared" = "yes"; then
66764 +        LDFLAGS="$LDFLAGS -pthread"
66765 +      else
66766 +
66767 +
66768 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
66769 +
66770 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
66771 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
66772 +    eval "EXTRA_LDFLAGS$unique=set"
66773 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
66774 +  fi
66775 +
66776 +      fi
66777 +    ;;
66778 +    -l*)
66779 +      ac_ii=`echo $ac_i|cut -c 3-`
66780 +
66781 +
66782 +  case $ac_ii in
66783 +  c|c_r|pthread*) ;;
66784 +  *)
66785 +    if test "$ext_shared" = "yes"; then
66786 +        LDFLAGS="$LDFLAGS -l$ac_ii"
66787 +    else
66788 +
66789 +
66790 +  case $ac_ii in
66791 +  c|c_r|pthread*) ;;
66792 +  *)
66793 +      LIBS="$LIBS -l$ac_ii"
66794 +   ;;
66795 +  esac
66796 +
66797 +
66798 +    fi
66799 +   ;;
66800 +  esac
66801 +
66802 +
66803 +    ;;
66804 +    -L*)
66805 +      ac_ii=`echo $ac_i|cut -c 3-`
66806 +
66807 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
66808 +
66809 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
66810 +    ai_p=$ac_ii
66811    else
66812 -    ac_result=0
66813 -    ac_crypt_md5=0
66814 +
66815 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
66816 +
66817 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
66818 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
66819    fi
66820 -  cat >> confdefs.h <<EOF
66821 -#define PHP_MD5_CRYPT $ac_result
66822 -EOF
66823 +
66824 +
66825 +      if test "$ext_shared" = "yes"; then
66826 +        LDFLAGS="-L$ai_p $LDFLAGS"
66827 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
66828 +      else
66829 +
66830
66831
66832 -  if test "$ac_cv_crypt_sha512" = "yes"; then
66833 -    ac_result=1
66834 -    ac_crypt_sha512=1
66835 -  else
66836 -    ac_result=0
66837 -    ac_crypt_sha512=0
66838 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
66839 +
66840 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
66841 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
66842 +    eval "LIBPATH$unique=set"
66843 +
66844 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
66845 +    LDFLAGS="$LDFLAGS -L$ai_p"
66846 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
66847 +
66848    fi
66849 -  cat >> confdefs.h <<EOF
66850 -#define PHP_SHA512_CRYPT $ac_result
66851 -EOF
66852
66853
66854 -  if test "$ac_cv_crypt_sha256" = "yes"; then
66855 -    ac_result=1
66856 -    ac_crypt_sha256=1
66857 -  else
66858 -    ac_result=0
66859 -    ac_crypt_sha256=0
66860 +      fi
66861 +
66862    fi
66863 -  cat >> confdefs.h <<EOF
66864 -#define PHP_SHA256_CRYPT $ac_result
66865 -EOF
66866 -
66867 -
66868 -  cat >> confdefs.h <<EOF
66869 -#define PHP_USE_PHP_CRYPT_R 0
66870 -EOF
66871
66872 -fi
66873 +    ;;
66874 +    esac
66875 +  done
66876
66877 -for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy
66878 -do
66879 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
66880 -echo "configure:88443: checking for $ac_func" >&5
66881 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
66882 +  echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6
66883 +echo "configure:94851: checking for netg_errstr in -lsybtcl64" >&5
66884 +ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'`
66885 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
66886    echo $ac_n "(cached) $ac_c" 1>&6
66887  else
66888 -  cat > conftest.$ac_ext <<EOF
66889 -#line 88448 "configure"
66890 +  ac_save_LIBS="$LIBS"
66891 +LIBS="-lsybtcl64  $LIBS"
66892 +cat > conftest.$ac_ext <<EOF
66893 +#line 94859 "configure"
66894  #include "confdefs.h"
66895 -/* System header to define __stub macros and hopefully few prototypes,
66896 -    which can conflict with char $ac_func(); below.  */
66897 -#include <assert.h>
66898  /* Override any gcc2 internal prototype to avoid an error.  */
66899  /* We use char because int might match the return type of a gcc2
66900      builtin and then its argument prototype would still apply.  */
66901 -char $ac_func();
66902 +char netg_errstr();
66903
66904  int main() {
66905 -
66906 -/* The GNU C library defines this for functions which it implements
66907 -    to always fail with ENOSYS.  Some functions are actually named
66908 -    something starting with __ and the normal name is an alias.  */
66909 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
66910 -choke me
66911 -#else
66912 -$ac_func();
66913 -#endif
66914 -
66915 +netg_errstr()
66916  ; return 0; }
66917  EOF
66918 -if { (eval echo configure:88471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
66919 +if { (eval echo configure:94870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
66920    rm -rf conftest*
66921 -  eval "ac_cv_func_$ac_func=yes"
66922 +  eval "ac_cv_lib_$ac_lib_var=yes"
66923  else
66924    echo "configure: failed program was:" >&5
66925    cat conftest.$ac_ext >&5
66926    rm -rf conftest*
66927 -  eval "ac_cv_func_$ac_func=no"
66928 +  eval "ac_cv_lib_$ac_lib_var=no"
66929  fi
66930  rm -f conftest*
66931 -fi
66932 +LIBS="$ac_save_LIBS"
66933
66934 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
66935 +fi
66936 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
66937    echo "$ac_t""yes" 1>&6
66938 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
66939 -  cat >> confdefs.h <<EOF
66940 -#define $ac_tr_func 1
66941 -EOF
66942 -
66943 +
66944 +    LDFLAGS=$save_old_LDFLAGS
66945 +    ext_shared=$save_ext_shared
66946 +
66947 +
66948 +
66949 +  case sybtcl64 in
66950 +  c|c_r|pthread*) ;;
66951 +  *)
66952 +    if test "$ext_shared" = "yes"; then
66953 +        SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
66954 +    else
66955 +
66956 +
66957 +  case sybtcl64 in
66958 +  c|c_r|pthread*) ;;
66959 +  *)
66960 +      LIBS="-lsybtcl64 $LIBS"
66961 +   ;;
66962 +  esac
66963 +
66964 +
66965 +    fi
66966 +   ;;
66967 +  esac
66968 +
66969 +
66970 +
66971 +
66972  else
66973    echo "$ac_t""no" 1>&6
66974 -fi
66975 -done
66976
66977 -echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
66978 -echo "configure:88496: checking for working fnmatch" >&5
66979 -if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
66980 -  echo $ac_n "(cached) $ac_c" 1>&6
66981 -else
66982 -  # Some versions of Solaris or SCO have a broken fnmatch function.
66983 -# So we run a test program.  If we are cross-compiling, take no chance.
66984 -# Thanks to John Oleynick and Franc,ois Pinard for this test.
66985 -if test "$cross_compiling" = yes; then
66986 -  ac_cv_func_fnmatch_works=no
66987 -else
66988 -  cat > conftest.$ac_ext <<EOF
66989 -#line 88507 "configure"
66990 -#include "confdefs.h"
66991 -main() { exit (fnmatch ("a*", "abc", 0) != 0); }
66992 -EOF
66993 -if { (eval echo configure:88511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
66994 -then
66995 -  ac_cv_func_fnmatch_works=yes
66996 -else
66997 -  echo "configure: failed program was:" >&5
66998 -  cat conftest.$ac_ext >&5
66999 -  rm -fr conftest*
67000 -  ac_cv_func_fnmatch_works=no
67001 -fi
67002 -rm -fr conftest*
67003 -fi
67004 +    LDFLAGS=$save_old_LDFLAGS
67005 +    ext_shared=$save_ext_shared
67006 +    unset ac_cv_lib_sybtcl64_netg_errstr
67007 +
67008 +
67009 +
67010 +  case sybtcl64 in
67011 +  c|c_r|pthread*) ;;
67012 +  *)
67013 +    if test "$ext_shared" = "yes"; then
67014 +        SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
67015 +    else
67016 +
67017 +
67018 +  case sybtcl64 in
67019 +  c|c_r|pthread*) ;;
67020 +  *)
67021 +      LIBS="-lsybtcl64 $LIBS"
67022 +   ;;
67023 +  esac
67024
67025 -fi
67026
67027 -echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6
67028 -if test $ac_cv_func_fnmatch_works = yes; then
67029 -  cat >> confdefs.h <<\EOF
67030 -#define HAVE_FNMATCH 1
67031 -EOF
67032 +    fi
67033 +   ;;
67034 +  esac
67035 +
67036
67037 +
67038 +
67039  fi
67040 -
67041
67042 +
67043 +
67044 +  save_old_LDFLAGS=$LDFLAGS
67045 +  ac_stuff="-L$SYBASE_CT_LIBDIR"
67046 +
67047 +  save_ext_shared=$ext_shared
67048 +  ext_shared=yes
67049 +
67050 +  for ac_i in $ac_stuff; do
67051 +    case $ac_i in
67052 +    -pthread)
67053 +      if test "$ext_shared" = "yes"; then
67054 +        LDFLAGS="$LDFLAGS -pthread"
67055 +      else
67056 +
67057 +
67058 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
67059 +
67060 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
67061 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
67062 +    eval "EXTRA_LDFLAGS$unique=set"
67063 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
67064 +  fi
67065 +
67066 +      fi
67067 +    ;;
67068 +    -l*)
67069 +      ac_ii=`echo $ac_i|cut -c 3-`
67070 +
67071 +
67072 +  case $ac_ii in
67073 +  c|c_r|pthread*) ;;
67074 +  *)
67075 +    if test "$ext_shared" = "yes"; then
67076 +        LDFLAGS="$LDFLAGS -l$ac_ii"
67077 +    else
67078 +
67079 +
67080 +  case $ac_ii in
67081 +  c|c_r|pthread*) ;;
67082 +  *)
67083 +      LIBS="$LIBS -l$ac_ii"
67084 +   ;;
67085 +  esac
67086
67087 -for ac_func in fork CreateProcess
67088 -do
67089 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
67090 -echo "configure:88538: checking for $ac_func" >&5
67091 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
67092 +
67093 +    fi
67094 +   ;;
67095 +  esac
67096 +
67097 +
67098 +    ;;
67099 +    -L*)
67100 +      ac_ii=`echo $ac_i|cut -c 3-`
67101 +
67102 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
67103 +
67104 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
67105 +    ai_p=$ac_ii
67106 +  else
67107 +
67108 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
67109 +
67110 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
67111 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
67112 +  fi
67113 +
67114 +
67115 +      if test "$ext_shared" = "yes"; then
67116 +        LDFLAGS="-L$ai_p $LDFLAGS"
67117 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
67118 +      else
67119 +
67120 +
67121 +
67122 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
67123 +
67124 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
67125 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
67126 +    eval "LIBPATH$unique=set"
67127 +
67128 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
67129 +    LDFLAGS="$LDFLAGS -L$ai_p"
67130 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
67131 +
67132 +  fi
67133 +
67134 +
67135 +      fi
67136 +
67137 +  fi
67138 +
67139 +    ;;
67140 +    esac
67141 +  done
67142 +
67143 +  echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6
67144 +echo "configure:95045: checking for insck__getVdate in -linsck64" >&5
67145 +ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'`
67146 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
67147    echo $ac_n "(cached) $ac_c" 1>&6
67148  else
67149 -  cat > conftest.$ac_ext <<EOF
67150 -#line 88543 "configure"
67151 +  ac_save_LIBS="$LIBS"
67152 +LIBS="-linsck64  $LIBS"
67153 +cat > conftest.$ac_ext <<EOF
67154 +#line 95053 "configure"
67155  #include "confdefs.h"
67156 -/* System header to define __stub macros and hopefully few prototypes,
67157 -    which can conflict with char $ac_func(); below.  */
67158 -#include <assert.h>
67159  /* Override any gcc2 internal prototype to avoid an error.  */
67160  /* We use char because int might match the return type of a gcc2
67161      builtin and then its argument prototype would still apply.  */
67162 -char $ac_func();
67163 +char insck__getVdate();
67164
67165  int main() {
67166 -
67167 -/* The GNU C library defines this for functions which it implements
67168 -    to always fail with ENOSYS.  Some functions are actually named
67169 -    something starting with __ and the normal name is an alias.  */
67170 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
67171 -choke me
67172 -#else
67173 -$ac_func();
67174 -#endif
67175 -
67176 +insck__getVdate()
67177  ; return 0; }
67178  EOF
67179 -if { (eval echo configure:88566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67180 +if { (eval echo configure:95064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67181    rm -rf conftest*
67182 -  eval "ac_cv_func_$ac_func=yes"
67183 +  eval "ac_cv_lib_$ac_lib_var=yes"
67184  else
67185    echo "configure: failed program was:" >&5
67186    cat conftest.$ac_ext >&5
67187    rm -rf conftest*
67188 -  eval "ac_cv_func_$ac_func=no"
67189 +  eval "ac_cv_lib_$ac_lib_var=no"
67190  fi
67191  rm -f conftest*
67192 -fi
67193 +LIBS="$ac_save_LIBS"
67194
67195 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
67196 +fi
67197 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
67198    echo "$ac_t""yes" 1>&6
67199 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
67200 -  cat >> confdefs.h <<EOF
67201 -#define $ac_tr_func 1
67202 -EOF
67203 -
67204 -  php_can_support_proc_open=yes
67205 -  break
67206 +
67207 +    LDFLAGS=$save_old_LDFLAGS
67208 +    ext_shared=$save_ext_shared
67209 +
67210 +
67211 +  case insck64 in
67212 +  c|c_r|pthread*) ;;
67213 +  *)
67214 +    if test "$ext_shared" = "yes"; then
67215 +        SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
67216 +    else
67217 +
67218 +
67219 +  case insck64 in
67220 +  c|c_r|pthread*) ;;
67221 +  *)
67222 +      LIBS="-linsck64 $LIBS"
67223 +   ;;
67224 +  esac
67225
67226 -else
67227 -  echo "$ac_t""no" 1>&6
67228 -php_can_support_proc_open=no
67229
67230 -fi
67231 -done
67232 +    fi
67233 +   ;;
67234 +  esac
67235
67236 -echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6
67237 -echo "configure:88596: checking if your OS can spawn processes with inherited handles" >&5
67238 -if test "$php_can_support_proc_open" = "yes"; then
67239 -  echo "$ac_t""yes" 1>&6
67240 -  cat >> confdefs.h <<\EOF
67241 -#define PHP_CAN_SUPPORT_PROC_OPEN 1
67242 -EOF
67243
67244 +
67245  else
67246    echo "$ac_t""no" 1>&6
67247 -fi
67248 -
67249 -if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then
67250 -  cat >> confdefs.h <<\EOF
67251 -#define ENABLE_CHROOT_FUNC 1
67252 -EOF
67253
67254 +    LDFLAGS=$save_old_LDFLAGS
67255 +    ext_shared=$save_ext_shared
67256 +    unset ac_cv_lib_insck64_insck__getVdate
67257 +
67258 +
67259  fi
67260
67261 -
67262 -  unset ac_cv_func_res_nsearch
67263 -  unset ac_cv_func___res_nsearch
67264 -  unset found
67265 +
67266 +  save_old_LDFLAGS=$LDFLAGS
67267 +  ac_stuff="-L$SYBASE_CT_LIBDIR"
67268
67269 -  echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6
67270 -echo "configure:88620: checking for res_nsearch" >&5
67271 -if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then
67272 -  echo $ac_n "(cached) $ac_c" 1>&6
67273 -else
67274 -  cat > conftest.$ac_ext <<EOF
67275 -#line 88625 "configure"
67276 -#include "confdefs.h"
67277 -/* System header to define __stub macros and hopefully few prototypes,
67278 -    which can conflict with char res_nsearch(); below.  */
67279 -#include <assert.h>
67280 -/* Override any gcc2 internal prototype to avoid an error.  */
67281 -/* We use char because int might match the return type of a gcc2
67282 -    builtin and then its argument prototype would still apply.  */
67283 -char res_nsearch();
67284 -
67285 -int main() {
67286 +  save_ext_shared=$ext_shared
67287 +  ext_shared=yes
67288 +
67289 +  for ac_i in $ac_stuff; do
67290 +    case $ac_i in
67291 +    -pthread)
67292 +      if test "$ext_shared" = "yes"; then
67293 +        LDFLAGS="$LDFLAGS -pthread"
67294 +      else
67295 +
67296 +
67297 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
67298 +
67299 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
67300 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
67301 +    eval "EXTRA_LDFLAGS$unique=set"
67302 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
67303 +  fi
67304
67305 -/* The GNU C library defines this for functions which it implements
67306 -    to always fail with ENOSYS.  Some functions are actually named
67307 -    something starting with __ and the normal name is an alias.  */
67308 -#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch)
67309 -choke me
67310 -#else
67311 -res_nsearch();
67312 -#endif
67313 +      fi
67314 +    ;;
67315 +    -l*)
67316 +      ac_ii=`echo $ac_i|cut -c 3-`
67317 +
67318 +
67319 +  case $ac_ii in
67320 +  c|c_r|pthread*) ;;
67321 +  *)
67322 +    if test "$ext_shared" = "yes"; then
67323 +        LDFLAGS="$LDFLAGS -l$ac_ii"
67324 +    else
67325 +
67326 +
67327 +  case $ac_ii in
67328 +  c|c_r|pthread*) ;;
67329 +  *)
67330 +      LIBS="$LIBS -l$ac_ii"
67331 +   ;;
67332 +  esac
67333
67334 -; return 0; }
67335 -EOF
67336 -if { (eval echo configure:88648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67337 -  rm -rf conftest*
67338 -  eval "ac_cv_func_res_nsearch=yes"
67339 -else
67340 -  echo "configure: failed program was:" >&5
67341 -  cat conftest.$ac_ext >&5
67342 -  rm -rf conftest*
67343 -  eval "ac_cv_func_res_nsearch=no"
67344 -fi
67345 -rm -f conftest*
67346 -fi
67347
67348 -if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then
67349 -  echo "$ac_t""yes" 1>&6
67350 -  found=yes
67351 -else
67352 -  echo "$ac_t""no" 1>&6
67353 - echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6
67354 -echo "configure:88666: checking for __res_nsearch" >&5
67355 -if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then
67356 -  echo $ac_n "(cached) $ac_c" 1>&6
67357 -else
67358 -  cat > conftest.$ac_ext <<EOF
67359 -#line 88671 "configure"
67360 -#include "confdefs.h"
67361 -/* System header to define __stub macros and hopefully few prototypes,
67362 -    which can conflict with char __res_nsearch(); below.  */
67363 -#include <assert.h>
67364 -/* Override any gcc2 internal prototype to avoid an error.  */
67365 -/* We use char because int might match the return type of a gcc2
67366 -    builtin and then its argument prototype would still apply.  */
67367 -char __res_nsearch();
67368 +    fi
67369 +   ;;
67370 +  esac
67371
67372 -int main() {
67373
67374 -/* The GNU C library defines this for functions which it implements
67375 -    to always fail with ENOSYS.  Some functions are actually named
67376 -    something starting with __ and the normal name is an alias.  */
67377 -#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch)
67378 -choke me
67379 -#else
67380 -__res_nsearch();
67381 -#endif
67382 +    ;;
67383 +    -L*)
67384 +      ac_ii=`echo $ac_i|cut -c 3-`
67385 +
67386 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
67387 +
67388 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
67389 +    ai_p=$ac_ii
67390 +  else
67391 +
67392 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
67393 +
67394 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
67395 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
67396 +  fi
67397
67398 -; return 0; }
67399 -EOF
67400 -if { (eval echo configure:88694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67401 -  rm -rf conftest*
67402 -  eval "ac_cv_func___res_nsearch=yes"
67403 -else
67404 -  echo "configure: failed program was:" >&5
67405 -  cat conftest.$ac_ext >&5
67406 -  rm -rf conftest*
67407 -  eval "ac_cv_func___res_nsearch=no"
67408 -fi
67409 -rm -f conftest*
67410 -fi
67411 +
67412 +      if test "$ext_shared" = "yes"; then
67413 +        LDFLAGS="-L$ai_p $LDFLAGS"
67414 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
67415 +      else
67416 +
67417 +
67418 +
67419 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
67420 +
67421 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
67422 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
67423 +    eval "LIBPATH$unique=set"
67424 +
67425 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
67426 +    LDFLAGS="$LDFLAGS -L$ai_p"
67427 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
67428 +
67429 +  fi
67430
67431 -if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then
67432 -  echo "$ac_t""yes" 1>&6
67433 -  found=yes
67434 -else
67435 -  echo "$ac_t""no" 1>&6
67436 -found=no
67437 -fi
67438 -
67439 -fi
67440
67441 +      fi
67442 +
67443 +  fi
67444
67445 -  case $found in
67446 -  yes)
67447 -    cat >> confdefs.h <<\EOF
67448 -#define HAVE_RES_NSEARCH 1
67449 -EOF
67450 +    ;;
67451 +    esac
67452 +  done
67453
67454 -    ac_cv_func_res_nsearch=yes
67455 -  ;;
67456 -
67457 -    *)
67458 -
67459 -  unset ac_cv_lib_resolv_res_nsearch
67460 -  unset ac_cv_lib_resolv___res_nsearch
67461 -  unset found
67462 -  echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6
67463 -echo "configure:88732: checking for res_nsearch in -lresolv" >&5
67464 -ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'`
67465 +  echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6
67466 +echo "configure:95212: checking for bsd_tcp in -linsck64" >&5
67467 +ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'`
67468  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
67469    echo $ac_n "(cached) $ac_c" 1>&6
67470  else
67471    ac_save_LIBS="$LIBS"
67472 -LIBS="-lresolv  $LIBS"
67473 +LIBS="-linsck64  $LIBS"
67474  cat > conftest.$ac_ext <<EOF
67475 -#line 88740 "configure"
67476 +#line 95220 "configure"
67477  #include "confdefs.h"
67478  /* Override any gcc2 internal prototype to avoid an error.  */
67479  /* We use char because int might match the return type of a gcc2
67480      builtin and then its argument prototype would still apply.  */
67481 -char res_nsearch();
67482 +char bsd_tcp();
67483
67484  int main() {
67485 -res_nsearch()
67486 +bsd_tcp()
67487  ; return 0; }
67488  EOF
67489 -if { (eval echo configure:88751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67490 +if { (eval echo configure:95231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67491    rm -rf conftest*
67492    eval "ac_cv_lib_$ac_lib_var=yes"
67493  else
67494 @@ -88762,167 +95242,257 @@ LIBS="$ac_save_LIBS"
67495  fi
67496  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
67497    echo "$ac_t""yes" 1>&6
67498 -  found=yes
67499 -else
67500 -  echo "$ac_t""no" 1>&6
67501 +
67502 +    LDFLAGS=$save_old_LDFLAGS
67503 +    ext_shared=$save_ext_shared
67504 +
67505 +
67506 +  case insck64 in
67507 +  c|c_r|pthread*) ;;
67508 +  *)
67509 +    if test "$ext_shared" = "yes"; then
67510 +        SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
67511 +    else
67512 +
67513 +
67514 +  case insck64 in
67515 +  c|c_r|pthread*) ;;
67516 +  *)
67517 +      LIBS="-linsck64 $LIBS"
67518 +   ;;
67519 +  esac
67520
67521 -    echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6
67522 -echo "configure:88771: checking for __res_nsearch in -lresolv" >&5
67523 -ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'`
67524 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
67525 -  echo $ac_n "(cached) $ac_c" 1>&6
67526 -else
67527 -  ac_save_LIBS="$LIBS"
67528 -LIBS="-lresolv  $LIBS"
67529 -cat > conftest.$ac_ext <<EOF
67530 -#line 88779 "configure"
67531 -#include "confdefs.h"
67532 -/* Override any gcc2 internal prototype to avoid an error.  */
67533 -/* We use char because int might match the return type of a gcc2
67534 -    builtin and then its argument prototype would still apply.  */
67535 -char __res_nsearch();
67536
67537 -int main() {
67538 -__res_nsearch()
67539 -; return 0; }
67540 -EOF
67541 -if { (eval echo configure:88790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67542 -  rm -rf conftest*
67543 -  eval "ac_cv_lib_$ac_lib_var=yes"
67544 -else
67545 -  echo "configure: failed program was:" >&5
67546 -  cat conftest.$ac_ext >&5
67547 -  rm -rf conftest*
67548 -  eval "ac_cv_lib_$ac_lib_var=no"
67549 -fi
67550 -rm -f conftest*
67551 -LIBS="$ac_save_LIBS"
67552 +    fi
67553 +   ;;
67554 +  esac
67555
67556 -fi
67557 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
67558 -  echo "$ac_t""yes" 1>&6
67559 -  found=yes
67560 +
67561 +
67562  else
67563    echo "$ac_t""no" 1>&6
67564 -found=no
67565 -fi
67566
67567 +    LDFLAGS=$save_old_LDFLAGS
67568 +    ext_shared=$save_ext_shared
67569 +    unset ac_cv_lib_insck64_bsd_tcp
67570 +
67571
67572  fi
67573
67574 +  elif test -f $SYBASE_CT_INCDIR/libsybct.so; then
67575 +
67576 +
67577 +  case sybcs in
67578 +  c|c_r|pthread*) ;;
67579 +  *)
67580 +    if test "$ext_shared" = "yes"; then
67581 +        SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD"
67582 +    else
67583 +
67584 +
67585 +  case sybcs in
67586 +  c|c_r|pthread*) ;;
67587 +  *)
67588 +      LIBS="-lsybcs $LIBS"
67589 +   ;;
67590 +  esac
67591
67592 -  if test "$found" = "yes"; then
67593 -    ac_libs=$LIBS
67594 -    LIBS="$LIBS -lresolv"
67595 -    if test "$cross_compiling" = yes; then
67596 -  found=no
67597 -else
67598 -  cat > conftest.$ac_ext <<EOF
67599 -#line 88822 "configure"
67600 -#include "confdefs.h"
67601 -main() { return (0); }
67602 -EOF
67603 -if { (eval echo configure:88826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
67604 -then
67605 -  found=yes
67606 -else
67607 -  echo "configure: failed program was:" >&5
67608 -  cat conftest.$ac_ext >&5
67609 -  rm -fr conftest*
67610 -  found=no
67611 -fi
67612 -rm -fr conftest*
67613 -fi
67614
67615 -    LIBS=$ac_libs
67616 -  fi
67617 +    fi
67618 +   ;;
67619 +  esac
67620 +
67621
67622 -  if test "$found" = "yes"; then
67623
67624
67625 -  case resolv in
67626 +  case sybct in
67627    c|c_r|pthread*) ;;
67628    *)
67629 -      LIBS="-lresolv $LIBS"
67630 +    if test "$ext_shared" = "yes"; then
67631 +        SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD"
67632 +    else
67633 +
67634 +
67635 +  case sybct in
67636 +  c|c_r|pthread*) ;;
67637 +  *)
67638 +      LIBS="-lsybct $LIBS"
67639     ;;
67640    esac
67641
67642
67643 -    cat >> confdefs.h <<\EOF
67644 -#define HAVE_RES_NSEARCH 1
67645 -EOF
67646 +    fi
67647 +   ;;
67648 +  esac
67649
67650 -    cat >> confdefs.h <<\EOF
67651 -#define HAVE_LIBRESOLV 1
67652 -EOF
67653
67654 -    ac_cv_func_res_nsearch=yes
67655 +
67656 +
67657 +  case sybcomn in
67658 +  c|c_r|pthread*) ;;
67659 +  *)
67660 +    if test "$ext_shared" = "yes"; then
67661 +        SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD"
67662 +    else
67663 +
67664 +
67665 +  case sybcomn in
67666 +  c|c_r|pthread*) ;;
67667 +  *)
67668 +      LIBS="-lsybcomn $LIBS"
67669 +   ;;
67670 +  esac
67671 +
67672 +
67673 +    fi
67674 +   ;;
67675 +  esac
67676 +
67677 +
67678 +
67679 +
67680 +  case sybintl in
67681 +  c|c_r|pthread*) ;;
67682 +  *)
67683 +    if test "$ext_shared" = "yes"; then
67684 +        SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD"
67685 +    else
67686 +
67687 +
67688 +  case sybintl in
67689 +  c|c_r|pthread*) ;;
67690 +  *)
67691 +      LIBS="-lsybintl $LIBS"
67692 +   ;;
67693 +  esac
67694 +
67695 +
67696 +    fi
67697 +   ;;
67698 +  esac
67699 +
67700 +
67701 +
67702 +    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl"
67703 +
67704 +
67705 +  save_old_LDFLAGS=$LDFLAGS
67706 +  ac_stuff="
67707 +      $SYBASE_CT_LIBS
67708 +    "
67709 +
67710 +  save_ext_shared=$ext_shared
67711 +  ext_shared=yes
67712 +
67713 +  for ac_i in $ac_stuff; do
67714 +    case $ac_i in
67715 +    -pthread)
67716 +      if test "$ext_shared" = "yes"; then
67717 +        LDFLAGS="$LDFLAGS -pthread"
67718 +      else
67719 +
67720 +
67721 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
67722 +
67723 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
67724 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
67725 +    eval "EXTRA_LDFLAGS$unique=set"
67726 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
67727 +  fi
67728 +
67729 +      fi
67730 +    ;;
67731 +    -l*)
67732 +      ac_ii=`echo $ac_i|cut -c 3-`
67733 +
67734 +
67735 +  case $ac_ii in
67736 +  c|c_r|pthread*) ;;
67737 +  *)
67738 +    if test "$ext_shared" = "yes"; then
67739 +        LDFLAGS="$LDFLAGS -l$ac_ii"
67740 +    else
67741 +
67742 +
67743 +  case $ac_ii in
67744 +  c|c_r|pthread*) ;;
67745 +  *)
67746 +      LIBS="$LIBS -l$ac_ii"
67747 +   ;;
67748 +  esac
67749 +
67750 +
67751 +    fi
67752 +   ;;
67753 +  esac
67754 +
67755 +
67756 +    ;;
67757 +    -L*)
67758 +      ac_ii=`echo $ac_i|cut -c 3-`
67759 +
67760 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
67761 +
67762 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
67763 +    ai_p=$ac_ii
67764    else
67765
67766 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
67767 +
67768 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
67769 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
67770 +  fi
67771 +
67772 +
67773 +      if test "$ext_shared" = "yes"; then
67774 +        LDFLAGS="-L$ai_p $LDFLAGS"
67775 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
67776 +      else
67777 +
67778
67779 -  unset ac_cv_lib_bind_res_nsearch
67780 -  unset ac_cv_lib_bind___res_nsearch
67781 -  unset found
67782 -  echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6
67783 -echo "configure:88868: checking for res_nsearch in -lbind" >&5
67784 -ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'`
67785 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
67786 -  echo $ac_n "(cached) $ac_c" 1>&6
67787 -else
67788 -  ac_save_LIBS="$LIBS"
67789 -LIBS="-lbind  $LIBS"
67790 -cat > conftest.$ac_ext <<EOF
67791 -#line 88876 "configure"
67792 -#include "confdefs.h"
67793 -/* Override any gcc2 internal prototype to avoid an error.  */
67794 -/* We use char because int might match the return type of a gcc2
67795 -    builtin and then its argument prototype would still apply.  */
67796 -char res_nsearch();
67797 +
67798 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
67799 +
67800 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
67801 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
67802 +    eval "LIBPATH$unique=set"
67803 +
67804 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
67805 +    LDFLAGS="$LDFLAGS -L$ai_p"
67806 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
67807 +
67808 +  fi
67809
67810 -int main() {
67811 -res_nsearch()
67812 -; return 0; }
67813 -EOF
67814 -if { (eval echo configure:88887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67815 -  rm -rf conftest*
67816 -  eval "ac_cv_lib_$ac_lib_var=yes"
67817 -else
67818 -  echo "configure: failed program was:" >&5
67819 -  cat conftest.$ac_ext >&5
67820 -  rm -rf conftest*
67821 -  eval "ac_cv_lib_$ac_lib_var=no"
67822 -fi
67823 -rm -f conftest*
67824 -LIBS="$ac_save_LIBS"
67825
67826 -fi
67827 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
67828 -  echo "$ac_t""yes" 1>&6
67829 -  found=yes
67830 -else
67831 -  echo "$ac_t""no" 1>&6
67832 +      fi
67833 +
67834 +  fi
67835
67836 -    echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6
67837 -echo "configure:88907: checking for __res_nsearch in -lbind" >&5
67838 -ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'`
67839 +    ;;
67840 +    esac
67841 +  done
67842 +
67843 +  echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6
67844 +echo "configure:95477: checking for netg_errstr in -lsybtcl" >&5
67845 +ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'`
67846  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
67847    echo $ac_n "(cached) $ac_c" 1>&6
67848  else
67849    ac_save_LIBS="$LIBS"
67850 -LIBS="-lbind  $LIBS"
67851 +LIBS="-lsybtcl  $LIBS"
67852  cat > conftest.$ac_ext <<EOF
67853 -#line 88915 "configure"
67854 +#line 95485 "configure"
67855  #include "confdefs.h"
67856  /* Override any gcc2 internal prototype to avoid an error.  */
67857  /* We use char because int might match the return type of a gcc2
67858      builtin and then its argument prototype would still apply.  */
67859 -char __res_nsearch();
67860 +char netg_errstr();
67861
67862  int main() {
67863 -__res_nsearch()
67864 +netg_errstr()
67865  ; return 0; }
67866  EOF
67867 -if { (eval echo configure:88926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67868 +if { (eval echo configure:95496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
67869    rm -rf conftest*
67870    eval "ac_cv_lib_$ac_lib_var=yes"
67871  else
67872 @@ -88937,89 +95507,186 @@ LIBS="$ac_save_LIBS"
67873  fi
67874  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
67875    echo "$ac_t""yes" 1>&6
67876 -  found=yes
67877 +
67878 +    LDFLAGS=$save_old_LDFLAGS
67879 +    ext_shared=$save_ext_shared
67880 +
67881 +
67882 +
67883 +  case sybtcl in
67884 +  c|c_r|pthread*) ;;
67885 +  *)
67886 +    if test "$ext_shared" = "yes"; then
67887 +        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
67888 +    else
67889 +
67890 +
67891 +  case sybtcl in
67892 +  c|c_r|pthread*) ;;
67893 +  *)
67894 +      LIBS="-lsybtcl $LIBS"
67895 +   ;;
67896 +  esac
67897 +
67898 +
67899 +    fi
67900 +   ;;
67901 +  esac
67902 +
67903 +
67904 +
67905 +
67906  else
67907    echo "$ac_t""no" 1>&6
67908 -found=no
67909 -fi
67910
67911 +    LDFLAGS=$save_old_LDFLAGS
67912 +    ext_shared=$save_ext_shared
67913 +    unset ac_cv_lib_sybtcl_netg_errstr
67914 +
67915 +
67916
67917 -fi
67918 +  case sybtcl in
67919 +  c|c_r|pthread*) ;;
67920 +  *)
67921 +    if test "$ext_shared" = "yes"; then
67922 +        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
67923 +    else
67924 +
67925 +
67926 +  case sybtcl in
67927 +  c|c_r|pthread*) ;;
67928 +  *)
67929 +      LIBS="-lsybtcl $LIBS"
67930 +   ;;
67931 +  esac
67932
67933
67934 -  if test "$found" = "yes"; then
67935 -    ac_libs=$LIBS
67936 -    LIBS="$LIBS -lbind"
67937 -    if test "$cross_compiling" = yes; then
67938 -  found=no
67939 -else
67940 -  cat > conftest.$ac_ext <<EOF
67941 -#line 88958 "configure"
67942 -#include "confdefs.h"
67943 -main() { return (0); }
67944 -EOF
67945 -if { (eval echo configure:88962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
67946 -then
67947 -  found=yes
67948 -else
67949 -  echo "configure: failed program was:" >&5
67950 -  cat conftest.$ac_ext >&5
67951 -  rm -fr conftest*
67952 -  found=no
67953 -fi
67954 -rm -fr conftest*
67955 +    fi
67956 +   ;;
67957 +  esac
67958 +
67959 +
67960 +
67961 +
67962  fi
67963
67964 -    LIBS=$ac_libs
67965 +
67966 +
67967 +  save_old_LDFLAGS=$LDFLAGS
67968 +  ac_stuff="-L$SYBASE_CT_LIBDIR"
67969 +
67970 +  save_ext_shared=$ext_shared
67971 +  ext_shared=yes
67972 +
67973 +  for ac_i in $ac_stuff; do
67974 +    case $ac_i in
67975 +    -pthread)
67976 +      if test "$ext_shared" = "yes"; then
67977 +        LDFLAGS="$LDFLAGS -pthread"
67978 +      else
67979 +
67980 +
67981 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
67982 +
67983 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
67984 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
67985 +    eval "EXTRA_LDFLAGS$unique=set"
67986 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
67987    fi
67988
67989 -  if test "$found" = "yes"; then
67990 +      fi
67991 +    ;;
67992 +    -l*)
67993 +      ac_ii=`echo $ac_i|cut -c 3-`
67994 +
67995 +
67996 +  case $ac_ii in
67997 +  c|c_r|pthread*) ;;
67998 +  *)
67999 +    if test "$ext_shared" = "yes"; then
68000 +        LDFLAGS="$LDFLAGS -l$ac_ii"
68001 +    else
68002 +
68003 +
68004 +  case $ac_ii in
68005 +  c|c_r|pthread*) ;;
68006 +  *)
68007 +      LIBS="$LIBS -l$ac_ii"
68008 +   ;;
68009 +  esac
68010 +
68011 +
68012 +    fi
68013 +   ;;
68014 +  esac
68015 +
68016 +
68017 +    ;;
68018 +    -L*)
68019 +      ac_ii=`echo $ac_i|cut -c 3-`
68020 +
68021 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
68022 +
68023 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
68024 +    ai_p=$ac_ii
68025 +  else
68026 +
68027 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
68028 +
68029 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
68030 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
68031 +  fi
68032 +
68033 +
68034 +      if test "$ext_shared" = "yes"; then
68035 +        LDFLAGS="-L$ai_p $LDFLAGS"
68036 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
68037 +      else
68038 +
68039 +
68040 +
68041 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
68042 +
68043 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
68044 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
68045 +    eval "LIBPATH$unique=set"
68046
68047 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
68048 +    LDFLAGS="$LDFLAGS -L$ai_p"
68049 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
68050
68051 -  case bind in
68052 -  c|c_r|pthread*) ;;
68053 -  *)
68054 -      LIBS="-lbind $LIBS"
68055 -   ;;
68056 -  esac
68057 +  fi
68058
68059
68060 -    cat >> confdefs.h <<\EOF
68061 -#define HAVE_RES_NSEARCH 1
68062 -EOF
68063 +      fi
68064 +
68065 +  fi
68066
68067 -    cat >> confdefs.h <<\EOF
68068 -#define HAVE_LIBBIND 1
68069 -EOF
68070 +    ;;
68071 +    esac
68072 +  done
68073
68074 -    ac_cv_func_res_nsearch=yes
68075 -  else
68076 -
68077 -
68078 -  unset ac_cv_lib_socket_res_nsearch
68079 -  unset ac_cv_lib_socket___res_nsearch
68080 -  unset found
68081 -  echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6
68082 -echo "configure:89004: checking for res_nsearch in -lsocket" >&5
68083 -ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'`
68084 +  echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
68085 +echo "configure:95671: checking for insck__getVdate in -linsck" >&5
68086 +ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
68087  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
68088    echo $ac_n "(cached) $ac_c" 1>&6
68089  else
68090    ac_save_LIBS="$LIBS"
68091 -LIBS="-lsocket  $LIBS"
68092 +LIBS="-linsck  $LIBS"
68093  cat > conftest.$ac_ext <<EOF
68094 -#line 89012 "configure"
68095 +#line 95679 "configure"
68096  #include "confdefs.h"
68097  /* Override any gcc2 internal prototype to avoid an error.  */
68098  /* We use char because int might match the return type of a gcc2
68099      builtin and then its argument prototype would still apply.  */
68100 -char res_nsearch();
68101 +char insck__getVdate();
68102
68103  int main() {
68104 -res_nsearch()
68105 +insck__getVdate()
68106  ; return 0; }
68107  EOF
68108 -if { (eval echo configure:89023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68109 +if { (eval echo configure:95690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68110    rm -rf conftest*
68111    eval "ac_cv_lib_$ac_lib_var=yes"
68112  else
68113 @@ -89034,31 +95701,159 @@ LIBS="$ac_save_LIBS"
68114  fi
68115  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
68116    echo "$ac_t""yes" 1>&6
68117 -  found=yes
68118 +
68119 +    LDFLAGS=$save_old_LDFLAGS
68120 +    ext_shared=$save_ext_shared
68121 +
68122 +
68123 +  case insck in
68124 +  c|c_r|pthread*) ;;
68125 +  *)
68126 +    if test "$ext_shared" = "yes"; then
68127 +        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
68128 +    else
68129 +
68130 +
68131 +  case insck in
68132 +  c|c_r|pthread*) ;;
68133 +  *)
68134 +      LIBS="-linsck $LIBS"
68135 +   ;;
68136 +  esac
68137 +
68138 +
68139 +    fi
68140 +   ;;
68141 +  esac
68142 +
68143 +
68144 +
68145  else
68146    echo "$ac_t""no" 1>&6
68147
68148 -    echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6
68149 -echo "configure:89043: checking for __res_nsearch in -lsocket" >&5
68150 -ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'`
68151 +    LDFLAGS=$save_old_LDFLAGS
68152 +    ext_shared=$save_ext_shared
68153 +    unset ac_cv_lib_insck_insck__getVdate
68154 +
68155 +
68156 +fi
68157 +
68158 +
68159 +  save_old_LDFLAGS=$LDFLAGS
68160 +  ac_stuff="-L$SYBASE_CT_LIBDIR"
68161 +
68162 +  save_ext_shared=$ext_shared
68163 +  ext_shared=yes
68164 +
68165 +  for ac_i in $ac_stuff; do
68166 +    case $ac_i in
68167 +    -pthread)
68168 +      if test "$ext_shared" = "yes"; then
68169 +        LDFLAGS="$LDFLAGS -pthread"
68170 +      else
68171 +
68172 +
68173 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
68174 +
68175 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
68176 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
68177 +    eval "EXTRA_LDFLAGS$unique=set"
68178 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
68179 +  fi
68180 +
68181 +      fi
68182 +    ;;
68183 +    -l*)
68184 +      ac_ii=`echo $ac_i|cut -c 3-`
68185 +
68186 +
68187 +  case $ac_ii in
68188 +  c|c_r|pthread*) ;;
68189 +  *)
68190 +    if test "$ext_shared" = "yes"; then
68191 +        LDFLAGS="$LDFLAGS -l$ac_ii"
68192 +    else
68193 +
68194 +
68195 +  case $ac_ii in
68196 +  c|c_r|pthread*) ;;
68197 +  *)
68198 +      LIBS="$LIBS -l$ac_ii"
68199 +   ;;
68200 +  esac
68201 +
68202 +
68203 +    fi
68204 +   ;;
68205 +  esac
68206 +
68207 +
68208 +    ;;
68209 +    -L*)
68210 +      ac_ii=`echo $ac_i|cut -c 3-`
68211 +
68212 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
68213 +
68214 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
68215 +    ai_p=$ac_ii
68216 +  else
68217 +
68218 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
68219 +
68220 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
68221 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
68222 +  fi
68223 +
68224 +
68225 +      if test "$ext_shared" = "yes"; then
68226 +        LDFLAGS="-L$ai_p $LDFLAGS"
68227 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
68228 +      else
68229 +
68230 +
68231 +
68232 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
68233 +
68234 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
68235 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
68236 +    eval "LIBPATH$unique=set"
68237 +
68238 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
68239 +    LDFLAGS="$LDFLAGS -L$ai_p"
68240 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
68241 +
68242 +  fi
68243 +
68244 +
68245 +      fi
68246 +
68247 +  fi
68248 +
68249 +    ;;
68250 +    esac
68251 +  done
68252 +
68253 +  echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
68254 +echo "configure:95838: checking for bsd_tcp in -linsck" >&5
68255 +ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
68256  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
68257    echo $ac_n "(cached) $ac_c" 1>&6
68258  else
68259    ac_save_LIBS="$LIBS"
68260 -LIBS="-lsocket  $LIBS"
68261 +LIBS="-linsck  $LIBS"
68262  cat > conftest.$ac_ext <<EOF
68263 -#line 89051 "configure"
68264 +#line 95846 "configure"
68265  #include "confdefs.h"
68266  /* Override any gcc2 internal prototype to avoid an error.  */
68267  /* We use char because int might match the return type of a gcc2
68268      builtin and then its argument prototype would still apply.  */
68269 -char __res_nsearch();
68270 +char bsd_tcp();
68271
68272  int main() {
68273 -__res_nsearch()
68274 +bsd_tcp()
68275  ; return 0; }
68276  EOF
68277 -if { (eval echo configure:89062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68278 +if { (eval echo configure:95857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68279    rm -rf conftest*
68280    eval "ac_cv_lib_$ac_lib_var=yes"
68281  else
68282 @@ -89073,255 +95868,257 @@ LIBS="$ac_save_LIBS"
68283  fi
68284  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
68285    echo "$ac_t""yes" 1>&6
68286 -  found=yes
68287 +
68288 +    LDFLAGS=$save_old_LDFLAGS
68289 +    ext_shared=$save_ext_shared
68290 +
68291 +
68292 +  case insck in
68293 +  c|c_r|pthread*) ;;
68294 +  *)
68295 +    if test "$ext_shared" = "yes"; then
68296 +        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
68297 +    else
68298 +
68299 +
68300 +  case insck in
68301 +  c|c_r|pthread*) ;;
68302 +  *)
68303 +      LIBS="-linsck $LIBS"
68304 +   ;;
68305 +  esac
68306 +
68307 +
68308 +    fi
68309 +   ;;
68310 +  esac
68311 +
68312 +
68313 +
68314  else
68315    echo "$ac_t""no" 1>&6
68316 -found=no
68317 -fi
68318
68319 +    LDFLAGS=$save_old_LDFLAGS
68320 +    ext_shared=$save_ext_shared
68321 +    unset ac_cv_lib_insck_bsd_tcp
68322 +
68323
68324  fi
68325
68326 +  else
68327 +
68328 +
68329 +  case cs in
68330 +  c|c_r|pthread*) ;;
68331 +  *)
68332 +    if test "$ext_shared" = "yes"; then
68333 +        SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD"
68334 +    else
68335 +
68336 +
68337 +  case cs in
68338 +  c|c_r|pthread*) ;;
68339 +  *)
68340 +      LIBS="-lcs $LIBS"
68341 +   ;;
68342 +  esac
68343
68344 -  if test "$found" = "yes"; then
68345 -    ac_libs=$LIBS
68346 -    LIBS="$LIBS -lsocket"
68347 -    if test "$cross_compiling" = yes; then
68348 -  found=no
68349 -else
68350 -  cat > conftest.$ac_ext <<EOF
68351 -#line 89094 "configure"
68352 -#include "confdefs.h"
68353 -main() { return (0); }
68354 -EOF
68355 -if { (eval echo configure:89098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
68356 -then
68357 -  found=yes
68358 -else
68359 -  echo "configure: failed program was:" >&5
68360 -  cat conftest.$ac_ext >&5
68361 -  rm -fr conftest*
68362 -  found=no
68363 -fi
68364 -rm -fr conftest*
68365 -fi
68366
68367 -    LIBS=$ac_libs
68368 -  fi
68369 +    fi
68370 +   ;;
68371 +  esac
68372 +
68373
68374 -  if test "$found" = "yes"; then
68375
68376
68377 -  case socket in
68378 +  case ct in
68379    c|c_r|pthread*) ;;
68380    *)
68381 -      LIBS="-lsocket $LIBS"
68382 +    if test "$ext_shared" = "yes"; then
68383 +        SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
68384 +    else
68385 +
68386 +
68387 +  case ct in
68388 +  c|c_r|pthread*) ;;
68389 +  *)
68390 +      LIBS="-lct $LIBS"
68391     ;;
68392    esac
68393
68394
68395 -    cat >> confdefs.h <<\EOF
68396 -#define HAVE_RES_NSEARCH 1
68397 -EOF
68398 +    fi
68399 +   ;;
68400 +  esac
68401
68402 -    cat >> confdefs.h <<\EOF
68403 -#define HAVE_LIBSOCKET 1
68404 -EOF
68405
68406 -    ac_cv_func_res_nsearch=yes
68407 -  else
68408
68409 -  :
68410 -
68411 -  fi
68412
68413 -
68414 -  fi
68415 +  case comn in
68416 +  c|c_r|pthread*) ;;
68417 +  *)
68418 +    if test "$ext_shared" = "yes"; then
68419 +        SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD"
68420 +    else
68421 +
68422
68423 +  case comn in
68424 +  c|c_r|pthread*) ;;
68425 +  *)
68426 +      LIBS="-lcomn $LIBS"
68427 +   ;;
68428 +  esac
68429
68430 -  fi
68431 -
68432 - ;;
68433 -
68434 +
68435 +    fi
68436 +   ;;
68437    esac
68438
68439
68440 -  unset ac_cv_func_dns_search
68441 -  unset ac_cv_func___dns_search
68442 -  unset found
68443 +
68444
68445 -  echo $ac_n "checking for dns_search""... $ac_c" 1>&6
68446 -echo "configure:89155: checking for dns_search" >&5
68447 -if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then
68448 -  echo $ac_n "(cached) $ac_c" 1>&6
68449 -else
68450 -  cat > conftest.$ac_ext <<EOF
68451 -#line 89160 "configure"
68452 -#include "confdefs.h"
68453 -/* System header to define __stub macros and hopefully few prototypes,
68454 -    which can conflict with char dns_search(); below.  */
68455 -#include <assert.h>
68456 -/* Override any gcc2 internal prototype to avoid an error.  */
68457 -/* We use char because int might match the return type of a gcc2
68458 -    builtin and then its argument prototype would still apply.  */
68459 -char dns_search();
68460 -
68461 -int main() {
68462 +  case intl in
68463 +  c|c_r|pthread*) ;;
68464 +  *)
68465 +    if test "$ext_shared" = "yes"; then
68466 +        SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD"
68467 +    else
68468 +
68469 +
68470 +  case intl in
68471 +  c|c_r|pthread*) ;;
68472 +  *)
68473 +      LIBS="-lintl $LIBS"
68474 +   ;;
68475 +  esac
68476
68477 -/* The GNU C library defines this for functions which it implements
68478 -    to always fail with ENOSYS.  Some functions are actually named
68479 -    something starting with __ and the normal name is an alias.  */
68480 -#if defined (__stub_dns_search) || defined (__stub___dns_search)
68481 -choke me
68482 -#else
68483 -dns_search();
68484 -#endif
68485
68486 -; return 0; }
68487 -EOF
68488 -if { (eval echo configure:89183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68489 -  rm -rf conftest*
68490 -  eval "ac_cv_func_dns_search=yes"
68491 -else
68492 -  echo "configure: failed program was:" >&5
68493 -  cat conftest.$ac_ext >&5
68494 -  rm -rf conftest*
68495 -  eval "ac_cv_func_dns_search=no"
68496 -fi
68497 -rm -f conftest*
68498 -fi
68499 +    fi
68500 +   ;;
68501 +  esac
68502
68503 -if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then
68504 -  echo "$ac_t""yes" 1>&6
68505 -  found=yes
68506 -else
68507 -  echo "$ac_t""no" 1>&6
68508 - echo $ac_n "checking for __dns_search""... $ac_c" 1>&6
68509 -echo "configure:89201: checking for __dns_search" >&5
68510 -if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then
68511 -  echo $ac_n "(cached) $ac_c" 1>&6
68512 -else
68513 -  cat > conftest.$ac_ext <<EOF
68514 -#line 89206 "configure"
68515 -#include "confdefs.h"
68516 -/* System header to define __stub macros and hopefully few prototypes,
68517 -    which can conflict with char __dns_search(); below.  */
68518 -#include <assert.h>
68519 -/* Override any gcc2 internal prototype to avoid an error.  */
68520 -/* We use char because int might match the return type of a gcc2
68521 -    builtin and then its argument prototype would still apply.  */
68522 -char __dns_search();
68523
68524 -int main() {
68525 +
68526 +    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
68527 +
68528 +
68529 +  save_old_LDFLAGS=$LDFLAGS
68530 +  ac_stuff="
68531 +      $SYBASE_CT_LIBS
68532 +    "
68533 +
68534 +  save_ext_shared=$ext_shared
68535 +  ext_shared=yes
68536 +
68537 +  for ac_i in $ac_stuff; do
68538 +    case $ac_i in
68539 +    -pthread)
68540 +      if test "$ext_shared" = "yes"; then
68541 +        LDFLAGS="$LDFLAGS -pthread"
68542 +      else
68543 +
68544 +
68545 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
68546 +
68547 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
68548 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
68549 +    eval "EXTRA_LDFLAGS$unique=set"
68550 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
68551 +  fi
68552
68553 -/* The GNU C library defines this for functions which it implements
68554 -    to always fail with ENOSYS.  Some functions are actually named
68555 -    something starting with __ and the normal name is an alias.  */
68556 -#if defined (__stub___dns_search) || defined (__stub_____dns_search)
68557 -choke me
68558 -#else
68559 -__dns_search();
68560 -#endif
68561 +      fi
68562 +    ;;
68563 +    -l*)
68564 +      ac_ii=`echo $ac_i|cut -c 3-`
68565 +
68566 +
68567 +  case $ac_ii in
68568 +  c|c_r|pthread*) ;;
68569 +  *)
68570 +    if test "$ext_shared" = "yes"; then
68571 +        LDFLAGS="$LDFLAGS -l$ac_ii"
68572 +    else
68573 +
68574 +
68575 +  case $ac_ii in
68576 +  c|c_r|pthread*) ;;
68577 +  *)
68578 +      LIBS="$LIBS -l$ac_ii"
68579 +   ;;
68580 +  esac
68581
68582 -; return 0; }
68583 -EOF
68584 -if { (eval echo configure:89229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68585 -  rm -rf conftest*
68586 -  eval "ac_cv_func___dns_search=yes"
68587 -else
68588 -  echo "configure: failed program was:" >&5
68589 -  cat conftest.$ac_ext >&5
68590 -  rm -rf conftest*
68591 -  eval "ac_cv_func___dns_search=no"
68592 -fi
68593 -rm -f conftest*
68594 -fi
68595
68596 -if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then
68597 -  echo "$ac_t""yes" 1>&6
68598 -  found=yes
68599 -else
68600 -  echo "$ac_t""no" 1>&6
68601 -found=no
68602 -fi
68603 -
68604 -fi
68605 +    fi
68606 +   ;;
68607 +  esac
68608
68609
68610 -  case $found in
68611 -  yes)
68612 -    cat >> confdefs.h <<\EOF
68613 -#define HAVE_DNS_SEARCH 1
68614 -EOF
68615 +    ;;
68616 +    -L*)
68617 +      ac_ii=`echo $ac_i|cut -c 3-`
68618 +
68619 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
68620 +
68621 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
68622 +    ai_p=$ac_ii
68623 +  else
68624 +
68625 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
68626 +
68627 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
68628 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
68629 +  fi
68630
68631 -    ac_cv_func_dns_search=yes
68632 -  ;;
68633 +
68634 +      if test "$ext_shared" = "yes"; then
68635 +        LDFLAGS="-L$ai_p $LDFLAGS"
68636 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
68637 +      else
68638 +
68639
68640 -    *)
68641
68642 -  unset ac_cv_lib_resolv_dns_search
68643 -  unset ac_cv_lib_resolv___dns_search
68644 -  unset found
68645 -  echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6
68646 -echo "configure:89267: checking for dns_search in -lresolv" >&5
68647 -ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'`
68648 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
68649 -  echo $ac_n "(cached) $ac_c" 1>&6
68650 -else
68651 -  ac_save_LIBS="$LIBS"
68652 -LIBS="-lresolv  $LIBS"
68653 -cat > conftest.$ac_ext <<EOF
68654 -#line 89275 "configure"
68655 -#include "confdefs.h"
68656 -/* Override any gcc2 internal prototype to avoid an error.  */
68657 -/* We use char because int might match the return type of a gcc2
68658 -    builtin and then its argument prototype would still apply.  */
68659 -char dns_search();
68660 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
68661 +
68662 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
68663 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
68664 +    eval "LIBPATH$unique=set"
68665 +
68666 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
68667 +    LDFLAGS="$LDFLAGS -L$ai_p"
68668 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
68669 +
68670 +  fi
68671
68672 -int main() {
68673 -dns_search()
68674 -; return 0; }
68675 -EOF
68676 -if { (eval echo configure:89286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68677 -  rm -rf conftest*
68678 -  eval "ac_cv_lib_$ac_lib_var=yes"
68679 -else
68680 -  echo "configure: failed program was:" >&5
68681 -  cat conftest.$ac_ext >&5
68682 -  rm -rf conftest*
68683 -  eval "ac_cv_lib_$ac_lib_var=no"
68684 -fi
68685 -rm -f conftest*
68686 -LIBS="$ac_save_LIBS"
68687
68688 -fi
68689 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
68690 -  echo "$ac_t""yes" 1>&6
68691 -  found=yes
68692 -else
68693 -  echo "$ac_t""no" 1>&6
68694 +      fi
68695 +
68696 +  fi
68697
68698 -    echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6
68699 -echo "configure:89306: checking for __dns_search in -lresolv" >&5
68700 -ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'`
68701 +    ;;
68702 +    esac
68703 +  done
68704 +
68705 +  echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
68706 +echo "configure:96103: checking for netg_errstr in -ltcl" >&5
68707 +ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
68708  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
68709    echo $ac_n "(cached) $ac_c" 1>&6
68710  else
68711    ac_save_LIBS="$LIBS"
68712 -LIBS="-lresolv  $LIBS"
68713 +LIBS="-ltcl  $LIBS"
68714  cat > conftest.$ac_ext <<EOF
68715 -#line 89314 "configure"
68716 +#line 96111 "configure"
68717  #include "confdefs.h"
68718  /* Override any gcc2 internal prototype to avoid an error.  */
68719  /* We use char because int might match the return type of a gcc2
68720      builtin and then its argument prototype would still apply.  */
68721 -char __dns_search();
68722 +char netg_errstr();
68723
68724  int main() {
68725 -__dns_search()
68726 +netg_errstr()
68727  ; return 0; }
68728  EOF
68729 -if { (eval echo configure:89325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68730 +if { (eval echo configure:96122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68731    rm -rf conftest*
68732    eval "ac_cv_lib_$ac_lib_var=yes"
68733  else
68734 @@ -89336,128 +96133,186 @@ LIBS="$ac_save_LIBS"
68735  fi
68736  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
68737    echo "$ac_t""yes" 1>&6
68738 -  found=yes
68739 +
68740 +    LDFLAGS=$save_old_LDFLAGS
68741 +    ext_shared=$save_ext_shared
68742 +
68743 +
68744 +
68745 +  case tcl in
68746 +  c|c_r|pthread*) ;;
68747 +  *)
68748 +    if test "$ext_shared" = "yes"; then
68749 +        SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD"
68750 +    else
68751 +
68752 +
68753 +  case tcl in
68754 +  c|c_r|pthread*) ;;
68755 +  *)
68756 +      LIBS="-ltcl $LIBS"
68757 +   ;;
68758 +  esac
68759 +
68760 +
68761 +    fi
68762 +   ;;
68763 +  esac
68764 +
68765 +
68766 +
68767 +
68768  else
68769    echo "$ac_t""no" 1>&6
68770 -found=no
68771 -fi
68772
68773 +    LDFLAGS=$save_old_LDFLAGS
68774 +    ext_shared=$save_ext_shared
68775 +    unset ac_cv_lib_tcl_netg_errstr
68776 +
68777 +
68778
68779 -fi
68780 +  case sybtcl in
68781 +  c|c_r|pthread*) ;;
68782 +  *)
68783 +    if test "$ext_shared" = "yes"; then
68784 +        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
68785 +    else
68786 +
68787 +
68788 +  case sybtcl in
68789 +  c|c_r|pthread*) ;;
68790 +  *)
68791 +      LIBS="-lsybtcl $LIBS"
68792 +   ;;
68793 +  esac
68794
68795
68796 -  if test "$found" = "yes"; then
68797 -    ac_libs=$LIBS
68798 -    LIBS="$LIBS -lresolv"
68799 -    if test "$cross_compiling" = yes; then
68800 -  found=no
68801 -else
68802 -  cat > conftest.$ac_ext <<EOF
68803 -#line 89357 "configure"
68804 -#include "confdefs.h"
68805 -main() { return (0); }
68806 -EOF
68807 -if { (eval echo configure:89361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
68808 -then
68809 -  found=yes
68810 -else
68811 -  echo "configure: failed program was:" >&5
68812 -  cat conftest.$ac_ext >&5
68813 -  rm -fr conftest*
68814 -  found=no
68815 -fi
68816 -rm -fr conftest*
68817 +    fi
68818 +   ;;
68819 +  esac
68820 +
68821 +
68822 +
68823 +
68824  fi
68825
68826 -    LIBS=$ac_libs
68827 +
68828 +
68829 +  save_old_LDFLAGS=$LDFLAGS
68830 +  ac_stuff="-L$SYBASE_CT_LIBDIR"
68831 +
68832 +  save_ext_shared=$ext_shared
68833 +  ext_shared=yes
68834 +
68835 +  for ac_i in $ac_stuff; do
68836 +    case $ac_i in
68837 +    -pthread)
68838 +      if test "$ext_shared" = "yes"; then
68839 +        LDFLAGS="$LDFLAGS -pthread"
68840 +      else
68841 +
68842 +
68843 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
68844 +
68845 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
68846 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
68847 +    eval "EXTRA_LDFLAGS$unique=set"
68848 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
68849    fi
68850
68851 -  if test "$found" = "yes"; then
68852 -
68853 +      fi
68854 +    ;;
68855 +    -l*)
68856 +      ac_ii=`echo $ac_i|cut -c 3-`
68857 +
68858
68859 -  case resolv in
68860 +  case $ac_ii in
68861    c|c_r|pthread*) ;;
68862    *)
68863 -      LIBS="-lresolv $LIBS"
68864 +    if test "$ext_shared" = "yes"; then
68865 +        LDFLAGS="$LDFLAGS -l$ac_ii"
68866 +    else
68867 +
68868 +
68869 +  case $ac_ii in
68870 +  c|c_r|pthread*) ;;
68871 +  *)
68872 +      LIBS="$LIBS -l$ac_ii"
68873     ;;
68874    esac
68875
68876
68877 -    cat >> confdefs.h <<\EOF
68878 -#define HAVE_DNS_SEARCH 1
68879 -EOF
68880 +    fi
68881 +   ;;
68882 +  esac
68883
68884 -    cat >> confdefs.h <<\EOF
68885 -#define HAVE_LIBRESOLV 1
68886 -EOF
68887
68888 -    ac_cv_func_dns_search=yes
68889 +    ;;
68890 +    -L*)
68891 +      ac_ii=`echo $ac_i|cut -c 3-`
68892 +
68893 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
68894 +
68895 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
68896 +    ai_p=$ac_ii
68897    else
68898
68899 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
68900 +
68901 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
68902 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
68903 +  fi
68904 +
68905 +
68906 +      if test "$ext_shared" = "yes"; then
68907 +        LDFLAGS="-L$ai_p $LDFLAGS"
68908 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
68909 +      else
68910 +
68911 +
68912 +
68913 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
68914 +
68915 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
68916 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
68917 +    eval "LIBPATH$unique=set"
68918 +
68919 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
68920 +    LDFLAGS="$LDFLAGS -L$ai_p"
68921 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
68922
68923 -  unset ac_cv_lib_bind_dns_search
68924 -  unset ac_cv_lib_bind___dns_search
68925 -  unset found
68926 -  echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6
68927 -echo "configure:89403: checking for dns_search in -lbind" >&5
68928 -ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'`
68929 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
68930 -  echo $ac_n "(cached) $ac_c" 1>&6
68931 -else
68932 -  ac_save_LIBS="$LIBS"
68933 -LIBS="-lbind  $LIBS"
68934 -cat > conftest.$ac_ext <<EOF
68935 -#line 89411 "configure"
68936 -#include "confdefs.h"
68937 -/* Override any gcc2 internal prototype to avoid an error.  */
68938 -/* We use char because int might match the return type of a gcc2
68939 -    builtin and then its argument prototype would still apply.  */
68940 -char dns_search();
68941 +  fi
68942
68943 -int main() {
68944 -dns_search()
68945 -; return 0; }
68946 -EOF
68947 -if { (eval echo configure:89422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
68948 -  rm -rf conftest*
68949 -  eval "ac_cv_lib_$ac_lib_var=yes"
68950 -else
68951 -  echo "configure: failed program was:" >&5
68952 -  cat conftest.$ac_ext >&5
68953 -  rm -rf conftest*
68954 -  eval "ac_cv_lib_$ac_lib_var=no"
68955 -fi
68956 -rm -f conftest*
68957 -LIBS="$ac_save_LIBS"
68958
68959 -fi
68960 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
68961 -  echo "$ac_t""yes" 1>&6
68962 -  found=yes
68963 -else
68964 -  echo "$ac_t""no" 1>&6
68965 +      fi
68966 +
68967 +  fi
68968
68969 -    echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6
68970 -echo "configure:89442: checking for __dns_search in -lbind" >&5
68971 -ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'`
68972 +    ;;
68973 +    esac
68974 +  done
68975 +
68976 +  echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
68977 +echo "configure:96297: checking for insck__getVdate in -linsck" >&5
68978 +ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
68979  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
68980    echo $ac_n "(cached) $ac_c" 1>&6
68981  else
68982    ac_save_LIBS="$LIBS"
68983 -LIBS="-lbind  $LIBS"
68984 +LIBS="-linsck  $LIBS"
68985  cat > conftest.$ac_ext <<EOF
68986 -#line 89450 "configure"
68987 +#line 96305 "configure"
68988  #include "confdefs.h"
68989  /* Override any gcc2 internal prototype to avoid an error.  */
68990  /* We use char because int might match the return type of a gcc2
68991      builtin and then its argument prototype would still apply.  */
68992 -char __dns_search();
68993 +char insck__getVdate();
68994
68995  int main() {
68996 -__dns_search()
68997 +insck__getVdate()
68998  ; return 0; }
68999  EOF
69000 -if { (eval echo configure:89461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69001 +if { (eval echo configure:96316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69002    rm -rf conftest*
69003    eval "ac_cv_lib_$ac_lib_var=yes"
69004  else
69005 @@ -89472,89 +96327,159 @@ LIBS="$ac_save_LIBS"
69006  fi
69007  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
69008    echo "$ac_t""yes" 1>&6
69009 -  found=yes
69010 -else
69011 -  echo "$ac_t""no" 1>&6
69012 -found=no
69013 -fi
69014 -
69015
69016 -fi
69017 +    LDFLAGS=$save_old_LDFLAGS
69018 +    ext_shared=$save_ext_shared
69019 +
69020 +
69021 +  case insck in
69022 +  c|c_r|pthread*) ;;
69023 +  *)
69024 +    if test "$ext_shared" = "yes"; then
69025 +        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
69026 +    else
69027 +
69028 +
69029 +  case insck in
69030 +  c|c_r|pthread*) ;;
69031 +  *)
69032 +      LIBS="-linsck $LIBS"
69033 +   ;;
69034 +  esac
69035
69036
69037 -  if test "$found" = "yes"; then
69038 -    ac_libs=$LIBS
69039 -    LIBS="$LIBS -lbind"
69040 -    if test "$cross_compiling" = yes; then
69041 -  found=no
69042 -else
69043 -  cat > conftest.$ac_ext <<EOF
69044 -#line 89493 "configure"
69045 -#include "confdefs.h"
69046 -main() { return (0); }
69047 -EOF
69048 -if { (eval echo configure:89497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
69049 -then
69050 -  found=yes
69051 +    fi
69052 +   ;;
69053 +  esac
69054 +
69055 +
69056 +
69057  else
69058 -  echo "configure: failed program was:" >&5
69059 -  cat conftest.$ac_ext >&5
69060 -  rm -fr conftest*
69061 -  found=no
69062 -fi
69063 -rm -fr conftest*
69064 +  echo "$ac_t""no" 1>&6
69065 +
69066 +    LDFLAGS=$save_old_LDFLAGS
69067 +    ext_shared=$save_ext_shared
69068 +    unset ac_cv_lib_insck_insck__getVdate
69069 +
69070 +
69071  fi
69072
69073 -    LIBS=$ac_libs
69074 +
69075 +  save_old_LDFLAGS=$LDFLAGS
69076 +  ac_stuff="-L$SYBASE_CT_LIBDIR"
69077 +
69078 +  save_ext_shared=$ext_shared
69079 +  ext_shared=yes
69080 +
69081 +  for ac_i in $ac_stuff; do
69082 +    case $ac_i in
69083 +    -pthread)
69084 +      if test "$ext_shared" = "yes"; then
69085 +        LDFLAGS="$LDFLAGS -pthread"
69086 +      else
69087 +
69088 +
69089 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
69090 +
69091 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
69092 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
69093 +    eval "EXTRA_LDFLAGS$unique=set"
69094 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
69095    fi
69096
69097 -  if test "$found" = "yes"; then
69098 -
69099 +      fi
69100 +    ;;
69101 +    -l*)
69102 +      ac_ii=`echo $ac_i|cut -c 3-`
69103 +
69104
69105 -  case bind in
69106 +  case $ac_ii in
69107    c|c_r|pthread*) ;;
69108    *)
69109 -      LIBS="-lbind $LIBS"
69110 +    if test "$ext_shared" = "yes"; then
69111 +        LDFLAGS="$LDFLAGS -l$ac_ii"
69112 +    else
69113 +
69114 +
69115 +  case $ac_ii in
69116 +  c|c_r|pthread*) ;;
69117 +  *)
69118 +      LIBS="$LIBS -l$ac_ii"
69119     ;;
69120    esac
69121
69122
69123 -    cat >> confdefs.h <<\EOF
69124 -#define HAVE_DNS_SEARCH 1
69125 -EOF
69126 +    fi
69127 +   ;;
69128 +  esac
69129
69130 -    cat >> confdefs.h <<\EOF
69131 -#define HAVE_LIBBIND 1
69132 -EOF
69133
69134 -    ac_cv_func_dns_search=yes
69135 +    ;;
69136 +    -L*)
69137 +      ac_ii=`echo $ac_i|cut -c 3-`
69138 +
69139 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
69140 +
69141 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
69142 +    ai_p=$ac_ii
69143    else
69144
69145 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
69146 +
69147 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
69148 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
69149 +  fi
69150 +
69151 +
69152 +      if test "$ext_shared" = "yes"; then
69153 +        LDFLAGS="-L$ai_p $LDFLAGS"
69154 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
69155 +      else
69156 +
69157 +
69158 +
69159 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
69160 +
69161 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
69162 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
69163 +    eval "LIBPATH$unique=set"
69164 +
69165 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
69166 +    LDFLAGS="$LDFLAGS -L$ai_p"
69167 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
69168
69169 -  unset ac_cv_lib_socket_dns_search
69170 -  unset ac_cv_lib_socket___dns_search
69171 -  unset found
69172 -  echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6
69173 -echo "configure:89539: checking for dns_search in -lsocket" >&5
69174 -ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'`
69175 +  fi
69176 +
69177 +
69178 +      fi
69179 +
69180 +  fi
69181 +
69182 +    ;;
69183 +    esac
69184 +  done
69185 +
69186 +  echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
69187 +echo "configure:96464: checking for bsd_tcp in -linsck" >&5
69188 +ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
69189  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
69190    echo $ac_n "(cached) $ac_c" 1>&6
69191  else
69192    ac_save_LIBS="$LIBS"
69193 -LIBS="-lsocket  $LIBS"
69194 +LIBS="-linsck  $LIBS"
69195  cat > conftest.$ac_ext <<EOF
69196 -#line 89547 "configure"
69197 +#line 96472 "configure"
69198  #include "confdefs.h"
69199  /* Override any gcc2 internal prototype to avoid an error.  */
69200  /* We use char because int might match the return type of a gcc2
69201      builtin and then its argument prototype would still apply.  */
69202 -char dns_search();
69203 +char bsd_tcp();
69204
69205  int main() {
69206 -dns_search()
69207 +bsd_tcp()
69208  ; return 0; }
69209  EOF
69210 -if { (eval echo configure:89558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69211 +if { (eval echo configure:96483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69212    rm -rf conftest*
69213    eval "ac_cv_lib_$ac_lib_var=yes"
69214  else
69215 @@ -89569,1638 +96494,1474 @@ LIBS="$ac_save_LIBS"
69216  fi
69217  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
69218    echo "$ac_t""yes" 1>&6
69219 -  found=yes
69220 +
69221 +    LDFLAGS=$save_old_LDFLAGS
69222 +    ext_shared=$save_ext_shared
69223 +
69224 +
69225 +  case insck in
69226 +  c|c_r|pthread*) ;;
69227 +  *)
69228 +    if test "$ext_shared" = "yes"; then
69229 +        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
69230 +    else
69231 +
69232 +
69233 +  case insck in
69234 +  c|c_r|pthread*) ;;
69235 +  *)
69236 +      LIBS="-linsck $LIBS"
69237 +   ;;
69238 +  esac
69239 +
69240 +
69241 +    fi
69242 +   ;;
69243 +  esac
69244 +
69245 +
69246 +
69247  else
69248    echo "$ac_t""no" 1>&6
69249
69250 -    echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6
69251 -echo "configure:89578: checking for __dns_search in -lsocket" >&5
69252 -ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'`
69253 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
69254 +    LDFLAGS=$save_old_LDFLAGS
69255 +    ext_shared=$save_ext_shared
69256 +    unset ac_cv_lib_insck_bsd_tcp
69257 +
69258 +
69259 +fi
69260 +
69261 +  fi
69262 +fi
69263 +
69264 +
69265 +
69266 +php_enable_sysvmsg=no
69267 +
69268 +echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
69269 +echo "configure:96543: checking whether to enable System V IPC support" >&5
69270 +# Check whether --enable-sysvmsg or --disable-sysvmsg was given.
69271 +if test "${enable_sysvmsg+set}" = set; then
69272 +  enableval="$enable_sysvmsg"
69273 +  PHP_SYSVMSG=$enableval
69274 +else
69275 +
69276 +  PHP_SYSVMSG=no
69277 +  test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL
69278 +
69279 +fi
69280 +
69281 +
69282 +
69283 +ext_output="yes, shared"
69284 +ext_shared=yes
69285 +case $PHP_SYSVMSG in
69286 +shared,*)
69287 +  PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'`
69288 +  ;;
69289 +shared)
69290 +  PHP_SYSVMSG=yes
69291 +  ;;
69292 +no)
69293 +  ext_output=no
69294 +  ext_shared=no
69295 +  ;;
69296 +*)
69297 +  ext_output=yes
69298 +  ext_shared=no
69299 +  ;;
69300 +esac
69301 +
69302 +
69303 +
69304 +echo "$ac_t""$ext_output" 1>&6
69305 +
69306 +
69307 +
69308 +
69309 +if test "$PHP_SYSVMSG" != "no"; then
69310 +  ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
69311 +echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
69312 +echo "configure:96586: checking for sys/msg.h" >&5
69313 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
69314    echo $ac_n "(cached) $ac_c" 1>&6
69315  else
69316 -  ac_save_LIBS="$LIBS"
69317 -LIBS="-lsocket  $LIBS"
69318 -cat > conftest.$ac_ext <<EOF
69319 -#line 89586 "configure"
69320 +  cat > conftest.$ac_ext <<EOF
69321 +#line 96591 "configure"
69322  #include "confdefs.h"
69323 -/* Override any gcc2 internal prototype to avoid an error.  */
69324 -/* We use char because int might match the return type of a gcc2
69325 -    builtin and then its argument prototype would still apply.  */
69326 -char __dns_search();
69327 -
69328 -int main() {
69329 -__dns_search()
69330 -; return 0; }
69331 +#include <sys/msg.h>
69332  EOF
69333 -if { (eval echo configure:89597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69334 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
69335 +{ (eval echo configure:96596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
69336 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
69337 +if test -z "$ac_err"; then
69338    rm -rf conftest*
69339 -  eval "ac_cv_lib_$ac_lib_var=yes"
69340 +  eval "ac_cv_header_$ac_safe=yes"
69341  else
69342 +  echo "$ac_err" >&5
69343    echo "configure: failed program was:" >&5
69344    cat conftest.$ac_ext >&5
69345    rm -rf conftest*
69346 -  eval "ac_cv_lib_$ac_lib_var=no"
69347 +  eval "ac_cv_header_$ac_safe=no"
69348  fi
69349  rm -f conftest*
69350 -LIBS="$ac_save_LIBS"
69351 -
69352  fi
69353 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
69354 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
69355    echo "$ac_t""yes" 1>&6
69356 -  found=yes
69357 +  :
69358  else
69359    echo "$ac_t""no" 1>&6
69360 -found=no
69361 -fi
69362 -
69363 +{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; }
69364
69365  fi
69366
69367
69368 -  if test "$found" = "yes"; then
69369 -    ac_libs=$LIBS
69370 -    LIBS="$LIBS -lsocket"
69371 -    if test "$cross_compiling" = yes; then
69372 -  found=no
69373 -else
69374 -  cat > conftest.$ac_ext <<EOF
69375 -#line 89629 "configure"
69376 -#include "confdefs.h"
69377 -main() { return (0); }
69378 +  cat >> confdefs.h <<\EOF
69379 +#define HAVE_SYSVMSG 1
69380  EOF
69381 -if { (eval echo configure:89633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
69382 -then
69383 -  found=yes
69384 -else
69385 -  echo "configure: failed program was:" >&5
69386 -  cat conftest.$ac_ext >&5
69387 -  rm -fr conftest*
69388 -  found=no
69389 -fi
69390 -rm -fr conftest*
69391 -fi
69392
69393 -    LIBS=$ac_libs
69394 -  fi
69395 +
69396 +  ext_builddir=ext/sysvmsg
69397 +  ext_srcdir=$abs_srcdir/ext/sysvmsg
69398
69399 -  if test "$found" = "yes"; then
69400 +  ac_extra=
69401 +
69402 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
69403 +    PHP_SYSVMSG_SHARED=no
69404
69405
69406 -  case socket in
69407 -  c|c_r|pthread*) ;;
69408 -  *)
69409 -      LIBS="-lsocket $LIBS"
69410 -   ;;
69411 +  case ext/sysvmsg in
69412 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
69413 +  /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
69414 +  *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
69415    esac
69416 +
69417 +
69418 +
69419 +  b_c_pre=$php_c_pre
69420 +  b_cxx_pre=$php_cxx_pre
69421 +  b_c_meta=$php_c_meta
69422 +  b_cxx_meta=$php_cxx_meta
69423 +  b_c_post=$php_c_post
69424 +  b_cxx_post=$php_cxx_post
69425 +  b_lo=$php_lo
69426
69427
69428 -    cat >> confdefs.h <<\EOF
69429 -#define HAVE_DNS_SEARCH 1
69430 -EOF
69431 +  old_IFS=$IFS
69432 +  for ac_src in sysvmsg.c; do
69433 +
69434 +      IFS=.
69435 +      set $ac_src
69436 +      ac_obj=$1
69437 +      IFS=$old_IFS
69438 +
69439 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
69440
69441 -    cat >> confdefs.h <<\EOF
69442 -#define HAVE_LIBSOCKET 1
69443 +      case $ac_src in
69444 +        *.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" ;;
69445 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
69446 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
69447 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
69448 +      esac
69449 +
69450 +    cat >>Makefile.objects<<EOF
69451 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
69452 +       $ac_comp
69453  EOF
69454 +  done
69455
69456 -    ac_cv_func_dns_search=yes
69457 +
69458 +    EXT_STATIC="$EXT_STATIC sysvmsg"
69459 +    if test "$ext_shared" != "nocli"; then
69460 +      EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
69461 +    fi
69462    else
69463 -
69464 -  :
69465 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
69466 +      PHP_SYSVMSG_SHARED=yes
69467 +
69468 +  case ext/sysvmsg in
69469 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
69470 +  /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
69471 +  *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
69472 +  esac
69473 +
69474 +
69475
69476 -  fi
69477 +  b_c_pre=$shared_c_pre
69478 +  b_cxx_pre=$shared_cxx_pre
69479 +  b_c_meta=$shared_c_meta
69480 +  b_cxx_meta=$shared_cxx_meta
69481 +  b_c_post=$shared_c_post
69482 +  b_cxx_post=$shared_cxx_post
69483 +  b_lo=$shared_lo
69484 +
69485 +
69486 +  old_IFS=$IFS
69487 +  for ac_src in sysvmsg.c; do
69488
69489 +      IFS=.
69490 +      set $ac_src
69491 +      ac_obj=$1
69492 +      IFS=$old_IFS
69493 +
69494 +      shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo"
69495 +
69496 +      case $ac_src in
69497 +        *.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" ;;
69498 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
69499 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
69500 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
69501 +      esac
69502 +
69503 +    cat >>Makefile.objects<<EOF
69504 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
69505 +       $ac_comp
69506 +EOF
69507 +  done
69508 +
69509 +      case $host_alias in
69510 +        *netware*)
69511 +
69512 +  install_modules="install-modules"
69513
69514 +  case $host_alias in
69515 +    *aix*)
69516 +      suffix=so
69517 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvmsg.so '$ext_builddir'/phpsysvmsg.so'
69518 +      ;;
69519 +    *netware*)
69520 +      suffix=nlm
69521 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVMSG, 3)_SHARED_LIBADD)'
69522 +      ;;
69523 +    *)
69524 +      suffix=la
69525 +      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_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD)'
69526 +      ;;
69527 +  esac
69528 +
69529 +  if test "x" = "xyes"; then
69530 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvmsg.$suffix"
69531 +  else
69532 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix"
69533    fi
69534
69535 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
69536 +
69537 +  cat >>Makefile.objects<<EOF
69538 +\$(phplibdir)/phpsysvmsg.$suffix: $ext_builddir/phpsysvmsg.$suffix
69539 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvmsg.$suffix \$(phplibdir)
69540 +
69541 +$ext_builddir/phpsysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(PHPSYSVMSG_SHARED_DEPENDENCIES)
69542 +       $link_cmd
69543 +
69544 +EOF
69545 +
69546 +          ;;
69547 +        *)
69548 +
69549 +  install_modules="install-modules"
69550 +
69551 +  case $host_alias in
69552 +    *aix*)
69553 +      suffix=so
69554 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(SYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvmsg.so '$ext_builddir'/sysvmsg.so'
69555 +      ;;
69556 +    *netware*)
69557 +      suffix=nlm
69558 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVMSG, 3)_SHARED_LIBADD)'
69559 +      ;;
69560 +    *)
69561 +      suffix=la
69562 +      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_sysvmsg) $(SYSVMSG_SHARED_LIBADD)'
69563 +      ;;
69564 +  esac
69565
69566 +  if test "x" = "xyes"; then
69567 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvmsg.$suffix"
69568 +  else
69569 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix"
69570    fi
69571
69572 - ;;
69573 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
69574 +
69575 +  cat >>Makefile.objects<<EOF
69576 +\$(phplibdir)/sysvmsg.$suffix: $ext_builddir/sysvmsg.$suffix
69577 +       \$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir)
69578 +
69579 +$ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES)
69580 +       $link_cmd
69581 +
69582 +EOF
69583 +
69584 +          ;;
69585 +      esac
69586 +      cat >> confdefs.h <<EOF
69587 +#define COMPILE_DL_SYSVMSG 1
69588 +EOF
69589 +
69590 +    fi
69591 +  fi
69592 +
69593 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
69594 +    PHP_SYSVMSG_SHARED=no
69595 +    case "$PHP_SAPI" in
69596 +      cgi|embed)
69597 +
69598
69599 +  case ext/sysvmsg in
69600 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
69601 +  /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
69602 +  *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
69603    esac
69604 +
69605 +
69606
69607 +  b_c_pre=$php_c_pre
69608 +  b_cxx_pre=$php_cxx_pre
69609 +  b_c_meta=$php_c_meta
69610 +  b_cxx_meta=$php_cxx_meta
69611 +  b_c_post=$php_c_post
69612 +  b_cxx_post=$php_cxx_post
69613 +  b_lo=$php_lo
69614
69615 -  unset ac_cv_func_dn_expand
69616 -  unset ac_cv_func___dn_expand
69617 -  unset found
69618 -
69619 -  echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
69620 -echo "configure:89690: checking for dn_expand" >&5
69621 -if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then
69622 -  echo $ac_n "(cached) $ac_c" 1>&6
69623 -else
69624 -  cat > conftest.$ac_ext <<EOF
69625 -#line 89695 "configure"
69626 -#include "confdefs.h"
69627 -/* System header to define __stub macros and hopefully few prototypes,
69628 -    which can conflict with char dn_expand(); below.  */
69629 -#include <assert.h>
69630 -/* Override any gcc2 internal prototype to avoid an error.  */
69631 -/* We use char because int might match the return type of a gcc2
69632 -    builtin and then its argument prototype would still apply.  */
69633 -char dn_expand();
69634
69635 -int main() {
69636 +  old_IFS=$IFS
69637 +  for ac_src in sysvmsg.c; do
69638 +
69639 +      IFS=.
69640 +      set $ac_src
69641 +      ac_obj=$1
69642 +      IFS=$old_IFS
69643 +
69644 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
69645
69646 -/* The GNU C library defines this for functions which it implements
69647 -    to always fail with ENOSYS.  Some functions are actually named
69648 -    something starting with __ and the normal name is an alias.  */
69649 -#if defined (__stub_dn_expand) || defined (__stub___dn_expand)
69650 -choke me
69651 -#else
69652 -dn_expand();
69653 -#endif
69654 +      case $ac_src in
69655 +        *.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" ;;
69656 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
69657 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
69658 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
69659 +      esac
69660
69661 -; return 0; }
69662 +    cat >>Makefile.objects<<EOF
69663 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
69664 +       $ac_comp
69665  EOF
69666 -if { (eval echo configure:89718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69667 -  rm -rf conftest*
69668 -  eval "ac_cv_func_dn_expand=yes"
69669 -else
69670 -  echo "configure: failed program was:" >&5
69671 -  cat conftest.$ac_ext >&5
69672 -  rm -rf conftest*
69673 -  eval "ac_cv_func_dn_expand=no"
69674 -fi
69675 -rm -f conftest*
69676 -fi
69677 +  done
69678
69679 -if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then
69680 -  echo "$ac_t""yes" 1>&6
69681 -  found=yes
69682 -else
69683 -  echo "$ac_t""no" 1>&6
69684 - echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
69685 -echo "configure:89736: checking for __dn_expand" >&5
69686 -if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then
69687 -  echo $ac_n "(cached) $ac_c" 1>&6
69688 -else
69689 -  cat > conftest.$ac_ext <<EOF
69690 -#line 89741 "configure"
69691 -#include "confdefs.h"
69692 -/* System header to define __stub macros and hopefully few prototypes,
69693 -    which can conflict with char __dn_expand(); below.  */
69694 -#include <assert.h>
69695 -/* Override any gcc2 internal prototype to avoid an error.  */
69696 -/* We use char because int might match the return type of a gcc2
69697 -    builtin and then its argument prototype would still apply.  */
69698 -char __dn_expand();
69699
69700 -int main() {
69701 +        EXT_STATIC="$EXT_STATIC sysvmsg"
69702 +        ;;
69703 +      *)
69704 +
69705 +
69706 +  case ext/sysvmsg in
69707 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
69708 +  /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
69709 +  *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
69710 +  esac
69711 +
69712 +
69713
69714 -/* The GNU C library defines this for functions which it implements
69715 -    to always fail with ENOSYS.  Some functions are actually named
69716 -    something starting with __ and the normal name is an alias.  */
69717 -#if defined (__stub___dn_expand) || defined (__stub_____dn_expand)
69718 -choke me
69719 -#else
69720 -__dn_expand();
69721 -#endif
69722 +  b_c_pre=$php_c_pre
69723 +  b_cxx_pre=$php_cxx_pre
69724 +  b_c_meta=$php_c_meta
69725 +  b_cxx_meta=$php_cxx_meta
69726 +  b_c_post=$php_c_post
69727 +  b_cxx_post=$php_cxx_post
69728 +  b_lo=$php_lo
69729
69730 -; return 0; }
69731 -EOF
69732 -if { (eval echo configure:89764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69733 -  rm -rf conftest*
69734 -  eval "ac_cv_func___dn_expand=yes"
69735 -else
69736 -  echo "configure: failed program was:" >&5
69737 -  cat conftest.$ac_ext >&5
69738 -  rm -rf conftest*
69739 -  eval "ac_cv_func___dn_expand=no"
69740 -fi
69741 -rm -f conftest*
69742 -fi
69743
69744 -if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then
69745 -  echo "$ac_t""yes" 1>&6
69746 -  found=yes
69747 -else
69748 -  echo "$ac_t""no" 1>&6
69749 -found=no
69750 -fi
69751 -
69752 -fi
69753 +  old_IFS=$IFS
69754 +  for ac_src in sysvmsg.c; do
69755 +
69756 +      IFS=.
69757 +      set $ac_src
69758 +      ac_obj=$1
69759 +      IFS=$old_IFS
69760 +
69761 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
69762
69763 +      case $ac_src in
69764 +        *.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" ;;
69765 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
69766 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
69767 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
69768 +      esac
69769
69770 -  case $found in
69771 -  yes)
69772 -    cat >> confdefs.h <<\EOF
69773 -#define HAVE_DN_EXPAND 1
69774 +    cat >>Makefile.objects<<EOF
69775 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
69776 +       $ac_comp
69777  EOF
69778 +  done
69779
69780 -    ac_cv_func_dn_expand=yes
69781 -  ;;
69782 +
69783 +        ;;
69784 +    esac
69785 +    EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
69786 +  fi
69787
69788 -    *)
69789
69790 -  unset ac_cv_lib_resolv_dn_expand
69791 -  unset ac_cv_lib_resolv___dn_expand
69792 -  unset found
69793 -  echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
69794 -echo "configure:89802: checking for dn_expand in -lresolv" >&5
69795 -ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
69796 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
69797 -  echo $ac_n "(cached) $ac_c" 1>&6
69798 -else
69799 -  ac_save_LIBS="$LIBS"
69800 -LIBS="-lresolv  $LIBS"
69801 -cat > conftest.$ac_ext <<EOF
69802 -#line 89810 "configure"
69803 -#include "confdefs.h"
69804 -/* Override any gcc2 internal prototype to avoid an error.  */
69805 -/* We use char because int might match the return type of a gcc2
69806 -    builtin and then its argument prototype would still apply.  */
69807 -char dn_expand();
69808 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
69809 +
69810
69811 -int main() {
69812 -dn_expand()
69813 -; return 0; }
69814 -EOF
69815 -if { (eval echo configure:89821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69816 -  rm -rf conftest*
69817 -  eval "ac_cv_lib_$ac_lib_var=yes"
69818 -else
69819 -  echo "configure: failed program was:" >&5
69820 -  cat conftest.$ac_ext >&5
69821 -  rm -rf conftest*
69822 -  eval "ac_cv_lib_$ac_lib_var=no"
69823 -fi
69824 -rm -f conftest*
69825 -LIBS="$ac_save_LIBS"
69826
69827 -fi
69828 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
69829 -  echo "$ac_t""yes" 1>&6
69830 -  found=yes
69831 -else
69832 -  echo "$ac_t""no" 1>&6
69833 +  if test "$ext_builddir" = "."; then
69834 +    PHP_PECL_EXTENSION=sysvmsg
69835 +
69836 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
69837
69838 -    echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
69839 -echo "configure:89841: checking for __dn_expand in -lresolv" >&5
69840 -ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
69841 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
69842 -  echo $ac_n "(cached) $ac_c" 1>&6
69843 -else
69844 -  ac_save_LIBS="$LIBS"
69845 -LIBS="-lresolv  $LIBS"
69846 -cat > conftest.$ac_ext <<EOF
69847 -#line 89849 "configure"
69848 -#include "confdefs.h"
69849 -/* Override any gcc2 internal prototype to avoid an error.  */
69850 -/* We use char because int might match the return type of a gcc2
69851 -    builtin and then its argument prototype would still apply.  */
69852 -char __dn_expand();
69853 +  fi
69854
69855 -int main() {
69856 -__dn_expand()
69857 -; return 0; }
69858 -EOF
69859 -if { (eval echo configure:89860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69860 -  rm -rf conftest*
69861 -  eval "ac_cv_lib_$ac_lib_var=yes"
69862 -else
69863 -  echo "configure: failed program was:" >&5
69864 -  cat conftest.$ac_ext >&5
69865 -  rm -rf conftest*
69866 -  eval "ac_cv_lib_$ac_lib_var=no"
69867  fi
69868 -rm -f conftest*
69869 -LIBS="$ac_save_LIBS"
69870
69871 -fi
69872 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
69873 -  echo "$ac_t""yes" 1>&6
69874 -  found=yes
69875 +
69876 +
69877 +php_enable_sysvsem=no
69878 +
69879 +echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
69880 +echo "configure:96923: checking whether to enable System V semaphore support" >&5
69881 +# Check whether --enable-sysvsem or --disable-sysvsem was given.
69882 +if test "${enable_sysvsem+set}" = set; then
69883 +  enableval="$enable_sysvsem"
69884 +  PHP_SYSVSEM=$enableval
69885  else
69886 -  echo "$ac_t""no" 1>&6
69887 -found=no
69888 +
69889 +  PHP_SYSVSEM=no
69890 +  test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL
69891 +
69892  fi
69893
69894 -
69895 -fi
69896
69897
69898 -  if test "$found" = "yes"; then
69899 -    ac_libs=$LIBS
69900 -    LIBS="$LIBS -lresolv"
69901 -    if test "$cross_compiling" = yes; then
69902 -  found=no
69903 -else
69904 -  cat > conftest.$ac_ext <<EOF
69905 -#line 89892 "configure"
69906 -#include "confdefs.h"
69907 -main() { return (0); }
69908 -EOF
69909 -if { (eval echo configure:89896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
69910 -then
69911 -  found=yes
69912 -else
69913 -  echo "configure: failed program was:" >&5
69914 -  cat conftest.$ac_ext >&5
69915 -  rm -fr conftest*
69916 -  found=no
69917 -fi
69918 -rm -fr conftest*
69919 -fi
69920 +ext_output="yes, shared"
69921 +ext_shared=yes
69922 +case $PHP_SYSVSEM in
69923 +shared,*)
69924 +  PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'`
69925 +  ;;
69926 +shared)
69927 +  PHP_SYSVSEM=yes
69928 +  ;;
69929 +no)
69930 +  ext_output=no
69931 +  ext_shared=no
69932 +  ;;
69933 +*)
69934 +  ext_output=yes
69935 +  ext_shared=no
69936 +  ;;
69937 +esac
69938 +
69939 +
69940 +
69941 +echo "$ac_t""$ext_output" 1>&6
69942
69943 -    LIBS=$ac_libs
69944 -  fi
69945
69946 -  if test "$found" = "yes"; then
69947 -
69948 -
69949 -  case resolv in
69950 -  c|c_r|pthread*) ;;
69951 -  *)
69952 -      LIBS="-lresolv $LIBS"
69953 -   ;;
69954 -  esac
69955
69956
69957 -    cat >> confdefs.h <<\EOF
69958 -#define HAVE_DN_EXPAND 1
69959 -EOF
69960 +if test "$PHP_SYSVSEM" != "no"; then
69961 +
69962 +  ext_builddir=ext/sysvsem
69963 +  ext_srcdir=$abs_srcdir/ext/sysvsem
69964
69965 -    cat >> confdefs.h <<\EOF
69966 -#define HAVE_LIBRESOLV 1
69967 -EOF
69968 +  ac_extra=
69969
69970 -    ac_cv_func_dn_expand=yes
69971 -  else
69972 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
69973 +    PHP_SYSVSEM_SHARED=no
69974
69975
69976 -  unset ac_cv_lib_bind_dn_expand
69977 -  unset ac_cv_lib_bind___dn_expand
69978 -  unset found
69979 -  echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6
69980 -echo "configure:89938: checking for dn_expand in -lbind" >&5
69981 -ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'`
69982 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
69983 -  echo $ac_n "(cached) $ac_c" 1>&6
69984 -else
69985 -  ac_save_LIBS="$LIBS"
69986 -LIBS="-lbind  $LIBS"
69987 -cat > conftest.$ac_ext <<EOF
69988 -#line 89946 "configure"
69989 -#include "confdefs.h"
69990 -/* Override any gcc2 internal prototype to avoid an error.  */
69991 -/* We use char because int might match the return type of a gcc2
69992 -    builtin and then its argument prototype would still apply.  */
69993 -char dn_expand();
69994 +  case ext/sysvsem in
69995 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
69996 +  /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
69997 +  *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
69998 +  esac
69999 +
70000 +
70001
70002 -int main() {
70003 -dn_expand()
70004 -; return 0; }
70005 -EOF
70006 -if { (eval echo configure:89957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70007 -  rm -rf conftest*
70008 -  eval "ac_cv_lib_$ac_lib_var=yes"
70009 -else
70010 -  echo "configure: failed program was:" >&5
70011 -  cat conftest.$ac_ext >&5
70012 -  rm -rf conftest*
70013 -  eval "ac_cv_lib_$ac_lib_var=no"
70014 -fi
70015 -rm -f conftest*
70016 -LIBS="$ac_save_LIBS"
70017 +  b_c_pre=$php_c_pre
70018 +  b_cxx_pre=$php_cxx_pre
70019 +  b_c_meta=$php_c_meta
70020 +  b_cxx_meta=$php_cxx_meta
70021 +  b_c_post=$php_c_post
70022 +  b_cxx_post=$php_cxx_post
70023 +  b_lo=$php_lo
70024
70025 -fi
70026 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
70027 -  echo "$ac_t""yes" 1>&6
70028 -  found=yes
70029 -else
70030 -  echo "$ac_t""no" 1>&6
70031
70032 -    echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6
70033 -echo "configure:89977: checking for __dn_expand in -lbind" >&5
70034 -ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'`
70035 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
70036 -  echo $ac_n "(cached) $ac_c" 1>&6
70037 -else
70038 -  ac_save_LIBS="$LIBS"
70039 -LIBS="-lbind  $LIBS"
70040 -cat > conftest.$ac_ext <<EOF
70041 -#line 89985 "configure"
70042 -#include "confdefs.h"
70043 -/* Override any gcc2 internal prototype to avoid an error.  */
70044 -/* We use char because int might match the return type of a gcc2
70045 -    builtin and then its argument prototype would still apply.  */
70046 -char __dn_expand();
70047 +  old_IFS=$IFS
70048 +  for ac_src in sysvsem.c; do
70049 +
70050 +      IFS=.
70051 +      set $ac_src
70052 +      ac_obj=$1
70053 +      IFS=$old_IFS
70054 +
70055 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
70056
70057 -int main() {
70058 -__dn_expand()
70059 -; return 0; }
70060 +      case $ac_src in
70061 +        *.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" ;;
70062 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70063 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70064 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
70065 +      esac
70066 +
70067 +    cat >>Makefile.objects<<EOF
70068 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
70069 +       $ac_comp
70070  EOF
70071 -if { (eval echo configure:89996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70072 -  rm -rf conftest*
70073 -  eval "ac_cv_lib_$ac_lib_var=yes"
70074 -else
70075 -  echo "configure: failed program was:" >&5
70076 -  cat conftest.$ac_ext >&5
70077 -  rm -rf conftest*
70078 -  eval "ac_cv_lib_$ac_lib_var=no"
70079 -fi
70080 -rm -f conftest*
70081 -LIBS="$ac_save_LIBS"
70082 +  done
70083
70084 -fi
70085 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
70086 -  echo "$ac_t""yes" 1>&6
70087 -  found=yes
70088 -else
70089 -  echo "$ac_t""no" 1>&6
70090 -found=no
70091 -fi
70092
70093 +    EXT_STATIC="$EXT_STATIC sysvsem"
70094 +    if test "$ext_shared" != "nocli"; then
70095 +      EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
70096 +    fi
70097 +  else
70098 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
70099 +      PHP_SYSVSEM_SHARED=yes
70100 +
70101 +  case ext/sysvsem in
70102 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
70103 +  /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
70104 +  *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
70105 +  esac
70106 +
70107
70108 -fi
70109 -
70110
70111 -  if test "$found" = "yes"; then
70112 -    ac_libs=$LIBS
70113 -    LIBS="$LIBS -lbind"
70114 -    if test "$cross_compiling" = yes; then
70115 -  found=no
70116 -else
70117 -  cat > conftest.$ac_ext <<EOF
70118 -#line 90028 "configure"
70119 -#include "confdefs.h"
70120 -main() { return (0); }
70121 -EOF
70122 -if { (eval echo configure:90032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
70123 -then
70124 -  found=yes
70125 -else
70126 -  echo "configure: failed program was:" >&5
70127 -  cat conftest.$ac_ext >&5
70128 -  rm -fr conftest*
70129 -  found=no
70130 -fi
70131 -rm -fr conftest*
70132 -fi
70133 +  b_c_pre=$shared_c_pre
70134 +  b_cxx_pre=$shared_cxx_pre
70135 +  b_c_meta=$shared_c_meta
70136 +  b_cxx_meta=$shared_cxx_meta
70137 +  b_c_post=$shared_c_post
70138 +  b_cxx_post=$shared_cxx_post
70139 +  b_lo=$shared_lo
70140
70141 -    LIBS=$ac_libs
70142 -  fi
70143
70144 -  if test "$found" = "yes"; then
70145 -
70146 +  old_IFS=$IFS
70147 +  for ac_src in sysvsem.c; do
70148
70149 -  case bind in
70150 -  c|c_r|pthread*) ;;
70151 -  *)
70152 -      LIBS="-lbind $LIBS"
70153 -   ;;
70154 -  esac
70155 +      IFS=.
70156 +      set $ac_src
70157 +      ac_obj=$1
70158 +      IFS=$old_IFS
70159 +
70160 +      shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo"
70161
70162 +      case $ac_src in
70163 +        *.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" ;;
70164 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70165 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70166 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
70167 +      esac
70168
70169 -    cat >> confdefs.h <<\EOF
70170 -#define HAVE_DN_EXPAND 1
70171 +    cat >>Makefile.objects<<EOF
70172 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
70173 +       $ac_comp
70174  EOF
70175 +  done
70176
70177 -    cat >> confdefs.h <<\EOF
70178 -#define HAVE_LIBBIND 1
70179 -EOF
70180 +      case $host_alias in
70181 +        *netware*)
70182 +
70183 +  install_modules="install-modules"
70184
70185 -    ac_cv_func_dn_expand=yes
70186 +  case $host_alias in
70187 +    *aix*)
70188 +      suffix=so
70189 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvsem.so '$ext_builddir'/phpsysvsem.so'
70190 +      ;;
70191 +    *netware*)
70192 +      suffix=nlm
70193 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)'
70194 +      ;;
70195 +    *)
70196 +      suffix=la
70197 +      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_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD)'
70198 +      ;;
70199 +  esac
70200 +
70201 +  if test "x" = "xyes"; then
70202 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix"
70203    else
70204 -
70205 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix"
70206 +  fi
70207
70208 -  unset ac_cv_lib_socket_dn_expand
70209 -  unset ac_cv_lib_socket___dn_expand
70210 -  unset found
70211 -  echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6
70212 -echo "configure:90074: checking for dn_expand in -lsocket" >&5
70213 -ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'`
70214 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
70215 -  echo $ac_n "(cached) $ac_c" 1>&6
70216 -else
70217 -  ac_save_LIBS="$LIBS"
70218 -LIBS="-lsocket  $LIBS"
70219 -cat > conftest.$ac_ext <<EOF
70220 -#line 90082 "configure"
70221 -#include "confdefs.h"
70222 -/* Override any gcc2 internal prototype to avoid an error.  */
70223 -/* We use char because int might match the return type of a gcc2
70224 -    builtin and then its argument prototype would still apply.  */
70225 -char dn_expand();
70226 -
70227 -int main() {
70228 -dn_expand()
70229 -; return 0; }
70230 -EOF
70231 -if { (eval echo configure:90093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70232 -  rm -rf conftest*
70233 -  eval "ac_cv_lib_$ac_lib_var=yes"
70234 -else
70235 -  echo "configure: failed program was:" >&5
70236 -  cat conftest.$ac_ext >&5
70237 -  rm -rf conftest*
70238 -  eval "ac_cv_lib_$ac_lib_var=no"
70239 -fi
70240 -rm -f conftest*
70241 -LIBS="$ac_save_LIBS"
70242 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
70243
70244 -fi
70245 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
70246 -  echo "$ac_t""yes" 1>&6
70247 -  found=yes
70248 -else
70249 -  echo "$ac_t""no" 1>&6
70250 +  cat >>Makefile.objects<<EOF
70251 +\$(phplibdir)/phpsysvsem.$suffix: $ext_builddir/phpsysvsem.$suffix
70252 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvsem.$suffix \$(phplibdir)
70253
70254 -    echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6
70255 -echo "configure:90113: checking for __dn_expand in -lsocket" >&5
70256 -ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'`
70257 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
70258 -  echo $ac_n "(cached) $ac_c" 1>&6
70259 -else
70260 -  ac_save_LIBS="$LIBS"
70261 -LIBS="-lsocket  $LIBS"
70262 -cat > conftest.$ac_ext <<EOF
70263 -#line 90121 "configure"
70264 -#include "confdefs.h"
70265 -/* Override any gcc2 internal prototype to avoid an error.  */
70266 -/* We use char because int might match the return type of a gcc2
70267 -    builtin and then its argument prototype would still apply.  */
70268 -char __dn_expand();
70269 +$ext_builddir/phpsysvsem.$suffix: \$(shared_objects_sysvsem) \$(PHPSYSVSEM_SHARED_DEPENDENCIES)
70270 +       $link_cmd
70271
70272 -int main() {
70273 -__dn_expand()
70274 -; return 0; }
70275  EOF
70276 -if { (eval echo configure:90132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70277 -  rm -rf conftest*
70278 -  eval "ac_cv_lib_$ac_lib_var=yes"
70279 -else
70280 -  echo "configure: failed program was:" >&5
70281 -  cat conftest.$ac_ext >&5
70282 -  rm -rf conftest*
70283 -  eval "ac_cv_lib_$ac_lib_var=no"
70284 -fi
70285 -rm -f conftest*
70286 -LIBS="$ac_save_LIBS"
70287
70288 -fi
70289 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
70290 -  echo "$ac_t""yes" 1>&6
70291 -  found=yes
70292 -else
70293 -  echo "$ac_t""no" 1>&6
70294 -found=no
70295 -fi
70296 +          ;;
70297 +        *)
70298 +
70299 +  install_modules="install-modules"
70300 +
70301 +  case $host_alias in
70302 +    *aix*)
70303 +      suffix=so
70304 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(SYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvsem.so '$ext_builddir'/sysvsem.so'
70305 +      ;;
70306 +    *netware*)
70307 +      suffix=nlm
70308 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSEM, 3)_SHARED_LIBADD)'
70309 +      ;;
70310 +    *)
70311 +      suffix=la
70312 +      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_sysvsem) $(SYSVSEM_SHARED_LIBADD)'
70313 +      ;;
70314 +  esac
70315
70316 +  if test "x" = "xyes"; then
70317 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvsem.$suffix"
70318 +  else
70319 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix"
70320 +  fi
70321
70322 -fi
70323 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
70324
70325 +  cat >>Makefile.objects<<EOF
70326 +\$(phplibdir)/sysvsem.$suffix: $ext_builddir/sysvsem.$suffix
70327 +       \$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir)
70328 +
70329 +$ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES)
70330 +       $link_cmd
70331
70332 -  if test "$found" = "yes"; then
70333 -    ac_libs=$LIBS
70334 -    LIBS="$LIBS -lsocket"
70335 -    if test "$cross_compiling" = yes; then
70336 -  found=no
70337 -else
70338 -  cat > conftest.$ac_ext <<EOF
70339 -#line 90164 "configure"
70340 -#include "confdefs.h"
70341 -main() { return (0); }
70342  EOF
70343 -if { (eval echo configure:90168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
70344 -then
70345 -  found=yes
70346 -else
70347 -  echo "configure: failed program was:" >&5
70348 -  cat conftest.$ac_ext >&5
70349 -  rm -fr conftest*
70350 -  found=no
70351 -fi
70352 -rm -fr conftest*
70353 -fi
70354
70355 -    LIBS=$ac_libs
70356 +          ;;
70357 +      esac
70358 +      cat >> confdefs.h <<EOF
70359 +#define COMPILE_DL_SYSVSEM 1
70360 +EOF
70361 +
70362 +    fi
70363    fi
70364
70365 -  if test "$found" = "yes"; then
70366 -
70367 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
70368 +    PHP_SYSVSEM_SHARED=no
70369 +    case "$PHP_SAPI" in
70370 +      cgi|embed)
70371 +
70372
70373 -  case socket in
70374 -  c|c_r|pthread*) ;;
70375 -  *)
70376 -      LIBS="-lsocket $LIBS"
70377 -   ;;
70378 +  case ext/sysvsem in
70379 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
70380 +  /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
70381 +  *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
70382    esac
70383 +
70384 +
70385
70386 +  b_c_pre=$php_c_pre
70387 +  b_cxx_pre=$php_cxx_pre
70388 +  b_c_meta=$php_c_meta
70389 +  b_cxx_meta=$php_cxx_meta
70390 +  b_c_post=$php_c_post
70391 +  b_cxx_post=$php_cxx_post
70392 +  b_lo=$php_lo
70393
70394 -    cat >> confdefs.h <<\EOF
70395 -#define HAVE_DN_EXPAND 1
70396 -EOF
70397
70398 -    cat >> confdefs.h <<\EOF
70399 -#define HAVE_LIBSOCKET 1
70400 -EOF
70401 +  old_IFS=$IFS
70402 +  for ac_src in sysvsem.c; do
70403 +
70404 +      IFS=.
70405 +      set $ac_src
70406 +      ac_obj=$1
70407 +      IFS=$old_IFS
70408 +
70409 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
70410
70411 -    ac_cv_func_dn_expand=yes
70412 -  else
70413 -
70414 -  :
70415 +      case $ac_src in
70416 +        *.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" ;;
70417 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70418 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70419 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
70420 +      esac
70421
70422 -  fi
70423 -
70424 +    cat >>Makefile.objects<<EOF
70425 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
70426 +       $ac_comp
70427 +EOF
70428 +  done
70429
70430 -  fi
70431 -
70432
70433 -  fi
70434 -
70435 - ;;
70436 +        EXT_STATIC="$EXT_STATIC sysvsem"
70437 +        ;;
70438 +      *)
70439 +
70440
70441 +  case ext/sysvsem in
70442 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
70443 +  /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
70444 +  *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
70445    esac
70446 +
70447 +
70448 +
70449 +  b_c_pre=$php_c_pre
70450 +  b_cxx_pre=$php_cxx_pre
70451 +  b_c_meta=$php_c_meta
70452 +  b_cxx_meta=$php_cxx_meta
70453 +  b_c_post=$php_c_post
70454 +  b_cxx_post=$php_cxx_post
70455 +  b_lo=$php_lo
70456
70457
70458 -  unset ac_cv_func_dn_skipname
70459 -  unset ac_cv_func___dn_skipname
70460 -  unset found
70461 +  old_IFS=$IFS
70462 +  for ac_src in sysvsem.c; do
70463 +
70464 +      IFS=.
70465 +      set $ac_src
70466 +      ac_obj=$1
70467 +      IFS=$old_IFS
70468 +
70469 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
70470 +
70471 +      case $ac_src in
70472 +        *.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" ;;
70473 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70474 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70475 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
70476 +      esac
70477 +
70478 +    cat >>Makefile.objects<<EOF
70479 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
70480 +       $ac_comp
70481 +EOF
70482 +  done
70483 +
70484 +
70485 +        ;;
70486 +    esac
70487 +    EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
70488 +  fi
70489 +
70490 +
70491 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
70492
70493 -  echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
70494 -echo "configure:90225: checking for dn_skipname" >&5
70495 -if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
70496 -  echo $ac_n "(cached) $ac_c" 1>&6
70497 -else
70498 -  cat > conftest.$ac_ext <<EOF
70499 -#line 90230 "configure"
70500 -#include "confdefs.h"
70501 -/* System header to define __stub macros and hopefully few prototypes,
70502 -    which can conflict with char dn_skipname(); below.  */
70503 -#include <assert.h>
70504 -/* Override any gcc2 internal prototype to avoid an error.  */
70505 -/* We use char because int might match the return type of a gcc2
70506 -    builtin and then its argument prototype would still apply.  */
70507 -char dn_skipname();
70508
70509 -int main() {
70510
70511 -/* The GNU C library defines this for functions which it implements
70512 -    to always fail with ENOSYS.  Some functions are actually named
70513 -    something starting with __ and the normal name is an alias.  */
70514 -#if defined (__stub_dn_skipname) || defined (__stub___dn_skipname)
70515 -choke me
70516 -#else
70517 -dn_skipname();
70518 -#endif
70519 +  if test "$ext_builddir" = "."; then
70520 +    PHP_PECL_EXTENSION=sysvsem
70521 +
70522 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
70523
70524 -; return 0; }
70525 +  fi
70526 +
70527 + cat >> confdefs.h <<\EOF
70528 +#define HAVE_SYSVSEM 1
70529  EOF
70530 -if { (eval echo configure:90253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70531 -  rm -rf conftest*
70532 -  eval "ac_cv_func_dn_skipname=yes"
70533 -else
70534 -  echo "configure: failed program was:" >&5
70535 -  cat conftest.$ac_ext >&5
70536 -  rm -rf conftest*
70537 -  eval "ac_cv_func_dn_skipname=no"
70538 -fi
70539 -rm -f conftest*
70540 -fi
70541
70542 -if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then
70543 -  echo "$ac_t""yes" 1>&6
70544 -  found=yes
70545 -else
70546 -  echo "$ac_t""no" 1>&6
70547 - echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
70548 -echo "configure:90271: checking for __dn_skipname" >&5
70549 -if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
70550 + echo $ac_n "checking for union semun""... $ac_c" 1>&6
70551 +echo "configure:97261: checking for union semun" >&5
70552 +if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
70553    echo $ac_n "(cached) $ac_c" 1>&6
70554  else
70555    cat > conftest.$ac_ext <<EOF
70556 -#line 90276 "configure"
70557 +#line 97266 "configure"
70558  #include "confdefs.h"
70559 -/* System header to define __stub macros and hopefully few prototypes,
70560 -    which can conflict with char __dn_skipname(); below.  */
70561 -#include <assert.h>
70562 -/* Override any gcc2 internal prototype to avoid an error.  */
70563 -/* We use char because int might match the return type of a gcc2
70564 -    builtin and then its argument prototype would still apply.  */
70565 -char __dn_skipname();
70566
70567 +#include <sys/types.h>
70568 +#include <sys/ipc.h>
70569 +#include <sys/sem.h>
70570 +
70571  int main() {
70572 -
70573 -/* The GNU C library defines this for functions which it implements
70574 -    to always fail with ENOSYS.  Some functions are actually named
70575 -    something starting with __ and the normal name is an alias.  */
70576 -#if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname)
70577 -choke me
70578 -#else
70579 -__dn_skipname();
70580 -#endif
70581 -
70582 +union semun x;
70583  ; return 0; }
70584  EOF
70585 -if { (eval echo configure:90299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70586 +if { (eval echo configure:97277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
70587    rm -rf conftest*
70588 -  eval "ac_cv_func___dn_skipname=yes"
70589 +
70590 +     php_cv_semun=yes
70591 +
70592  else
70593    echo "configure: failed program was:" >&5
70594    cat conftest.$ac_ext >&5
70595    rm -rf conftest*
70596 -  eval "ac_cv_func___dn_skipname=no"
70597 +
70598 +     php_cv_semun=no
70599 +
70600  fi
70601  rm -f conftest*
70602 -fi
70603 -
70604 -if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then
70605 -  echo "$ac_t""yes" 1>&6
70606 -  found=yes
70607 -else
70608 -  echo "$ac_t""no" 1>&6
70609 -found=no
70610 -fi
70611
70612  fi
70613
70614 -
70615 -  case $found in
70616 -  yes)
70617 -    cat >> confdefs.h <<\EOF
70618 -#define HAVE_DN_SKIPNAME 1
70619 +echo "$ac_t""$php_cv_semun" 1>&6
70620 + if test "$php_cv_semun" = "yes"; then
70621 +   cat >> confdefs.h <<\EOF
70622 +#define HAVE_SEMUN 1
70623  EOF
70624
70625 -    ac_cv_func_dn_skipname=yes
70626 -  ;;
70627 -
70628 -    *)
70629 -
70630 -  unset ac_cv_lib_resolv_dn_skipname
70631 -  unset ac_cv_lib_resolv___dn_skipname
70632 -  unset found
70633 -  echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
70634 -echo "configure:90337: checking for dn_skipname in -lresolv" >&5
70635 -ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'`
70636 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
70637 -  echo $ac_n "(cached) $ac_c" 1>&6
70638 -else
70639 -  ac_save_LIBS="$LIBS"
70640 -LIBS="-lresolv  $LIBS"
70641 -cat > conftest.$ac_ext <<EOF
70642 -#line 90345 "configure"
70643 -#include "confdefs.h"
70644 -/* Override any gcc2 internal prototype to avoid an error.  */
70645 -/* We use char because int might match the return type of a gcc2
70646 -    builtin and then its argument prototype would still apply.  */
70647 -char dn_skipname();
70648 -
70649 -int main() {
70650 -dn_skipname()
70651 -; return 0; }
70652 + else
70653 +   cat >> confdefs.h <<\EOF
70654 +#define HAVE_SEMUN 0
70655  EOF
70656 -if { (eval echo configure:90356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70657 -  rm -rf conftest*
70658 -  eval "ac_cv_lib_$ac_lib_var=yes"
70659 -else
70660 -  echo "configure: failed program was:" >&5
70661 -  cat conftest.$ac_ext >&5
70662 -  rm -rf conftest*
70663 -  eval "ac_cv_lib_$ac_lib_var=no"
70664 -fi
70665 -rm -f conftest*
70666 -LIBS="$ac_save_LIBS"
70667
70668 + fi
70669  fi
70670 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
70671 -  echo "$ac_t""yes" 1>&6
70672 -  found=yes
70673 -else
70674 -  echo "$ac_t""no" 1>&6
70675
70676 -    echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
70677 -echo "configure:90376: checking for __dn_skipname in -lresolv" >&5
70678 -ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'`
70679 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
70680 -  echo $ac_n "(cached) $ac_c" 1>&6
70681 -else
70682 -  ac_save_LIBS="$LIBS"
70683 -LIBS="-lresolv  $LIBS"
70684 -cat > conftest.$ac_ext <<EOF
70685 -#line 90384 "configure"
70686 -#include "confdefs.h"
70687 -/* Override any gcc2 internal prototype to avoid an error.  */
70688 -/* We use char because int might match the return type of a gcc2
70689 -    builtin and then its argument prototype would still apply.  */
70690 -char __dn_skipname();
70691
70692 -int main() {
70693 -__dn_skipname()
70694 -; return 0; }
70695 -EOF
70696 -if { (eval echo configure:90395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70697 -  rm -rf conftest*
70698 -  eval "ac_cv_lib_$ac_lib_var=yes"
70699 -else
70700 -  echo "configure: failed program was:" >&5
70701 -  cat conftest.$ac_ext >&5
70702 -  rm -rf conftest*
70703 -  eval "ac_cv_lib_$ac_lib_var=no"
70704 -fi
70705 -rm -f conftest*
70706 -LIBS="$ac_save_LIBS"
70707
70708 -fi
70709 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
70710 -  echo "$ac_t""yes" 1>&6
70711 -  found=yes
70712 -else
70713 -  echo "$ac_t""no" 1>&6
70714 -found=no
70715 -fi
70716 +php_enable_sysvshm=no
70717
70718 +echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
70719 +echo "configure:97313: checking whether to enable System V shared memory support" >&5
70720 +# Check whether --enable-sysvshm or --disable-sysvshm was given.
70721 +if test "${enable_sysvshm+set}" = set; then
70722 +  enableval="$enable_sysvshm"
70723 +  PHP_SYSVSHM=$enableval
70724 +else
70725
70726 +  PHP_SYSVSHM=no
70727 +  test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL
70728 +
70729  fi
70730
70731
70732 -  if test "$found" = "yes"; then
70733 -    ac_libs=$LIBS
70734 -    LIBS="$LIBS -lresolv"
70735 -    if test "$cross_compiling" = yes; then
70736 -  found=no
70737 -else
70738 -  cat > conftest.$ac_ext <<EOF
70739 -#line 90427 "configure"
70740 -#include "confdefs.h"
70741 -main() { return (0); }
70742 -EOF
70743 -if { (eval echo configure:90431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
70744 -then
70745 -  found=yes
70746 -else
70747 -  echo "configure: failed program was:" >&5
70748 -  cat conftest.$ac_ext >&5
70749 -  rm -fr conftest*
70750 -  found=no
70751 -fi
70752 -rm -fr conftest*
70753 -fi
70754
70755 -    LIBS=$ac_libs
70756 -  fi
70757 +ext_output="yes, shared"
70758 +ext_shared=yes
70759 +case $PHP_SYSVSHM in
70760 +shared,*)
70761 +  PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'`
70762 +  ;;
70763 +shared)
70764 +  PHP_SYSVSHM=yes
70765 +  ;;
70766 +no)
70767 +  ext_output=no
70768 +  ext_shared=no
70769 +  ;;
70770 +*)
70771 +  ext_output=yes
70772 +  ext_shared=no
70773 +  ;;
70774 +esac
70775
70776 -  if test "$found" = "yes"; then
70777 -
70778 -
70779 -  case resolv in
70780 -  c|c_r|pthread*) ;;
70781 -  *)
70782 -      LIBS="-lresolv $LIBS"
70783 -   ;;
70784 -  esac
70785
70786
70787 -    cat >> confdefs.h <<\EOF
70788 -#define HAVE_DN_SKIPNAME 1
70789 -EOF
70790 +echo "$ac_t""$ext_output" 1>&6
70791
70792 -    cat >> confdefs.h <<\EOF
70793 -#define HAVE_LIBRESOLV 1
70794 +
70795 +
70796 +
70797 +if test "$PHP_SYSVSHM" != "no"; then
70798 +  cat >> confdefs.h <<\EOF
70799 +#define HAVE_SYSVSHM 1
70800  EOF
70801
70802 -    ac_cv_func_dn_skipname=yes
70803 -  else
70804 +
70805 +  ext_builddir=ext/sysvshm
70806 +  ext_srcdir=$abs_srcdir/ext/sysvshm
70807 +
70808 +  ac_extra=
70809 +
70810 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
70811 +    PHP_SYSVSHM_SHARED=no
70812
70813
70814 -  unset ac_cv_lib_bind_dn_skipname
70815 -  unset ac_cv_lib_bind___dn_skipname
70816 -  unset found
70817 -  echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
70818 -echo "configure:90473: checking for dn_skipname in -lbind" >&5
70819 -ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'`
70820 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
70821 -  echo $ac_n "(cached) $ac_c" 1>&6
70822 -else
70823 -  ac_save_LIBS="$LIBS"
70824 -LIBS="-lbind  $LIBS"
70825 -cat > conftest.$ac_ext <<EOF
70826 -#line 90481 "configure"
70827 -#include "confdefs.h"
70828 -/* Override any gcc2 internal prototype to avoid an error.  */
70829 -/* We use char because int might match the return type of a gcc2
70830 -    builtin and then its argument prototype would still apply.  */
70831 -char dn_skipname();
70832 +  case ext/sysvshm in
70833 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
70834 +  /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
70835 +  *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
70836 +  esac
70837 +
70838 +
70839
70840 -int main() {
70841 -dn_skipname()
70842 -; return 0; }
70843 -EOF
70844 -if { (eval echo configure:90492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70845 -  rm -rf conftest*
70846 -  eval "ac_cv_lib_$ac_lib_var=yes"
70847 -else
70848 -  echo "configure: failed program was:" >&5
70849 -  cat conftest.$ac_ext >&5
70850 -  rm -rf conftest*
70851 -  eval "ac_cv_lib_$ac_lib_var=no"
70852 -fi
70853 -rm -f conftest*
70854 -LIBS="$ac_save_LIBS"
70855 +  b_c_pre=$php_c_pre
70856 +  b_cxx_pre=$php_cxx_pre
70857 +  b_c_meta=$php_c_meta
70858 +  b_cxx_meta=$php_cxx_meta
70859 +  b_c_post=$php_c_post
70860 +  b_cxx_post=$php_cxx_post
70861 +  b_lo=$php_lo
70862
70863 -fi
70864 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
70865 -  echo "$ac_t""yes" 1>&6
70866 -  found=yes
70867 -else
70868 -  echo "$ac_t""no" 1>&6
70869
70870 -    echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
70871 -echo "configure:90512: checking for __dn_skipname in -lbind" >&5
70872 -ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
70873 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
70874 -  echo $ac_n "(cached) $ac_c" 1>&6
70875 -else
70876 -  ac_save_LIBS="$LIBS"
70877 -LIBS="-lbind  $LIBS"
70878 -cat > conftest.$ac_ext <<EOF
70879 -#line 90520 "configure"
70880 -#include "confdefs.h"
70881 -/* Override any gcc2 internal prototype to avoid an error.  */
70882 -/* We use char because int might match the return type of a gcc2
70883 -    builtin and then its argument prototype would still apply.  */
70884 -char __dn_skipname();
70885 +  old_IFS=$IFS
70886 +  for ac_src in sysvshm.c; do
70887 +
70888 +      IFS=.
70889 +      set $ac_src
70890 +      ac_obj=$1
70891 +      IFS=$old_IFS
70892 +
70893 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
70894
70895 -int main() {
70896 -__dn_skipname()
70897 -; return 0; }
70898 +      case $ac_src in
70899 +        *.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" ;;
70900 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70901 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
70902 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
70903 +      esac
70904 +
70905 +    cat >>Makefile.objects<<EOF
70906 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
70907 +       $ac_comp
70908  EOF
70909 -if { (eval echo configure:90531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
70910 -  rm -rf conftest*
70911 -  eval "ac_cv_lib_$ac_lib_var=yes"
70912 -else
70913 -  echo "configure: failed program was:" >&5
70914 -  cat conftest.$ac_ext >&5
70915 -  rm -rf conftest*
70916 -  eval "ac_cv_lib_$ac_lib_var=no"
70917 -fi
70918 -rm -f conftest*
70919 -LIBS="$ac_save_LIBS"
70920 +  done
70921
70922 -fi
70923 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
70924 -  echo "$ac_t""yes" 1>&6
70925 -  found=yes
70926 -else
70927 -  echo "$ac_t""no" 1>&6
70928 -found=no
70929 -fi
70930
70931 +    EXT_STATIC="$EXT_STATIC sysvshm"
70932 +    if test "$ext_shared" != "nocli"; then
70933 +      EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
70934 +    fi
70935 +  else
70936 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
70937 +      PHP_SYSVSHM_SHARED=yes
70938 +
70939 +  case ext/sysvshm in
70940 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
70941 +  /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
70942 +  *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
70943 +  esac
70944 +
70945
70946 -fi
70947 -
70948
70949 -  if test "$found" = "yes"; then
70950 -    ac_libs=$LIBS
70951 -    LIBS="$LIBS -lbind"
70952 -    if test "$cross_compiling" = yes; then
70953 -  found=no
70954 -else
70955 -  cat > conftest.$ac_ext <<EOF
70956 -#line 90563 "configure"
70957 -#include "confdefs.h"
70958 -main() { return (0); }
70959 -EOF
70960 -if { (eval echo configure:90567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
70961 -then
70962 -  found=yes
70963 -else
70964 -  echo "configure: failed program was:" >&5
70965 -  cat conftest.$ac_ext >&5
70966 -  rm -fr conftest*
70967 -  found=no
70968 -fi
70969 -rm -fr conftest*
70970 -fi
70971 +  b_c_pre=$shared_c_pre
70972 +  b_cxx_pre=$shared_cxx_pre
70973 +  b_c_meta=$shared_c_meta
70974 +  b_cxx_meta=$shared_cxx_meta
70975 +  b_c_post=$shared_c_post
70976 +  b_cxx_post=$shared_cxx_post
70977 +  b_lo=$shared_lo
70978
70979 -    LIBS=$ac_libs
70980 -  fi
70981
70982 -  if test "$found" = "yes"; then
70983 -
70984 +  old_IFS=$IFS
70985 +  for ac_src in sysvshm.c; do
70986
70987 -  case bind in
70988 -  c|c_r|pthread*) ;;
70989 -  *)
70990 -      LIBS="-lbind $LIBS"
70991 -   ;;
70992 -  esac
70993 +      IFS=.
70994 +      set $ac_src
70995 +      ac_obj=$1
70996 +      IFS=$old_IFS
70997 +
70998 +      shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo"
70999
71000 +      case $ac_src in
71001 +        *.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" ;;
71002 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
71003 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
71004 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
71005 +      esac
71006
71007 -    cat >> confdefs.h <<\EOF
71008 -#define HAVE_DN_SKIPNAME 1
71009 +    cat >>Makefile.objects<<EOF
71010 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
71011 +       $ac_comp
71012  EOF
71013 +  done
71014
71015 -    cat >> confdefs.h <<\EOF
71016 -#define HAVE_LIBBIND 1
71017 -EOF
71018 +      case $host_alias in
71019 +        *netware*)
71020 +
71021 +  install_modules="install-modules"
71022
71023 -    ac_cv_func_dn_skipname=yes
71024 +  case $host_alias in
71025 +    *aix*)
71026 +      suffix=so
71027 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvshm.so '$ext_builddir'/phpsysvshm.so'
71028 +      ;;
71029 +    *netware*)
71030 +      suffix=nlm
71031 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)'
71032 +      ;;
71033 +    *)
71034 +      suffix=la
71035 +      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_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD)'
71036 +      ;;
71037 +  esac
71038 +
71039 +  if test "x" = "xyes"; then
71040 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix"
71041    else
71042 -
71043 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix"
71044 +  fi
71045
71046 -  unset ac_cv_lib_socket_dn_skipname
71047 -  unset ac_cv_lib_socket___dn_skipname
71048 -  unset found
71049 -  echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6
71050 -echo "configure:90609: checking for dn_skipname in -lsocket" >&5
71051 -ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'`
71052 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
71053 -  echo $ac_n "(cached) $ac_c" 1>&6
71054 -else
71055 -  ac_save_LIBS="$LIBS"
71056 -LIBS="-lsocket  $LIBS"
71057 -cat > conftest.$ac_ext <<EOF
71058 -#line 90617 "configure"
71059 -#include "confdefs.h"
71060 -/* Override any gcc2 internal prototype to avoid an error.  */
71061 -/* We use char because int might match the return type of a gcc2
71062 -    builtin and then its argument prototype would still apply.  */
71063 -char dn_skipname();
71064 -
71065 -int main() {
71066 -dn_skipname()
71067 -; return 0; }
71068 -EOF
71069 -if { (eval echo configure:90628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
71070 -  rm -rf conftest*
71071 -  eval "ac_cv_lib_$ac_lib_var=yes"
71072 -else
71073 -  echo "configure: failed program was:" >&5
71074 -  cat conftest.$ac_ext >&5
71075 -  rm -rf conftest*
71076 -  eval "ac_cv_lib_$ac_lib_var=no"
71077 -fi
71078 -rm -f conftest*
71079 -LIBS="$ac_save_LIBS"
71080 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
71081
71082 -fi
71083 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
71084 -  echo "$ac_t""yes" 1>&6
71085 -  found=yes
71086 -else
71087 -  echo "$ac_t""no" 1>&6
71088 +  cat >>Makefile.objects<<EOF
71089 +\$(phplibdir)/phpsysvshm.$suffix: $ext_builddir/phpsysvshm.$suffix
71090 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvshm.$suffix \$(phplibdir)
71091
71092 -    echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6
71093 -echo "configure:90648: checking for __dn_skipname in -lsocket" >&5
71094 -ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'`
71095 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
71096 -  echo $ac_n "(cached) $ac_c" 1>&6
71097 -else
71098 -  ac_save_LIBS="$LIBS"
71099 -LIBS="-lsocket  $LIBS"
71100 -cat > conftest.$ac_ext <<EOF
71101 -#line 90656 "configure"
71102 -#include "confdefs.h"
71103 -/* Override any gcc2 internal prototype to avoid an error.  */
71104 -/* We use char because int might match the return type of a gcc2
71105 -    builtin and then its argument prototype would still apply.  */
71106 -char __dn_skipname();
71107 +$ext_builddir/phpsysvshm.$suffix: \$(shared_objects_sysvshm) \$(PHPSYSVSHM_SHARED_DEPENDENCIES)
71108 +       $link_cmd
71109
71110 -int main() {
71111 -__dn_skipname()
71112 -; return 0; }
71113  EOF
71114 -if { (eval echo configure:90667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
71115 -  rm -rf conftest*
71116 -  eval "ac_cv_lib_$ac_lib_var=yes"
71117 -else
71118 -  echo "configure: failed program was:" >&5
71119 -  cat conftest.$ac_ext >&5
71120 -  rm -rf conftest*
71121 -  eval "ac_cv_lib_$ac_lib_var=no"
71122 -fi
71123 -rm -f conftest*
71124 -LIBS="$ac_save_LIBS"
71125
71126 -fi
71127 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
71128 -  echo "$ac_t""yes" 1>&6
71129 -  found=yes
71130 -else
71131 -  echo "$ac_t""no" 1>&6
71132 -found=no
71133 -fi
71134 +          ;;
71135 +        *)
71136 +
71137 +  install_modules="install-modules"
71138 +
71139 +  case $host_alias in
71140 +    *aix*)
71141 +      suffix=so
71142 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(SYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvshm.so '$ext_builddir'/sysvshm.so'
71143 +      ;;
71144 +    *netware*)
71145 +      suffix=nlm
71146 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSHM, 3)_SHARED_LIBADD)'
71147 +      ;;
71148 +    *)
71149 +      suffix=la
71150 +      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_sysvshm) $(SYSVSHM_SHARED_LIBADD)'
71151 +      ;;
71152 +  esac
71153
71154 +  if test "x" = "xyes"; then
71155 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvshm.$suffix"
71156 +  else
71157 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvshm.$suffix"
71158 +  fi
71159
71160 -fi
71161 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
71162
71163 +  cat >>Makefile.objects<<EOF
71164 +\$(phplibdir)/sysvshm.$suffix: $ext_builddir/sysvshm.$suffix
71165 +       \$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir)
71166 +
71167 +$ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES)
71168 +       $link_cmd
71169
71170 -  if test "$found" = "yes"; then
71171 -    ac_libs=$LIBS
71172 -    LIBS="$LIBS -lsocket"
71173 -    if test "$cross_compiling" = yes; then
71174 -  found=no
71175 -else
71176 -  cat > conftest.$ac_ext <<EOF
71177 -#line 90699 "configure"
71178 -#include "confdefs.h"
71179 -main() { return (0); }
71180  EOF
71181 -if { (eval echo configure:90703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
71182 -then
71183 -  found=yes
71184 -else
71185 -  echo "configure: failed program was:" >&5
71186 -  cat conftest.$ac_ext >&5
71187 -  rm -fr conftest*
71188 -  found=no
71189 -fi
71190 -rm -fr conftest*
71191 -fi
71192
71193 -    LIBS=$ac_libs
71194 +          ;;
71195 +      esac
71196 +      cat >> confdefs.h <<EOF
71197 +#define COMPILE_DL_SYSVSHM 1
71198 +EOF
71199 +
71200 +    fi
71201    fi
71202
71203 -  if test "$found" = "yes"; then
71204 -
71205 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
71206 +    PHP_SYSVSHM_SHARED=no
71207 +    case "$PHP_SAPI" in
71208 +      cgi|embed)
71209 +
71210
71211 -  case socket in
71212 -  c|c_r|pthread*) ;;
71213 -  *)
71214 -      LIBS="-lsocket $LIBS"
71215 -   ;;
71216 +  case ext/sysvshm in
71217 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
71218 +  /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
71219 +  *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
71220    esac
71221 +
71222 +
71223
71224 +  b_c_pre=$php_c_pre
71225 +  b_cxx_pre=$php_cxx_pre
71226 +  b_c_meta=$php_c_meta
71227 +  b_cxx_meta=$php_cxx_meta
71228 +  b_c_post=$php_c_post
71229 +  b_cxx_post=$php_cxx_post
71230 +  b_lo=$php_lo
71231
71232 -    cat >> confdefs.h <<\EOF
71233 -#define HAVE_DN_SKIPNAME 1
71234 -EOF
71235
71236 -    cat >> confdefs.h <<\EOF
71237 -#define HAVE_LIBSOCKET 1
71238 +  old_IFS=$IFS
71239 +  for ac_src in sysvshm.c; do
71240 +
71241 +      IFS=.
71242 +      set $ac_src
71243 +      ac_obj=$1
71244 +      IFS=$old_IFS
71245 +
71246 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
71247 +
71248 +      case $ac_src in
71249 +        *.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" ;;
71250 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
71251 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
71252 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
71253 +      esac
71254 +
71255 +    cat >>Makefile.objects<<EOF
71256 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
71257 +       $ac_comp
71258  EOF
71259 +  done
71260
71261 -    ac_cv_func_dn_skipname=yes
71262 -  else
71263 -
71264 -  :
71265
71266 -  fi
71267 +        EXT_STATIC="$EXT_STATIC sysvshm"
71268 +        ;;
71269 +      *)
71270 +
71271
71272 -
71273 -  fi
71274 +  case ext/sysvshm in
71275 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
71276 +  /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
71277 +  *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
71278 +  esac
71279
71280 -
71281 -  fi
71282
71283 - ;;
71284 +
71285 +  b_c_pre=$php_c_pre
71286 +  b_cxx_pre=$php_cxx_pre
71287 +  b_c_meta=$php_c_meta
71288 +  b_cxx_meta=$php_cxx_meta
71289 +  b_c_post=$php_c_post
71290 +  b_cxx_post=$php_cxx_post
71291 +  b_lo=$php_lo
71292 +
71293 +
71294 +  old_IFS=$IFS
71295 +  for ac_src in sysvshm.c; do
71296
71297 -  esac
71298 +      IFS=.
71299 +      set $ac_src
71300 +      ac_obj=$1
71301 +      IFS=$old_IFS
71302 +
71303 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
71304
71305 +      case $ac_src in
71306 +        *.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" ;;
71307 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
71308 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
71309 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
71310 +      esac
71311
71312 +    cat >>Makefile.objects<<EOF
71313 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
71314 +       $ac_comp
71315 +EOF
71316 +  done
71317
71318
71319 -  unset ac_cv_func_res_search
71320 -  unset ac_cv_func___res_search
71321 -  unset found
71322 +        ;;
71323 +    esac
71324 +    EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
71325 +  fi
71326 +
71327 +
71328 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
71329
71330 -  echo $ac_n "checking for res_search""... $ac_c" 1>&6
71331 -echo "configure:90762: checking for res_search" >&5
71332 -if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
71333 -  echo $ac_n "(cached) $ac_c" 1>&6
71334 -else
71335 -  cat > conftest.$ac_ext <<EOF
71336 -#line 90767 "configure"
71337 -#include "confdefs.h"
71338 -/* System header to define __stub macros and hopefully few prototypes,
71339 -    which can conflict with char res_search(); below.  */
71340 -#include <assert.h>
71341 -/* Override any gcc2 internal prototype to avoid an error.  */
71342 -/* We use char because int might match the return type of a gcc2
71343 -    builtin and then its argument prototype would still apply.  */
71344 -char res_search();
71345
71346 -int main() {
71347
71348 -/* The GNU C library defines this for functions which it implements
71349 -    to always fail with ENOSYS.  Some functions are actually named
71350 -    something starting with __ and the normal name is an alias.  */
71351 -#if defined (__stub_res_search) || defined (__stub___res_search)
71352 -choke me
71353 -#else
71354 -res_search();
71355 -#endif
71356 +  if test "$ext_builddir" = "."; then
71357 +    PHP_PECL_EXTENSION=sysvshm
71358 +
71359 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
71360 +
71361 +  fi
71362
71363 -; return 0; }
71364 -EOF
71365 -if { (eval echo configure:90790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
71366 -  rm -rf conftest*
71367 -  eval "ac_cv_func_res_search=yes"
71368 -else
71369 -  echo "configure: failed program was:" >&5
71370 -  cat conftest.$ac_ext >&5
71371 -  rm -rf conftest*
71372 -  eval "ac_cv_func_res_search=no"
71373 -fi
71374 -rm -f conftest*
71375  fi
71376
71377 -if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then
71378 -  echo "$ac_t""yes" 1>&6
71379 -  found=yes
71380 -else
71381 -  echo "$ac_t""no" 1>&6
71382 - echo $ac_n "checking for __res_search""... $ac_c" 1>&6
71383 -echo "configure:90808: checking for __res_search" >&5
71384 -if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
71385 -  echo $ac_n "(cached) $ac_c" 1>&6
71386 -else
71387 -  cat > conftest.$ac_ext <<EOF
71388 -#line 90813 "configure"
71389 -#include "confdefs.h"
71390 -/* System header to define __stub macros and hopefully few prototypes,
71391 -    which can conflict with char __res_search(); below.  */
71392 -#include <assert.h>
71393 -/* Override any gcc2 internal prototype to avoid an error.  */
71394 -/* We use char because int might match the return type of a gcc2
71395 -    builtin and then its argument prototype would still apply.  */
71396 -char __res_search();
71397
71398 -int main() {
71399
71400 -/* The GNU C library defines this for functions which it implements
71401 -    to always fail with ENOSYS.  Some functions are actually named
71402 -    something starting with __ and the normal name is an alias.  */
71403 -#if defined (__stub___res_search) || defined (__stub_____res_search)
71404 -choke me
71405 -#else
71406 -__res_search();
71407 -#endif
71408 +php_with_tidy=no
71409
71410 -; return 0; }
71411 -EOF
71412 -if { (eval echo configure:90836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
71413 -  rm -rf conftest*
71414 -  eval "ac_cv_func___res_search=yes"
71415 +echo $ac_n "checking for TIDY support""... $ac_c" 1>&6
71416 +echo "configure:97657: checking for TIDY support" >&5
71417 +# Check whether --with-tidy or --without-tidy was given.
71418 +if test "${with_tidy+set}" = set; then
71419 +  withval="$with_tidy"
71420 +  PHP_TIDY=$withval
71421  else
71422 -  echo "configure: failed program was:" >&5
71423 -  cat conftest.$ac_ext >&5
71424 -  rm -rf conftest*
71425 -  eval "ac_cv_func___res_search=no"
71426 -fi
71427 -rm -f conftest*
71428 -fi
71429 +
71430 +  PHP_TIDY=no
71431 +  test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL
71432
71433 -if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then
71434 -  echo "$ac_t""yes" 1>&6
71435 -  found=yes
71436 -else
71437 -  echo "$ac_t""no" 1>&6
71438 -found=no
71439 -fi
71440 -
71441  fi
71442
71443
71444 -  case $found in
71445 -  yes)
71446 -    cat >> confdefs.h <<\EOF
71447 -#define HAVE_RES_SEARCH 1
71448 -EOF
71449
71450 -    ac_cv_func_res_search=yes
71451 +ext_output="yes, shared"
71452 +ext_shared=yes
71453 +case $PHP_TIDY in
71454 +shared,*)
71455 +  PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'`
71456    ;;
71457 -
71458 -    *)
71459 -
71460 -  unset ac_cv_lib_resolv_res_search
71461 -  unset ac_cv_lib_resolv___res_search
71462 -  unset found
71463 -  echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
71464 -echo "configure:90874: checking for res_search in -lresolv" >&5
71465 -ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
71466 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
71467 -  echo $ac_n "(cached) $ac_c" 1>&6
71468 -else
71469 -  ac_save_LIBS="$LIBS"
71470 -LIBS="-lresolv  $LIBS"
71471 -cat > conftest.$ac_ext <<EOF
71472 -#line 90882 "configure"
71473 -#include "confdefs.h"
71474 -/* Override any gcc2 internal prototype to avoid an error.  */
71475 -/* We use char because int might match the return type of a gcc2
71476 -    builtin and then its argument prototype would still apply.  */
71477 -char res_search();
71478 +shared)
71479 +  PHP_TIDY=yes
71480 +  ;;
71481 +no)
71482 +  ext_output=no
71483 +  ext_shared=no
71484 +  ;;
71485 +*)
71486 +  ext_output=yes
71487 +  ext_shared=no
71488 +  ;;
71489 +esac
71490
71491 -int main() {
71492 -res_search()
71493 -; return 0; }
71494 -EOF
71495 -if { (eval echo configure:90893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
71496 -  rm -rf conftest*
71497 -  eval "ac_cv_lib_$ac_lib_var=yes"
71498 -else
71499 -  echo "configure: failed program was:" >&5
71500 -  cat conftest.$ac_ext >&5
71501 -  rm -rf conftest*
71502 -  eval "ac_cv_lib_$ac_lib_var=no"
71503 -fi
71504 -rm -f conftest*
71505 -LIBS="$ac_save_LIBS"
71506
71507 -fi
71508 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
71509 -  echo "$ac_t""yes" 1>&6
71510 -  found=yes
71511 -else
71512 -  echo "$ac_t""no" 1>&6
71513
71514 -    echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
71515 -echo "configure:90913: checking for __res_search in -lresolv" >&5
71516 -ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'`
71517 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
71518 -  echo $ac_n "(cached) $ac_c" 1>&6
71519 -else
71520 -  ac_save_LIBS="$LIBS"
71521 -LIBS="-lresolv  $LIBS"
71522 -cat > conftest.$ac_ext <<EOF
71523 -#line 90921 "configure"
71524 -#include "confdefs.h"
71525 -/* Override any gcc2 internal prototype to avoid an error.  */
71526 -/* We use char because int might match the return type of a gcc2
71527 -    builtin and then its argument prototype would still apply.  */
71528 -char __res_search();
71529 +echo "$ac_t""$ext_output" 1>&6
71530
71531 -int main() {
71532 -__res_search()
71533 -; return 0; }
71534 -EOF
71535 -if { (eval echo configure:90932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
71536 -  rm -rf conftest*
71537 -  eval "ac_cv_lib_$ac_lib_var=yes"
71538 -else
71539 -  echo "configure: failed program was:" >&5
71540 -  cat conftest.$ac_ext >&5
71541 -  rm -rf conftest*
71542 -  eval "ac_cv_lib_$ac_lib_var=no"
71543 -fi
71544 -rm -f conftest*
71545 -LIBS="$ac_save_LIBS"
71546
71547 -fi
71548 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
71549 -  echo "$ac_t""yes" 1>&6
71550 -  found=yes
71551 -else
71552 -  echo "$ac_t""no" 1>&6
71553 -found=no
71554 -fi
71555
71556 -
71557 -fi
71558
71559 +if test "$PHP_TIDY" != "no"; then
71560
71561 -  if test "$found" = "yes"; then
71562 -    ac_libs=$LIBS
71563 -    LIBS="$LIBS -lresolv"
71564 -    if test "$cross_compiling" = yes; then
71565 -  found=no
71566 -else
71567 -  cat > conftest.$ac_ext <<EOF
71568 -#line 90964 "configure"
71569 -#include "confdefs.h"
71570 -main() { return (0); }
71571 -EOF
71572 -if { (eval echo configure:90968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
71573 -then
71574 -  found=yes
71575 -else
71576 -  echo "configure: failed program was:" >&5
71577 -  cat conftest.$ac_ext >&5
71578 -  rm -fr conftest*
71579 -  found=no
71580 -fi
71581 -rm -fr conftest*
71582 -fi
71583 +  if test "$PHP_TIDY" != "yes"; then
71584 +    TIDY_SEARCH_DIRS=$PHP_TIDY
71585 +  else
71586 +    TIDY_SEARCH_DIRS="/usr/local /usr"
71587 +  fi
71588
71589 -    LIBS=$ac_libs
71590 +  for i in $TIDY_SEARCH_DIRS; do
71591 +    if test -f $i/include/tidy/tidy.h; then
71592 +      TIDY_DIR=$i
71593 +      TIDY_INCDIR=$i/include/tidy
71594 +    elif test -f $i/include/tidy.h; then
71595 +      TIDY_DIR=$i
71596 +      TIDY_INCDIR=$i/include
71597 +    fi
71598 +  done
71599 +
71600 +  if test -z "$TIDY_DIR"; then
71601 +    { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; }
71602    fi
71603
71604 -  if test "$found" = "yes"; then
71605 +  TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
71606 +
71607 +
71608 +
71609 +  if test "$ext_shared" = "yes"; then
71610 +    TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD"
71611 +    if test -n "$TIDY_LIBDIR"; then
71612 +
71613 +  if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
71614 +
71615 +  if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
71616 +    ai_p=$TIDY_LIBDIR
71617 +  else
71618 +
71619 +    ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
71620 +
71621 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
71622 +    ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
71623 +  fi
71624 +
71625 +
71626 +      if test "$ext_shared" = "yes"; then
71627 +        TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD"
71628 +        test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD"
71629 +      else
71630 +
71631 +
71632 +
71633 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
71634 +
71635 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
71636 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
71637 +    eval "LIBPATH$unique=set"
71638
71639 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
71640 +    LDFLAGS="$LDFLAGS -L$ai_p"
71641 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
71642
71643 -  case resolv in
71644 -  c|c_r|pthread*) ;;
71645 -  *)
71646 -      LIBS="-lresolv $LIBS"
71647 -   ;;
71648 -  esac
71649 +  fi
71650
71651
71652 -    cat >> confdefs.h <<\EOF
71653 -#define HAVE_RES_SEARCH 1
71654 -EOF
71655 +      fi
71656 +
71657 +  fi
71658 +
71659 +    fi
71660 +  else
71661 +
71662 +
71663 +  if test -n "$TIDY_LIBDIR"; then
71664 +
71665 +  if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
71666 +
71667 +  if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
71668 +    ai_p=$TIDY_LIBDIR
71669 +  else
71670 +
71671 +    ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
71672 +
71673 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
71674 +    ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
71675 +  fi
71676 +
71677 +
71678 +
71679 +
71680 +
71681 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
71682 +
71683 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
71684 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
71685 +    eval "LIBPATH$unique=set"
71686 +
71687 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
71688 +    LDFLAGS="$LDFLAGS -L$ai_p"
71689 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
71690 +
71691 +  fi
71692
71693 -    cat >> confdefs.h <<\EOF
71694 -#define HAVE_LIBRESOLV 1
71695 -EOF
71696
71697 -    ac_cv_func_res_search=yes
71698 -  else
71699
71700 +  fi
71701 +
71702 +  fi
71703
71704 -  unset ac_cv_lib_bind_res_search
71705 -  unset ac_cv_lib_bind___res_search
71706 -  unset found
71707 -  echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
71708 -echo "configure:91010: checking for res_search in -lbind" >&5
71709 -ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'`
71710 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
71711 -  echo $ac_n "(cached) $ac_c" 1>&6
71712 -else
71713 -  ac_save_LIBS="$LIBS"
71714 -LIBS="-lbind  $LIBS"
71715 -cat > conftest.$ac_ext <<EOF
71716 -#line 91018 "configure"
71717 -#include "confdefs.h"
71718 -/* Override any gcc2 internal prototype to avoid an error.  */
71719 -/* We use char because int might match the return type of a gcc2
71720 -    builtin and then its argument prototype would still apply.  */
71721 -char res_search();
71722 +
71723 +  case tidy in
71724 +  c|c_r|pthread*) ;;
71725 +  *)
71726 +      LIBS="-ltidy $LIBS"
71727 +   ;;
71728 +  esac
71729
71730 -int main() {
71731 -res_search()
71732 -; return 0; }
71733 -EOF
71734 -if { (eval echo configure:91029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
71735 -  rm -rf conftest*
71736 -  eval "ac_cv_lib_$ac_lib_var=yes"
71737 -else
71738 -  echo "configure: failed program was:" >&5
71739 -  cat conftest.$ac_ext >&5
71740 -  rm -rf conftest*
71741 -  eval "ac_cv_lib_$ac_lib_var=no"
71742 -fi
71743 -rm -f conftest*
71744 -LIBS="$ac_save_LIBS"
71745
71746 -fi
71747 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
71748 -  echo "$ac_t""yes" 1>&6
71749 -  found=yes
71750 -else
71751 -  echo "$ac_t""no" 1>&6
71752
71753 -    echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
71754 -echo "configure:91049: checking for __res_search in -lbind" >&5
71755 -ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'`
71756 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
71757 -  echo $ac_n "(cached) $ac_c" 1>&6
71758 -else
71759 -  ac_save_LIBS="$LIBS"
71760 -LIBS="-lbind  $LIBS"
71761 -cat > conftest.$ac_ext <<EOF
71762 -#line 91057 "configure"
71763 -#include "confdefs.h"
71764 -/* Override any gcc2 internal prototype to avoid an error.  */
71765 -/* We use char because int might match the return type of a gcc2
71766 -    builtin and then its argument prototype would still apply.  */
71767 -char __res_search();
71768
71769 -int main() {
71770 -__res_search()
71771 -; return 0; }
71772 -EOF
71773 -if { (eval echo configure:91068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
71774 -  rm -rf conftest*
71775 -  eval "ac_cv_lib_$ac_lib_var=yes"
71776 -else
71777 -  echo "configure: failed program was:" >&5
71778 -  cat conftest.$ac_ext >&5
71779 -  rm -rf conftest*
71780 -  eval "ac_cv_lib_$ac_lib_var=no"
71781 -fi
71782 -rm -f conftest*
71783 -LIBS="$ac_save_LIBS"
71784 +  fi
71785
71786 -fi
71787 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
71788 -  echo "$ac_t""yes" 1>&6
71789 -  found=yes
71790 -else
71791 -  echo "$ac_t""no" 1>&6
71792 -found=no
71793 -fi
71794
71795
71796 -fi
71797 +  if test "$TIDY_INCDIR" != "/usr/include"; then
71798 +
71799 +  if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then
71800 +    ai_p=$TIDY_INCDIR
71801 +  else
71802 +
71803 +    ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
71804 +
71805 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
71806 +    ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`"
71807 +  fi
71808
71809 +
71810 +
71811 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
71812 +
71813 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
71814 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
71815 +    eval "INCLUDEPATH$unique=set"
71816 +
71817 +      if test ""; then
71818 +        INCLUDES="-I$ai_p $INCLUDES"
71819 +      else
71820 +        INCLUDES="$INCLUDES -I$ai_p"
71821 +      fi
71822 +
71823 +  fi
71824
71825 -  if test "$found" = "yes"; then
71826 -    ac_libs=$LIBS
71827 -    LIBS="$LIBS -lbind"
71828 -    if test "$cross_compiling" = yes; then
71829 -  found=no
71830 -else
71831 -  cat > conftest.$ac_ext <<EOF
71832 -#line 91100 "configure"
71833 -#include "confdefs.h"
71834 -main() { return (0); }
71835 -EOF
71836 -if { (eval echo configure:91104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
71837 -then
71838 -  found=yes
71839 -else
71840 -  echo "configure: failed program was:" >&5
71841 -  cat conftest.$ac_ext >&5
71842 -  rm -fr conftest*
71843 -  found=no
71844 -fi
71845 -rm -fr conftest*
71846 -fi
71847 +  fi
71848
71849 -    LIBS=$ac_libs
71850 +
71851 +
71852 +  save_old_LDFLAGS=$LDFLAGS
71853 +  ac_stuff=""
71854 +
71855 +  save_ext_shared=$ext_shared
71856 +  ext_shared=yes
71857 +
71858 +  for ac_i in $ac_stuff; do
71859 +    case $ac_i in
71860 +    -pthread)
71861 +      if test "$ext_shared" = "yes"; then
71862 +        LDFLAGS="$LDFLAGS -pthread"
71863 +      else
71864 +
71865 +
71866 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
71867 +
71868 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
71869 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
71870 +    eval "EXTRA_LDFLAGS$unique=set"
71871 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
71872    fi
71873
71874 -  if test "$found" = "yes"; then
71875 -
71876 +      fi
71877 +    ;;
71878 +    -l*)
71879 +      ac_ii=`echo $ac_i|cut -c 3-`
71880 +
71881
71882 -  case bind in
71883 +  case $ac_ii in
71884    c|c_r|pthread*) ;;
71885    *)
71886 -      LIBS="-lbind $LIBS"
71887 +    if test "$ext_shared" = "yes"; then
71888 +        LDFLAGS="$LDFLAGS -l$ac_ii"
71889 +    else
71890 +
71891 +
71892 +  case $ac_ii in
71893 +  c|c_r|pthread*) ;;
71894 +  *)
71895 +      LIBS="$LIBS -l$ac_ii"
71896     ;;
71897    esac
71898
71899
71900 -    cat >> confdefs.h <<\EOF
71901 -#define HAVE_RES_SEARCH 1
71902 -EOF
71903 +    fi
71904 +   ;;
71905 +  esac
71906
71907 -    cat >> confdefs.h <<\EOF
71908 -#define HAVE_LIBBIND 1
71909 -EOF
71910
71911 -    ac_cv_func_res_search=yes
71912 +    ;;
71913 +    -L*)
71914 +      ac_ii=`echo $ac_i|cut -c 3-`
71915 +
71916 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
71917 +
71918 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
71919 +    ai_p=$ac_ii
71920    else
71921
71922 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
71923 +
71924 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
71925 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
71926 +  fi
71927 +
71928 +
71929 +      if test "$ext_shared" = "yes"; then
71930 +        LDFLAGS="-L$ai_p $LDFLAGS"
71931 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
71932 +      else
71933 +
71934
71935 -  unset ac_cv_lib_socket_res_search
71936 -  unset ac_cv_lib_socket___res_search
71937 -  unset found
71938 -  echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
71939 -echo "configure:91146: checking for res_search in -lsocket" >&5
71940 -ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'`
71941 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
71942 -  echo $ac_n "(cached) $ac_c" 1>&6
71943 -else
71944 -  ac_save_LIBS="$LIBS"
71945 -LIBS="-lsocket  $LIBS"
71946 -cat > conftest.$ac_ext <<EOF
71947 -#line 91154 "configure"
71948 -#include "confdefs.h"
71949 -/* Override any gcc2 internal prototype to avoid an error.  */
71950 -/* We use char because int might match the return type of a gcc2
71951 -    builtin and then its argument prototype would still apply.  */
71952 -char res_search();
71953 +
71954 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
71955 +
71956 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
71957 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
71958 +    eval "LIBPATH$unique=set"
71959 +
71960 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
71961 +    LDFLAGS="$LDFLAGS -L$ai_p"
71962 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
71963 +
71964 +  fi
71965
71966 -int main() {
71967 -res_search()
71968 -; return 0; }
71969 -EOF
71970 -if { (eval echo configure:91165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
71971 -  rm -rf conftest*
71972 -  eval "ac_cv_lib_$ac_lib_var=yes"
71973 -else
71974 -  echo "configure: failed program was:" >&5
71975 -  cat conftest.$ac_ext >&5
71976 -  rm -rf conftest*
71977 -  eval "ac_cv_lib_$ac_lib_var=no"
71978 -fi
71979 -rm -f conftest*
71980 -LIBS="$ac_save_LIBS"
71981
71982 -fi
71983 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
71984 -  echo "$ac_t""yes" 1>&6
71985 -  found=yes
71986 -else
71987 -  echo "$ac_t""no" 1>&6
71988 +      fi
71989 +
71990 +  fi
71991
71992 -    echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
71993 -echo "configure:91185: checking for __res_search in -lsocket" >&5
71994 -ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'`
71995 +    ;;
71996 +    esac
71997 +  done
71998 +
71999 +  echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6
72000 +echo "configure:97946: checking for tidyOptGetDoc in -ltidy" >&5
72001 +ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'`
72002  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
72003    echo $ac_n "(cached) $ac_c" 1>&6
72004  else
72005    ac_save_LIBS="$LIBS"
72006 -LIBS="-lsocket  $LIBS"
72007 +LIBS="-ltidy  $LIBS"
72008  cat > conftest.$ac_ext <<EOF
72009 -#line 91193 "configure"
72010 +#line 97954 "configure"
72011  #include "confdefs.h"
72012  /* Override any gcc2 internal prototype to avoid an error.  */
72013  /* We use char because int might match the return type of a gcc2
72014      builtin and then its argument prototype would still apply.  */
72015 -char __res_search();
72016 +char tidyOptGetDoc();
72017
72018  int main() {
72019 -__res_search()
72020 +tidyOptGetDoc()
72021  ; return 0; }
72022  EOF
72023 -if { (eval echo configure:91204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
72024 +if { (eval echo configure:97965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
72025    rm -rf conftest*
72026    eval "ac_cv_lib_$ac_lib_var=yes"
72027  else
72028 @@ -91215,618 +97976,390 @@ LIBS="$ac_save_LIBS"
72029  fi
72030  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
72031    echo "$ac_t""yes" 1>&6
72032 -  found=yes
72033 -else
72034 -  echo "$ac_t""no" 1>&6
72035 -found=no
72036 -fi
72037 -
72038
72039 -fi
72040 -
72041 -
72042 -  if test "$found" = "yes"; then
72043 -    ac_libs=$LIBS
72044 -    LIBS="$LIBS -lsocket"
72045 -    if test "$cross_compiling" = yes; then
72046 -  found=no
72047 -else
72048 -  cat > conftest.$ac_ext <<EOF
72049 -#line 91236 "configure"
72050 -#include "confdefs.h"
72051 -main() { return (0); }
72052 +    LDFLAGS=$save_old_LDFLAGS
72053 +    ext_shared=$save_ext_shared
72054 +
72055 +  cat >> confdefs.h <<\EOF
72056 +#define HAVE_TIDYOPTGETDOC 1
72057  EOF
72058 -if { (eval echo configure:91240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
72059 -then
72060 -  found=yes
72061 -else
72062 -  echo "configure: failed program was:" >&5
72063 -  cat conftest.$ac_ext >&5
72064 -  rm -fr conftest*
72065 -  found=no
72066 -fi
72067 -rm -fr conftest*
72068 -fi
72069
72070 -    LIBS=$ac_libs
72071 -  fi
72072 +
72073 +
72074 +else
72075 +  echo "$ac_t""no" 1>&6
72076
72077 -  if test "$found" = "yes"; then
72078 +    LDFLAGS=$save_old_LDFLAGS
72079 +    ext_shared=$save_ext_shared
72080 +    unset ac_cv_lib_tidy_tidyOptGetDoc
72081
72082
72083 -  case socket in
72084 -  c|c_r|pthread*) ;;
72085 -  *)
72086 -      LIBS="-lsocket $LIBS"
72087 -   ;;
72088 -  esac
72089 -
72090 -
72091 -    cat >> confdefs.h <<\EOF
72092 -#define HAVE_RES_SEARCH 1
72093 -EOF
72094 +fi
72095
72096 -    cat >> confdefs.h <<\EOF
72097 -#define HAVE_LIBSOCKET 1
72098 -EOF
72099
72100 -    ac_cv_func_res_search=yes
72101 -  else
72102 -
72103 -  :
72104
72105 -  fi
72106
72107 +  ext_builddir=ext/tidy
72108 +  ext_srcdir=$abs_srcdir/ext/tidy
72109
72110 -  fi
72111 -
72112 +  ac_extra=
72113
72114 -  fi
72115 -
72116 - ;;
72117 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
72118 +    PHP_TIDY_SHARED=no
72119 +
72120
72121 +  case ext/tidy in
72122 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
72123 +  /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
72124 +  *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
72125    esac
72126 -
72127 -
72128 -echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
72129 -echo "configure:91293: checking whether atof() accepts NAN" >&5
72130 -if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then
72131 -  echo $ac_n "(cached) $ac_c" 1>&6
72132 -else
72133
72134 -if test "$cross_compiling" = yes; then
72135
72136 -  ac_cv_atof_accept_nan=no
72137 -
72138 -else
72139 -  cat > conftest.$ac_ext <<EOF
72140 -#line 91304 "configure"
72141 -#include "confdefs.h"
72142 -
72143 -#include <math.h>
72144 -#include <stdlib.h>
72145 -
72146 -#ifdef HAVE_ISNAN
72147 -#define zend_isnan(a) isnan(a)
72148 -#elif defined(HAVE_FPCLASS)
72149 -#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
72150 -#else
72151 -#define zend_isnan(a) 0
72152 -#endif
72153
72154 -int main(int argc, char** argv)
72155 -{
72156 -       return zend_isnan(atof("NAN")) ? 0 : 1;
72157 -}
72158 +  b_c_pre=$php_c_pre
72159 +  b_cxx_pre=$php_cxx_pre
72160 +  b_c_meta=$php_c_meta
72161 +  b_cxx_meta=$php_cxx_meta
72162 +  b_c_post=$php_c_post
72163 +  b_cxx_post=$php_cxx_post
72164 +  b_lo=$php_lo
72165
72166 -EOF
72167 -if { (eval echo configure:91324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
72168 -then
72169 -
72170 -  ac_cv_atof_accept_nan=yes
72171
72172 -else
72173 -  echo "configure: failed program was:" >&5
72174 -  cat conftest.$ac_ext >&5
72175 -  rm -fr conftest*
72176 +  old_IFS=$IFS
72177 +  for ac_src in tidy.c; do
72178
72179 -  ac_cv_atof_accept_nan=no
72180 -
72181 -fi
72182 -rm -fr conftest*
72183 -fi
72184 +      IFS=.
72185 +      set $ac_src
72186 +      ac_obj=$1
72187 +      IFS=$old_IFS
72188 +
72189 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
72190
72191 -fi
72192 +      case $ac_src in
72193 +        *.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" ;;
72194 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
72195 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
72196 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
72197 +      esac
72198
72199 -echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6
72200 -if test "$ac_cv_atof_accept_nan" = "yes"; then
72201 -  cat >> confdefs.h <<\EOF
72202 -#define HAVE_ATOF_ACCEPTS_NAN 1
72203 +    cat >>Makefile.objects<<EOF
72204 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
72205 +       $ac_comp
72206  EOF
72207 +  done
72208
72209 -fi
72210
72211 -echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
72212 -echo "configure:91351: checking whether atof() accepts INF" >&5
72213 -if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then
72214 -  echo $ac_n "(cached) $ac_c" 1>&6
72215 -else
72216 +    EXT_STATIC="$EXT_STATIC tidy"
72217 +    if test "$ext_shared" != "nocli"; then
72218 +      EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
72219 +    fi
72220 +  else
72221 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
72222 +      PHP_TIDY_SHARED=yes
72223 +
72224 +  case ext/tidy in
72225 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
72226 +  /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
72227 +  *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
72228 +  esac
72229
72230 -if test "$cross_compiling" = yes; then
72231
72232 -  ac_cv_atof_accept_inf=no
72233
72234 -else
72235 -  cat > conftest.$ac_ext <<EOF
72236 -#line 91362 "configure"
72237 -#include "confdefs.h"
72238 +  b_c_pre=$shared_c_pre
72239 +  b_cxx_pre=$shared_cxx_pre
72240 +  b_c_meta=$shared_c_meta
72241 +  b_cxx_meta=$shared_cxx_meta
72242 +  b_c_post=$shared_c_post
72243 +  b_cxx_post=$shared_cxx_post
72244 +  b_lo=$shared_lo
72245
72246 -#include <math.h>
72247 -#include <stdlib.h>
72248
72249 -#ifdef HAVE_ISINF
72250 -#define zend_isinf(a) isinf(a)
72251 -#elif defined(INFINITY)
72252 -/* Might not work, but is required by ISO C99 */
72253 -#define zend_isinf(a) (((a)==INFINITY)?1:0)
72254 -#elif defined(HAVE_FPCLASS)
72255 -#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
72256 -#else
72257 -#define zend_isinf(a) 0
72258 -#endif
72259 +  old_IFS=$IFS
72260 +  for ac_src in tidy.c; do
72261 +
72262 +      IFS=.
72263 +      set $ac_src
72264 +      ac_obj=$1
72265 +      IFS=$old_IFS
72266 +
72267 +      shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo"
72268
72269 -int main(int argc, char** argv)
72270 -{
72271 -       return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1;
72272 -}
72273 +      case $ac_src in
72274 +        *.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" ;;
72275 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
72276 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
72277 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
72278 +      esac
72279
72280 +    cat >>Makefile.objects<<EOF
72281 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
72282 +       $ac_comp
72283  EOF
72284 -if { (eval echo configure:91385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
72285 -then
72286 -
72287 -  ac_cv_atof_accept_inf=yes
72288 +  done
72289
72290 -else
72291 -  echo "configure: failed program was:" >&5
72292 -  cat conftest.$ac_ext >&5
72293 -  rm -fr conftest*
72294 +      case $host_alias in
72295 +        *netware*)
72296 +
72297 +  install_modules="install-modules"
72298 +
72299 +  case $host_alias in
72300 +    *aix*)
72301 +      suffix=so
72302 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptidy.so '$ext_builddir'/phptidy.so'
72303 +      ;;
72304 +    *netware*)
72305 +      suffix=nlm
72306 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)'
72307 +      ;;
72308 +    *)
72309 +      suffix=la
72310 +      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_tidy) $(PHPTIDY_SHARED_LIBADD)'
72311 +      ;;
72312 +  esac
72313 +
72314 +  if test "x" = "xyes"; then
72315 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix"
72316 +  else
72317 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix"
72318 +  fi
72319
72320 -  ac_cv_atof_accept_inf=no
72321 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
72322
72323 -fi
72324 -rm -fr conftest*
72325 -fi
72326 +  cat >>Makefile.objects<<EOF
72327 +\$(phplibdir)/phptidy.$suffix: $ext_builddir/phptidy.$suffix
72328 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phptidy.$suffix \$(phplibdir)
72329
72330 -fi
72331 +$ext_builddir/phptidy.$suffix: \$(shared_objects_tidy) \$(PHPTIDY_SHARED_DEPENDENCIES)
72332 +       $link_cmd
72333
72334 -echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6
72335 -if test "$ac_cv_atof_accept_inf" = "yes"; then
72336 -  cat >> confdefs.h <<\EOF
72337 -#define HAVE_ATOF_ACCEPTS_INF 1
72338  EOF
72339
72340 -fi
72341 -
72342 -echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
72343 -echo "configure:91412: checking whether HUGE_VAL == INF" >&5
72344 -if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then
72345 -  echo $ac_n "(cached) $ac_c" 1>&6
72346 -else
72347 -
72348 -if test "$cross_compiling" = yes; then
72349 -
72350 -  ac_cv_huge_val_inf=yes
72351 -
72352 -else
72353 -  cat > conftest.$ac_ext <<EOF
72354 -#line 91423 "configure"
72355 -#include "confdefs.h"
72356 -
72357 -#include <math.h>
72358 -#include <stdlib.h>
72359 -
72360 -#ifdef HAVE_ISINF
72361 -#define zend_isinf(a) isinf(a)
72362 -#elif defined(INFINITY)
72363 -/* Might not work, but is required by ISO C99 */
72364 -#define zend_isinf(a) (((a)==INFINITY)?1:0)
72365 -#elif defined(HAVE_FPCLASS)
72366 -#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
72367 -#else
72368 -#define zend_isinf(a) 0
72369 -#endif
72370 +          ;;
72371 +        *)
72372 +
72373 +  install_modules="install-modules"
72374
72375 -int main(int argc, char** argv)
72376 -{
72377 -       return zend_isinf(HUGE_VAL) ? 0 : 1;
72378 -}
72379 +  case $host_alias in
72380 +    *aix*)
72381 +      suffix=so
72382 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/tidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(TIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tidy.so '$ext_builddir'/tidy.so'
72383 +      ;;
72384 +    *netware*)
72385 +      suffix=nlm
72386 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TIDY, 3)_SHARED_LIBADD)'
72387 +      ;;
72388 +    *)
72389 +      suffix=la
72390 +      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_tidy) $(TIDY_SHARED_LIBADD)'
72391 +      ;;
72392 +  esac
72393
72394 -EOF
72395 -if { (eval echo configure:91446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
72396 -then
72397 +  if test "x" = "xyes"; then
72398 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tidy.$suffix"
72399 +  else
72400 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix"
72401 +  fi
72402
72403 -  ac_cv_huge_val_inf=yes
72404 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
72405
72406 -else
72407 -  echo "configure: failed program was:" >&5
72408 -  cat conftest.$ac_ext >&5
72409 -  rm -fr conftest*
72410 -
72411 -  ac_cv_huge_val_inf=no
72412 +  cat >>Makefile.objects<<EOF
72413 +\$(phplibdir)/tidy.$suffix: $ext_builddir/tidy.$suffix
72414 +       \$(LIBTOOL) --mode=install cp $ext_builddir/tidy.$suffix \$(phplibdir)
72415
72416 -fi
72417 -rm -fr conftest*
72418 -fi
72419 +$ext_builddir/tidy.$suffix: \$(shared_objects_tidy) \$(TIDY_SHARED_DEPENDENCIES)
72420 +       $link_cmd
72421
72422 -fi
72423 +EOF
72424
72425 -echo "$ac_t""$ac_cv_huge_val_inf" 1>&6
72426 -if test "$ac_cv_huge_val_inf" = "yes"; then
72427 -  cat >> confdefs.h <<\EOF
72428 -#define HAVE_HUGE_VAL_INF 1
72429 +          ;;
72430 +      esac
72431 +      cat >> confdefs.h <<EOF
72432 +#define COMPILE_DL_TIDY 1
72433  EOF
72434
72435 -fi
72436 +    fi
72437 +  fi
72438
72439 -echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
72440 -echo "configure:91473: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
72441 -if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then
72442 -  echo $ac_n "(cached) $ac_c" 1>&6
72443 -else
72444 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
72445 +    PHP_TIDY_SHARED=no
72446 +    case "$PHP_SAPI" in
72447 +      cgi|embed)
72448 +
72449 +
72450 +  case ext/tidy in
72451 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
72452 +  /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
72453 +  *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
72454 +  esac
72455
72456 -if test "$cross_compiling" = yes; then
72457
72458 -  ac_cv_huge_val_nan=yes
72459 -
72460 -else
72461 -  cat > conftest.$ac_ext <<EOF
72462 -#line 91484 "configure"
72463 -#include "confdefs.h"
72464 -
72465 -#include <math.h>
72466 -#include <stdlib.h>
72467 -
72468 -#ifdef HAVE_ISNAN
72469 -#define zend_isnan(a) isnan(a)
72470 -#elif defined(HAVE_FPCLASS)
72471 -#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
72472 -#else
72473 -#define zend_isnan(a) 0
72474 -#endif
72475
72476 -int main(int argc, char** argv)
72477 -{
72478 -#if defined(__sparc__) && !(__GNUC__ >= 3)
72479 -       /* prevent bug #27830 */
72480 -       return 1;
72481 -#else
72482 -       return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1;
72483 -#endif
72484 -}
72485 +  b_c_pre=$php_c_pre
72486 +  b_cxx_pre=$php_cxx_pre
72487 +  b_c_meta=$php_c_meta
72488 +  b_cxx_meta=$php_cxx_meta
72489 +  b_c_post=$php_c_post
72490 +  b_cxx_post=$php_cxx_post
72491 +  b_lo=$php_lo
72492
72493 -EOF
72494 -if { (eval echo configure:91509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
72495 -then
72496 -
72497 -  ac_cv_huge_val_nan=yes
72498
72499 -else
72500 -  echo "configure: failed program was:" >&5
72501 -  cat conftest.$ac_ext >&5
72502 -  rm -fr conftest*
72503 +  old_IFS=$IFS
72504 +  for ac_src in tidy.c; do
72505
72506 -  ac_cv_huge_val_nan=no
72507 -
72508 -fi
72509 -rm -fr conftest*
72510 -fi
72511 +      IFS=.
72512 +      set $ac_src
72513 +      ac_obj=$1
72514 +      IFS=$old_IFS
72515 +
72516 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
72517
72518 -fi
72519 +      case $ac_src in
72520 +        *.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" ;;
72521 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
72522 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
72523 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
72524 +      esac
72525
72526 -echo "$ac_t""$ac_cv_huge_val_nan" 1>&6
72527 -if test "$ac_cv_huge_val_nan" = "yes"; then
72528 -  cat >> confdefs.h <<\EOF
72529 -#define HAVE_HUGE_VAL_NAN 1
72530 +    cat >>Makefile.objects<<EOF
72531 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
72532 +       $ac_comp
72533  EOF
72534 +  done
72535
72536 -fi
72537
72538 -echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6
72539 -echo "configure:91536: checking whether strptime() declaration fails" >&5
72540 -if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then
72541 -  echo $ac_n "(cached) $ac_c" 1>&6
72542 -else
72543 +        EXT_STATIC="$EXT_STATIC tidy"
72544 +        ;;
72545 +      *)
72546 +
72547 +
72548 +  case ext/tidy in
72549 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
72550 +  /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
72551 +  *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
72552 +  esac
72553 +
72554
72555 -cat > conftest.$ac_ext <<EOF
72556 -#line 91542 "configure"
72557 -#include "confdefs.h"
72558 -
72559 -#include <time.h>
72560 -
72561 -int main() {
72562
72563 -#ifndef HAVE_STRPTIME
72564 -#error no strptime() on this platform
72565 -#else
72566 -/* use invalid strptime() declaration to see if it fails to compile */
72567 -int strptime(const char *s, const char *format, struct tm *tm);
72568 -#endif
72569 +  b_c_pre=$php_c_pre
72570 +  b_cxx_pre=$php_cxx_pre
72571 +  b_c_meta=$php_c_meta
72572 +  b_cxx_meta=$php_cxx_meta
72573 +  b_c_post=$php_c_post
72574 +  b_cxx_post=$php_cxx_post
72575 +  b_lo=$php_lo
72576
72577 -; return 0; }
72578 -EOF
72579 -if { (eval echo configure:91558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
72580 -  rm -rf conftest*
72581 -
72582 -  ac_cv_strptime_decl_fails=no
72583
72584 -else
72585 -  echo "configure: failed program was:" >&5
72586 -  cat conftest.$ac_ext >&5
72587 -  rm -rf conftest*
72588 +  old_IFS=$IFS
72589 +  for ac_src in tidy.c; do
72590
72591 -  ac_cv_strptime_decl_fails=yes
72592 +      IFS=.
72593 +      set $ac_src
72594 +      ac_obj=$1
72595 +      IFS=$old_IFS
72596 +
72597 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
72598
72599 -fi
72600 -rm -f conftest*
72601 -fi
72602 +      case $ac_src in
72603 +        *.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" ;;
72604 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
72605 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
72606 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
72607 +      esac
72608
72609 -echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6
72610 -if test "$ac_cv_strptime_decl_fails" = "yes"; then
72611 -  cat >> confdefs.h <<\EOF
72612 -#define HAVE_STRPTIME_DECL_FAILS 1
72613 +    cat >>Makefile.objects<<EOF
72614 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
72615 +       $ac_comp
72616  EOF
72617 +  done
72618
72619 -fi
72620
72621 -for ac_hdr in wchar.h
72622 -do
72623 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
72624 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
72625 -echo "configure:91586: checking for $ac_hdr" >&5
72626 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
72627 -  echo $ac_n "(cached) $ac_c" 1>&6
72628 -else
72629 -  cat > conftest.$ac_ext <<EOF
72630 -#line 91591 "configure"
72631 -#include "confdefs.h"
72632 -#include <$ac_hdr>
72633 -EOF
72634 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
72635 -{ (eval echo configure:91596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
72636 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
72637 -if test -z "$ac_err"; then
72638 -  rm -rf conftest*
72639 -  eval "ac_cv_header_$ac_safe=yes"
72640 -else
72641 -  echo "$ac_err" >&5
72642 -  echo "configure: failed program was:" >&5
72643 -  cat conftest.$ac_ext >&5
72644 -  rm -rf conftest*
72645 -  eval "ac_cv_header_$ac_safe=no"
72646 -fi
72647 -rm -f conftest*
72648 -fi
72649 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
72650 -  echo "$ac_t""yes" 1>&6
72651 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
72652 -  cat >> confdefs.h <<EOF
72653 -#define $ac_tr_hdr 1
72654 -EOF
72655 -
72656 -else
72657 -  echo "$ac_t""no" 1>&6
72658 -fi
72659 -done
72660 +        ;;
72661 +    esac
72662 +    EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
72663 +  fi
72664 +
72665 +
72666 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
72667 +
72668
72669 -for ac_func in mblen
72670 -do
72671 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
72672 -echo "configure:91625: checking for $ac_func" >&5
72673 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
72674 -  echo $ac_n "(cached) $ac_c" 1>&6
72675 -else
72676 -  cat > conftest.$ac_ext <<EOF
72677 -#line 91630 "configure"
72678 -#include "confdefs.h"
72679 -/* System header to define __stub macros and hopefully few prototypes,
72680 -    which can conflict with char $ac_func(); below.  */
72681 -#include <assert.h>
72682 -/* Override any gcc2 internal prototype to avoid an error.  */
72683 -/* We use char because int might match the return type of a gcc2
72684 -    builtin and then its argument prototype would still apply.  */
72685 -char $ac_func();
72686
72687 -int main() {
72688 +  if test "$ext_builddir" = "."; then
72689 +    PHP_PECL_EXTENSION=tidy
72690 +
72691 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
72692
72693 -/* The GNU C library defines this for functions which it implements
72694 -    to always fail with ENOSYS.  Some functions are actually named
72695 -    something starting with __ and the normal name is an alias.  */
72696 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
72697 -choke me
72698 -#else
72699 -$ac_func();
72700 -#endif
72701 +  fi
72702
72703 -; return 0; }
72704 -EOF
72705 -if { (eval echo configure:91653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
72706 -  rm -rf conftest*
72707 -  eval "ac_cv_func_$ac_func=yes"
72708 -else
72709 -  echo "configure: failed program was:" >&5
72710 -  cat conftest.$ac_ext >&5
72711 -  rm -rf conftest*
72712 -  eval "ac_cv_func_$ac_func=no"
72713 -fi
72714 -rm -f conftest*
72715 -fi
72716 +
72717 +  PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD"
72718
72719 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
72720 -  echo "$ac_t""yes" 1>&6
72721 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
72722 -  cat >> confdefs.h <<EOF
72723 -#define $ac_tr_func 1
72724 +  cat >> confdefs.h <<\EOF
72725 +#define HAVE_TIDY 1
72726  EOF
72727 -
72728 -else
72729 -  echo "$ac_t""no" 1>&6
72730 -fi
72731 -done
72732
72733 -for ac_func in mbrlen mbsinit
72734 -do
72735 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
72736 -echo "configure:91680: checking for $ac_func" >&5
72737 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
72738 -  echo $ac_n "(cached) $ac_c" 1>&6
72739 -else
72740 -  cat > conftest.$ac_ext <<EOF
72741 -#line 91685 "configure"
72742 -#include "confdefs.h"
72743 -/* System header to define __stub macros and hopefully few prototypes,
72744 -    which can conflict with char $ac_func(); below.  */
72745 -#include <assert.h>
72746 -/* Override any gcc2 internal prototype to avoid an error.  */
72747 -/* We use char because int might match the return type of a gcc2
72748 -    builtin and then its argument prototype would still apply.  */
72749 -char $ac_func();
72750 +fi
72751
72752 -int main() {
72753
72754 -/* The GNU C library defines this for functions which it implements
72755 -    to always fail with ENOSYS.  Some functions are actually named
72756 -    something starting with __ and the normal name is an alias.  */
72757 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
72758 -choke me
72759 -#else
72760 -$ac_func();
72761 -#endif
72762
72763 -; return 0; }
72764 -EOF
72765 -if { (eval echo configure:91708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
72766 -  rm -rf conftest*
72767 -  eval "ac_cv_func_$ac_func=yes"
72768 -else
72769 -  echo "configure: failed program was:" >&5
72770 -  cat conftest.$ac_ext >&5
72771 -  rm -rf conftest*
72772 -  eval "ac_cv_func_$ac_func=no"
72773 -fi
72774 -rm -f conftest*
72775 -fi
72776
72777 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
72778 -  echo "$ac_t""yes" 1>&6
72779 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
72780 -  cat >> confdefs.h <<EOF
72781 -#define $ac_tr_func 1
72782 -EOF
72783 -
72784 -else
72785 -  echo "$ac_t""no" 1>&6
72786 -fi
72787 -done
72788 +php_enable_tokenizer=yes
72789
72790 -echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
72791 -echo "configure:91733: checking for mbstate_t" >&5
72792 -if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
72793 -  echo $ac_n "(cached) $ac_c" 1>&6
72794 +echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
72795 +echo "configure:98309: checking whether to enable tokenizer support" >&5
72796 +# Check whether --enable-tokenizer or --disable-tokenizer was given.
72797 +if test "${enable_tokenizer+set}" = set; then
72798 +  enableval="$enable_tokenizer"
72799 +  PHP_TOKENIZER=$enableval
72800  else
72801
72802 -cat > conftest.$ac_ext <<EOF
72803 -#line 91739 "configure"
72804 -#include "confdefs.h"
72805 -
72806 -#ifdef HAVE_WCHAR_H
72807 -# include <wchar.h>
72808 -#endif
72809 +  PHP_TOKENIZER=yes
72810 +  test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL
72811
72812 -int main() {
72813 +fi
72814
72815 -int __tmp__() { mbstate_t a; }
72816
72817 -; return 0; }
72818 -EOF
72819 -if { (eval echo configure:91752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
72820 -  rm -rf conftest*
72821 -
72822 -  ac_cv_type_mbstate_t=yes
72823
72824 -else
72825 -  echo "configure: failed program was:" >&5
72826 -  cat conftest.$ac_ext >&5
72827 -  rm -rf conftest*
72828 -
72829 -  ac_cv_type_mbstate_t=no
72830 +ext_output="yes, shared"
72831 +ext_shared=yes
72832 +case $PHP_TOKENIZER in
72833 +shared,*)
72834 +  PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'`
72835 +  ;;
72836 +shared)
72837 +  PHP_TOKENIZER=yes
72838 +  ;;
72839 +no)
72840 +  ext_output=no
72841 +  ext_shared=no
72842 +  ;;
72843 +*)
72844 +  ext_output=yes
72845 +  ext_shared=no
72846 +  ;;
72847 +esac
72848
72849 -fi
72850 -rm -f conftest*
72851 -fi
72852
72853 -echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6
72854 -if test "$ac_cv_type_mbstate_t" = "yes"; then
72855 -  cat >> confdefs.h <<\EOF
72856 -#define HAVE_MBSTATE_T 1
72857 -EOF
72858
72859 -fi
72860 +echo "$ac_t""$ext_output" 1>&6
72861
72862 -for ac_hdr in atomic.h
72863 -do
72864 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
72865 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
72866 -echo "configure:91780: checking for $ac_hdr" >&5
72867 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
72868 -  echo $ac_n "(cached) $ac_c" 1>&6
72869 -else
72870 -  cat > conftest.$ac_ext <<EOF
72871 -#line 91785 "configure"
72872 -#include "confdefs.h"
72873 -#include <$ac_hdr>
72874 -EOF
72875 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
72876 -{ (eval echo configure:91790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
72877 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
72878 -if test -z "$ac_err"; then
72879 -  rm -rf conftest*
72880 -  eval "ac_cv_header_$ac_safe=yes"
72881 -else
72882 -  echo "$ac_err" >&5
72883 -  echo "configure: failed program was:" >&5
72884 -  cat conftest.$ac_ext >&5
72885 -  rm -rf conftest*
72886 -  eval "ac_cv_header_$ac_safe=no"
72887 -fi
72888 -rm -f conftest*
72889 -fi
72890 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
72891 -  echo "$ac_t""yes" 1>&6
72892 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
72893 -  cat >> confdefs.h <<EOF
72894 -#define $ac_tr_hdr 1
72895 -EOF
72896 -
72897 -else
72898 -  echo "$ac_t""no" 1>&6
72899 -fi
72900 -done
72901
72902
72903
72904 -  ext_builddir=ext/standard
72905 -  ext_srcdir=$abs_srcdir/ext/standard
72906 +if test "$PHP_TOKENIZER" != "no"; then
72907 +
72908 +  ext_builddir=ext/tokenizer
72909 +  ext_srcdir=$abs_srcdir/ext/tokenizer
72910
72911    ac_extra=
72912
72913 -  if test "" != "shared" && test "" != "yes" && test "" != "cli"; then
72914 -    PHP_STANDARD_SHARED=no
72915 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
72916 +    PHP_TOKENIZER_SHARED=no
72917
72918
72919 -  case ext/standard in
72920 +  case ext/tokenizer in
72921    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
72922 -  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
72923 -  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
72924 +  /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
72925 +  *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
72926    esac
72927
72928
72929 @@ -91841,17 +98374,7 @@ done
72930
72931
72932    old_IFS=$IFS
72933 -  for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
72934 -                            cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
72935 -                            flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
72936 -                            info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
72937 -                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
72938 -                            soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
72939 -                            var.c versioning.c assert.c strnatcmp.c levenshtein.c \
72940 -                            incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
72941 -                            http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
72942 -                            var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
72943 -                            filters.c proc_open.c streamsfuncs.c http.c; do
72944 +  for ac_src in tokenizer.c tokenizer_data.c; do
72945
72946        IFS=.
72947        set $ac_src
72948 @@ -91874,18 +98397,18 @@ EOF
72949    done
72950
72951
72952 -    EXT_STATIC="$EXT_STATIC standard"
72953 -    if test "" != "nocli"; then
72954 -      EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
72955 +    EXT_STATIC="$EXT_STATIC tokenizer"
72956 +    if test "$ext_shared" != "nocli"; then
72957 +      EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
72958      fi
72959    else
72960 -    if test "" = "shared" || test "" = "yes"; then
72961 -      PHP_STANDARD_SHARED=yes
72962 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
72963 +      PHP_TOKENIZER_SHARED=yes
72964
72965 -  case ext/standard in
72966 +  case ext/tokenizer in
72967    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
72968 -  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
72969 -  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
72970 +  /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
72971 +  *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
72972    esac
72973
72974
72975 @@ -91900,24 +98423,14 @@ EOF
72976
72977
72978    old_IFS=$IFS
72979 -  for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
72980 -                            cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
72981 -                            flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
72982 -                            info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
72983 -                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
72984 -                            soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
72985 -                            var.c versioning.c assert.c strnatcmp.c levenshtein.c \
72986 -                            incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
72987 -                            http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
72988 -                            var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
72989 -                            filters.c proc_open.c streamsfuncs.c http.c; do
72990 +  for ac_src in tokenizer.c tokenizer_data.c; do
72991
72992        IFS=.
72993        set $ac_src
72994        ac_obj=$1
72995        IFS=$old_IFS
72996
72997 -      shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo"
72998 +      shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo"
72999
73000        case $ac_src in
73001          *.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" ;;
73002 @@ -91940,31 +98453,31 @@ EOF
73003    case $host_alias in
73004      *aix*)
73005        suffix=so
73006 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpstandard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpstandard.so '$ext_builddir'/phpstandard.so'
73007 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptokenizer.so '$ext_builddir'/phptokenizer.so'
73008        ;;
73009      *netware*)
73010        suffix=nlm
73011 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)'
73012 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)'
73013        ;;
73014      *)
73015        suffix=la
73016 -      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_standard) $(PHPSTANDARD_SHARED_LIBADD)'
73017 +      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_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD)'
73018        ;;
73019    esac
73020
73021    if test "x" = "xyes"; then
73022 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix"
73023 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix"
73024    else
73025 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix"
73026 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix"
73027    fi
73028
73029 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
73030 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
73031
73032    cat >>Makefile.objects<<EOF
73033 -\$(phplibdir)/phpstandard.$suffix: $ext_builddir/phpstandard.$suffix
73034 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpstandard.$suffix \$(phplibdir)
73035 +\$(phplibdir)/phptokenizer.$suffix: $ext_builddir/phptokenizer.$suffix
73036 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phptokenizer.$suffix \$(phplibdir)
73037
73038 -$ext_builddir/phpstandard.$suffix: \$(shared_objects_standard) \$(PHPSTANDARD_SHARED_DEPENDENCIES)
73039 +$ext_builddir/phptokenizer.$suffix: \$(shared_objects_tokenizer) \$(PHPTOKENIZER_SHARED_DEPENDENCIES)
73040         $link_cmd
73041
73042  EOF
73043 @@ -91977,31 +98490,31 @@ EOF
73044    case $host_alias in
73045      *aix*)
73046        suffix=so
73047 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/standard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(STANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/standard.so '$ext_builddir'/standard.so'
73048 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/tokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(TOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tokenizer.so '$ext_builddir'/tokenizer.so'
73049        ;;
73050      *netware*)
73051        suffix=nlm
73052 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(STANDARD, 3)_SHARED_LIBADD)'
73053 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TOKENIZER, 3)_SHARED_LIBADD)'
73054        ;;
73055      *)
73056        suffix=la
73057 -      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_standard) $(STANDARD_SHARED_LIBADD)'
73058 +      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_tokenizer) $(TOKENIZER_SHARED_LIBADD)'
73059        ;;
73060    esac
73061
73062    if test "x" = "xyes"; then
73063 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/standard.$suffix"
73064 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tokenizer.$suffix"
73065    else
73066 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix"
73067 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix"
73068    fi
73069
73070 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
73071 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
73072
73073    cat >>Makefile.objects<<EOF
73074 -\$(phplibdir)/standard.$suffix: $ext_builddir/standard.$suffix
73075 -       \$(LIBTOOL) --mode=install cp $ext_builddir/standard.$suffix \$(phplibdir)
73076 +\$(phplibdir)/tokenizer.$suffix: $ext_builddir/tokenizer.$suffix
73077 +       \$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir)
73078
73079 -$ext_builddir/standard.$suffix: \$(shared_objects_standard) \$(STANDARD_SHARED_DEPENDENCIES)
73080 +$ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES)
73081         $link_cmd
73082
73083  EOF
73084 @@ -92009,22 +98522,22 @@ EOF
73085            ;;
73086        esac
73087        cat >> confdefs.h <<EOF
73088 -#define COMPILE_DL_STANDARD 1
73089 +#define COMPILE_DL_TOKENIZER 1
73090  EOF
73091
73092      fi
73093    fi
73094
73095 -  if test "" != "shared" && test "" != "yes" && test "" = "cli"; then
73096 -    PHP_STANDARD_SHARED=no
73097 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
73098 +    PHP_TOKENIZER_SHARED=no
73099      case "$PHP_SAPI" in
73100        cgi|embed)
73101
73102
73103 -  case ext/standard in
73104 +  case ext/tokenizer in
73105    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
73106 -  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
73107 -  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
73108 +  /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
73109 +  *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
73110    esac
73111
73112
73113 @@ -92039,17 +98552,7 @@ EOF
73114
73115
73116    old_IFS=$IFS
73117 -  for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
73118 -                            cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
73119 -                            flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
73120 -                            info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
73121 -                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
73122 -                            soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
73123 -                            var.c versioning.c assert.c strnatcmp.c levenshtein.c \
73124 -                            incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
73125 -                            http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
73126 -                            var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
73127 -                            filters.c proc_open.c streamsfuncs.c http.c; do
73128 +  for ac_src in tokenizer.c tokenizer_data.c; do
73129
73130        IFS=.
73131        set $ac_src
73132 @@ -92072,15 +98575,15 @@ EOF
73133    done
73134
73135
73136 -        EXT_STATIC="$EXT_STATIC standard"
73137 +        EXT_STATIC="$EXT_STATIC tokenizer"
73138          ;;
73139        *)
73140
73141
73142 -  case ext/standard in
73143 +  case ext/tokenizer in
73144    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
73145 -  /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
73146 -  *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
73147 +  /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
73148 +  *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
73149    esac
73150
73151
73152 @@ -92095,17 +98598,7 @@ EOF
73153
73154
73155    old_IFS=$IFS
73156 -  for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
73157 -                            cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
73158 -                            flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
73159 -                            info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
73160 -                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
73161 -                            soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
73162 -                            var.c versioning.c assert.c strnatcmp.c levenshtein.c \
73163 -                            incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
73164 -                            http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
73165 -                            var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
73166 -                            filters.c proc_open.c streamsfuncs.c http.c; do
73167 +  for ac_src in tokenizer.c tokenizer_data.c; do
73168
73169        IFS=.
73170        set $ac_src
73171 @@ -92130,7 +98623,7 @@ EOF
73172
73173          ;;
73174      esac
73175 -    EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
73176 +    EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
73177    fi
73178
73179
73180 @@ -92139,52 +98632,34 @@ EOF
73181
73182
73183    if test "$ext_builddir" = "."; then
73184 -    PHP_PECL_EXTENSION=standard
73185 +    PHP_PECL_EXTENSION=tokenizer
73186
73187    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
73188
73189    fi
73190
73191 -
73192 -
73193 +
73194    src=$ext_srcdir/Makefile.frag
73195    ac_srcdir=$ext_srcdir
73196    ac_builddir=$ext_builddir
73197    test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
73198
73199 -
73200 -
73201 -    for header_file in ext/standard/; do
73202 -
73203 -
73204 -  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
73205 -
73206 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
73207 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
73208 -    eval "INSTALLHEADERS$unique=set"
73209 -
73210 -        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
73211 -
73212 -  fi
73213 -
73214 -    done
73215 -
73216 -
73217 +fi
73218
73219
73220
73221 -php_with_sybase_ct=no
73222 +php_enable_wddx=no
73223
73224 -echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
73225 -echo "configure:92180: checking for Sybase-CT support" >&5
73226 -# Check whether --with-sybase-ct or --without-sybase-ct was given.
73227 -if test "${with_sybase_ct+set}" = set; then
73228 -  withval="$with_sybase_ct"
73229 -  PHP_SYBASE_CT=$withval
73230 +echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
73231 +echo "configure:98655: checking whether to enable WDDX support" >&5
73232 +# Check whether --enable-wddx or --disable-wddx was given.
73233 +if test "${enable_wddx+set}" = set; then
73234 +  enableval="$enable_wddx"
73235 +  PHP_WDDX=$enableval
73236  else
73237
73238 -  PHP_SYBASE_CT=no
73239 -  test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL
73240 +  PHP_WDDX=no
73241 +  test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL
73242
73243  fi
73244
73245 @@ -92192,12 +98667,12 @@ fi
73246
73247  ext_output="yes, shared"
73248  ext_shared=yes
73249 -case $PHP_SYBASE_CT in
73250 +case $PHP_WDDX in
73251  shared,*)
73252 -  PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'`
73253 +  PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'`
73254    ;;
73255  shared)
73256 -  PHP_SYBASE_CT=yes
73257 +  PHP_WDDX=yes
73258    ;;
73259  no)
73260    ext_output=no
73261 @@ -92216,254 +98691,290 @@ echo "$ac_t""$ext_output" 1>&6
73262
73263
73264
73265 -if test "$PHP_SYBASE_CT" != "no"; then
73266 +if test -z "$PHP_LIBXML_DIR"; then
73267 +
73268 +php_with_libxml_dir=no
73269
73270 -  if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then
73271 -    { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; }
73272 -  fi
73273 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
73274 +echo "configure:98700: checking libxml2 install dir" >&5
73275 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
73276 +if test "${with_libxml_dir+set}" = set; then
73277 +  withval="$with_libxml_dir"
73278 +  PHP_LIBXML_DIR=$withval
73279 +else
73280 +
73281 +  PHP_LIBXML_DIR=no
73282 +
73283
73284 -  cat >> confdefs.h <<\EOF
73285 -#define HAVE_SYBASE_CT 1
73286 -EOF
73287 +fi
73288
73289 -
73290 -  ext_builddir=ext/sybase_ct
73291 -  ext_srcdir=$abs_srcdir/ext/sybase_ct
73292
73293 -  ac_extra=
73294 +ext_output=$PHP_LIBXML_DIR
73295 +echo "$ac_t""$ext_output" 1>&6
73296
73297 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
73298 -    PHP_SYBASE_CT_SHARED=no
73299 -
73300 -
73301 -  case ext/sybase_ct in
73302 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
73303 -  /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
73304 -  *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
73305 -  esac
73306 +
73307 +
73308 +fi
73309 +
73310 +
73311 +php_with_libexpat_dir=no
73312 +
73313 +echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6
73314 +echo "configure:98724: checking libexpat dir for WDDX" >&5
73315 +# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
73316 +if test "${with_libexpat_dir+set}" = set; then
73317 +  withval="$with_libexpat_dir"
73318 +  PHP_LIBEXPAT_DIR=$withval
73319 +else
73320
73321 +  PHP_LIBEXPAT_DIR=no
73322
73323
73324 -  b_c_pre=$php_c_pre
73325 -  b_cxx_pre=$php_cxx_pre
73326 -  b_c_meta=$php_c_meta
73327 -  b_cxx_meta=$php_cxx_meta
73328 -  b_c_post=$php_c_post
73329 -  b_cxx_post=$php_cxx_post
73330 -  b_lo=$php_lo
73331 +fi
73332
73333
73334 -  old_IFS=$IFS
73335 -  for ac_src in php_sybase_ct.c; do
73336 -
73337 -      IFS=.
73338 -      set $ac_src
73339 -      ac_obj=$1
73340 -      IFS=$old_IFS
73341 -
73342 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
73343 +ext_output=$PHP_LIBEXPAT_DIR
73344 +echo "$ac_t""$ext_output" 1>&6
73345
73346 -      case $ac_src in
73347 -        *.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" ;;
73348 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73349 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73350 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
73351 -      esac
73352
73353 -    cat >>Makefile.objects<<EOF
73354 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
73355 -       $ac_comp
73356 -EOF
73357 -  done
73358
73359
73360 -    EXT_STATIC="$EXT_STATIC sybase_ct"
73361 -    if test "$ext_shared" != "nocli"; then
73362 -      EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
73363 +if test "$PHP_WDDX" != "no"; then
73364 +
73365 +        if test "$PHP_LIBEXPAT_DIR" = "no"; then
73366 +    if test "$PHP_LIBXML" = "no"; then
73367 +      { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
73368      fi
73369 -  else
73370 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
73371 -      PHP_SYBASE_CT_SHARED=yes
73372 -
73373 -  case ext/sybase_ct in
73374 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
73375 -  /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
73376 -  *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
73377 -  esac
73378 -
73379 +
73380 +
73381 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
73382 +echo "configure:98752: checking for xml2-config path" >&5
73383 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
73384 +  echo $ac_n "(cached) $ac_c" 1>&6
73385 +else
73386
73387 +  for i in $PHP_LIBXML_DIR /usr/local /usr; do
73388 +    if test -x "$i/bin/xml2-config"; then
73389 +      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
73390 +      break
73391 +    fi
73392 +  done
73393
73394 -  b_c_pre=$shared_c_pre
73395 -  b_cxx_pre=$shared_cxx_pre
73396 -  b_c_meta=$shared_c_meta
73397 -  b_cxx_meta=$shared_cxx_meta
73398 -  b_c_post=$shared_c_post
73399 -  b_cxx_post=$shared_cxx_post
73400 -  b_lo=$shared_lo
73401 +fi
73402
73403 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
73404
73405 -  old_IFS=$IFS
73406 -  for ac_src in php_sybase_ct.c; do
73407 -
73408 -      IFS=.
73409 -      set $ac_src
73410 -      ac_obj=$1
73411 -      IFS=$old_IFS
73412 +  if test -x "$ac_cv_php_xml2_config_path"; then
73413 +    XML2_CONFIG="$ac_cv_php_xml2_config_path"
73414 +    libxml_full_version=`$XML2_CONFIG --version`
73415 +    ac_IFS=$IFS
73416 +    IFS="."
73417 +    set $libxml_full_version
73418 +    IFS=$ac_IFS
73419 +    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
73420 +    if test "$LIBXML_VERSION" -ge "2006011"; then
73421 +      LIBXML_LIBS=`$XML2_CONFIG --libs`
73422 +      LIBXML_INCS=`$XML2_CONFIG --cflags`
73423
73424 -      shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo"
73425 -
73426 -      case $ac_src in
73427 -        *.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" ;;
73428 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73429 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73430 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
73431 -      esac
73432 +  for ac_i in $LIBXML_LIBS; do
73433 +    case $ac_i in
73434 +    -pthread)
73435 +      if test "$ext_shared" = "yes"; then
73436 +        WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread"
73437 +      else
73438 +
73439 +
73440 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
73441 +
73442 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
73443 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
73444 +    eval "EXTRA_LDFLAGS$unique=set"
73445 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
73446 +  fi
73447
73448 -    cat >>Makefile.objects<<EOF
73449 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
73450 -       $ac_comp
73451 -EOF
73452 -  done
73453 +      fi
73454 +    ;;
73455 +    -l*)
73456 +      ac_ii=`echo $ac_i|cut -c 3-`
73457 +
73458 +
73459 +  case $ac_ii in
73460 +  c|c_r|pthread*) ;;
73461 +  *)
73462 +    if test "$ext_shared" = "yes"; then
73463 +        WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii"
73464 +    else
73465 +
73466 +
73467 +  case $ac_ii in
73468 +  c|c_r|pthread*) ;;
73469 +  *)
73470 +      LIBS="$LIBS -l$ac_ii"
73471 +   ;;
73472 +  esac
73473
73474 -      case $host_alias in
73475 -        *netware*)
73476 -
73477 -  install_modules="install-modules"
73478
73479 -  case $host_alias in
73480 -    *aix*)
73481 -      suffix=so
73482 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsybase_ct.so '$ext_builddir'/phpsybase_ct.so'
73483 -      ;;
73484 -    *netware*)
73485 -      suffix=nlm
73486 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)'
73487 -      ;;
73488 -    *)
73489 -      suffix=la
73490 -      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_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD)'
73491 -      ;;
73492 +    fi
73493 +   ;;
73494    esac
73495
73496 -  if test "x" = "xyes"; then
73497 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix"
73498 +
73499 +    ;;
73500 +    -L*)
73501 +      ac_ii=`echo $ac_i|cut -c 3-`
73502 +
73503 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
73504 +
73505 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
73506 +    ai_p=$ac_ii
73507    else
73508 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix"
73509 +
73510 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
73511 +
73512 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
73513 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
73514    fi
73515 -
73516 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
73517 -
73518 -  cat >>Makefile.objects<<EOF
73519 -\$(phplibdir)/phpsybase_ct.$suffix: $ext_builddir/phpsybase_ct.$suffix
73520 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsybase_ct.$suffix \$(phplibdir)
73521
73522 -$ext_builddir/phpsybase_ct.$suffix: \$(shared_objects_sybase_ct) \$(PHPSYBASE_CT_SHARED_DEPENDENCIES)
73523 -       $link_cmd
73524 +
73525 +      if test "$ext_shared" = "yes"; then
73526 +        WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
73527 +        test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD"
73528 +      else
73529 +
73530 +
73531 +
73532 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
73533 +
73534 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
73535 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
73536 +    eval "LIBPATH$unique=set"
73537 +
73538 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
73539 +    LDFLAGS="$LDFLAGS -L$ai_p"
73540 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
73541 +
73542 +  fi
73543
73544 -EOF
73545
73546 -          ;;
73547 -        *)
73548 -
73549 -  install_modules="install-modules"
73550 +      fi
73551 +
73552 +  fi
73553
73554 -  case $host_alias in
73555 -    *aix*)
73556 -      suffix=so
73557 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(SYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sybase_ct.so '$ext_builddir'/sybase_ct.so'
73558 -      ;;
73559 -    *netware*)
73560 -      suffix=nlm
73561 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYBASE_CT, 3)_SHARED_LIBADD)'
73562 -      ;;
73563 -    *)
73564 -      suffix=la
73565 -      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_sybase_ct) $(SYBASE_CT_SHARED_LIBADD)'
73566 -      ;;
73567 -  esac
73568 +    ;;
73569 +    esac
73570 +  done
73571
73572 -  if test "x" = "xyes"; then
73573 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sybase_ct.$suffix"
73574 +
73575 +  for ac_i in $LIBXML_INCS; do
73576 +    case $ac_i in
73577 +    -I*)
73578 +      ac_ii=`echo $ac_i|cut -c 3-`
73579 +
73580 +  if test "$ac_ii" != "/usr/include"; then
73581 +
73582 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
73583 +    ai_p=$ac_ii
73584    else
73585 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix"
73586 +
73587 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
73588 +
73589 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
73590 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
73591    fi
73592 -
73593 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
73594
73595 -  cat >>Makefile.objects<<EOF
73596 -\$(phplibdir)/sybase_ct.$suffix: $ext_builddir/sybase_ct.$suffix
73597 -       \$(LIBTOOL) --mode=install cp $ext_builddir/sybase_ct.$suffix \$(phplibdir)
73598 +
73599 +
73600 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
73601 +
73602 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
73603 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
73604 +    eval "INCLUDEPATH$unique=set"
73605 +
73606 +      if test ""; then
73607 +        INCLUDES="-I$ai_p $INCLUDES"
73608 +      else
73609 +        INCLUDES="$INCLUDES -I$ai_p"
73610 +      fi
73611 +
73612 +  fi
73613
73614 -$ext_builddir/sybase_ct.$suffix: \$(shared_objects_sybase_ct) \$(SYBASE_CT_SHARED_DEPENDENCIES)
73615 -       $link_cmd
73616 +  fi
73617
73618 -EOF
73619 +    ;;
73620 +    esac
73621 +  done
73622
73623 -          ;;
73624 -      esac
73625 -      cat >> confdefs.h <<EOF
73626 -#define COMPILE_DL_SYBASE_CT 1
73627 -EOF
73628
73629 -    fi
73630 -  fi
73631 +            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
73632 +echo "configure:98910: checking whether libxml build works" >&5
73633 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
73634 +  echo $ac_n "(cached) $ac_c" 1>&6
73635 +else
73636 +
73637 +
73638 +  old_LIBS=$LIBS
73639 +  LIBS="
73640 +          $WDDX_SHARED_LIBADD
73641 +         $LIBS"
73642 +  if test "$cross_compiling" = yes; then
73643 +
73644 +    LIBS=$old_LIBS
73645 +
73646 +else
73647 +  cat > conftest.$ac_ext <<EOF
73648 +#line 98926 "configure"
73649 +#include "confdefs.h"
73650
73651 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
73652 -    PHP_SYBASE_CT_SHARED=no
73653 -    case "$PHP_SAPI" in
73654 -      cgi|embed)
73655 +
73656 +    char xmlInitParser();
73657 +    int main() {
73658 +      xmlInitParser();
73659 +      return 0;
73660 +    }
73661 +
73662 +EOF
73663 +if { (eval echo configure:98937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
73664 +then
73665 +
73666 +    LIBS=$old_LIBS
73667 +
73668 +          php_cv_libxml_build_works=yes
73669
73670
73671 -  case ext/sybase_ct in
73672 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
73673 -  /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
73674 -  *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
73675 -  esac
73676 +else
73677 +  echo "configure: failed program was:" >&5
73678 +  cat conftest.$ac_ext >&5
73679 +  rm -fr conftest*
73680
73681 +    LIBS=$old_LIBS
73682 +
73683 +          echo "$ac_t""no" 1>&6
73684 +          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
73685 +
73686
73687 -
73688 -  b_c_pre=$php_c_pre
73689 -  b_cxx_pre=$php_cxx_pre
73690 -  b_c_meta=$php_c_meta
73691 -  b_cxx_meta=$php_cxx_meta
73692 -  b_c_post=$php_c_post
73693 -  b_cxx_post=$php_cxx_post
73694 -  b_lo=$php_lo
73695 +fi
73696 +rm -fr conftest*
73697 +fi
73698
73699
73700 -  old_IFS=$IFS
73701 -  for ac_src in php_sybase_ct.c; do
73702 -
73703 -      IFS=.
73704 -      set $ac_src
73705 -      ac_obj=$1
73706 -      IFS=$old_IFS
73707
73708 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
73709 -
73710 -      case $ac_src in
73711 -        *.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" ;;
73712 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73713 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73714 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
73715 -      esac
73716 +fi
73717
73718 -    cat >>Makefile.objects<<EOF
73719 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
73720 -       $ac_comp
73721 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
73722 +      if test "$php_cv_libxml_build_works" = "yes"; then
73723 +        cat >> confdefs.h <<\EOF
73724 +#define HAVE_LIBXML 1
73725  EOF
73726 -  done
73727
73728 -
73729 -        EXT_STATIC="$EXT_STATIC sybase_ct"
73730 -        ;;
73731 -      *)
73732 +      fi
73733 +
73734 +      if test "$PHP_XML" = "no"; then
73735
73736
73737 -  case ext/sybase_ct in
73738 +  case ext/xml in
73739    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
73740 -  /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
73741 -  *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
73742 +  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
73743 +  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
73744    esac
73745
73746
73747 @@ -92478,20 +98989,20 @@ EOF
73748
73749
73750    old_IFS=$IFS
73751 -  for ac_src in php_sybase_ct.c; do
73752 +  for ac_src in compat.c; do
73753
73754        IFS=.
73755        set $ac_src
73756        ac_obj=$1
73757        IFS=$old_IFS
73758
73759 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
73760 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
73761
73762        case $ac_src in
73763 -        *.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" ;;
73764 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73765 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73766 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
73767 +        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73768 +        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73769 +        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
73770 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
73771        esac
73772
73773      cat >>Makefile.objects<<EOF
73774 @@ -92501,47 +99012,46 @@ EOF
73775    done
73776
73777
73778 -        ;;
73779 -    esac
73780 -    EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
73781 -  fi
73782 -
73783 +
73784
73785 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
73786 +    BUILD_DIR="$BUILD_DIR ext/xml"
73787
73788
73789 -
73790 -  if test "$ext_builddir" = "."; then
73791 -    PHP_PECL_EXTENSION=sybase_ct
73792 +      fi
73793
73794 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
73795 +    else
73796 +      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
73797 +    fi
73798 +else
73799 +      { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
73800 +
73801 +  fi
73802
73803    fi
73804
73805 -
73806 -  PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD"
73807 +        if test "$PHP_LIBEXPAT_DIR" != "no"; then
73808 +    for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
73809 +      if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
73810 +        EXPAT_DIR=$i
73811 +        break
73812 +      fi
73813 +    done
73814
73815 -
73816 -  if test "$PHP_SYBASE_CT" = "yes"; then
73817 -    SYBASE_CT_INCDIR=/home/sybase/include
73818 -    SYBASE_CT_LIBDIR=/home/sybase/lib
73819 -  else
73820 -    SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include
73821 -    SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
73822 -  fi
73823 +    if test -z "$EXPAT_DIR"; then
73824 +      { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
73825 +    fi
73826
73827 -  if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
73828
73829 -  if test "$SYBASE_CT_INCDIR" != "/usr/include"; then
73830 +  if test "$EXPAT_DIR/include" != "/usr/include"; then
73831
73832 -  if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then
73833 -    ai_p=$SYBASE_CT_INCDIR
73834 +  if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
73835 +    ai_p=$EXPAT_DIR/include
73836    else
73837
73838 -    ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
73839 +    ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
73840
73841      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
73842 -    ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`"
73843 +    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
73844    fi
73845
73846
73847 @@ -92562,27 +99072,28 @@ EOF
73848
73849    fi
73850
73851 -  else
73852 -    { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; }
73853 -  fi
73854 -
73855 -
73856 -  if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then
73857
73858 -  if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then
73859 -    ai_p=$SYBASE_CT_LIBDIR
73860 +
73861 +  if test "$ext_shared" = "yes"; then
73862 +    WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD"
73863 +    if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
73864 +
73865 +  if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
73866 +
73867 +  if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
73868 +    ai_p=$EXPAT_DIR/$PHP_LIBDIR
73869    else
73870
73871 -    ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
73872 +    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
73873
73874      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
73875 -    ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`"
73876 +    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
73877    fi
73878
73879
73880        if test "$ext_shared" = "yes"; then
73881 -        SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD"
73882 -        test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD"
73883 +        WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
73884 +        test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD"
73885        else
73886
73887
73888 @@ -92604,772 +99115,522 @@ EOF
73889
73890    fi
73891
73892 -  if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
73893 -
73894 -
73895 -  case ct in
73896 -  c|c_r|pthread*) ;;
73897 -  *)
73898 -    if test "$ext_shared" = "yes"; then
73899 -        SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
73900 -    else
73901 -
73902 -
73903 -  case ct in
73904 -  c|c_r|pthread*) ;;
73905 -  *)
73906 -      LIBS="-lct $LIBS"
73907 -   ;;
73908 -  esac
73909 -
73910 -
73911      fi
73912 -   ;;
73913 -  esac
73914 +  else
73915 +
73916
73917 +  if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
73918 +
73919 +  if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
73920 +
73921 +  if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
73922 +    ai_p=$EXPAT_DIR/$PHP_LIBDIR
73923 +  else
73924 +
73925 +    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
73926 +
73927 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
73928 +    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
73929 +  fi
73930
73931 -    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
73932 -  elif test -f $SYBASE_CT_INCDIR/libsybct64.so; then
73933
73934 -
73935 -  case sybcs64 in
73936 -  c|c_r|pthread*) ;;
73937 -  *)
73938 -    if test "$ext_shared" = "yes"; then
73939 -        SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD"
73940 -    else
73941
73942
73943 -  case sybcs64 in
73944 -  c|c_r|pthread*) ;;
73945 -  *)
73946 -      LIBS="-lsybcs64 $LIBS"
73947 -   ;;
73948 -  esac
73949 -
73950 -
73951 -    fi
73952 -   ;;
73953 -  esac
73954 -
73955 -
73956 -
73957
73958 -  case sybct64 in
73959 -  c|c_r|pthread*) ;;
73960 -  *)
73961 -    if test "$ext_shared" = "yes"; then
73962 -        SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD"
73963 -    else
73964 -
73965 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
73966
73967 -  case sybct64 in
73968 -  c|c_r|pthread*) ;;
73969 -  *)
73970 -      LIBS="-lsybct64 $LIBS"
73971 -   ;;
73972 -  esac
73973 -
73974 -
73975 -    fi
73976 -   ;;
73977 -  esac
73978 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
73979 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
73980 +    eval "LIBPATH$unique=set"
73981 +
73982 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
73983 +    LDFLAGS="$LDFLAGS -L$ai_p"
73984 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
73985 +
73986 +  fi
73987
73988
73989
73990 +  fi
73991 +
73992 +  fi
73993
73994 -  case sybcomn64 in
73995 -  c|c_r|pthread*) ;;
73996 -  *)
73997 -    if test "$ext_shared" = "yes"; then
73998 -        SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD"
73999 -    else
74000 -
74001
74002 -  case sybcomn64 in
74003 +  case expat in
74004    c|c_r|pthread*) ;;
74005    *)
74006 -      LIBS="-lsybcomn64 $LIBS"
74007 +      LIBS="-lexpat $LIBS"
74008     ;;
74009    esac
74010
74011
74012 -    fi
74013 -   ;;
74014 -  esac
74015
74016
74017 -
74018 -
74019 -  case sybintl64 in
74020 -  c|c_r|pthread*) ;;
74021 -  *)
74022 -    if test "$ext_shared" = "yes"; then
74023 -        SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD"
74024 -    else
74025 -
74026 -
74027 -  case sybintl64 in
74028 -  c|c_r|pthread*) ;;
74029 -  *)
74030 -      LIBS="-lsybintl64 $LIBS"
74031 -   ;;
74032 -  esac
74033 +  fi
74034
74035
74036 -    fi
74037 -   ;;
74038 -  esac
74039 +    cat >> confdefs.h <<\EOF
74040 +#define HAVE_LIBEXPAT 1
74041 +EOF
74042
74043 +  fi
74044
74045 +  cat >> confdefs.h <<\EOF
74046 +#define HAVE_WDDX 1
74047 +EOF
74048
74049 -    ac_solid_uname_s=`uname -s 2>/dev/null`
74050 -    case $ac_solid_uname_s in
74051 -      *OSF*)                            ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define
74052 -      *) CFLAGS="${CFLAGS} -DSYB_LP64"  ;; #
74053 -    esac
74054 -    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64"
74055
74056 +  ext_builddir=ext/wddx
74057 +  ext_srcdir=$abs_srcdir/ext/wddx
74058 +
74059 +  ac_extra=
74060 +
74061 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
74062 +    PHP_WDDX_SHARED=no
74063
74064 -  save_old_LDFLAGS=$LDFLAGS
74065 -  ac_stuff="
74066 -      $SYBASE_CT_LIBS
74067 -    "
74068 -
74069 -  save_ext_shared=$ext_shared
74070 -  ext_shared=yes
74071
74072 -  for ac_i in $ac_stuff; do
74073 -    case $ac_i in
74074 -    -pthread)
74075 -      if test "$ext_shared" = "yes"; then
74076 -        LDFLAGS="$LDFLAGS -pthread"
74077 -      else
74078 -
74079 +  case ext/wddx in
74080 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
74081 +  /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
74082 +  *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
74083 +  esac
74084
74085 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
74086
74087 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
74088 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
74089 -    eval "EXTRA_LDFLAGS$unique=set"
74090 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
74091 -  fi
74092
74093 -      fi
74094 -    ;;
74095 -    -l*)
74096 -      ac_ii=`echo $ac_i|cut -c 3-`
74097 -
74098 +  b_c_pre=$php_c_pre
74099 +  b_cxx_pre=$php_cxx_pre
74100 +  b_c_meta=$php_c_meta
74101 +  b_cxx_meta=$php_cxx_meta
74102 +  b_c_post=$php_c_post
74103 +  b_cxx_post=$php_cxx_post
74104 +  b_lo=$php_lo
74105 +
74106 +
74107 +  old_IFS=$IFS
74108 +  for ac_src in wddx.c; do
74109
74110 -  case $ac_ii in
74111 -  c|c_r|pthread*) ;;
74112 -  *)
74113 -    if test "$ext_shared" = "yes"; then
74114 -        LDFLAGS="$LDFLAGS -l$ac_ii"
74115 -    else
74116 +      IFS=.
74117 +      set $ac_src
74118 +      ac_obj=$1
74119 +      IFS=$old_IFS
74120
74121 -
74122 -  case $ac_ii in
74123 -  c|c_r|pthread*) ;;
74124 -  *)
74125 -      LIBS="$LIBS -l$ac_ii"
74126 -   ;;
74127 -  esac
74128 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
74129 +
74130 +      case $ac_src in
74131 +        *.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" ;;
74132 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
74133 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
74134 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
74135 +      esac
74136 +
74137 +    cat >>Makefile.objects<<EOF
74138 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
74139 +       $ac_comp
74140 +EOF
74141 +  done
74142
74143
74144 +    EXT_STATIC="$EXT_STATIC wddx"
74145 +    if test "$ext_shared" != "nocli"; then
74146 +      EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
74147      fi
74148 -   ;;
74149 +  else
74150 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
74151 +      PHP_WDDX_SHARED=yes
74152 +
74153 +  case ext/wddx in
74154 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
74155 +  /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
74156 +  *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
74157    esac
74158 +
74159 +
74160 +
74161 +  b_c_pre=$shared_c_pre
74162 +  b_cxx_pre=$shared_cxx_pre
74163 +  b_c_meta=$shared_c_meta
74164 +  b_cxx_meta=$shared_cxx_meta
74165 +  b_c_post=$shared_c_post
74166 +  b_cxx_post=$shared_cxx_post
74167 +  b_lo=$shared_lo
74168
74169
74170 -    ;;
74171 -    -L*)
74172 -      ac_ii=`echo $ac_i|cut -c 3-`
74173 +  old_IFS=$IFS
74174 +  for ac_src in wddx.c; do
74175 +
74176 +      IFS=.
74177 +      set $ac_src
74178 +      ac_obj=$1
74179 +      IFS=$old_IFS
74180
74181 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
74182 -
74183 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
74184 -    ai_p=$ac_ii
74185 +      shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo"
74186 +
74187 +      case $ac_src in
74188 +        *.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" ;;
74189 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
74190 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
74191 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
74192 +      esac
74193 +
74194 +    cat >>Makefile.objects<<EOF
74195 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
74196 +       $ac_comp
74197 +EOF
74198 +  done
74199 +
74200 +      case $host_alias in
74201 +        *netware*)
74202 +
74203 +  install_modules="install-modules"
74204 +
74205 +  case $host_alias in
74206 +    *aix*)
74207 +      suffix=so
74208 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpwddx.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(PHPWDDX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpwddx.so '$ext_builddir'/phpwddx.so'
74209 +      ;;
74210 +    *netware*)
74211 +      suffix=nlm
74212 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPWDDX, 3)_SHARED_LIBADD)'
74213 +      ;;
74214 +    *)
74215 +      suffix=la
74216 +      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_wddx) $(PHPWDDX_SHARED_LIBADD)'
74217 +      ;;
74218 +  esac
74219 +
74220 +  if test "x" = "xyes"; then
74221 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpwddx.$suffix"
74222    else
74223 -
74224 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
74225 -
74226 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
74227 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
74228 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix"
74229    fi
74230 -
74231 -
74232 -      if test "$ext_shared" = "yes"; then
74233 -        LDFLAGS="-L$ai_p $LDFLAGS"
74234 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
74235 -      else
74236 -
74237 -
74238 -
74239 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
74240 -
74241 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
74242 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
74243 -    eval "LIBPATH$unique=set"
74244 -
74245 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
74246 -    LDFLAGS="$LDFLAGS -L$ai_p"
74247 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
74248
74249 -  fi
74250 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
74251 +
74252 +  cat >>Makefile.objects<<EOF
74253 +\$(phplibdir)/phpwddx.$suffix: $ext_builddir/phpwddx.$suffix
74254 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpwddx.$suffix \$(phplibdir)
74255 +
74256 +$ext_builddir/phpwddx.$suffix: \$(shared_objects_wddx) \$(PHPWDDX_SHARED_DEPENDENCIES)
74257 +       $link_cmd
74258 +
74259 +EOF
74260 +
74261 +          ;;
74262 +        *)
74263 +
74264 +  install_modules="install-modules"
74265
74266 +  case $host_alias in
74267 +    *aix*)
74268 +      suffix=so
74269 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/wddx.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(WDDX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/wddx.so '$ext_builddir'/wddx.so'
74270 +      ;;
74271 +    *netware*)
74272 +      suffix=nlm
74273 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(WDDX, 3)_SHARED_LIBADD)'
74274 +      ;;
74275 +    *)
74276 +      suffix=la
74277 +      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_wddx) $(WDDX_SHARED_LIBADD)'
74278 +      ;;
74279 +  esac
74280
74281 -      fi
74282 -
74283 +  if test "x" = "xyes"; then
74284 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/wddx.$suffix"
74285 +  else
74286 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/wddx.$suffix"
74287    fi
74288 +
74289 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
74290
74291 -    ;;
74292 -    esac
74293 -  done
74294 +  cat >>Makefile.objects<<EOF
74295 +\$(phplibdir)/wddx.$suffix: $ext_builddir/wddx.$suffix
74296 +       \$(LIBTOOL) --mode=install cp $ext_builddir/wddx.$suffix \$(phplibdir)
74297
74298 -  echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6
74299 -echo "configure:92832: checking for netg_errstr in -lsybtcl64" >&5
74300 -ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'`
74301 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
74302 -  echo $ac_n "(cached) $ac_c" 1>&6
74303 -else
74304 -  ac_save_LIBS="$LIBS"
74305 -LIBS="-lsybtcl64  $LIBS"
74306 -cat > conftest.$ac_ext <<EOF
74307 -#line 92840 "configure"
74308 -#include "confdefs.h"
74309 -/* Override any gcc2 internal prototype to avoid an error.  */
74310 -/* We use char because int might match the return type of a gcc2
74311 -    builtin and then its argument prototype would still apply.  */
74312 -char netg_errstr();
74313 +$ext_builddir/wddx.$suffix: \$(shared_objects_wddx) \$(WDDX_SHARED_DEPENDENCIES)
74314 +       $link_cmd
74315
74316 -int main() {
74317 -netg_errstr()
74318 -; return 0; }
74319  EOF
74320 -if { (eval echo configure:92851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
74321 -  rm -rf conftest*
74322 -  eval "ac_cv_lib_$ac_lib_var=yes"
74323 -else
74324 -  echo "configure: failed program was:" >&5
74325 -  cat conftest.$ac_ext >&5
74326 -  rm -rf conftest*
74327 -  eval "ac_cv_lib_$ac_lib_var=no"
74328 -fi
74329 -rm -f conftest*
74330 -LIBS="$ac_save_LIBS"
74331 -
74332 -fi
74333 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
74334 -  echo "$ac_t""yes" 1>&6
74335 -
74336 -    LDFLAGS=$save_old_LDFLAGS
74337 -    ext_shared=$save_ext_shared
74338 -
74339 -
74340 -
74341 -  case sybtcl64 in
74342 -  c|c_r|pthread*) ;;
74343 -  *)
74344 -    if test "$ext_shared" = "yes"; then
74345 -        SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
74346 -    else
74347 -
74348 -
74349 -  case sybtcl64 in
74350 -  c|c_r|pthread*) ;;
74351 -  *)
74352 -      LIBS="-lsybtcl64 $LIBS"
74353 -   ;;
74354 -  esac
74355
74356 +          ;;
74357 +      esac
74358 +      cat >> confdefs.h <<EOF
74359 +#define COMPILE_DL_WDDX 1
74360 +EOF
74361
74362      fi
74363 -   ;;
74364 +  fi
74365 +
74366 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
74367 +    PHP_WDDX_SHARED=no
74368 +    case "$PHP_SAPI" in
74369 +      cgi|embed)
74370 +
74371 +
74372 +  case ext/wddx in
74373 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
74374 +  /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
74375 +  *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
74376    esac
74377 +
74378 +
74379
74380 +  b_c_pre=$php_c_pre
74381 +  b_cxx_pre=$php_cxx_pre
74382 +  b_c_meta=$php_c_meta
74383 +  b_cxx_meta=$php_cxx_meta
74384 +  b_c_post=$php_c_post
74385 +  b_cxx_post=$php_cxx_post
74386 +  b_lo=$php_lo
74387
74388 -
74389 -
74390 -else
74391 -  echo "$ac_t""no" 1>&6
74392
74393 -    LDFLAGS=$save_old_LDFLAGS
74394 -    ext_shared=$save_ext_shared
74395 -    unset ac_cv_lib_sybtcl64_netg_errstr
74396 -
74397 -
74398 +  old_IFS=$IFS
74399 +  for ac_src in wddx.c; do
74400
74401 -  case sybtcl64 in
74402 -  c|c_r|pthread*) ;;
74403 -  *)
74404 -    if test "$ext_shared" = "yes"; then
74405 -        SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
74406 -    else
74407 +      IFS=.
74408 +      set $ac_src
74409 +      ac_obj=$1
74410 +      IFS=$old_IFS
74411
74412 -
74413 -  case sybtcl64 in
74414 -  c|c_r|pthread*) ;;
74415 -  *)
74416 -      LIBS="-lsybtcl64 $LIBS"
74417 -   ;;
74418 -  esac
74419 -
74420 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
74421
74422 -    fi
74423 -   ;;
74424 -  esac
74425 +      case $ac_src in
74426 +        *.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" ;;
74427 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
74428 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
74429 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
74430 +      esac
74431
74432 +    cat >>Makefile.objects<<EOF
74433 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
74434 +       $ac_comp
74435 +EOF
74436 +  done
74437
74438 -
74439 -
74440 -fi
74441
74442 -
74443 -
74444 -  save_old_LDFLAGS=$LDFLAGS
74445 -  ac_stuff="-L$SYBASE_CT_LIBDIR"
74446 -
74447 -  save_ext_shared=$ext_shared
74448 -  ext_shared=yes
74449 -
74450 -  for ac_i in $ac_stuff; do
74451 -    case $ac_i in
74452 -    -pthread)
74453 -      if test "$ext_shared" = "yes"; then
74454 -        LDFLAGS="$LDFLAGS -pthread"
74455 -      else
74456 +        EXT_STATIC="$EXT_STATIC wddx"
74457 +        ;;
74458 +      *)
74459
74460
74461 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
74462 +  case ext/wddx in
74463 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
74464 +  /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
74465 +  *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
74466 +  esac
74467 +
74468
74469 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
74470 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
74471 -    eval "EXTRA_LDFLAGS$unique=set"
74472 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
74473 -  fi
74474
74475 -      fi
74476 -    ;;
74477 -    -l*)
74478 -      ac_ii=`echo $ac_i|cut -c 3-`
74479 -
74480 +  b_c_pre=$php_c_pre
74481 +  b_cxx_pre=$php_cxx_pre
74482 +  b_c_meta=$php_c_meta
74483 +  b_cxx_meta=$php_cxx_meta
74484 +  b_c_post=$php_c_post
74485 +  b_cxx_post=$php_cxx_post
74486 +  b_lo=$php_lo
74487 +
74488 +
74489 +  old_IFS=$IFS
74490 +  for ac_src in wddx.c; do
74491
74492 -  case $ac_ii in
74493 -  c|c_r|pthread*) ;;
74494 -  *)
74495 -    if test "$ext_shared" = "yes"; then
74496 -        LDFLAGS="$LDFLAGS -l$ac_ii"
74497 -    else
74498 +      IFS=.
74499 +      set $ac_src
74500 +      ac_obj=$1
74501 +      IFS=$old_IFS
74502
74503 -
74504 -  case $ac_ii in
74505 -  c|c_r|pthread*) ;;
74506 -  *)
74507 -      LIBS="$LIBS -l$ac_ii"
74508 -   ;;
74509 -  esac
74510 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
74511
74512 +      case $ac_src in
74513 +        *.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" ;;
74514 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
74515 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
74516 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
74517 +      esac
74518
74519 -    fi
74520 -   ;;
74521 -  esac
74522 +    cat >>Makefile.objects<<EOF
74523 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
74524 +       $ac_comp
74525 +EOF
74526 +  done
74527
74528
74529 -    ;;
74530 -    -L*)
74531 -      ac_ii=`echo $ac_i|cut -c 3-`
74532 -
74533 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
74534 -
74535 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
74536 -    ai_p=$ac_ii
74537 -  else
74538 -
74539 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
74540 -
74541 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
74542 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
74543 +        ;;
74544 +    esac
74545 +    EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
74546    fi
74547 -
74548 -
74549 -      if test "$ext_shared" = "yes"; then
74550 -        LDFLAGS="-L$ai_p $LDFLAGS"
74551 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
74552 -      else
74553 -
74554 -
74555
74556 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
74557
74558 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
74559 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
74560 -    eval "LIBPATH$unique=set"
74561 -
74562 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
74563 -    LDFLAGS="$LDFLAGS -L$ai_p"
74564 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
74565 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
74566
74567 -  fi
74568
74569
74570 -      fi
74571 +  if test "$ext_builddir" = "."; then
74572 +    PHP_PECL_EXTENSION=wddx
74573
74574 -  fi
74575 -
74576 -    ;;
74577 -    esac
74578 -  done
74579 -
74580 -  echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6
74581 -echo "configure:93026: checking for insck__getVdate in -linsck64" >&5
74582 -ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'`
74583 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
74584 -  echo $ac_n "(cached) $ac_c" 1>&6
74585 -else
74586 -  ac_save_LIBS="$LIBS"
74587 -LIBS="-linsck64  $LIBS"
74588 -cat > conftest.$ac_ext <<EOF
74589 -#line 93034 "configure"
74590 -#include "confdefs.h"
74591 -/* Override any gcc2 internal prototype to avoid an error.  */
74592 -/* We use char because int might match the return type of a gcc2
74593 -    builtin and then its argument prototype would still apply.  */
74594 -char insck__getVdate();
74595 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
74596
74597 -int main() {
74598 -insck__getVdate()
74599 -; return 0; }
74600 -EOF
74601 -if { (eval echo configure:93045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
74602 -  rm -rf conftest*
74603 -  eval "ac_cv_lib_$ac_lib_var=yes"
74604 -else
74605 -  echo "configure: failed program was:" >&5
74606 -  cat conftest.$ac_ext >&5
74607 -  rm -rf conftest*
74608 -  eval "ac_cv_lib_$ac_lib_var=no"
74609 -fi
74610 -rm -f conftest*
74611 -LIBS="$ac_save_LIBS"
74612 +  fi
74613
74614 -fi
74615 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
74616 -  echo "$ac_t""yes" 1>&6
74617
74618 -    LDFLAGS=$save_old_LDFLAGS
74619 -    ext_shared=$save_ext_shared
74620 -
74621 +  am_i_shared=$PHP_WDDX_SHARED
74622 +  is_it_shared=$PHP_LIBXML_SHARED
74623 +  is_it_enabled=$PHP_LIBXML
74624 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
74625 +    { echo "configure: error:
74626 +You've configured extension wddx to build statically, but it
74627 +depends on extension libxml, which you've configured to build shared.
74628 +You either need to build wddx shared or build libxml statically for the
74629 +build to be successful.
74630 +" 1>&2; exit 1; }
74631 +  fi
74632 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
74633 +    { echo "configure: error:
74634 +You've configured extension wddx, which depends on extension libxml,
74635 +but you've either not enabled libxml, or have disabled it.
74636 +" 1>&2; exit 1; }
74637 +  fi
74638
74639 -  case insck64 in
74640 -  c|c_r|pthread*) ;;
74641 -  *)
74642 -    if test "$ext_shared" = "yes"; then
74643 -        SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
74644 -    else
74645 -
74646
74647 -  case insck64 in
74648 -  c|c_r|pthread*) ;;
74649 -  *)
74650 -      LIBS="-linsck64 $LIBS"
74651 -   ;;
74652 -  esac
74653 +  PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
74654
74655 +fi
74656
74657 -    fi
74658 -   ;;
74659 -  esac
74660
74661
74662 -
74663 -else
74664 -  echo "$ac_t""no" 1>&6
74665 +php_enable_xml=yes
74666
74667 -    LDFLAGS=$save_old_LDFLAGS
74668 -    ext_shared=$save_ext_shared
74669 -    unset ac_cv_lib_insck64_insck__getVdate
74670 -
74671 +echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
74672 +echo "configure:99504: checking whether to enable XML support" >&5
74673 +# Check whether --enable-xml or --disable-xml was given.
74674 +if test "${enable_xml+set}" = set; then
74675 +  enableval="$enable_xml"
74676 +  PHP_XML=$enableval
74677 +else
74678
74679 -fi
74680 +  PHP_XML=yes
74681 +  test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL
74682
74683 -
74684 -  save_old_LDFLAGS=$LDFLAGS
74685 -  ac_stuff="-L$SYBASE_CT_LIBDIR"
74686 -
74687 -  save_ext_shared=$ext_shared
74688 -  ext_shared=yes
74689 -
74690 -  for ac_i in $ac_stuff; do
74691 -    case $ac_i in
74692 -    -pthread)
74693 -      if test "$ext_shared" = "yes"; then
74694 -        LDFLAGS="$LDFLAGS -pthread"
74695 -      else
74696 -
74697 -
74698 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
74699 -
74700 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
74701 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
74702 -    eval "EXTRA_LDFLAGS$unique=set"
74703 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
74704 -  fi
74705 +fi
74706
74707 -      fi
74708 -    ;;
74709 -    -l*)
74710 -      ac_ii=`echo $ac_i|cut -c 3-`
74711 -
74712 -
74713 -  case $ac_ii in
74714 -  c|c_r|pthread*) ;;
74715 -  *)
74716 -    if test "$ext_shared" = "yes"; then
74717 -        LDFLAGS="$LDFLAGS -l$ac_ii"
74718 -    else
74719 -
74720 -
74721 -  case $ac_ii in
74722 -  c|c_r|pthread*) ;;
74723 -  *)
74724 -      LIBS="$LIBS -l$ac_ii"
74725 -   ;;
74726 -  esac
74727
74728
74729 -    fi
74730 -   ;;
74731 -  esac
74732 +ext_output="yes, shared"
74733 +ext_shared=yes
74734 +case $PHP_XML in
74735 +shared,*)
74736 +  PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'`
74737 +  ;;
74738 +shared)
74739 +  PHP_XML=yes
74740 +  ;;
74741 +no)
74742 +  ext_output=no
74743 +  ext_shared=no
74744 +  ;;
74745 +*)
74746 +  ext_output=yes
74747 +  ext_shared=no
74748 +  ;;
74749 +esac
74750
74751
74752 -    ;;
74753 -    -L*)
74754 -      ac_ii=`echo $ac_i|cut -c 3-`
74755 -
74756 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
74757 -
74758 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
74759 -    ai_p=$ac_ii
74760 -  else
74761 -
74762 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
74763 -
74764 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
74765 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
74766 -  fi
74767
74768 -
74769 -      if test "$ext_shared" = "yes"; then
74770 -        LDFLAGS="-L$ai_p $LDFLAGS"
74771 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
74772 -      else
74773 -
74774 -
74775 -
74776 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
74777 -
74778 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
74779 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
74780 -    eval "LIBPATH$unique=set"
74781 -
74782 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
74783 -    LDFLAGS="$LDFLAGS -L$ai_p"
74784 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
74785 -
74786 -  fi
74787 +echo "$ac_t""$ext_output" 1>&6
74788
74789
74790 -      fi
74791 -
74792 -  fi
74793
74794 -    ;;
74795 -    esac
74796 -  done
74797
74798 -  echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6
74799 -echo "configure:93193: checking for bsd_tcp in -linsck64" >&5
74800 -ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'`
74801 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
74802 -  echo $ac_n "(cached) $ac_c" 1>&6
74803 -else
74804 -  ac_save_LIBS="$LIBS"
74805 -LIBS="-linsck64  $LIBS"
74806 -cat > conftest.$ac_ext <<EOF
74807 -#line 93201 "configure"
74808 -#include "confdefs.h"
74809 -/* Override any gcc2 internal prototype to avoid an error.  */
74810 -/* We use char because int might match the return type of a gcc2
74811 -    builtin and then its argument prototype would still apply.  */
74812 -char bsd_tcp();
74813 +if test -z "$PHP_LIBXML_DIR"; then
74814 +
74815 +php_with_libxml_dir=no
74816
74817 -int main() {
74818 -bsd_tcp()
74819 -; return 0; }
74820 -EOF
74821 -if { (eval echo configure:93212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
74822 -  rm -rf conftest*
74823 -  eval "ac_cv_lib_$ac_lib_var=yes"
74824 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
74825 +echo "configure:99549: checking libxml2 install dir" >&5
74826 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
74827 +if test "${with_libxml_dir+set}" = set; then
74828 +  withval="$with_libxml_dir"
74829 +  PHP_LIBXML_DIR=$withval
74830  else
74831 -  echo "configure: failed program was:" >&5
74832 -  cat conftest.$ac_ext >&5
74833 -  rm -rf conftest*
74834 -  eval "ac_cv_lib_$ac_lib_var=no"
74835 -fi
74836 -rm -f conftest*
74837 -LIBS="$ac_save_LIBS"
74838 -
74839 -fi
74840 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
74841 -  echo "$ac_t""yes" 1>&6
74842 -
74843 -    LDFLAGS=$save_old_LDFLAGS
74844 -    ext_shared=$save_ext_shared
74845 -
74846
74847 -  case insck64 in
74848 -  c|c_r|pthread*) ;;
74849 -  *)
74850 -    if test "$ext_shared" = "yes"; then
74851 -        SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
74852 -    else
74853 -
74854 +  PHP_LIBXML_DIR=no
74855
74856 -  case insck64 in
74857 -  c|c_r|pthread*) ;;
74858 -  *)
74859 -      LIBS="-linsck64 $LIBS"
74860 -   ;;
74861 -  esac
74862 +
74863 +fi
74864
74865
74866 -    fi
74867 -   ;;
74868 -  esac
74869 +ext_output=$PHP_LIBXML_DIR
74870 +echo "$ac_t""$ext_output" 1>&6
74871
74872
74873 -
74874 -else
74875 -  echo "$ac_t""no" 1>&6
74876
74877 -    LDFLAGS=$save_old_LDFLAGS
74878 -    ext_shared=$save_ext_shared
74879 -    unset ac_cv_lib_insck64_bsd_tcp
74880 -
74881 -
74882  fi
74883
74884 -  elif test -f $SYBASE_CT_INCDIR/libsybct.so; then
74885 -
74886 +
74887 +php_with_libexpat_dir=no
74888 +
74889 +echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6
74890 +echo "configure:99573: checking libexpat install dir" >&5
74891 +# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
74892 +if test "${with_libexpat_dir+set}" = set; then
74893 +  withval="$with_libexpat_dir"
74894 +  PHP_LIBEXPAT_DIR=$withval
74895 +else
74896
74897 -  case sybcs in
74898 -  c|c_r|pthread*) ;;
74899 -  *)
74900 -    if test "$ext_shared" = "yes"; then
74901 -        SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD"
74902 -    else
74903 -
74904 +  PHP_LIBEXPAT_DIR=no
74905
74906 -  case sybcs in
74907 -  c|c_r|pthread*) ;;
74908 -  *)
74909 -      LIBS="-lsybcs $LIBS"
74910 -   ;;
74911 -  esac
74912 -
74913
74914 -    fi
74915 -   ;;
74916 -  esac
74917 +fi
74918
74919
74920 -
74921 -
74922 -  case sybct in
74923 -  c|c_r|pthread*) ;;
74924 -  *)
74925 -    if test "$ext_shared" = "yes"; then
74926 -        SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD"
74927 -    else
74928 -
74929 -
74930 -  case sybct in
74931 -  c|c_r|pthread*) ;;
74932 -  *)
74933 -      LIBS="-lsybct $LIBS"
74934 -   ;;
74935 -  esac
74936 +ext_output=$PHP_LIBEXPAT_DIR
74937 +echo "$ac_t""$ext_output" 1>&6
74938
74939
74940 -    fi
74941 -   ;;
74942 -  esac
74943
74944
74945 -
74946 -
74947 -  case sybcomn in
74948 -  c|c_r|pthread*) ;;
74949 -  *)
74950 -    if test "$ext_shared" = "yes"; then
74951 -        SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD"
74952 -    else
74953 -
74954 -
74955 -  case sybcomn in
74956 -  c|c_r|pthread*) ;;
74957 -  *)
74958 -      LIBS="-lsybcomn $LIBS"
74959 -   ;;
74960 -  esac
74961 +if test "$PHP_XML" != "no"; then
74962
74963 +        if test "$PHP_LIBEXPAT_DIR" = "no"; then
74964
74965 +    if test "$PHP_LIBXML" = "no"; then
74966 +      { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
74967      fi
74968 -   ;;
74969 -  esac
74970 -
74971
74972
74973 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
74974 +echo "configure:99602: checking for xml2-config path" >&5
74975 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
74976 +  echo $ac_n "(cached) $ac_c" 1>&6
74977 +else
74978
74979 -  case sybintl in
74980 -  c|c_r|pthread*) ;;
74981 -  *)
74982 -    if test "$ext_shared" = "yes"; then
74983 -        SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD"
74984 -    else
74985 -
74986 -
74987 -  case sybintl in
74988 -  c|c_r|pthread*) ;;
74989 -  *)
74990 -      LIBS="-lsybintl $LIBS"
74991 -   ;;
74992 -  esac
74993 -
74994 -
74995 +  for i in $PHP_LIBXML_DIR /usr/local /usr; do
74996 +    if test -x "$i/bin/xml2-config"; then
74997 +      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
74998 +      break
74999      fi
75000 -   ;;
75001 -  esac
75002 +  done
75003
75004 +fi
75005
75006 -
75007 -    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl"
75008 -
75009 -
75010 -  save_old_LDFLAGS=$LDFLAGS
75011 -  ac_stuff="
75012 -      $SYBASE_CT_LIBS
75013 -    "
75014 -
75015 -  save_ext_shared=$ext_shared
75016 -  ext_shared=yes
75017 -
75018 -  for ac_i in $ac_stuff; do
75019 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
75020 +
75021 +  if test -x "$ac_cv_php_xml2_config_path"; then
75022 +    XML2_CONFIG="$ac_cv_php_xml2_config_path"
75023 +    libxml_full_version=`$XML2_CONFIG --version`
75024 +    ac_IFS=$IFS
75025 +    IFS="."
75026 +    set $libxml_full_version
75027 +    IFS=$ac_IFS
75028 +    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
75029 +    if test "$LIBXML_VERSION" -ge "2006011"; then
75030 +      LIBXML_LIBS=`$XML2_CONFIG --libs`
75031 +      LIBXML_INCS=`$XML2_CONFIG --cflags`
75032 +
75033 +  for ac_i in $LIBXML_LIBS; do
75034      case $ac_i in
75035      -pthread)
75036        if test "$ext_shared" = "yes"; then
75037 -        LDFLAGS="$LDFLAGS -pthread"
75038 +        XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread"
75039        else
75040
75041
75042 @@ -93391,7 +99652,7 @@ fi
75043    c|c_r|pthread*) ;;
75044    *)
75045      if test "$ext_shared" = "yes"; then
75046 -        LDFLAGS="$LDFLAGS -l$ac_ii"
75047 +        XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii"
75048      else
75049
75050
75051 @@ -93426,8 +99687,8 @@ fi
75052
75053
75054        if test "$ext_shared" = "yes"; then
75055 -        LDFLAGS="-L$ai_p $LDFLAGS"
75056 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
75057 +        XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
75058 +        test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD"
75059        else
75060
75061
75062 @@ -93453,160 +99714,13 @@ fi
75063      esac
75064    done
75065
75066 -  echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6
75067 -echo "configure:93458: checking for netg_errstr in -lsybtcl" >&5
75068 -ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'`
75069 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
75070 -  echo $ac_n "(cached) $ac_c" 1>&6
75071 -else
75072 -  ac_save_LIBS="$LIBS"
75073 -LIBS="-lsybtcl  $LIBS"
75074 -cat > conftest.$ac_ext <<EOF
75075 -#line 93466 "configure"
75076 -#include "confdefs.h"
75077 -/* Override any gcc2 internal prototype to avoid an error.  */
75078 -/* We use char because int might match the return type of a gcc2
75079 -    builtin and then its argument prototype would still apply.  */
75080 -char netg_errstr();
75081 -
75082 -int main() {
75083 -netg_errstr()
75084 -; return 0; }
75085 -EOF
75086 -if { (eval echo configure:93477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
75087 -  rm -rf conftest*
75088 -  eval "ac_cv_lib_$ac_lib_var=yes"
75089 -else
75090 -  echo "configure: failed program was:" >&5
75091 -  cat conftest.$ac_ext >&5
75092 -  rm -rf conftest*
75093 -  eval "ac_cv_lib_$ac_lib_var=no"
75094 -fi
75095 -rm -f conftest*
75096 -LIBS="$ac_save_LIBS"
75097 -
75098 -fi
75099 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
75100 -  echo "$ac_t""yes" 1>&6
75101 -
75102 -    LDFLAGS=$save_old_LDFLAGS
75103 -    ext_shared=$save_ext_shared
75104 -
75105 -
75106 -
75107 -  case sybtcl in
75108 -  c|c_r|pthread*) ;;
75109 -  *)
75110 -    if test "$ext_shared" = "yes"; then
75111 -        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
75112 -    else
75113 -
75114 -
75115 -  case sybtcl in
75116 -  c|c_r|pthread*) ;;
75117 -  *)
75118 -      LIBS="-lsybtcl $LIBS"
75119 -   ;;
75120 -  esac
75121 -
75122 -
75123 -    fi
75124 -   ;;
75125 -  esac
75126 -
75127 -
75128 -
75129 -
75130 -else
75131 -  echo "$ac_t""no" 1>&6
75132 -
75133 -    LDFLAGS=$save_old_LDFLAGS
75134 -    ext_shared=$save_ext_shared
75135 -    unset ac_cv_lib_sybtcl_netg_errstr
75136 -
75137 -
75138 -
75139 -  case sybtcl in
75140 -  c|c_r|pthread*) ;;
75141 -  *)
75142 -    if test "$ext_shared" = "yes"; then
75143 -        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
75144 -    else
75145
75146 -
75147 -  case sybtcl in
75148 -  c|c_r|pthread*) ;;
75149 -  *)
75150 -      LIBS="-lsybtcl $LIBS"
75151 -   ;;
75152 -  esac
75153 -
75154 -
75155 -    fi
75156 -   ;;
75157 -  esac
75158 -
75159 -
75160 -
75161 -
75162 -fi
75163 -
75164 -
75165 -
75166 -  save_old_LDFLAGS=$LDFLAGS
75167 -  ac_stuff="-L$SYBASE_CT_LIBDIR"
75168 -
75169 -  save_ext_shared=$ext_shared
75170 -  ext_shared=yes
75171 -
75172 -  for ac_i in $ac_stuff; do
75173 +  for ac_i in $LIBXML_INCS; do
75174      case $ac_i in
75175 -    -pthread)
75176 -      if test "$ext_shared" = "yes"; then
75177 -        LDFLAGS="$LDFLAGS -pthread"
75178 -      else
75179 -
75180 -
75181 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
75182 -
75183 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
75184 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
75185 -    eval "EXTRA_LDFLAGS$unique=set"
75186 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
75187 -  fi
75188 -
75189 -      fi
75190 -    ;;
75191 -    -l*)
75192 -      ac_ii=`echo $ac_i|cut -c 3-`
75193 -
75194 -
75195 -  case $ac_ii in
75196 -  c|c_r|pthread*) ;;
75197 -  *)
75198 -    if test "$ext_shared" = "yes"; then
75199 -        LDFLAGS="$LDFLAGS -l$ac_ii"
75200 -    else
75201 -
75202 -
75203 -  case $ac_ii in
75204 -  c|c_r|pthread*) ;;
75205 -  *)
75206 -      LIBS="$LIBS -l$ac_ii"
75207 -   ;;
75208 -  esac
75209 -
75210 -
75211 -    fi
75212 -   ;;
75213 -  esac
75214 -
75215 -
75216 -    ;;
75217 -    -L*)
75218 +    -I*)
75219        ac_ii=`echo $ac_i|cut -c 3-`
75220
75221 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
75222 +  if test "$ac_ii" != "/usr/include"; then
75223
75224    if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
75225      ai_p=$ac_ii
75226 @@ -93619,176 +99733,187 @@ fi
75227    fi
75228
75229
75230 -      if test "$ext_shared" = "yes"; then
75231 -        LDFLAGS="-L$ai_p $LDFLAGS"
75232 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
75233 -      else
75234 -
75235 -
75236
75237    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
75238
75239 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
75240 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
75241    if test -n "$unique" && test "`eval $cmd`" = "" ; then
75242 -    eval "LIBPATH$unique=set"
75243 +    eval "INCLUDEPATH$unique=set"
75244
75245 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
75246 -    LDFLAGS="$LDFLAGS -L$ai_p"
75247 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
75248 -
75249 -  fi
75250 -
75251 -
75252 +      if test ""; then
75253 +        INCLUDES="-I$ai_p $INCLUDES"
75254 +      else
75255 +        INCLUDES="$INCLUDES -I$ai_p"
75256        fi
75257
75258    fi
75259
75260 +  fi
75261 +
75262      ;;
75263      esac
75264    done
75265
75266 -  echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
75267 -echo "configure:93652: checking for insck__getVdate in -linsck" >&5
75268 -ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
75269 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
75270 +
75271 +            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
75272 +echo "configure:99760: checking whether libxml build works" >&5
75273 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
75274    echo $ac_n "(cached) $ac_c" 1>&6
75275  else
75276 -  ac_save_LIBS="$LIBS"
75277 -LIBS="-linsck  $LIBS"
75278 -cat > conftest.$ac_ext <<EOF
75279 -#line 93660 "configure"
75280 +
75281 +
75282 +  old_LIBS=$LIBS
75283 +  LIBS="
75284 +          $XML_SHARED_LIBADD
75285 +         $LIBS"
75286 +  if test "$cross_compiling" = yes; then
75287 +
75288 +    LIBS=$old_LIBS
75289 +
75290 +else
75291 +  cat > conftest.$ac_ext <<EOF
75292 +#line 99776 "configure"
75293  #include "confdefs.h"
75294 -/* Override any gcc2 internal prototype to avoid an error.  */
75295 -/* We use char because int might match the return type of a gcc2
75296 -    builtin and then its argument prototype would still apply.  */
75297 -char insck__getVdate();
75298
75299 -int main() {
75300 -insck__getVdate()
75301 -; return 0; }
75302 +
75303 +    char xmlInitParser();
75304 +    int main() {
75305 +      xmlInitParser();
75306 +      return 0;
75307 +    }
75308 +
75309  EOF
75310 -if { (eval echo configure:93671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
75311 -  rm -rf conftest*
75312 -  eval "ac_cv_lib_$ac_lib_var=yes"
75313 +if { (eval echo configure:99787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
75314 +then
75315 +
75316 +    LIBS=$old_LIBS
75317 +
75318 +          php_cv_libxml_build_works=yes
75319 +
75320 +
75321  else
75322    echo "configure: failed program was:" >&5
75323    cat conftest.$ac_ext >&5
75324 -  rm -rf conftest*
75325 -  eval "ac_cv_lib_$ac_lib_var=no"
75326 -fi
75327 -rm -f conftest*
75328 -LIBS="$ac_save_LIBS"
75329 -
75330 -fi
75331 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
75332 -  echo "$ac_t""yes" 1>&6
75333 +  rm -fr conftest*
75334
75335 -    LDFLAGS=$save_old_LDFLAGS
75336 -    ext_shared=$save_ext_shared
75337 +    LIBS=$old_LIBS
75338
75339 +          echo "$ac_t""no" 1>&6
75340 +          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
75341 +
75342
75343 -  case insck in
75344 -  c|c_r|pthread*) ;;
75345 -  *)
75346 -    if test "$ext_shared" = "yes"; then
75347 -        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
75348 -    else
75349 -
75350 -
75351 -  case insck in
75352 -  c|c_r|pthread*) ;;
75353 -  *)
75354 -      LIBS="-linsck $LIBS"
75355 -   ;;
75356 -  esac
75357 +fi
75358 +rm -fr conftest*
75359 +fi
75360
75361
75362 -    fi
75363 -   ;;
75364 -  esac
75365 +
75366 +fi
75367
75368 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
75369 +      if test "$php_cv_libxml_build_works" = "yes"; then
75370 +        cat >> confdefs.h <<\EOF
75371 +#define HAVE_LIBXML 1
75372 +EOF
75373
75374 +      fi
75375 +
75376 +      xml_extra_sources="compat.c"
75377 +
75378 +  am_i_shared=$PHP_XML_SHARED
75379 +  is_it_shared=$PHP_LIBXML_SHARED
75380 +  is_it_enabled=$PHP_LIBXML
75381 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
75382 +    { echo "configure: error:
75383 +You've configured extension xml to build statically, but it
75384 +depends on extension libxml, which you've configured to build shared.
75385 +You either need to build xml shared or build libxml statically for the
75386 +build to be successful.
75387 +" 1>&2; exit 1; }
75388 +  fi
75389 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
75390 +    { echo "configure: error:
75391 +You've configured extension xml, which depends on extension libxml,
75392 +but you've either not enabled libxml, or have disabled it.
75393 +" 1>&2; exit 1; }
75394 +  fi
75395
75396 -else
75397 -  echo "$ac_t""no" 1>&6
75398 -
75399 -    LDFLAGS=$save_old_LDFLAGS
75400 -    ext_shared=$save_ext_shared
75401 -    unset ac_cv_lib_insck_insck__getVdate
75402
75403 +    else
75404 +      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
75405 +    fi
75406 +else
75407 +      { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
75408 +
75409 +  fi
75410 +
75411 +  fi
75412
75413 -fi
75414 +        if test "$PHP_LIBEXPAT_DIR" != "no"; then
75415 +    for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
75416 +      if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
75417 +        EXPAT_DIR=$i
75418 +        break
75419 +      fi
75420 +    done
75421 +
75422 +    if test -z "$EXPAT_DIR"; then
75423 +      { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
75424 +    fi
75425
75426
75427 -  save_old_LDFLAGS=$LDFLAGS
75428 -  ac_stuff="-L$SYBASE_CT_LIBDIR"
75429 -
75430 -  save_ext_shared=$ext_shared
75431 -  ext_shared=yes
75432 -
75433 -  for ac_i in $ac_stuff; do
75434 -    case $ac_i in
75435 -    -pthread)
75436 -      if test "$ext_shared" = "yes"; then
75437 -        LDFLAGS="$LDFLAGS -pthread"
75438 -      else
75439 -
75440 -
75441 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
75442 -
75443 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
75444 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
75445 -    eval "EXTRA_LDFLAGS$unique=set"
75446 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
75447 +  if test "$EXPAT_DIR/include" != "/usr/include"; then
75448 +
75449 +  if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
75450 +    ai_p=$EXPAT_DIR/include
75451 +  else
75452 +
75453 +    ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
75454 +
75455 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
75456 +    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
75457    fi
75458
75459 -      fi
75460 -    ;;
75461 -    -l*)
75462 -      ac_ii=`echo $ac_i|cut -c 3-`
75463 -
75464 -
75465 -  case $ac_ii in
75466 -  c|c_r|pthread*) ;;
75467 -  *)
75468 -    if test "$ext_shared" = "yes"; then
75469 -        LDFLAGS="$LDFLAGS -l$ac_ii"
75470 -    else
75471 -
75472 +
75473
75474 -  case $ac_ii in
75475 -  c|c_r|pthread*) ;;
75476 -  *)
75477 -      LIBS="$LIBS -l$ac_ii"
75478 -   ;;
75479 -  esac
75480 -
75481 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
75482 +
75483 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
75484 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
75485 +    eval "INCLUDEPATH$unique=set"
75486 +
75487 +      if test ""; then
75488 +        INCLUDES="-I$ai_p $INCLUDES"
75489 +      else
75490 +        INCLUDES="$INCLUDES -I$ai_p"
75491 +      fi
75492 +
75493 +  fi
75494
75495 -    fi
75496 -   ;;
75497 -  esac
75498 +  fi
75499
75500 +
75501
75502 -    ;;
75503 -    -L*)
75504 -      ac_ii=`echo $ac_i|cut -c 3-`
75505 +  if test "$ext_shared" = "yes"; then
75506 +    XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD"
75507 +    if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
75508
75509 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
75510 +  if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
75511
75512 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
75513 -    ai_p=$ac_ii
75514 +  if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
75515 +    ai_p=$EXPAT_DIR/$PHP_LIBDIR
75516    else
75517
75518 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
75519 +    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
75520
75521      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
75522 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
75523 +    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
75524    fi
75525
75526
75527        if test "$ext_shared" = "yes"; then
75528 -        LDFLAGS="-L$ai_p $LDFLAGS"
75529 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
75530 +        XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
75531 +        test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD"
75532        else
75533
75534
75535 @@ -93810,386 +99935,496 @@ fi
75536
75537    fi
75538
75539 -    ;;
75540 -    esac
75541 -  done
75542 -
75543 -  echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
75544 -echo "configure:93819: checking for bsd_tcp in -linsck" >&5
75545 -ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
75546 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
75547 -  echo $ac_n "(cached) $ac_c" 1>&6
75548 -else
75549 -  ac_save_LIBS="$LIBS"
75550 -LIBS="-linsck  $LIBS"
75551 -cat > conftest.$ac_ext <<EOF
75552 -#line 93827 "configure"
75553 -#include "confdefs.h"
75554 -/* Override any gcc2 internal prototype to avoid an error.  */
75555 -/* We use char because int might match the return type of a gcc2
75556 -    builtin and then its argument prototype would still apply.  */
75557 -char bsd_tcp();
75558 +    fi
75559 +  else
75560 +
75561
75562 -int main() {
75563 -bsd_tcp()
75564 -; return 0; }
75565 -EOF
75566 -if { (eval echo configure:93838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
75567 -  rm -rf conftest*
75568 -  eval "ac_cv_lib_$ac_lib_var=yes"
75569 -else
75570 -  echo "configure: failed program was:" >&5
75571 -  cat conftest.$ac_ext >&5
75572 -  rm -rf conftest*
75573 -  eval "ac_cv_lib_$ac_lib_var=no"
75574 -fi
75575 -rm -f conftest*
75576 -LIBS="$ac_save_LIBS"
75577 +  if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
75578 +
75579 +  if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
75580 +
75581 +  if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
75582 +    ai_p=$EXPAT_DIR/$PHP_LIBDIR
75583 +  else
75584 +
75585 +    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
75586 +
75587 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
75588 +    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
75589 +  fi
75590
75591 -fi
75592 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
75593 -  echo "$ac_t""yes" 1>&6
75594 +
75595 +
75596
75597 -    LDFLAGS=$save_old_LDFLAGS
75598 -    ext_shared=$save_ext_shared
75599 +
75600 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
75601 +
75602 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
75603 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
75604 +    eval "LIBPATH$unique=set"
75605
75606 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
75607 +    LDFLAGS="$LDFLAGS -L$ai_p"
75608 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
75609
75610 -  case insck in
75611 -  c|c_r|pthread*) ;;
75612 -  *)
75613 -    if test "$ext_shared" = "yes"; then
75614 -        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
75615 -    else
75616 -
75617 +  fi
75618 +
75619 +
75620 +
75621 +  fi
75622 +
75623 +  fi
75624
75625 -  case insck in
75626 +
75627 +  case expat in
75628    c|c_r|pthread*) ;;
75629    *)
75630 -      LIBS="-linsck $LIBS"
75631 +      LIBS="-lexpat $LIBS"
75632     ;;
75633    esac
75634
75635
75636 -    fi
75637 -   ;;
75638 -  esac
75639
75640
75641 -
75642 -else
75643 -  echo "$ac_t""no" 1>&6
75644 +  fi
75645 +
75646 +
75647 +    cat >> confdefs.h <<\EOF
75648 +#define HAVE_LIBEXPAT 1
75649 +EOF
75650 +
75651 +  fi
75652
75653 -    LDFLAGS=$save_old_LDFLAGS
75654 -    ext_shared=$save_ext_shared
75655 -    unset ac_cv_lib_insck_bsd_tcp
75656 -
75657
75658 -fi
75659 +  ext_builddir=ext/xml
75660 +  ext_srcdir=$abs_srcdir/ext/xml
75661
75662 -  else
75663 +  ac_extra=
75664 +
75665 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
75666 +    PHP_XML_SHARED=no
75667
75668
75669 -  case cs in
75670 -  c|c_r|pthread*) ;;
75671 -  *)
75672 -    if test "$ext_shared" = "yes"; then
75673 -        SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD"
75674 -    else
75675 -
75676 -
75677 -  case cs in
75678 -  c|c_r|pthread*) ;;
75679 -  *)
75680 -      LIBS="-lcs $LIBS"
75681 -   ;;
75682 +  case ext/xml in
75683 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
75684 +  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
75685 +  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
75686    esac
75687 +
75688 +
75689
75690 -
75691 -    fi
75692 -   ;;
75693 -  esac
75694 +  b_c_pre=$php_c_pre
75695 +  b_cxx_pre=$php_cxx_pre
75696 +  b_c_meta=$php_c_meta
75697 +  b_cxx_meta=$php_cxx_meta
75698 +  b_c_post=$php_c_post
75699 +  b_cxx_post=$php_cxx_post
75700 +  b_lo=$php_lo
75701
75702
75703 -
75704 +  old_IFS=$IFS
75705 +  for ac_src in xml.c $xml_extra_sources; do
75706
75707 -  case ct in
75708 -  c|c_r|pthread*) ;;
75709 -  *)
75710 -    if test "$ext_shared" = "yes"; then
75711 -        SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
75712 -    else
75713 +      IFS=.
75714 +      set $ac_src
75715 +      ac_obj=$1
75716 +      IFS=$old_IFS
75717
75718 -
75719 -  case ct in
75720 -  c|c_r|pthread*) ;;
75721 -  *)
75722 -      LIBS="-lct $LIBS"
75723 -   ;;
75724 -  esac
75725 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
75726 +
75727 +      case $ac_src in
75728 +        *.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" ;;
75729 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
75730 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
75731 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
75732 +      esac
75733 +
75734 +    cat >>Makefile.objects<<EOF
75735 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
75736 +       $ac_comp
75737 +EOF
75738 +  done
75739
75740
75741 +    EXT_STATIC="$EXT_STATIC xml"
75742 +    if test "$ext_shared" != "nocli"; then
75743 +      EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
75744      fi
75745 -   ;;
75746 +  else
75747 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
75748 +      PHP_XML_SHARED=yes
75749 +
75750 +  case ext/xml in
75751 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
75752 +  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
75753 +  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
75754    esac
75755 +
75756 +
75757 +
75758 +  b_c_pre=$shared_c_pre
75759 +  b_cxx_pre=$shared_cxx_pre
75760 +  b_c_meta=$shared_c_meta
75761 +  b_cxx_meta=$shared_cxx_meta
75762 +  b_c_post=$shared_c_post
75763 +  b_cxx_post=$shared_cxx_post
75764 +  b_lo=$shared_lo
75765
75766
75767 -
75768 +  old_IFS=$IFS
75769 +  for ac_src in xml.c $xml_extra_sources; do
75770
75771 -  case comn in
75772 -  c|c_r|pthread*) ;;
75773 -  *)
75774 -    if test "$ext_shared" = "yes"; then
75775 -        SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD"
75776 -    else
75777 +      IFS=.
75778 +      set $ac_src
75779 +      ac_obj=$1
75780 +      IFS=$old_IFS
75781
75782 -
75783 -  case comn in
75784 -  c|c_r|pthread*) ;;
75785 -  *)
75786 -      LIBS="-lcomn $LIBS"
75787 -   ;;
75788 -  esac
75789 +      shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo"
75790 +
75791 +      case $ac_src in
75792 +        *.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" ;;
75793 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
75794 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
75795 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
75796 +      esac
75797
75798 +    cat >>Makefile.objects<<EOF
75799 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
75800 +       $ac_comp
75801 +EOF
75802 +  done
75803
75804 -    fi
75805 -   ;;
75806 -  esac
75807 +      case $host_alias in
75808 +        *netware*)
75809 +
75810 +  install_modules="install-modules"
75811
75812 +  case $host_alias in
75813 +    *aix*)
75814 +      suffix=so
75815 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxml.so '$ext_builddir'/phpxml.so'
75816 +      ;;
75817 +    *netware*)
75818 +      suffix=nlm
75819 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)'
75820 +      ;;
75821 +    *)
75822 +      suffix=la
75823 +      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_xml) $(PHPXML_SHARED_LIBADD)'
75824 +      ;;
75825 +  esac
75826
75827 -
75828 -
75829 -  case intl in
75830 -  c|c_r|pthread*) ;;
75831 -  *)
75832 -    if test "$ext_shared" = "yes"; then
75833 -        SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD"
75834 -    else
75835 -
75836 +  if test "x" = "xyes"; then
75837 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix"
75838 +  else
75839 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix"
75840 +  fi
75841
75842 -  case intl in
75843 -  c|c_r|pthread*) ;;
75844 -  *)
75845 -      LIBS="-lintl $LIBS"
75846 -   ;;
75847 -  esac
75848 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
75849
75850 +  cat >>Makefile.objects<<EOF
75851 +\$(phplibdir)/phpxml.$suffix: $ext_builddir/phpxml.$suffix
75852 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxml.$suffix \$(phplibdir)
75853
75854 -    fi
75855 -   ;;
75856 +$ext_builddir/phpxml.$suffix: \$(shared_objects_xml) \$(PHPXML_SHARED_DEPENDENCIES)
75857 +       $link_cmd
75858 +
75859 +EOF
75860 +
75861 +          ;;
75862 +        *)
75863 +
75864 +  install_modules="install-modules"
75865 +
75866 +  case $host_alias in
75867 +    *aix*)
75868 +      suffix=so
75869 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(XML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xml.so '$ext_builddir'/xml.so'
75870 +      ;;
75871 +    *netware*)
75872 +      suffix=nlm
75873 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XML, 3)_SHARED_LIBADD)'
75874 +      ;;
75875 +    *)
75876 +      suffix=la
75877 +      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_xml) $(XML_SHARED_LIBADD)'
75878 +      ;;
75879    esac
75880
75881 +  if test "x" = "xyes"; then
75882 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xml.$suffix"
75883 +  else
75884 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xml.$suffix"
75885 +  fi
75886 +
75887 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
75888 +
75889 +  cat >>Makefile.objects<<EOF
75890 +\$(phplibdir)/xml.$suffix: $ext_builddir/xml.$suffix
75891 +       \$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir)
75892 +
75893 +$ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES)
75894 +       $link_cmd
75895 +
75896 +EOF
75897 +
75898 +          ;;
75899 +      esac
75900 +      cat >> confdefs.h <<EOF
75901 +#define COMPILE_DL_XML 1
75902 +EOF
75903 +
75904 +    fi
75905 +  fi
75906
75907 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
75908 +    PHP_XML_SHARED=no
75909 +    case "$PHP_SAPI" in
75910 +      cgi|embed)
75911 +
75912
75913 -    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
75914 +  case ext/xml in
75915 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
75916 +  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
75917 +  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
75918 +  esac
75919
75920 -
75921 -  save_old_LDFLAGS=$LDFLAGS
75922 -  ac_stuff="
75923 -      $SYBASE_CT_LIBS
75924 -    "
75925
75926 -  save_ext_shared=$ext_shared
75927 -  ext_shared=yes
75928 +
75929 +  b_c_pre=$php_c_pre
75930 +  b_cxx_pre=$php_cxx_pre
75931 +  b_c_meta=$php_c_meta
75932 +  b_cxx_meta=$php_cxx_meta
75933 +  b_c_post=$php_c_post
75934 +  b_cxx_post=$php_cxx_post
75935 +  b_lo=$php_lo
75936 +
75937 +
75938 +  old_IFS=$IFS
75939 +  for ac_src in xml.c $xml_extra_sources; do
75940
75941 -  for ac_i in $ac_stuff; do
75942 -    case $ac_i in
75943 -    -pthread)
75944 -      if test "$ext_shared" = "yes"; then
75945 -        LDFLAGS="$LDFLAGS -pthread"
75946 -      else
75947 +      IFS=.
75948 +      set $ac_src
75949 +      ac_obj=$1
75950 +      IFS=$old_IFS
75951 +
75952 +      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
75953 +
75954 +      case $ac_src in
75955 +        *.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" ;;
75956 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
75957 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
75958 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
75959 +      esac
75960 +
75961 +    cat >>Makefile.objects<<EOF
75962 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
75963 +       $ac_comp
75964 +EOF
75965 +  done
75966 +
75967 +
75968 +        EXT_STATIC="$EXT_STATIC xml"
75969 +        ;;
75970 +      *)
75971
75972
75973 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
75974 +  case ext/xml in
75975 +  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
75976 +  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
75977 +  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
75978 +  esac
75979 +
75980
75981 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
75982 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
75983 -    eval "EXTRA_LDFLAGS$unique=set"
75984 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
75985 -  fi
75986
75987 -      fi
75988 -    ;;
75989 -    -l*)
75990 -      ac_ii=`echo $ac_i|cut -c 3-`
75991 -
75992 +  b_c_pre=$php_c_pre
75993 +  b_cxx_pre=$php_cxx_pre
75994 +  b_c_meta=$php_c_meta
75995 +  b_cxx_meta=$php_cxx_meta
75996 +  b_c_post=$php_c_post
75997 +  b_cxx_post=$php_cxx_post
75998 +  b_lo=$php_lo
75999 +
76000 +
76001 +  old_IFS=$IFS
76002 +  for ac_src in xml.c $xml_extra_sources; do
76003
76004 -  case $ac_ii in
76005 -  c|c_r|pthread*) ;;
76006 -  *)
76007 -    if test "$ext_shared" = "yes"; then
76008 -        LDFLAGS="$LDFLAGS -l$ac_ii"
76009 -    else
76010 +      IFS=.
76011 +      set $ac_src
76012 +      ac_obj=$1
76013 +      IFS=$old_IFS
76014
76015 -
76016 -  case $ac_ii in
76017 -  c|c_r|pthread*) ;;
76018 -  *)
76019 -      LIBS="$LIBS -l$ac_ii"
76020 -   ;;
76021 -  esac
76022 +      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
76023
76024 +      case $ac_src in
76025 +        *.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" ;;
76026 +        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
76027 +        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
76028 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
76029 +      esac
76030
76031 -    fi
76032 -   ;;
76033 -  esac
76034 +    cat >>Makefile.objects<<EOF
76035 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
76036 +       $ac_comp
76037 +EOF
76038 +  done
76039
76040
76041 -    ;;
76042 -    -L*)
76043 -      ac_ii=`echo $ac_i|cut -c 3-`
76044 -
76045 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
76046 -
76047 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
76048 -    ai_p=$ac_ii
76049 -  else
76050 -
76051 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
76052 -
76053 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
76054 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
76055 +        ;;
76056 +    esac
76057 +    EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
76058    fi
76059 +
76060 +
76061 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
76062 +
76063
76064 +
76065 +  if test "$ext_builddir" = "."; then
76066 +    PHP_PECL_EXTENSION=xml
76067
76068 -      if test "$ext_shared" = "yes"; then
76069 -        LDFLAGS="-L$ai_p $LDFLAGS"
76070 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
76071 -      else
76072 -
76073 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
76074 +
76075 +  fi
76076 +
76077
76078 +  PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD"
76079 +
76080
76081 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
76082
76083 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
76084 +    for header_file in ext/xml/; do
76085 +
76086 +
76087 +  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
76088 +
76089 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
76090    if test -n "$unique" && test "`eval $cmd`" = "" ; then
76091 -    eval "LIBPATH$unique=set"
76092 +    eval "INSTALLHEADERS$unique=set"
76093
76094 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
76095 -    LDFLAGS="$LDFLAGS -L$ai_p"
76096 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
76097 -
76098 +        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
76099 +
76100    fi
76101
76102 +    done
76103 +
76104
76105 -      fi
76106 -
76107 -  fi
76108 +  cat >> confdefs.h <<\EOF
76109 +#define HAVE_XML 1
76110 +EOF
76111
76112 -    ;;
76113 -    esac
76114 -  done
76115 +fi
76116
76117 -  echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
76118 -echo "configure:94084: checking for netg_errstr in -ltcl" >&5
76119 -ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
76120 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
76121 -  echo $ac_n "(cached) $ac_c" 1>&6
76122 -else
76123 -  ac_save_LIBS="$LIBS"
76124 -LIBS="-ltcl  $LIBS"
76125 -cat > conftest.$ac_ext <<EOF
76126 -#line 94092 "configure"
76127 -#include "confdefs.h"
76128 -/* Override any gcc2 internal prototype to avoid an error.  */
76129 -/* We use char because int might match the return type of a gcc2
76130 -    builtin and then its argument prototype would still apply.  */
76131 -char netg_errstr();
76132
76133 -int main() {
76134 -netg_errstr()
76135 -; return 0; }
76136 -EOF
76137 -if { (eval echo configure:94103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
76138 -  rm -rf conftest*
76139 -  eval "ac_cv_lib_$ac_lib_var=yes"
76140 +
76141 +php_enable_xmlreader=yes
76142 +
76143 +echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6
76144 +echo "configure:100323: checking whether to enable XMLReader support" >&5
76145 +# Check whether --enable-xmlreader or --disable-xmlreader was given.
76146 +if test "${enable_xmlreader+set}" = set; then
76147 +  enableval="$enable_xmlreader"
76148 +  PHP_XMLREADER=$enableval
76149  else
76150 -  echo "configure: failed program was:" >&5
76151 -  cat conftest.$ac_ext >&5
76152 -  rm -rf conftest*
76153 -  eval "ac_cv_lib_$ac_lib_var=no"
76154 -fi
76155 -rm -f conftest*
76156 -LIBS="$ac_save_LIBS"
76157 +
76158 +  PHP_XMLREADER=yes
76159 +  test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL
76160
76161  fi
76162 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
76163 -  echo "$ac_t""yes" 1>&6
76164 -
76165 -    LDFLAGS=$save_old_LDFLAGS
76166 -    ext_shared=$save_ext_shared
76167 -
76168 -
76169 -
76170 -  case tcl in
76171 -  c|c_r|pthread*) ;;
76172 -  *)
76173 -    if test "$ext_shared" = "yes"; then
76174 -        SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD"
76175 -    else
76176 -
76177 -
76178 -  case tcl in
76179 -  c|c_r|pthread*) ;;
76180 -  *)
76181 -      LIBS="-ltcl $LIBS"
76182 -   ;;
76183 -  esac
76184
76185
76186 -    fi
76187 -   ;;
76188 -  esac
76189 +
76190 +ext_output="yes, shared"
76191 +ext_shared=yes
76192 +case $PHP_XMLREADER in
76193 +shared,*)
76194 +  PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'`
76195 +  ;;
76196 +shared)
76197 +  PHP_XMLREADER=yes
76198 +  ;;
76199 +no)
76200 +  ext_output=no
76201 +  ext_shared=no
76202 +  ;;
76203 +*)
76204 +  ext_output=yes
76205 +  ext_shared=no
76206 +  ;;
76207 +esac
76208
76209
76210 -
76211 +
76212 +echo "$ac_t""$ext_output" 1>&6
76213 +
76214 +
76215 +
76216 +
76217 +if test -z "$PHP_LIBXML_DIR"; then
76218
76219 -else
76220 -  echo "$ac_t""no" 1>&6
76221 +php_with_libxml_dir=no
76222
76223 -    LDFLAGS=$save_old_LDFLAGS
76224 -    ext_shared=$save_ext_shared
76225 -    unset ac_cv_lib_tcl_netg_errstr
76226 -
76227 -
76228 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
76229 +echo "configure:100368: checking libxml2 install dir" >&5
76230 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
76231 +if test "${with_libxml_dir+set}" = set; then
76232 +  withval="$with_libxml_dir"
76233 +  PHP_LIBXML_DIR=$withval
76234 +else
76235
76236 -  case sybtcl in
76237 -  c|c_r|pthread*) ;;
76238 -  *)
76239 -    if test "$ext_shared" = "yes"; then
76240 -        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
76241 -    else
76242 -
76243 +  PHP_LIBXML_DIR=no
76244
76245 -  case sybtcl in
76246 -  c|c_r|pthread*) ;;
76247 -  *)
76248 -      LIBS="-lsybtcl $LIBS"
76249 -   ;;
76250 -  esac
76251 +
76252 +fi
76253
76254
76255 -    fi
76256 -   ;;
76257 -  esac
76258 +ext_output=$PHP_LIBXML_DIR
76259 +echo "$ac_t""$ext_output" 1>&6
76260 +
76261
76262
76263 -
76264 -
76265  fi
76266
76267 +if test "$PHP_XMLREADER" != "no"; then
76268 +
76269 +  if test "$PHP_LIBXML" = "no"; then
76270 +    { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
76271 +  fi
76272 +
76273
76274 -
76275 -  save_old_LDFLAGS=$LDFLAGS
76276 -  ac_stuff="-L$SYBASE_CT_LIBDIR"
76277 -
76278 -  save_ext_shared=$ext_shared
76279 -  ext_shared=yes
76280 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
76281 +echo "configure:100396: checking for xml2-config path" >&5
76282 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
76283 +  echo $ac_n "(cached) $ac_c" 1>&6
76284 +else
76285
76286 -  for ac_i in $ac_stuff; do
76287 +  for i in $PHP_LIBXML_DIR /usr/local /usr; do
76288 +    if test -x "$i/bin/xml2-config"; then
76289 +      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
76290 +      break
76291 +    fi
76292 +  done
76293 +
76294 +fi
76295 +
76296 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
76297 +
76298 +  if test -x "$ac_cv_php_xml2_config_path"; then
76299 +    XML2_CONFIG="$ac_cv_php_xml2_config_path"
76300 +    libxml_full_version=`$XML2_CONFIG --version`
76301 +    ac_IFS=$IFS
76302 +    IFS="."
76303 +    set $libxml_full_version
76304 +    IFS=$ac_IFS
76305 +    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
76306 +    if test "$LIBXML_VERSION" -ge "2006011"; then
76307 +      LIBXML_LIBS=`$XML2_CONFIG --libs`
76308 +      LIBXML_INCS=`$XML2_CONFIG --cflags`
76309 +
76310 +  for ac_i in $LIBXML_LIBS; do
76311      case $ac_i in
76312      -pthread)
76313        if test "$ext_shared" = "yes"; then
76314 -        LDFLAGS="$LDFLAGS -pthread"
76315 +        XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread"
76316        else
76317
76318
76319 @@ -94211,7 +100446,7 @@ fi
76320    c|c_r|pthread*) ;;
76321    *)
76322      if test "$ext_shared" = "yes"; then
76323 -        LDFLAGS="$LDFLAGS -l$ac_ii"
76324 +        XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii"
76325      else
76326
76327
76328 @@ -94246,8 +100481,8 @@ fi
76329
76330
76331        if test "$ext_shared" = "yes"; then
76332 -        LDFLAGS="-L$ai_p $LDFLAGS"
76333 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
76334 +        XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD"
76335 +        test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD"
76336        else
76337
76338
76339 @@ -94273,133 +100508,13 @@ fi
76340      esac
76341    done
76342
76343 -  echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
76344 -echo "configure:94278: checking for insck__getVdate in -linsck" >&5
76345 -ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
76346 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
76347 -  echo $ac_n "(cached) $ac_c" 1>&6
76348 -else
76349 -  ac_save_LIBS="$LIBS"
76350 -LIBS="-linsck  $LIBS"
76351 -cat > conftest.$ac_ext <<EOF
76352 -#line 94286 "configure"
76353 -#include "confdefs.h"
76354 -/* Override any gcc2 internal prototype to avoid an error.  */
76355 -/* We use char because int might match the return type of a gcc2
76356 -    builtin and then its argument prototype would still apply.  */
76357 -char insck__getVdate();
76358 -
76359 -int main() {
76360 -insck__getVdate()
76361 -; return 0; }
76362 -EOF
76363 -if { (eval echo configure:94297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
76364 -  rm -rf conftest*
76365 -  eval "ac_cv_lib_$ac_lib_var=yes"
76366 -else
76367 -  echo "configure: failed program was:" >&5
76368 -  cat conftest.$ac_ext >&5
76369 -  rm -rf conftest*
76370 -  eval "ac_cv_lib_$ac_lib_var=no"
76371 -fi
76372 -rm -f conftest*
76373 -LIBS="$ac_save_LIBS"
76374 -
76375 -fi
76376 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
76377 -  echo "$ac_t""yes" 1>&6
76378 -
76379 -    LDFLAGS=$save_old_LDFLAGS
76380 -    ext_shared=$save_ext_shared
76381 -
76382 -
76383 -  case insck in
76384 -  c|c_r|pthread*) ;;
76385 -  *)
76386 -    if test "$ext_shared" = "yes"; then
76387 -        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
76388 -    else
76389
76390 -
76391 -  case insck in
76392 -  c|c_r|pthread*) ;;
76393 -  *)
76394 -      LIBS="-linsck $LIBS"
76395 -   ;;
76396 -  esac
76397 -
76398 -
76399 -    fi
76400 -   ;;
76401 -  esac
76402 -
76403 -
76404 -
76405 -else
76406 -  echo "$ac_t""no" 1>&6
76407 -
76408 -    LDFLAGS=$save_old_LDFLAGS
76409 -    ext_shared=$save_ext_shared
76410 -    unset ac_cv_lib_insck_insck__getVdate
76411 -
76412 -
76413 -fi
76414 -
76415 -
76416 -  save_old_LDFLAGS=$LDFLAGS
76417 -  ac_stuff="-L$SYBASE_CT_LIBDIR"
76418 -
76419 -  save_ext_shared=$ext_shared
76420 -  ext_shared=yes
76421 -
76422 -  for ac_i in $ac_stuff; do
76423 +  for ac_i in $LIBXML_INCS; do
76424      case $ac_i in
76425 -    -pthread)
76426 -      if test "$ext_shared" = "yes"; then
76427 -        LDFLAGS="$LDFLAGS -pthread"
76428 -      else
76429 -
76430 -
76431 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
76432 -
76433 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
76434 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
76435 -    eval "EXTRA_LDFLAGS$unique=set"
76436 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
76437 -  fi
76438 -
76439 -      fi
76440 -    ;;
76441 -    -l*)
76442 -      ac_ii=`echo $ac_i|cut -c 3-`
76443 -
76444 -
76445 -  case $ac_ii in
76446 -  c|c_r|pthread*) ;;
76447 -  *)
76448 -    if test "$ext_shared" = "yes"; then
76449 -        LDFLAGS="$LDFLAGS -l$ac_ii"
76450 -    else
76451 -
76452 -
76453 -  case $ac_ii in
76454 -  c|c_r|pthread*) ;;
76455 -  *)
76456 -      LIBS="$LIBS -l$ac_ii"
76457 -   ;;
76458 -  esac
76459 -
76460 -
76461 -    fi
76462 -   ;;
76463 -  esac
76464 -
76465 -
76466 -    ;;
76467 -    -L*)
76468 +    -I*)
76469        ac_ii=`echo $ac_i|cut -c 3-`
76470
76471 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
76472 +  if test "$ac_ii" != "/usr/include"; then
76473
76474    if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
76475      ai_p=$ac_ii
76476 @@ -94412,209 +100527,109 @@ fi
76477    fi
76478
76479
76480 -      if test "$ext_shared" = "yes"; then
76481 -        LDFLAGS="-L$ai_p $LDFLAGS"
76482 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
76483 -      else
76484 -
76485 -
76486
76487    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
76488
76489 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
76490 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
76491    if test -n "$unique" && test "`eval $cmd`" = "" ; then
76492 -    eval "LIBPATH$unique=set"
76493 +    eval "INCLUDEPATH$unique=set"
76494
76495 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
76496 -    LDFLAGS="$LDFLAGS -L$ai_p"
76497 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
76498 -
76499 -  fi
76500 -
76501 -
76502 +      if test ""; then
76503 +        INCLUDES="-I$ai_p $INCLUDES"
76504 +      else
76505 +        INCLUDES="$INCLUDES -I$ai_p"
76506        fi
76507
76508    fi
76509
76510 +  fi
76511 +
76512      ;;
76513      esac
76514    done
76515
76516 -  echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
76517 -echo "configure:94445: checking for bsd_tcp in -linsck" >&5
76518 -ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
76519 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
76520 -  echo $ac_n "(cached) $ac_c" 1>&6
76521 -else
76522 -  ac_save_LIBS="$LIBS"
76523 -LIBS="-linsck  $LIBS"
76524 -cat > conftest.$ac_ext <<EOF
76525 -#line 94453 "configure"
76526 -#include "confdefs.h"
76527 -/* Override any gcc2 internal prototype to avoid an error.  */
76528 -/* We use char because int might match the return type of a gcc2
76529 -    builtin and then its argument prototype would still apply.  */
76530 -char bsd_tcp();
76531
76532 -int main() {
76533 -bsd_tcp()
76534 -; return 0; }
76535 -EOF
76536 -if { (eval echo configure:94464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
76537 -  rm -rf conftest*
76538 -  eval "ac_cv_lib_$ac_lib_var=yes"
76539 +            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
76540 +echo "configure:100554: checking whether libxml build works" >&5
76541 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
76542 +  echo $ac_n "(cached) $ac_c" 1>&6
76543  else
76544 -  echo "configure: failed program was:" >&5
76545 -  cat conftest.$ac_ext >&5
76546 -  rm -rf conftest*
76547 -  eval "ac_cv_lib_$ac_lib_var=no"
76548 -fi
76549 -rm -f conftest*
76550 -LIBS="$ac_save_LIBS"
76551 -
76552 -fi
76553 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
76554 -  echo "$ac_t""yes" 1>&6
76555 -
76556 -    LDFLAGS=$save_old_LDFLAGS
76557 -    ext_shared=$save_ext_shared
76558 -
76559
76560 -  case insck in
76561 -  c|c_r|pthread*) ;;
76562 -  *)
76563 -    if test "$ext_shared" = "yes"; then
76564 -        SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
76565 -    else
76566 -
76567 +
76568 +  old_LIBS=$LIBS
76569 +  LIBS="
76570 +          $XMLREADER_SHARED_LIBADD
76571 +         $LIBS"
76572 +  if test "$cross_compiling" = yes; then
76573
76574 -  case insck in
76575 -  c|c_r|pthread*) ;;
76576 -  *)
76577 -      LIBS="-linsck $LIBS"
76578 -   ;;
76579 -  esac
76580 -
76581 -
76582 -    fi
76583 -   ;;
76584 -  esac
76585 -
76586 -
76587 +    LIBS=$old_LIBS
76588
76589  else
76590 -  echo "$ac_t""no" 1>&6
76591 +  cat > conftest.$ac_ext <<EOF
76592 +#line 100570 "configure"
76593 +#include "confdefs.h"
76594
76595 -    LDFLAGS=$save_old_LDFLAGS
76596 -    ext_shared=$save_ext_shared
76597 -    unset ac_cv_lib_insck_bsd_tcp
76598
76599 +    char xmlInitParser();
76600 +    int main() {
76601 +      xmlInitParser();
76602 +      return 0;
76603 +    }
76604
76605 -fi
76606 -
76607 -  fi
76608 -fi
76609 -
76610 -
76611 -
76612 -php_enable_sysvmsg=no
76613 -
76614 -echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
76615 -echo "configure:94524: checking whether to enable System V IPC support" >&5
76616 -# Check whether --enable-sysvmsg or --disable-sysvmsg was given.
76617 -if test "${enable_sysvmsg+set}" = set; then
76618 -  enableval="$enable_sysvmsg"
76619 -  PHP_SYSVMSG=$enableval
76620 -else
76621 -
76622 -  PHP_SYSVMSG=no
76623 -  test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL
76624 -
76625 -fi
76626 -
76627 -
76628 -
76629 -ext_output="yes, shared"
76630 -ext_shared=yes
76631 -case $PHP_SYSVMSG in
76632 -shared,*)
76633 -  PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'`
76634 -  ;;
76635 -shared)
76636 -  PHP_SYSVMSG=yes
76637 -  ;;
76638 -no)
76639 -  ext_output=no
76640 -  ext_shared=no
76641 -  ;;
76642 -*)
76643 -  ext_output=yes
76644 -  ext_shared=no
76645 -  ;;
76646 -esac
76647 -
76648 -
76649 -
76650 -echo "$ac_t""$ext_output" 1>&6
76651 -
76652 -
76653 -
76654 -
76655 -if test "$PHP_SYSVMSG" != "no"; then
76656 -  ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
76657 -echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
76658 -echo "configure:94567: checking for sys/msg.h" >&5
76659 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
76660 -  echo $ac_n "(cached) $ac_c" 1>&6
76661 -else
76662 -  cat > conftest.$ac_ext <<EOF
76663 -#line 94572 "configure"
76664 -#include "confdefs.h"
76665 -#include <sys/msg.h>
76666  EOF
76667 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
76668 -{ (eval echo configure:94577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
76669 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
76670 -if test -z "$ac_err"; then
76671 -  rm -rf conftest*
76672 -  eval "ac_cv_header_$ac_safe=yes"
76673 +if { (eval echo configure:100581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
76674 +then
76675 +
76676 +    LIBS=$old_LIBS
76677 +
76678 +          php_cv_libxml_build_works=yes
76679 +
76680 +
76681  else
76682 -  echo "$ac_err" >&5
76683    echo "configure: failed program was:" >&5
76684    cat conftest.$ac_ext >&5
76685 -  rm -rf conftest*
76686 -  eval "ac_cv_header_$ac_safe=no"
76687 -fi
76688 -rm -f conftest*
76689 -fi
76690 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
76691 -  echo "$ac_t""yes" 1>&6
76692 -  :
76693 -else
76694 -  echo "$ac_t""no" 1>&6
76695 -{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; }
76696 +  rm -fr conftest*
76697 +
76698 +    LIBS=$old_LIBS
76699 +
76700 +          echo "$ac_t""no" 1>&6
76701 +          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
76702 +
76703
76704  fi
76705 +rm -fr conftest*
76706 +fi
76707
76708
76709 -  cat >> confdefs.h <<\EOF
76710 -#define HAVE_SYSVMSG 1
76711 +
76712 +fi
76713 +
76714 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
76715 +      if test "$php_cv_libxml_build_works" = "yes"; then
76716 +        cat >> confdefs.h <<\EOF
76717 +#define HAVE_LIBXML 1
76718  EOF
76719
76720 -
76721 -  ext_builddir=ext/sysvmsg
76722 -  ext_srcdir=$abs_srcdir/ext/sysvmsg
76723 +      fi
76724 +
76725 +    cat >> confdefs.h <<\EOF
76726 +#define HAVE_XMLREADER 1
76727 +EOF
76728 +
76729 +
76730 +  ext_builddir=ext/xmlreader
76731 +  ext_srcdir=$abs_srcdir/ext/xmlreader
76732
76733    ac_extra=
76734
76735    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
76736 -    PHP_SYSVMSG_SHARED=no
76737 +    PHP_XMLREADER_SHARED=no
76738
76739
76740 -  case ext/sysvmsg in
76741 +  case ext/xmlreader in
76742    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
76743 -  /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
76744 -  *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
76745 +  /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
76746 +  *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
76747    esac
76748
76749
76750 @@ -94629,7 +100644,7 @@ EOF
76751
76752
76753    old_IFS=$IFS
76754 -  for ac_src in sysvmsg.c; do
76755 +  for ac_src in php_xmlreader.c; do
76756
76757        IFS=.
76758        set $ac_src
76759 @@ -94652,18 +100667,18 @@ EOF
76760    done
76761
76762
76763 -    EXT_STATIC="$EXT_STATIC sysvmsg"
76764 +    EXT_STATIC="$EXT_STATIC xmlreader"
76765      if test "$ext_shared" != "nocli"; then
76766 -      EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
76767 +      EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
76768      fi
76769    else
76770      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
76771 -      PHP_SYSVMSG_SHARED=yes
76772 +      PHP_XMLREADER_SHARED=yes
76773
76774 -  case ext/sysvmsg in
76775 +  case ext/xmlreader in
76776    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
76777 -  /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
76778 -  *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
76779 +  /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
76780 +  *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
76781    esac
76782
76783
76784 @@ -94678,14 +100693,14 @@ EOF
76785
76786
76787    old_IFS=$IFS
76788 -  for ac_src in sysvmsg.c; do
76789 +  for ac_src in php_xmlreader.c; do
76790
76791        IFS=.
76792        set $ac_src
76793        ac_obj=$1
76794        IFS=$old_IFS
76795
76796 -      shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo"
76797 +      shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo"
76798
76799        case $ac_src in
76800          *.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" ;;
76801 @@ -94708,31 +100723,31 @@ EOF
76802    case $host_alias in
76803      *aix*)
76804        suffix=so
76805 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvmsg.so '$ext_builddir'/phpsysvmsg.so'
76806 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlreader.so '$ext_builddir'/phpxmlreader.so'
76807        ;;
76808      *netware*)
76809        suffix=nlm
76810 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVMSG, 3)_SHARED_LIBADD)'
76811 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)'
76812        ;;
76813      *)
76814        suffix=la
76815 -      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_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD)'
76816 +      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_xmlreader) $(PHPXMLREADER_SHARED_LIBADD)'
76817        ;;
76818    esac
76819
76820    if test "x" = "xyes"; then
76821 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvmsg.$suffix"
76822 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix"
76823    else
76824 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix"
76825 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix"
76826    fi
76827
76828 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
76829 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
76830
76831    cat >>Makefile.objects<<EOF
76832 -\$(phplibdir)/phpsysvmsg.$suffix: $ext_builddir/phpsysvmsg.$suffix
76833 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvmsg.$suffix \$(phplibdir)
76834 +\$(phplibdir)/phpxmlreader.$suffix: $ext_builddir/phpxmlreader.$suffix
76835 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlreader.$suffix \$(phplibdir)
76836
76837 -$ext_builddir/phpsysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(PHPSYSVMSG_SHARED_DEPENDENCIES)
76838 +$ext_builddir/phpxmlreader.$suffix: \$(shared_objects_xmlreader) \$(PHPXMLREADER_SHARED_DEPENDENCIES)
76839         $link_cmd
76840
76841  EOF
76842 @@ -94745,31 +100760,31 @@ EOF
76843    case $host_alias in
76844      *aix*)
76845        suffix=so
76846 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(SYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvmsg.so '$ext_builddir'/sysvmsg.so'
76847 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(XMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlreader.so '$ext_builddir'/xmlreader.so'
76848        ;;
76849      *netware*)
76850        suffix=nlm
76851 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVMSG, 3)_SHARED_LIBADD)'
76852 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLREADER, 3)_SHARED_LIBADD)'
76853        ;;
76854      *)
76855        suffix=la
76856 -      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_sysvmsg) $(SYSVMSG_SHARED_LIBADD)'
76857 +      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_xmlreader) $(XMLREADER_SHARED_LIBADD)'
76858        ;;
76859    esac
76860
76861    if test "x" = "xyes"; then
76862 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvmsg.$suffix"
76863 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlreader.$suffix"
76864    else
76865 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix"
76866 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlreader.$suffix"
76867    fi
76868
76869 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
76870 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
76871
76872    cat >>Makefile.objects<<EOF
76873 -\$(phplibdir)/sysvmsg.$suffix: $ext_builddir/sysvmsg.$suffix
76874 -       \$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir)
76875 +\$(phplibdir)/xmlreader.$suffix: $ext_builddir/xmlreader.$suffix
76876 +       \$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir)
76877
76878 -$ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES)
76879 +$ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES)
76880         $link_cmd
76881
76882  EOF
76883 @@ -94777,22 +100792,22 @@ EOF
76884            ;;
76885        esac
76886        cat >> confdefs.h <<EOF
76887 -#define COMPILE_DL_SYSVMSG 1
76888 +#define COMPILE_DL_XMLREADER 1
76889  EOF
76890
76891      fi
76892    fi
76893
76894    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
76895 -    PHP_SYSVMSG_SHARED=no
76896 +    PHP_XMLREADER_SHARED=no
76897      case "$PHP_SAPI" in
76898        cgi|embed)
76899
76900
76901 -  case ext/sysvmsg in
76902 +  case ext/xmlreader in
76903    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
76904 -  /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
76905 -  *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
76906 +  /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
76907 +  *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
76908    esac
76909
76910
76911 @@ -94807,7 +100822,7 @@ EOF
76912
76913
76914    old_IFS=$IFS
76915 -  for ac_src in sysvmsg.c; do
76916 +  for ac_src in php_xmlreader.c; do
76917
76918        IFS=.
76919        set $ac_src
76920 @@ -94830,15 +100845,15 @@ EOF
76921    done
76922
76923
76924 -        EXT_STATIC="$EXT_STATIC sysvmsg"
76925 +        EXT_STATIC="$EXT_STATIC xmlreader"
76926          ;;
76927        *)
76928
76929
76930 -  case ext/sysvmsg in
76931 +  case ext/xmlreader in
76932    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
76933 -  /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
76934 -  *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
76935 +  /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
76936 +  *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
76937    esac
76938
76939
76940 @@ -94853,7 +100868,7 @@ EOF
76941
76942
76943    old_IFS=$IFS
76944 -  for ac_src in sysvmsg.c; do
76945 +  for ac_src in php_xmlreader.c; do
76946
76947        IFS=.
76948        set $ac_src
76949 @@ -94878,7 +100893,7 @@ EOF
76950
76951          ;;
76952      esac
76953 -    EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
76954 +    EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
76955    fi
76956
76957
76958 @@ -94887,74 +100902,438 @@ EOF
76959
76960
76961    if test "$ext_builddir" = "."; then
76962 -    PHP_PECL_EXTENSION=sysvmsg
76963 +    PHP_PECL_EXTENSION=xmlreader
76964
76965    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
76966
76967    fi
76968
76969 +
76970 +  am_i_shared=$PHP_XMLREADER_SHARED
76971 +  is_it_shared=$PHP_DOM_SHARED
76972 +  is_it_enabled=$PHP_DOM
76973 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
76974 +    { echo "configure: error:
76975 +You've configured extension xmlreader to build statically, but it
76976 +depends on extension dom, which you've configured to build shared.
76977 +You either need to build xmlreader shared or build dom statically for the
76978 +build to be successful.
76979 +" 1>&2; exit 1; }
76980 +  fi
76981 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
76982 +    { echo "configure: error:
76983 +You've configured extension xmlreader, which depends on extension dom,
76984 +but you've either not enabled dom, or have disabled it.
76985 +" 1>&2; exit 1; }
76986 +  fi
76987 +
76988 +
76989 +  PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD"
76990 +
76991 +
76992 +    else
76993 +      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
76994 +    fi
76995 +else
76996 +    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
76997 +
76998 +  fi
76999 +
77000  fi
77001
77002
77003 +# Local macros for automake & autoconf
77004
77005 -php_enable_sysvsem=no
77006
77007 -echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
77008 -echo "configure:94904: checking whether to enable System V semaphore support" >&5
77009 -# Check whether --enable-sysvsem or --disable-sysvsem was given.
77010 -if test "${enable_sysvsem+set}" = set; then
77011 -  enableval="$enable_sysvsem"
77012 -  PHP_SYSVSEM=$enableval
77013 +
77014 +
77015 +
77016 +
77017 +
77018 +
77019 +
77020 +
77021 +
77022 +
77023 +
77024 +php_with_xmlrpc=no
77025 +
77026 +echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
77027 +echo "configure:100963: checking for XMLRPC-EPI support" >&5
77028 +# Check whether --with-xmlrpc or --without-xmlrpc was given.
77029 +if test "${with_xmlrpc+set}" = set; then
77030 +  withval="$with_xmlrpc"
77031 +  PHP_XMLRPC=$withval
77032  else
77033
77034 -  PHP_SYSVSEM=no
77035 -  test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL
77036 +  PHP_XMLRPC=no
77037 +  test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL
77038 +
77039 +fi
77040 +
77041 +
77042 +
77043 +ext_output="yes, shared"
77044 +ext_shared=yes
77045 +case $PHP_XMLRPC in
77046 +shared,*)
77047 +  PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'`
77048 +  ;;
77049 +shared)
77050 +  PHP_XMLRPC=yes
77051 +  ;;
77052 +no)
77053 +  ext_output=no
77054 +  ext_shared=no
77055 +  ;;
77056 +*)
77057 +  ext_output=yes
77058 +  ext_shared=no
77059 +  ;;
77060 +esac
77061 +
77062 +
77063 +
77064 +echo "$ac_t""$ext_output" 1>&6
77065 +
77066 +
77067 +
77068 +
77069 +if test -z "$PHP_LIBXML_DIR"; then
77070 +
77071 +php_with_libxml_dir=no
77072 +
77073 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
77074 +echo "configure:101008: checking libxml2 install dir" >&5
77075 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
77076 +if test "${with_libxml_dir+set}" = set; then
77077 +  withval="$with_libxml_dir"
77078 +  PHP_LIBXML_DIR=$withval
77079 +else
77080 +
77081 +  PHP_LIBXML_DIR=no
77082 +
77083 +
77084 +fi
77085 +
77086 +
77087 +ext_output=$PHP_LIBXML_DIR
77088 +echo "$ac_t""$ext_output" 1>&6
77089 +
77090 +
77091 +
77092 +fi
77093 +
77094 +
77095 +php_with_libexpat_dir=no
77096 +
77097 +echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
77098 +echo "configure:101032: checking libexpat dir for XMLRPC-EPI" >&5
77099 +# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
77100 +if test "${with_libexpat_dir+set}" = set; then
77101 +  withval="$with_libexpat_dir"
77102 +  PHP_LIBEXPAT_DIR=$withval
77103 +else
77104 +
77105 +  PHP_LIBEXPAT_DIR=no
77106 +
77107 +
77108 +fi
77109 +
77110 +
77111 +ext_output=$PHP_LIBEXPAT_DIR
77112 +echo "$ac_t""$ext_output" 1>&6
77113 +
77114 +
77115 +
77116 +
77117 +
77118 +php_with_iconv_dir=no
77119 +
77120 +echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
77121 +echo "configure:101055: checking iconv dir for XMLRPC-EPI" >&5
77122 +# Check whether --with-iconv-dir or --without-iconv-dir was given.
77123 +if test "${with_iconv_dir+set}" = set; then
77124 +  withval="$with_iconv_dir"
77125 +  PHP_ICONV_DIR=$withval
77126 +else
77127 +
77128 +  PHP_ICONV_DIR=no
77129 +
77130 +
77131 +fi
77132 +
77133 +
77134 +ext_output=$PHP_ICONV_DIR
77135 +echo "$ac_t""$ext_output" 1>&6
77136 +
77137 +
77138 +
77139 +
77140 +if test "$PHP_XMLRPC" != "no"; then
77141 +
77142 +
77143 +  am_i_shared=$PHP_XMLRPC_SHARED
77144 +  is_it_shared=$PHP_LIBXML_SHARED
77145 +  is_it_enabled=$PHP_LIBXML
77146 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
77147 +    { echo "configure: error:
77148 +You've configured extension xmlrpc to build statically, but it
77149 +depends on extension libxml, which you've configured to build shared.
77150 +You either need to build xmlrpc shared or build libxml statically for the
77151 +build to be successful.
77152 +" 1>&2; exit 1; }
77153 +  fi
77154 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
77155 +    { echo "configure: error:
77156 +You've configured extension xmlrpc, which depends on extension libxml,
77157 +but you've either not enabled libxml, or have disabled it.
77158 +" 1>&2; exit 1; }
77159 +  fi
77160 +
77161 +
77162 +  PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
77163 +
77164 +  cat >> confdefs.h <<\EOF
77165 +#define HAVE_XMLRPC 1
77166 +EOF
77167 +
77168 +
77169 +        if test "$PHP_LIBEXPAT_DIR" = "no"; then
77170 +
77171 +    if test "$PHP_LIBXML" = "no"; then
77172 +      { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
77173 +    fi
77174 +
77175 +
77176 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
77177 +echo "configure:101111: checking for xml2-config path" >&5
77178 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
77179 +  echo $ac_n "(cached) $ac_c" 1>&6
77180 +else
77181 +
77182 +  for i in $PHP_LIBXML_DIR /usr/local /usr; do
77183 +    if test -x "$i/bin/xml2-config"; then
77184 +      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
77185 +      break
77186 +    fi
77187 +  done
77188 +
77189 +fi
77190 +
77191 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
77192 +
77193 +  if test -x "$ac_cv_php_xml2_config_path"; then
77194 +    XML2_CONFIG="$ac_cv_php_xml2_config_path"
77195 +    libxml_full_version=`$XML2_CONFIG --version`
77196 +    ac_IFS=$IFS
77197 +    IFS="."
77198 +    set $libxml_full_version
77199 +    IFS=$ac_IFS
77200 +    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
77201 +    if test "$LIBXML_VERSION" -ge "2006011"; then
77202 +      LIBXML_LIBS=`$XML2_CONFIG --libs`
77203 +      LIBXML_INCS=`$XML2_CONFIG --cflags`
77204 +
77205 +  for ac_i in $LIBXML_LIBS; do
77206 +    case $ac_i in
77207 +    -pthread)
77208 +      if test "$ext_shared" = "yes"; then
77209 +        XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread"
77210 +      else
77211 +
77212 +
77213 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
77214 +
77215 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
77216 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
77217 +    eval "EXTRA_LDFLAGS$unique=set"
77218 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
77219 +  fi
77220 +
77221 +      fi
77222 +    ;;
77223 +    -l*)
77224 +      ac_ii=`echo $ac_i|cut -c 3-`
77225 +
77226 +
77227 +  case $ac_ii in
77228 +  c|c_r|pthread*) ;;
77229 +  *)
77230 +    if test "$ext_shared" = "yes"; then
77231 +        XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii"
77232 +    else
77233 +
77234 +
77235 +  case $ac_ii in
77236 +  c|c_r|pthread*) ;;
77237 +  *)
77238 +      LIBS="$LIBS -l$ac_ii"
77239 +   ;;
77240 +  esac
77241 +
77242 +
77243 +    fi
77244 +   ;;
77245 +  esac
77246 +
77247 +
77248 +    ;;
77249 +    -L*)
77250 +      ac_ii=`echo $ac_i|cut -c 3-`
77251 +
77252 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
77253 +
77254 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
77255 +    ai_p=$ac_ii
77256 +  else
77257 +
77258 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
77259 +
77260 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
77261 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
77262 +  fi
77263 +
77264 +
77265 +      if test "$ext_shared" = "yes"; then
77266 +        XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
77267 +        test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
77268 +      else
77269 +
77270 +
77271 +
77272 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
77273 +
77274 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
77275 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
77276 +    eval "LIBPATH$unique=set"
77277 +
77278 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
77279 +    LDFLAGS="$LDFLAGS -L$ai_p"
77280 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
77281 +
77282 +  fi
77283 +
77284 +
77285 +      fi
77286 +
77287 +  fi
77288 +
77289 +    ;;
77290 +    esac
77291 +  done
77292 +
77293 +
77294 +  for ac_i in $LIBXML_INCS; do
77295 +    case $ac_i in
77296 +    -I*)
77297 +      ac_ii=`echo $ac_i|cut -c 3-`
77298 +
77299 +  if test "$ac_ii" != "/usr/include"; then
77300 +
77301 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
77302 +    ai_p=$ac_ii
77303 +  else
77304 +
77305 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
77306 +
77307 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
77308 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
77309 +  fi
77310 +
77311 +
77312 +
77313 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
77314 +
77315 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
77316 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
77317 +    eval "INCLUDEPATH$unique=set"
77318 +
77319 +      if test ""; then
77320 +        INCLUDES="-I$ai_p $INCLUDES"
77321 +      else
77322 +        INCLUDES="$INCLUDES -I$ai_p"
77323 +      fi
77324 +
77325 +  fi
77326 +
77327 +  fi
77328 +
77329 +    ;;
77330 +    esac
77331 +  done
77332 +
77333 +
77334 +            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
77335 +echo "configure:101269: checking whether libxml build works" >&5
77336 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
77337 +  echo $ac_n "(cached) $ac_c" 1>&6
77338 +else
77339 +
77340 +
77341 +  old_LIBS=$LIBS
77342 +  LIBS="
77343 +          $XMLRPC_SHARED_LIBADD
77344 +         $LIBS"
77345 +  if test "$cross_compiling" = yes; then
77346 +
77347 +    LIBS=$old_LIBS
77348 +
77349 +else
77350 +  cat > conftest.$ac_ext <<EOF
77351 +#line 101285 "configure"
77352 +#include "confdefs.h"
77353
77354 +
77355 +    char xmlInitParser();
77356 +    int main() {
77357 +      xmlInitParser();
77358 +      return 0;
77359 +    }
77360 +
77361 +EOF
77362 +if { (eval echo configure:101296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
77363 +then
77364 +
77365 +    LIBS=$old_LIBS
77366 +
77367 +          php_cv_libxml_build_works=yes
77368 +
77369 +
77370 +else
77371 +  echo "configure: failed program was:" >&5
77372 +  cat conftest.$ac_ext >&5
77373 +  rm -fr conftest*
77374 +
77375 +    LIBS=$old_LIBS
77376 +
77377 +          echo "$ac_t""no" 1>&6
77378 +          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
77379 +
77380 +
77381 +fi
77382 +rm -fr conftest*
77383  fi
77384
77385
77386 +
77387 +fi
77388
77389 -ext_output="yes, shared"
77390 -ext_shared=yes
77391 -case $PHP_SYSVSEM in
77392 -shared,*)
77393 -  PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'`
77394 -  ;;
77395 -shared)
77396 -  PHP_SYSVSEM=yes
77397 -  ;;
77398 -no)
77399 -  ext_output=no
77400 -  ext_shared=no
77401 -  ;;
77402 -*)
77403 -  ext_output=yes
77404 -  ext_shared=no
77405 -  ;;
77406 -esac
77407 -
77408 -
77409 -
77410 -echo "$ac_t""$ext_output" 1>&6
77411 -
77412 -
77413 -
77414 -
77415 -if test "$PHP_SYSVSEM" != "no"; then
77416 -
77417 -  ext_builddir=ext/sysvsem
77418 -  ext_srcdir=$abs_srcdir/ext/sysvsem
77419 -
77420 -  ac_extra=
77421 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
77422 +      if test "$php_cv_libxml_build_works" = "yes"; then
77423 +        cat >> confdefs.h <<\EOF
77424 +#define HAVE_LIBXML 1
77425 +EOF
77426
77427 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
77428 -    PHP_SYSVSEM_SHARED=no
77429 -
77430 +      fi
77431 +
77432 +      if test "$PHP_XML" = "no"; then
77433 +
77434
77435 -  case ext/sysvsem in
77436 +  case ext/xml in
77437    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
77438 -  /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
77439 -  *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
77440 +  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
77441 +  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
77442    esac
77443
77444
77445 @@ -94969,7 +101348,7 @@ if test "$PHP_SYSVSEM" != "no"; then
77446
77447
77448    old_IFS=$IFS
77449 -  for ac_src in sysvsem.c; do
77450 +  for ac_src in compat.c; do
77451
77452        IFS=.
77453        set $ac_src
77454 @@ -94979,10 +101358,10 @@ if test "$PHP_SYSVSEM" != "no"; then
77455        PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
77456
77457        case $ac_src in
77458 -        *.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" ;;
77459 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
77460 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
77461 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
77462 +        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
77463 +        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
77464 +        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
77465 +        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
77466        esac
77467
77468      cat >>Makefile.objects<<EOF
77469 @@ -94992,734 +101371,678 @@ EOF
77470    done
77471
77472
77473 -    EXT_STATIC="$EXT_STATIC sysvsem"
77474 -    if test "$ext_shared" != "nocli"; then
77475 -      EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
77476 +
77477 +
77478 +    BUILD_DIR="$BUILD_DIR ext/xml"
77479 +
77480 +
77481 +      fi
77482 +
77483 +    else
77484 +      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
77485      fi
77486 +else
77487 +      { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
77488 +
77489 +  fi
77490 +
77491    else
77492 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
77493 -      PHP_SYSVSEM_SHARED=yes
77494 +    testval=no
77495 +    for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
77496 +      if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
77497 +        cat >> confdefs.h <<\EOF
77498 +#define HAVE_LIBEXPAT 1
77499 +EOF
77500 +
77501 +
77502 +
77503 +  if test "$ext_shared" = "yes"; then
77504 +    XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD"
77505 +    if test -n "$i/$PHP_LIBDIR"; then
77506
77507 -  case ext/sysvsem in
77508 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
77509 -  /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
77510 -  *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
77511 -  esac
77512 +  if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
77513 +
77514 +  if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
77515 +    ai_p=$i/$PHP_LIBDIR
77516 +  else
77517 +
77518 +    ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
77519 +
77520 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
77521 +    ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
77522 +  fi
77523 +
77524 +
77525 +      if test "$ext_shared" = "yes"; then
77526 +        XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
77527 +        test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
77528 +      else
77529 +
77530
77531
77532 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
77533 +
77534 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
77535 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
77536 +    eval "LIBPATH$unique=set"
77537 +
77538 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
77539 +    LDFLAGS="$LDFLAGS -L$ai_p"
77540 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
77541 +
77542 +  fi
77543
77544 -  b_c_pre=$shared_c_pre
77545 -  b_cxx_pre=$shared_cxx_pre
77546 -  b_c_meta=$shared_c_meta
77547 -  b_cxx_meta=$shared_cxx_meta
77548 -  b_c_post=$shared_c_post
77549 -  b_cxx_post=$shared_cxx_post
77550 -  b_lo=$shared_lo
77551
77552 +      fi
77553 +
77554 +  fi
77555
77556 -  old_IFS=$IFS
77557 -  for ac_src in sysvsem.c; do
77558 -
77559 -      IFS=.
77560 -      set $ac_src
77561 -      ac_obj=$1
77562 -      IFS=$old_IFS
77563 -
77564 -      shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo"
77565 +    fi
77566 +  else
77567 +
77568
77569 -      case $ac_src in
77570 -        *.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" ;;
77571 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
77572 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
77573 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
77574 -      esac
77575 +  if test -n "$i/$PHP_LIBDIR"; then
77576 +
77577 +  if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
77578 +
77579 +  if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
77580 +    ai_p=$i/$PHP_LIBDIR
77581 +  else
77582 +
77583 +    ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
77584 +
77585 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
77586 +    ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
77587 +  fi
77588
77589 -    cat >>Makefile.objects<<EOF
77590 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
77591 -       $ac_comp
77592 -EOF
77593 -  done
77594 +
77595 +
77596 +
77597 +
77598 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
77599 +
77600 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
77601 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
77602 +    eval "LIBPATH$unique=set"
77603 +
77604 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
77605 +    LDFLAGS="$LDFLAGS -L$ai_p"
77606 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
77607 +
77608 +  fi
77609
77610 -      case $host_alias in
77611 -        *netware*)
77612 -
77613 -  install_modules="install-modules"
77614
77615 -  case $host_alias in
77616 -    *aix*)
77617 -      suffix=so
77618 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvsem.so '$ext_builddir'/phpsysvsem.so'
77619 -      ;;
77620 -    *netware*)
77621 -      suffix=nlm
77622 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)'
77623 -      ;;
77624 -    *)
77625 -      suffix=la
77626 -      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_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD)'
77627 -      ;;
77628 -  esac
77629 +
77630 +  fi
77631
77632 -  if test "x" = "xyes"; then
77633 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix"
77634 -  else
77635 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix"
77636    fi
77637
77638 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
77639 +
77640 +  case expat in
77641 +  c|c_r|pthread*) ;;
77642 +  *)
77643 +      LIBS="-lexpat $LIBS"
77644 +   ;;
77645 +  esac
77646
77647 -  cat >>Makefile.objects<<EOF
77648 -\$(phplibdir)/phpsysvsem.$suffix: $ext_builddir/phpsysvsem.$suffix
77649 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvsem.$suffix \$(phplibdir)
77650
77651 -$ext_builddir/phpsysvsem.$suffix: \$(shared_objects_sysvsem) \$(PHPSYSVSEM_SHARED_DEPENDENCIES)
77652 -       $link_cmd
77653
77654 -EOF
77655
77656 -          ;;
77657 -        *)
77658 -
77659 -  install_modules="install-modules"
77660 +  fi
77661
77662 -  case $host_alias in
77663 -    *aix*)
77664 -      suffix=so
77665 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(SYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvsem.so '$ext_builddir'/sysvsem.so'
77666 -      ;;
77667 -    *netware*)
77668 -      suffix=nlm
77669 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSEM, 3)_SHARED_LIBADD)'
77670 -      ;;
77671 -    *)
77672 -      suffix=la
77673 -      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_sysvsem) $(SYSVSEM_SHARED_LIBADD)'
77674 -      ;;
77675 -  esac
77676
77677 -  if test "x" = "xyes"; then
77678 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvsem.$suffix"
77679 +
77680 +  if test "$i/include" != "/usr/include"; then
77681 +
77682 +  if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then
77683 +    ai_p=$i/include
77684    else
77685 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix"
77686 +
77687 +    ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`"
77688 +
77689 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
77690 +    ai_p="$ep_realdir/`basename \"$i/include\"`"
77691    fi
77692 -
77693 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
77694 -
77695 -  cat >>Makefile.objects<<EOF
77696 -\$(phplibdir)/sysvsem.$suffix: $ext_builddir/sysvsem.$suffix
77697 -       \$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir)
77698
77699 -$ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES)
77700 -       $link_cmd
77701 +
77702 +
77703 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
77704 +
77705 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
77706 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
77707 +    eval "INCLUDEPATH$unique=set"
77708 +
77709 +      if test ""; then
77710 +        INCLUDES="-I$ai_p $INCLUDES"
77711 +      else
77712 +        INCLUDES="$INCLUDES -I$ai_p"
77713 +      fi
77714 +
77715 +  fi
77716
77717 -EOF
77718 +  fi
77719
77720 -          ;;
77721 -      esac
77722 -      cat >> confdefs.h <<EOF
77723 -#define COMPILE_DL_SYSVSEM 1
77724 -EOF
77725 +        testval=yes
77726 +        break
77727 +      fi
77728 +    done
77729
77730 +    if test "$testval" = "no"; then
77731 +      { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" 1>&2; exit 1; }
77732      fi
77733    fi
77734
77735 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
77736 -    PHP_SYSVSEM_SHARED=no
77737 -    case "$PHP_SAPI" in
77738 -      cgi|embed)
77739 -
77740 +    if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then
77741 +
77742 +    if test "$PHP_ICONV_DIR" != "no"; then
77743 +      PHP_ICONV=$PHP_ICONV_DIR
77744 +    fi
77745
77746 -  case ext/sysvsem in
77747 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
77748 -  /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
77749 -  *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
77750 -  esac
77751 +    if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
77752 +      PHP_ICONV=yes
77753 +    fi
77754
77755 +
77756 +  found_iconv=no
77757 +  unset ICONV_DIR
77758 +
77759 +  # Create the directories for a VPATH build:
77760 +  $php_shtool mkdir -p ext/iconv
77761 +
77762 +  echo > ext/iconv/php_have_bsd_iconv.h
77763 +  echo > ext/iconv/php_have_ibm_iconv.h
77764 +  echo > ext/iconv/php_have_glibc_iconv.h
77765 +  echo > ext/iconv/php_have_libiconv.h
77766 +  echo > ext/iconv/php_have_iconv.h
77767 +  echo > ext/iconv/php_php_iconv_impl.h
77768 +  echo > ext/iconv/php_iconv_aliased_libiconv.h
77769 +  echo > ext/iconv/php_php_iconv_h_path.h
77770 +  echo > ext/iconv/php_iconv_supports_errno.h
77771 +
77772 +        if test "$PHP_ICONV" = "yes"; then
77773 +    echo $ac_n "checking for iconv""... $ac_c" 1>&6
77774 +echo "configure:101565: checking for iconv" >&5
77775 +if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
77776 +  echo $ac_n "(cached) $ac_c" 1>&6
77777 +else
77778 +  cat > conftest.$ac_ext <<EOF
77779 +#line 101570 "configure"
77780 +#include "confdefs.h"
77781 +/* System header to define __stub macros and hopefully few prototypes,
77782 +    which can conflict with char iconv(); below.  */
77783 +#include <assert.h>
77784 +/* Override any gcc2 internal prototype to avoid an error.  */
77785 +/* We use char because int might match the return type of a gcc2
77786 +    builtin and then its argument prototype would still apply.  */
77787 +char iconv();
77788 +
77789 +int main() {
77790 +
77791 +/* The GNU C library defines this for functions which it implements
77792 +    to always fail with ENOSYS.  Some functions are actually named
77793 +    something starting with __ and the normal name is an alias.  */
77794 +#if defined (__stub_iconv) || defined (__stub___iconv)
77795 +choke me
77796 +#else
77797 +iconv();
77798 +#endif
77799 +
77800 +; return 0; }
77801 +EOF
77802 +if { (eval echo configure:101593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
77803 +  rm -rf conftest*
77804 +  eval "ac_cv_func_iconv=yes"
77805 +else
77806 +  echo "configure: failed program was:" >&5
77807 +  cat conftest.$ac_ext >&5
77808 +  rm -rf conftest*
77809 +  eval "ac_cv_func_iconv=no"
77810 +fi
77811 +rm -f conftest*
77812 +fi
77813 +
77814 +if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
77815 +  echo "$ac_t""yes" 1>&6
77816
77817 +      found_iconv=yes
77818 +
77819 +else
77820 +  echo "$ac_t""no" 1>&6
77821
77822 -  b_c_pre=$php_c_pre
77823 -  b_cxx_pre=$php_cxx_pre
77824 -  b_c_meta=$php_c_meta
77825 -  b_cxx_meta=$php_cxx_meta
77826 -  b_c_post=$php_c_post
77827 -  b_cxx_post=$php_cxx_post
77828 -  b_lo=$php_lo
77829 +      echo $ac_n "checking for libiconv""... $ac_c" 1>&6
77830 +echo "configure:101614: checking for libiconv" >&5
77831 +if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
77832 +  echo $ac_n "(cached) $ac_c" 1>&6
77833 +else
77834 +  cat > conftest.$ac_ext <<EOF
77835 +#line 101619 "configure"
77836 +#include "confdefs.h"
77837 +/* System header to define __stub macros and hopefully few prototypes,
77838 +    which can conflict with char libiconv(); below.  */
77839 +#include <assert.h>
77840 +/* Override any gcc2 internal prototype to avoid an error.  */
77841 +/* We use char because int might match the return type of a gcc2
77842 +    builtin and then its argument prototype would still apply.  */
77843 +char libiconv();
77844
77845 +int main() {
77846
77847 -  old_IFS=$IFS
77848 -  for ac_src in sysvsem.c; do
77849 +/* The GNU C library defines this for functions which it implements
77850 +    to always fail with ENOSYS.  Some functions are actually named
77851 +    something starting with __ and the normal name is an alias.  */
77852 +#if defined (__stub_libiconv) || defined (__stub___libiconv)
77853 +choke me
77854 +#else
77855 +libiconv();
77856 +#endif
77857 +
77858 +; return 0; }
77859 +EOF
77860 +if { (eval echo configure:101642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
77861 +  rm -rf conftest*
77862 +  eval "ac_cv_func_libiconv=yes"
77863 +else
77864 +  echo "configure: failed program was:" >&5
77865 +  cat conftest.$ac_ext >&5
77866 +  rm -rf conftest*
77867 +  eval "ac_cv_func_libiconv=no"
77868 +fi
77869 +rm -f conftest*
77870 +fi
77871 +
77872 +if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then
77873 +  echo "$ac_t""yes" 1>&6
77874
77875 -      IFS=.
77876 -      set $ac_src
77877 -      ac_obj=$1
77878 -      IFS=$old_IFS
77879 +
77880 +  echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
77881 +
77882 +        cat >> confdefs.h <<\EOF
77883 +#define HAVE_LIBICONV 1
77884 +EOF
77885 +
77886 +        found_iconv=yes
77887
77888 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
77889 +else
77890 +  echo "$ac_t""no" 1>&6
77891 +fi
77892
77893 -      case $ac_src in
77894 -        *.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" ;;
77895 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
77896 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
77897 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
77898 -      esac
77899 +
77900 +fi
77901
77902 -    cat >>Makefile.objects<<EOF
77903 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
77904 -       $ac_comp
77905 +  fi
77906 +
77907 +        if test "$found_iconv" = "no"; then
77908 +
77909 +    for i in $PHP_ICONV /usr/local /usr; do
77910 +      if test -r $i/include/giconv.h; then
77911 +        cat >> confdefs.h <<\EOF
77912 +#define HAVE_GICONV_H 1
77913  EOF
77914 -  done
77915
77916 +        ICONV_DIR=$i
77917 +        iconv_lib_name=giconv
77918 +        break
77919 +      elif test -r $i/include/iconv.h; then
77920 +        ICONV_DIR=$i
77921 +        iconv_lib_name=iconv
77922 +        break
77923 +      fi
77924 +    done
77925
77926 -        EXT_STATIC="$EXT_STATIC sysvsem"
77927 -        ;;
77928 -      *)
77929 -
77930 +    if test -z "$ICONV_DIR"; then
77931 +      { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
77932 +    fi
77933
77934 -  case ext/sysvsem in
77935 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
77936 -  /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
77937 -  *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
77938 -  esac
77939 +    if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
77940 +       test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
77941 +    then
77942 +
77943 +  save_old_LDFLAGS=$LDFLAGS
77944 +  ac_stuff="
77945 +        -L$ICONV_DIR/$PHP_LIBDIR
77946 +      "
77947
77948 +  save_ext_shared=$ext_shared
77949 +  ext_shared=yes
77950
77951 +  for ac_i in $ac_stuff; do
77952 +    case $ac_i in
77953 +    -pthread)
77954 +      if test "$ext_shared" = "yes"; then
77955 +        LDFLAGS="$LDFLAGS -pthread"
77956 +      else
77957 +
77958 +
77959 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
77960 +
77961 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
77962 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
77963 +    eval "EXTRA_LDFLAGS$unique=set"
77964 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
77965 +  fi
77966
77967 -  b_c_pre=$php_c_pre
77968 -  b_cxx_pre=$php_cxx_pre
77969 -  b_c_meta=$php_c_meta
77970 -  b_cxx_meta=$php_cxx_meta
77971 -  b_c_post=$php_c_post
77972 -  b_cxx_post=$php_cxx_post
77973 -  b_lo=$php_lo
77974 -
77975 -
77976 -  old_IFS=$IFS
77977 -  for ac_src in sysvsem.c; do
77978 +      fi
77979 +    ;;
77980 +    -l*)
77981 +      ac_ii=`echo $ac_i|cut -c 3-`
77982 +
77983
77984 -      IFS=.
77985 -      set $ac_src
77986 -      ac_obj=$1
77987 -      IFS=$old_IFS
77988 +  case $ac_ii in
77989 +  c|c_r|pthread*) ;;
77990 +  *)
77991 +    if test "$ext_shared" = "yes"; then
77992 +        LDFLAGS="$LDFLAGS -l$ac_ii"
77993 +    else
77994
77995 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
77996 +
77997 +  case $ac_ii in
77998 +  c|c_r|pthread*) ;;
77999 +  *)
78000 +      LIBS="$LIBS -l$ac_ii"
78001 +   ;;
78002 +  esac
78003
78004 -      case $ac_src in
78005 -        *.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" ;;
78006 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78007 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78008 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
78009 -      esac
78010
78011 -    cat >>Makefile.objects<<EOF
78012 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
78013 -       $ac_comp
78014 -EOF
78015 -  done
78016 +    fi
78017 +   ;;
78018 +  esac
78019
78020
78021 -        ;;
78022 -    esac
78023 -    EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
78024 +    ;;
78025 +    -L*)
78026 +      ac_ii=`echo $ac_i|cut -c 3-`
78027 +
78028 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
78029 +
78030 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
78031 +    ai_p=$ac_ii
78032 +  else
78033 +
78034 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
78035 +
78036 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
78037 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
78038    fi
78039 +
78040 +
78041 +      if test "$ext_shared" = "yes"; then
78042 +        LDFLAGS="-L$ai_p $LDFLAGS"
78043 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
78044 +      else
78045 +
78046
78047
78048 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
78049 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
78050 +
78051 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
78052 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
78053 +    eval "LIBPATH$unique=set"
78054 +
78055 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
78056 +    LDFLAGS="$LDFLAGS -L$ai_p"
78057 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
78058
78059 +  fi
78060
78061
78062 -  if test "$ext_builddir" = "."; then
78063 -    PHP_PECL_EXTENSION=sysvsem
78064 +      fi
78065
78066 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
78067 -
78068    fi
78069
78070 - cat >> confdefs.h <<\EOF
78071 -#define HAVE_SYSVSEM 1
78072 -EOF
78073 +    ;;
78074 +    esac
78075 +  done
78076
78077 - echo $ac_n "checking for union semun""... $ac_c" 1>&6
78078 -echo "configure:95242: checking for union semun" >&5
78079 -if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
78080 +  echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
78081 +echo "configure:101798: checking for libiconv in -l$iconv_lib_name" >&5
78082 +ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
78083 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
78084    echo $ac_n "(cached) $ac_c" 1>&6
78085  else
78086 -  cat > conftest.$ac_ext <<EOF
78087 -#line 95247 "configure"
78088 +  ac_save_LIBS="$LIBS"
78089 +LIBS="-l$iconv_lib_name  $LIBS"
78090 +cat > conftest.$ac_ext <<EOF
78091 +#line 101806 "configure"
78092  #include "confdefs.h"
78093 +/* Override any gcc2 internal prototype to avoid an error.  */
78094 +/* We use char because int might match the return type of a gcc2
78095 +    builtin and then its argument prototype would still apply.  */
78096 +char libiconv();
78097
78098 -#include <sys/types.h>
78099 -#include <sys/ipc.h>
78100 -#include <sys/sem.h>
78101 -
78102  int main() {
78103 -union semun x;
78104 +libiconv()
78105  ; return 0; }
78106  EOF
78107 -if { (eval echo configure:95258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
78108 +if { (eval echo configure:101817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
78109    rm -rf conftest*
78110 -
78111 -     php_cv_semun=yes
78112 -
78113 +  eval "ac_cv_lib_$ac_lib_var=yes"
78114  else
78115    echo "configure: failed program was:" >&5
78116    cat conftest.$ac_ext >&5
78117    rm -rf conftest*
78118 -
78119 -     php_cv_semun=no
78120 -
78121 +  eval "ac_cv_lib_$ac_lib_var=no"
78122  fi
78123  rm -f conftest*
78124 -
78125 -fi
78126 -
78127 -echo "$ac_t""$php_cv_semun" 1>&6
78128 - if test "$php_cv_semun" = "yes"; then
78129 -   cat >> confdefs.h <<\EOF
78130 -#define HAVE_SEMUN 1
78131 -EOF
78132 -
78133 - else
78134 -   cat >> confdefs.h <<\EOF
78135 -#define HAVE_SEMUN 0
78136 -EOF
78137 +LIBS="$ac_save_LIBS"
78138
78139 - fi
78140  fi
78141 -
78142 -
78143 -
78144 -php_enable_sysvshm=no
78145 -
78146 -echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
78147 -echo "configure:95294: checking whether to enable System V shared memory support" >&5
78148 -# Check whether --enable-sysvshm or --disable-sysvshm was given.
78149 -if test "${enable_sysvshm+set}" = set; then
78150 -  enableval="$enable_sysvshm"
78151 -  PHP_SYSVSHM=$enableval
78152 -else
78153 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
78154 +  echo "$ac_t""yes" 1>&6
78155
78156 -  PHP_SYSVSHM=no
78157 -  test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL
78158 -
78159 -fi
78160 -
78161 -
78162 -
78163 -ext_output="yes, shared"
78164 -ext_shared=yes
78165 -case $PHP_SYSVSHM in
78166 -shared,*)
78167 -  PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'`
78168 -  ;;
78169 -shared)
78170 -  PHP_SYSVSHM=yes
78171 -  ;;
78172 -no)
78173 -  ext_output=no
78174 -  ext_shared=no
78175 -  ;;
78176 -*)
78177 -  ext_output=yes
78178 -  ext_shared=no
78179 -  ;;
78180 -esac
78181 -
78182 -
78183 -
78184 -echo "$ac_t""$ext_output" 1>&6
78185 -
78186 +    LDFLAGS=$save_old_LDFLAGS
78187 +    ext_shared=$save_ext_shared
78188 +
78189 +        found_iconv=yes
78190 +
78191 +  echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
78192
78193 +        cat >> confdefs.h <<\EOF
78194 +#define HAVE_LIBICONV 1
78195 +EOF
78196
78197 +
78198 +  echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h
78199
78200 -if test "$PHP_SYSVSHM" != "no"; then
78201 -  cat >> confdefs.h <<\EOF
78202 -#define HAVE_SYSVSHM 1
78203 +        cat >> confdefs.h <<\EOF
78204 +#define ICONV_ALIASED_LIBICONV 1
78205  EOF
78206
78207 +
78208
78209 -  ext_builddir=ext/sysvshm
78210 -  ext_srcdir=$abs_srcdir/ext/sysvshm
78211 -
78212 -  ac_extra=
78213 +else
78214 +  echo "$ac_t""no" 1>&6
78215
78216 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
78217 -    PHP_SYSVSHM_SHARED=no
78218 +    LDFLAGS=$save_old_LDFLAGS
78219 +    ext_shared=$save_ext_shared
78220 +    unset ac_cv_lib_$iconv_lib_name_libiconv
78221
78222 +
78223 +  save_old_LDFLAGS=$LDFLAGS
78224 +  ac_stuff="
78225 +          -L$ICONV_DIR/$PHP_LIBDIR
78226 +        "
78227
78228 -  case ext/sysvshm in
78229 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
78230 -  /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
78231 -  *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
78232 -  esac
78233 +  save_ext_shared=$ext_shared
78234 +  ext_shared=yes
78235
78236 +  for ac_i in $ac_stuff; do
78237 +    case $ac_i in
78238 +    -pthread)
78239 +      if test "$ext_shared" = "yes"; then
78240 +        LDFLAGS="$LDFLAGS -pthread"
78241 +      else
78242 +
78243
78244 -
78245 -  b_c_pre=$php_c_pre
78246 -  b_cxx_pre=$php_cxx_pre
78247 -  b_c_meta=$php_c_meta
78248 -  b_cxx_meta=$php_cxx_meta
78249 -  b_c_post=$php_c_post
78250 -  b_cxx_post=$php_cxx_post
78251 -  b_lo=$php_lo
78252 -
78253 -
78254 -  old_IFS=$IFS
78255 -  for ac_src in sysvshm.c; do
78256 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
78257
78258 -      IFS=.
78259 -      set $ac_src
78260 -      ac_obj=$1
78261 -      IFS=$old_IFS
78262 -
78263 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
78264 -
78265 -      case $ac_src in
78266 -        *.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" ;;
78267 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78268 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78269 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
78270 -      esac
78271 -
78272 -    cat >>Makefile.objects<<EOF
78273 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
78274 -       $ac_comp
78275 -EOF
78276 -  done
78277 -
78278 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
78279 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
78280 +    eval "EXTRA_LDFLAGS$unique=set"
78281 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
78282 +  fi
78283
78284 -    EXT_STATIC="$EXT_STATIC sysvshm"
78285 -    if test "$ext_shared" != "nocli"; then
78286 -      EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
78287 -    fi
78288 -  else
78289 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
78290 -      PHP_SYSVSHM_SHARED=yes
78291 +      fi
78292 +    ;;
78293 +    -l*)
78294 +      ac_ii=`echo $ac_i|cut -c 3-`
78295
78296 -  case ext/sysvshm in
78297 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
78298 -  /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
78299 -  *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
78300 -  esac
78301 -
78302
78303 -
78304 -  b_c_pre=$shared_c_pre
78305 -  b_cxx_pre=$shared_cxx_pre
78306 -  b_c_meta=$shared_c_meta
78307 -  b_cxx_meta=$shared_cxx_meta
78308 -  b_c_post=$shared_c_post
78309 -  b_cxx_post=$shared_cxx_post
78310 -  b_lo=$shared_lo
78311 -
78312 -
78313 -  old_IFS=$IFS
78314 -  for ac_src in sysvshm.c; do
78315 -
78316 -      IFS=.
78317 -      set $ac_src
78318 -      ac_obj=$1
78319 -      IFS=$old_IFS
78320 +  case $ac_ii in
78321 +  c|c_r|pthread*) ;;
78322 +  *)
78323 +    if test "$ext_shared" = "yes"; then
78324 +        LDFLAGS="$LDFLAGS -l$ac_ii"
78325 +    else
78326
78327 -      shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo"
78328 -
78329 -      case $ac_src in
78330 -        *.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" ;;
78331 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78332 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78333 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
78334 -      esac
78335 -
78336 -    cat >>Makefile.objects<<EOF
78337 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
78338 -       $ac_comp
78339 -EOF
78340 -  done
78341 -
78342 -      case $host_alias in
78343 -        *netware*)
78344 -
78345 -  install_modules="install-modules"
78346 -
78347 -  case $host_alias in
78348 -    *aix*)
78349 -      suffix=so
78350 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvshm.so '$ext_builddir'/phpsysvshm.so'
78351 -      ;;
78352 -    *netware*)
78353 -      suffix=nlm
78354 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)'
78355 -      ;;
78356 -    *)
78357 -      suffix=la
78358 -      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_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD)'
78359 -      ;;
78360 -  esac
78361 -
78362 -  if test "x" = "xyes"; then
78363 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix"
78364 -  else
78365 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix"
78366 -  fi
78367
78368 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
78369 -
78370 -  cat >>Makefile.objects<<EOF
78371 -\$(phplibdir)/phpsysvshm.$suffix: $ext_builddir/phpsysvshm.$suffix
78372 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvshm.$suffix \$(phplibdir)
78373 -
78374 -$ext_builddir/phpsysvshm.$suffix: \$(shared_objects_sysvshm) \$(PHPSYSVSHM_SHARED_DEPENDENCIES)
78375 -       $link_cmd
78376 -
78377 -EOF
78378 -
78379 -          ;;
78380 -        *)
78381 -
78382 -  install_modules="install-modules"
78383 -
78384 -  case $host_alias in
78385 -    *aix*)
78386 -      suffix=so
78387 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(SYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvshm.so '$ext_builddir'/sysvshm.so'
78388 -      ;;
78389 -    *netware*)
78390 -      suffix=nlm
78391 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSHM, 3)_SHARED_LIBADD)'
78392 -      ;;
78393 -    *)
78394 -      suffix=la
78395 -      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_sysvshm) $(SYSVSHM_SHARED_LIBADD)'
78396 -      ;;
78397 +  case $ac_ii in
78398 +  c|c_r|pthread*) ;;
78399 +  *)
78400 +      LIBS="$LIBS -l$ac_ii"
78401 +   ;;
78402    esac
78403
78404 -  if test "x" = "xyes"; then
78405 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvshm.$suffix"
78406 -  else
78407 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvshm.$suffix"
78408 -  fi
78409 -
78410 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
78411 -
78412 -  cat >>Makefile.objects<<EOF
78413 -\$(phplibdir)/sysvshm.$suffix: $ext_builddir/sysvshm.$suffix
78414 -       \$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir)
78415 -
78416 -$ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES)
78417 -       $link_cmd
78418 -
78419 -EOF
78420 -
78421 -          ;;
78422 -      esac
78423 -      cat >> confdefs.h <<EOF
78424 -#define COMPILE_DL_SYSVSHM 1
78425 -EOF
78426
78427      fi
78428 -  fi
78429 -
78430 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
78431 -    PHP_SYSVSHM_SHARED=no
78432 -    case "$PHP_SAPI" in
78433 -      cgi|embed)
78434 -
78435 -
78436 -  case ext/sysvshm in
78437 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
78438 -  /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
78439 -  *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
78440 +   ;;
78441    esac
78442 -
78443 -
78444 -
78445 -  b_c_pre=$php_c_pre
78446 -  b_cxx_pre=$php_cxx_pre
78447 -  b_c_meta=$php_c_meta
78448 -  b_cxx_meta=$php_cxx_meta
78449 -  b_c_post=$php_c_post
78450 -  b_cxx_post=$php_cxx_post
78451 -  b_lo=$php_lo
78452
78453
78454 -  old_IFS=$IFS
78455 -  for ac_src in sysvshm.c; do
78456 -
78457 -      IFS=.
78458 -      set $ac_src
78459 -      ac_obj=$1
78460 -      IFS=$old_IFS
78461 +    ;;
78462 +    -L*)
78463 +      ac_ii=`echo $ac_i|cut -c 3-`
78464
78465 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
78466 -
78467 -      case $ac_src in
78468 -        *.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" ;;
78469 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78470 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78471 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
78472 -      esac
78473 -
78474 -    cat >>Makefile.objects<<EOF
78475 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
78476 -       $ac_comp
78477 -EOF
78478 -  done
78479 -
78480 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
78481 +
78482 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
78483 +    ai_p=$ac_ii
78484 +  else
78485 +
78486 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
78487 +
78488 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
78489 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
78490 +  fi
78491
78492 -        EXT_STATIC="$EXT_STATIC sysvshm"
78493 -        ;;
78494 -      *)
78495 +
78496 +      if test "$ext_shared" = "yes"; then
78497 +        LDFLAGS="-L$ai_p $LDFLAGS"
78498 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
78499 +      else
78500
78501
78502 -  case ext/sysvshm in
78503 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
78504 -  /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
78505 -  *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
78506 -  esac
78507 -
78508 -
78509 -
78510 -  b_c_pre=$php_c_pre
78511 -  b_cxx_pre=$php_cxx_pre
78512 -  b_c_meta=$php_c_meta
78513 -  b_cxx_meta=$php_cxx_meta
78514 -  b_c_post=$php_c_post
78515 -  b_cxx_post=$php_cxx_post
78516 -  b_lo=$php_lo
78517 -
78518 -
78519 -  old_IFS=$IFS
78520 -  for ac_src in sysvshm.c; do
78521 -
78522 -      IFS=.
78523 -      set $ac_src
78524 -      ac_obj=$1
78525 -      IFS=$old_IFS
78526 -
78527 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
78528 -
78529 -      case $ac_src in
78530 -        *.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" ;;
78531 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78532 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
78533 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
78534 -      esac
78535 -
78536 -    cat >>Makefile.objects<<EOF
78537 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
78538 -       $ac_comp
78539 -EOF
78540 -  done
78541 -
78542 -
78543 -        ;;
78544 -    esac
78545 -    EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
78546 -  fi
78547
78548 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
78549
78550 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
78551 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
78552 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
78553 +    eval "LIBPATH$unique=set"
78554 +
78555 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
78556 +    LDFLAGS="$LDFLAGS -L$ai_p"
78557 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
78558
78559 +  fi
78560
78561
78562 -  if test "$ext_builddir" = "."; then
78563 -    PHP_PECL_EXTENSION=sysvshm
78564 +      fi
78565
78566 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
78567 -
78568    fi
78569
78570 -fi
78571 -
78572 -
78573 -
78574 -php_with_tidy=no
78575 +    ;;
78576 +    esac
78577 +  done
78578
78579 -echo $ac_n "checking for TIDY support""... $ac_c" 1>&6
78580 -echo "configure:95638: checking for TIDY support" >&5
78581 -# Check whether --with-tidy or --without-tidy was given.
78582 -if test "${with_tidy+set}" = set; then
78583 -  withval="$with_tidy"
78584 -  PHP_TIDY=$withval
78585 +  echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
78586 +echo "configure:101958: checking for iconv in -l$iconv_lib_name" >&5
78587 +ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
78588 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
78589 +  echo $ac_n "(cached) $ac_c" 1>&6
78590  else
78591 -
78592 -  PHP_TIDY=no
78593 -  test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL
78594 +  ac_save_LIBS="$LIBS"
78595 +LIBS="-l$iconv_lib_name  $LIBS"
78596 +cat > conftest.$ac_ext <<EOF
78597 +#line 101966 "configure"
78598 +#include "confdefs.h"
78599 +/* Override any gcc2 internal prototype to avoid an error.  */
78600 +/* We use char because int might match the return type of a gcc2
78601 +    builtin and then its argument prototype would still apply.  */
78602 +char iconv();
78603
78604 +int main() {
78605 +iconv()
78606 +; return 0; }
78607 +EOF
78608 +if { (eval echo configure:101977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
78609 +  rm -rf conftest*
78610 +  eval "ac_cv_lib_$ac_lib_var=yes"
78611 +else
78612 +  echo "configure: failed program was:" >&5
78613 +  cat conftest.$ac_ext >&5
78614 +  rm -rf conftest*
78615 +  eval "ac_cv_lib_$ac_lib_var=no"
78616  fi
78617 +rm -f conftest*
78618 +LIBS="$ac_save_LIBS"
78619
78620 +fi
78621 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
78622 +  echo "$ac_t""yes" 1>&6
78623 +
78624 +    LDFLAGS=$save_old_LDFLAGS
78625 +    ext_shared=$save_ext_shared
78626 +
78627 +          found_iconv=yes
78628 +
78629 +
78630 +else
78631 +  echo "$ac_t""no" 1>&6
78632
78633 +    LDFLAGS=$save_old_LDFLAGS
78634 +    ext_shared=$save_ext_shared
78635 +    unset ac_cv_lib_$iconv_lib_name_iconv
78636 +
78637 +
78638 +fi
78639
78640 -ext_output="yes, shared"
78641 -ext_shared=yes
78642 -case $PHP_TIDY in
78643 -shared,*)
78644 -  PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'`
78645 -  ;;
78646 -shared)
78647 -  PHP_TIDY=yes
78648 -  ;;
78649 -no)
78650 -  ext_output=no
78651 -  ext_shared=no
78652 -  ;;
78653 -*)
78654 -  ext_output=yes
78655 -  ext_shared=no
78656 -  ;;
78657 -esac
78658 -
78659 -
78660 -
78661 -echo "$ac_t""$ext_output" 1>&6
78662 -
78663 -
78664 -
78665 -
78666 -if test "$PHP_TIDY" != "no"; then
78667 -
78668 -  if test "$PHP_TIDY" != "yes"; then
78669 -    TIDY_SEARCH_DIRS=$PHP_TIDY
78670 -  else
78671 -    TIDY_SEARCH_DIRS="/usr/local /usr"
78672 -  fi
78673 +
78674 +
78675 +fi
78676
78677 -  for i in $TIDY_SEARCH_DIRS; do
78678 -    if test -f $i/include/tidy/tidy.h; then
78679 -      TIDY_DIR=$i
78680 -      TIDY_INCDIR=$i/include/tidy
78681 -    elif test -f $i/include/tidy.h; then
78682 -      TIDY_DIR=$i
78683 -      TIDY_INCDIR=$i/include
78684      fi
78685 -  done
78686 -
78687 -  if test -z "$TIDY_DIR"; then
78688 -    { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; }
78689    fi
78690
78691 -  TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
78692 +  if test "$found_iconv" = "yes"; then
78693 +
78694 +  echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h
78695
78696 -
78697 +    cat >> confdefs.h <<\EOF
78698 +#define HAVE_ICONV 1
78699 +EOF
78700 +
78701 +    if test -n "$ICONV_DIR"; then
78702 +
78703
78704    if test "$ext_shared" = "yes"; then
78705 -    TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD"
78706 -    if test -n "$TIDY_LIBDIR"; then
78707 +    XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD"
78708 +    if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
78709
78710 -  if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
78711 +  if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
78712
78713 -  if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
78714 -    ai_p=$TIDY_LIBDIR
78715 +  if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
78716 +    ai_p=$ICONV_DIR/$PHP_LIBDIR
78717    else
78718
78719 -    ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
78720 +    ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
78721
78722      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
78723 -    ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
78724 +    ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
78725    fi
78726
78727
78728        if test "$ext_shared" = "yes"; then
78729 -        TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD"
78730 -        test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD"
78731 +        XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
78732 +        test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
78733        else
78734
78735
78736 @@ -95745,18 +102068,18 @@ if test "$PHP_TIDY" != "no"; then
78737    else
78738
78739
78740 -  if test -n "$TIDY_LIBDIR"; then
78741 +  if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
78742
78743 -  if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
78744 +  if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
78745
78746 -  if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
78747 -    ai_p=$TIDY_LIBDIR
78748 +  if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
78749 +    ai_p=$ICONV_DIR/$PHP_LIBDIR
78750    else
78751
78752 -    ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
78753 +    ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
78754
78755      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
78756 -    ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
78757 +    ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
78758    fi
78759
78760
78761 @@ -95776,223 +102099,642 @@ if test "$PHP_TIDY" != "no"; then
78762    fi
78763
78764
78765 -
78766 -  fi
78767 +
78768 +  fi
78769 +
78770 +  fi
78771 +
78772 +
78773 +  case $iconv_lib_name in
78774 +  c|c_r|pthread*) ;;
78775 +  *)
78776 +      LIBS="-l$iconv_lib_name $LIBS"
78777 +   ;;
78778 +  esac
78779 +
78780 +
78781 +
78782 +
78783 +  fi
78784 +
78785 +
78786 +
78787 +  if test "$ICONV_DIR/include" != "/usr/include"; then
78788 +
78789 +  if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then
78790 +    ai_p=$ICONV_DIR/include
78791 +  else
78792 +
78793 +    ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
78794 +
78795 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
78796 +    ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`"
78797 +  fi
78798 +
78799 +
78800 +
78801 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
78802 +
78803 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
78804 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
78805 +    eval "INCLUDEPATH$unique=set"
78806 +
78807 +      if test ""; then
78808 +        INCLUDES="-I$ai_p $INCLUDES"
78809 +      else
78810 +        INCLUDES="$INCLUDES -I$ai_p"
78811 +      fi
78812 +
78813 +  fi
78814 +
78815 +  fi
78816 +
78817 +    fi
78818 +
78819 +else
78820 +      { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; }
78821 +
78822 +  fi
78823 +
78824 +  fi
78825 +fi
78826 +
78827 +if test "$PHP_XMLRPC" = "yes"; then
78828 +  # Extract the first word of "ranlib", so it can be a program name with args.
78829 +set dummy ranlib; ac_word=$2
78830 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
78831 +echo "configure:102167: checking for $ac_word" >&5
78832 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
78833 +  echo $ac_n "(cached) $ac_c" 1>&6
78834 +else
78835 +  if test -n "$RANLIB"; then
78836 +  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
78837 +else
78838 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
78839 +  ac_dummy="$PATH"
78840 +  for ac_dir in $ac_dummy; do
78841 +    test -z "$ac_dir" && ac_dir=.
78842 +    if test -f $ac_dir/$ac_word; then
78843 +      ac_cv_prog_RANLIB="ranlib"
78844 +      break
78845 +    fi
78846 +  done
78847 +  IFS="$ac_save_ifs"
78848 +  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
78849 +fi
78850 +fi
78851 +RANLIB="$ac_cv_prog_RANLIB"
78852 +if test -n "$RANLIB"; then
78853 +  echo "$ac_t""$RANLIB" 1>&6
78854 +else
78855 +  echo "$ac_t""no" 1>&6
78856 +fi
78857 +
78858 +echo $ac_n "checking for inline""... $ac_c" 1>&6
78859 +echo "configure:102195: checking for inline" >&5
78860 +if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
78861 +  echo $ac_n "(cached) $ac_c" 1>&6
78862 +else
78863 +  ac_cv_c_inline=no
78864 +for ac_kw in inline __inline__ __inline; do
78865 +  cat > conftest.$ac_ext <<EOF
78866 +#line 102202 "configure"
78867 +#include "confdefs.h"
78868 +
78869 +int main() {
78870 +} $ac_kw foo() {
78871 +; return 0; }
78872 +EOF
78873 +if { (eval echo configure:102209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
78874 +  rm -rf conftest*
78875 +  ac_cv_c_inline=$ac_kw; break
78876 +else
78877 +  echo "configure: failed program was:" >&5
78878 +  cat conftest.$ac_ext >&5
78879 +fi
78880 +rm -f conftest*
78881 +done
78882 +
78883 +fi
78884 +
78885 +echo "$ac_t""$ac_cv_c_inline" 1>&6
78886 +case "$ac_cv_c_inline" in
78887 +  inline | yes) ;;
78888 +  no) cat >> confdefs.h <<\EOF
78889 +#define inline
78890 +EOF
78891 + ;;
78892 +  *)  cat >> confdefs.h <<EOF
78893 +#define inline $ac_cv_c_inline
78894 +EOF
78895 + ;;
78896 +esac
78897 +
78898 +
78899 +
78900 +
78901 +
78902 +
78903 +
78904 +cat >> confdefs.h <<\EOF
78905 +#define UNDEF_THREADS_HACK
78906 +EOF
78907 +
78908 +
78909 +
78910 +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
78911 +echo "configure:102247: checking for ANSI C header files" >&5
78912 +if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
78913 +  echo $ac_n "(cached) $ac_c" 1>&6
78914 +else
78915 +  cat > conftest.$ac_ext <<EOF
78916 +#line 102252 "configure"
78917 +#include "confdefs.h"
78918 +#include <stdlib.h>
78919 +#include <stdarg.h>
78920 +#include <string.h>
78921 +#include <float.h>
78922 +EOF
78923 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
78924 +{ (eval echo configure:102260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
78925 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
78926 +if test -z "$ac_err"; then
78927 +  rm -rf conftest*
78928 +  ac_cv_header_stdc=yes
78929 +else
78930 +  echo "$ac_err" >&5
78931 +  echo "configure: failed program was:" >&5
78932 +  cat conftest.$ac_ext >&5
78933 +  rm -rf conftest*
78934 +  ac_cv_header_stdc=no
78935 +fi
78936 +rm -f conftest*
78937 +
78938 +if test $ac_cv_header_stdc = yes; then
78939 +  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
78940 +cat > conftest.$ac_ext <<EOF
78941 +#line 102277 "configure"
78942 +#include "confdefs.h"
78943 +#include <string.h>
78944 +EOF
78945 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
78946 +  egrep "memchr" >/dev/null 2>&1; then
78947 +  :
78948 +else
78949 +  rm -rf conftest*
78950 +  ac_cv_header_stdc=no
78951 +fi
78952 +rm -f conftest*
78953 +
78954 +fi
78955 +
78956 +if test $ac_cv_header_stdc = yes; then
78957 +  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
78958 +cat > conftest.$ac_ext <<EOF
78959 +#line 102295 "configure"
78960 +#include "confdefs.h"
78961 +#include <stdlib.h>
78962 +EOF
78963 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
78964 +  egrep "free" >/dev/null 2>&1; then
78965 +  :
78966 +else
78967 +  rm -rf conftest*
78968 +  ac_cv_header_stdc=no
78969 +fi
78970 +rm -f conftest*
78971 +
78972 +fi
78973 +
78974 +if test $ac_cv_header_stdc = yes; then
78975 +  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
78976 +if test "$cross_compiling" = yes; then
78977 +  :
78978 +else
78979 +  cat > conftest.$ac_ext <<EOF
78980 +#line 102316 "configure"
78981 +#include "confdefs.h"
78982 +#include <ctype.h>
78983 +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
78984 +#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
78985 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
78986 +int main () { int i; for (i = 0; i < 256; i++)
78987 +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
78988 +exit (0); }
78989 +
78990 +EOF
78991 +if { (eval echo configure:102327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
78992 +then
78993 +  :
78994 +else
78995 +  echo "configure: failed program was:" >&5
78996 +  cat conftest.$ac_ext >&5
78997 +  rm -fr conftest*
78998 +  ac_cv_header_stdc=no
78999 +fi
79000 +rm -fr conftest*
79001 +fi
79002 +
79003 +fi
79004 +fi
79005 +
79006 +echo "$ac_t""$ac_cv_header_stdc" 1>&6
79007 +if test $ac_cv_header_stdc = yes; then
79008 +  cat >> confdefs.h <<\EOF
79009 +#define STDC_HEADERS 1
79010 +EOF
79011 +
79012 +fi
79013 +
79014 +for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h
79015 +do
79016 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
79017 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
79018 +echo "configure:102354: checking for $ac_hdr" >&5
79019 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
79020 +  echo $ac_n "(cached) $ac_c" 1>&6
79021 +else
79022 +  cat > conftest.$ac_ext <<EOF
79023 +#line 102359 "configure"
79024 +#include "confdefs.h"
79025 +#include <$ac_hdr>
79026 +EOF
79027 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
79028 +{ (eval echo configure:102364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
79029 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
79030 +if test -z "$ac_err"; then
79031 +  rm -rf conftest*
79032 +  eval "ac_cv_header_$ac_safe=yes"
79033 +else
79034 +  echo "$ac_err" >&5
79035 +  echo "configure: failed program was:" >&5
79036 +  cat conftest.$ac_ext >&5
79037 +  rm -rf conftest*
79038 +  eval "ac_cv_header_$ac_safe=no"
79039 +fi
79040 +rm -f conftest*
79041 +fi
79042 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
79043 +  echo "$ac_t""yes" 1>&6
79044 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
79045 +  cat >> confdefs.h <<EOF
79046 +#define $ac_tr_hdr 1
79047 +EOF
79048 +
79049 +else
79050 +  echo "$ac_t""no" 1>&6
79051 +fi
79052 +done
79053 +
79054 +
79055 +
79056 +
79057 +
79058 +
79059 +echo $ac_n "checking size of char""... $ac_c" 1>&6
79060 +echo "configure:102396: checking size of char" >&5
79061 +if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
79062 +  echo $ac_n "(cached) $ac_c" 1>&6
79063 +else
79064 +  if test "$cross_compiling" = yes; then
79065 +  ac_cv_sizeof_char=1
79066 +else
79067 +  cat > conftest.$ac_ext <<EOF
79068 +#line 102404 "configure"
79069 +#include "confdefs.h"
79070 +#include <stdio.h>
79071 +#include <sys/types.h>
79072 +main()
79073 +{
79074 +  FILE *f=fopen("conftestval", "w");
79075 +  if (!f) exit(1);
79076 +  fprintf(f, "%d\n", sizeof(char));
79077 +  exit(0);
79078 +}
79079 +EOF
79080 +if { (eval echo configure:102416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
79081 +then
79082 +  ac_cv_sizeof_char=`cat conftestval`
79083 +else
79084 +  echo "configure: failed program was:" >&5
79085 +  cat conftest.$ac_ext >&5
79086 +  rm -fr conftest*
79087 +  ac_cv_sizeof_char=0
79088 +fi
79089 +rm -fr conftest*
79090 +fi
79091 +
79092 +fi
79093 +echo "$ac_t""$ac_cv_sizeof_char" 1>&6
79094 +cat >> confdefs.h <<EOF
79095 +#define SIZEOF_CHAR $ac_cv_sizeof_char
79096 +EOF
79097 +
79098 +
79099 +
79100 +echo $ac_n "checking size of int""... $ac_c" 1>&6
79101 +echo "configure:102437: checking size of int" >&5
79102 +if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
79103 +  echo $ac_n "(cached) $ac_c" 1>&6
79104 +else
79105 +  if test "$cross_compiling" = yes; then
79106 +  ac_cv_sizeof_int=4
79107 +else
79108 +  cat > conftest.$ac_ext <<EOF
79109 +#line 102445 "configure"
79110 +#include "confdefs.h"
79111 +#include <stdio.h>
79112 +#include <sys/types.h>
79113 +main()
79114 +{
79115 +  FILE *f=fopen("conftestval", "w");
79116 +  if (!f) exit(1);
79117 +  fprintf(f, "%d\n", sizeof(int));
79118 +  exit(0);
79119 +}
79120 +EOF
79121 +if { (eval echo configure:102457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
79122 +then
79123 +  ac_cv_sizeof_int=`cat conftestval`
79124 +else
79125 +  echo "configure: failed program was:" >&5
79126 +  cat conftest.$ac_ext >&5
79127 +  rm -fr conftest*
79128 +  ac_cv_sizeof_int=0
79129 +fi
79130 +rm -fr conftest*
79131 +fi
79132 +
79133 +fi
79134 +echo "$ac_t""$ac_cv_sizeof_int" 1>&6
79135 +cat >> confdefs.h <<EOF
79136 +#define SIZEOF_INT $ac_cv_sizeof_int
79137 +EOF
79138 +
79139 +
79140 +echo $ac_n "checking size of long""... $ac_c" 1>&6
79141 +echo "configure:102477: checking size of long" >&5
79142 +if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
79143 +  echo $ac_n "(cached) $ac_c" 1>&6
79144 +else
79145 +  if test "$cross_compiling" = yes; then
79146 +  ac_cv_sizeof_long=4
79147 +else
79148 +  cat > conftest.$ac_ext <<EOF
79149 +#line 102485 "configure"
79150 +#include "confdefs.h"
79151 +#include <stdio.h>
79152 +#include <sys/types.h>
79153 +main()
79154 +{
79155 +  FILE *f=fopen("conftestval", "w");
79156 +  if (!f) exit(1);
79157 +  fprintf(f, "%d\n", sizeof(long));
79158 +  exit(0);
79159 +}
79160 +EOF
79161 +if { (eval echo configure:102497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
79162 +then
79163 +  ac_cv_sizeof_long=`cat conftestval`
79164 +else
79165 +  echo "configure: failed program was:" >&5
79166 +  cat conftest.$ac_ext >&5
79167 +  rm -fr conftest*
79168 +  ac_cv_sizeof_long=0
79169 +fi
79170 +rm -fr conftest*
79171 +fi
79172 +
79173 +fi
79174 +echo "$ac_t""$ac_cv_sizeof_long" 1>&6
79175 +cat >> confdefs.h <<EOF
79176 +#define SIZEOF_LONG $ac_cv_sizeof_long
79177 +EOF
79178
79179 -  fi
79180 -
79181 -
79182 -  case tidy in
79183 -  c|c_r|pthread*) ;;
79184 -  *)
79185 -      LIBS="-ltidy $LIBS"
79186 -   ;;
79187 -  esac
79188
79189 +echo $ac_n "checking size of long long""... $ac_c" 1>&6
79190 +echo "configure:102517: checking size of long long" >&5
79191 +if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
79192 +  echo $ac_n "(cached) $ac_c" 1>&6
79193 +else
79194 +  if test "$cross_compiling" = yes; then
79195 +  ac_cv_sizeof_long_long=8
79196 +else
79197 +  cat > conftest.$ac_ext <<EOF
79198 +#line 102525 "configure"
79199 +#include "confdefs.h"
79200 +#include <stdio.h>
79201 +#include <sys/types.h>
79202 +main()
79203 +{
79204 +  FILE *f=fopen("conftestval", "w");
79205 +  if (!f) exit(1);
79206 +  fprintf(f, "%d\n", sizeof(long long));
79207 +  exit(0);
79208 +}
79209 +EOF
79210 +if { (eval echo configure:102537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
79211 +then
79212 +  ac_cv_sizeof_long_long=`cat conftestval`
79213 +else
79214 +  echo "configure: failed program was:" >&5
79215 +  cat conftest.$ac_ext >&5
79216 +  rm -fr conftest*
79217 +  ac_cv_sizeof_long_long=0
79218 +fi
79219 +rm -fr conftest*
79220 +fi
79221
79222 +fi
79223 +echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
79224 +cat >> confdefs.h <<EOF
79225 +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
79226 +EOF
79227
79228
79229 -  fi
79230 +echo $ac_n "checking for size_t""... $ac_c" 1>&6
79231 +echo "configure:102557: checking for size_t" >&5
79232 +if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
79233 +  echo $ac_n "(cached) $ac_c" 1>&6
79234 +else
79235 +  cat > conftest.$ac_ext <<EOF
79236 +#line 102562 "configure"
79237 +#include "confdefs.h"
79238 +#include <sys/types.h>
79239 +#if STDC_HEADERS
79240 +#include <stdlib.h>
79241 +#include <stddef.h>
79242 +#endif
79243 +EOF
79244 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
79245 +  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
79246 +  rm -rf conftest*
79247 +  ac_cv_type_size_t=yes
79248 +else
79249 +  rm -rf conftest*
79250 +  ac_cv_type_size_t=no
79251 +fi
79252 +rm -f conftest*
79253
79254 +fi
79255 +echo "$ac_t""$ac_cv_type_size_t" 1>&6
79256 +if test $ac_cv_type_size_t = no; then
79257 +  cat >> confdefs.h <<\EOF
79258 +#define size_t unsigned
79259 +EOF
79260
79261 -
79262 -  if test "$TIDY_INCDIR" != "/usr/include"; then
79263 -
79264 -  if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then
79265 -    ai_p=$TIDY_INCDIR
79266 -  else
79267 -
79268 -    ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
79269 -
79270 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
79271 -    ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`"
79272 -  fi
79273 +fi
79274
79275 -
79276 -
79277 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
79278 -
79279 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
79280 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
79281 -    eval "INCLUDEPATH$unique=set"
79282 -
79283 -      if test ""; then
79284 -        INCLUDES="-I$ai_p $INCLUDES"
79285 -      else
79286 -        INCLUDES="$INCLUDES -I$ai_p"
79287 -      fi
79288 -
79289 -  fi
79290 +echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
79291 +echo "configure:102590: checking whether time.h and sys/time.h may both be included" >&5
79292 +if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
79293 +  echo $ac_n "(cached) $ac_c" 1>&6
79294 +else
79295 +  cat > conftest.$ac_ext <<EOF
79296 +#line 102595 "configure"
79297 +#include "confdefs.h"
79298 +#include <sys/types.h>
79299 +#include <sys/time.h>
79300 +#include <time.h>
79301 +int main() {
79302 +struct tm *tp;
79303 +; return 0; }
79304 +EOF
79305 +if { (eval echo configure:102604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
79306 +  rm -rf conftest*
79307 +  ac_cv_header_time=yes
79308 +else
79309 +  echo "configure: failed program was:" >&5
79310 +  cat conftest.$ac_ext >&5
79311 +  rm -rf conftest*
79312 +  ac_cv_header_time=no
79313 +fi
79314 +rm -f conftest*
79315 +fi
79316
79317 -  fi
79318 +echo "$ac_t""$ac_cv_header_time" 1>&6
79319 +if test $ac_cv_header_time = yes; then
79320 +  cat >> confdefs.h <<\EOF
79321 +#define TIME_WITH_SYS_TIME 1
79322 +EOF
79323
79324 +fi
79325
79326 -
79327 -  save_old_LDFLAGS=$LDFLAGS
79328 -  ac_stuff=""
79329 -
79330 -  save_ext_shared=$ext_shared
79331 -  ext_shared=yes
79332 -
79333 -  for ac_i in $ac_stuff; do
79334 -    case $ac_i in
79335 -    -pthread)
79336 -      if test "$ext_shared" = "yes"; then
79337 -        LDFLAGS="$LDFLAGS -pthread"
79338 -      else
79339 -
79340 -
79341 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
79342 -
79343 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
79344 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
79345 -    eval "EXTRA_LDFLAGS$unique=set"
79346 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
79347 -  fi
79348 +echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
79349 +echo "configure:102625: checking for uid_t in sys/types.h" >&5
79350 +if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
79351 +  echo $ac_n "(cached) $ac_c" 1>&6
79352 +else
79353 +  cat > conftest.$ac_ext <<EOF
79354 +#line 102630 "configure"
79355 +#include "confdefs.h"
79356 +#include <sys/types.h>
79357 +EOF
79358 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
79359 +  egrep "uid_t" >/dev/null 2>&1; then
79360 +  rm -rf conftest*
79361 +  ac_cv_type_uid_t=yes
79362 +else
79363 +  rm -rf conftest*
79364 +  ac_cv_type_uid_t=no
79365 +fi
79366 +rm -f conftest*
79367
79368 -      fi
79369 -    ;;
79370 -    -l*)
79371 -      ac_ii=`echo $ac_i|cut -c 3-`
79372 -
79373 -
79374 -  case $ac_ii in
79375 -  c|c_r|pthread*) ;;
79376 -  *)
79377 -    if test "$ext_shared" = "yes"; then
79378 -        LDFLAGS="$LDFLAGS -l$ac_ii"
79379 -    else
79380 -
79381 -
79382 -  case $ac_ii in
79383 -  c|c_r|pthread*) ;;
79384 -  *)
79385 -      LIBS="$LIBS -l$ac_ii"
79386 -   ;;
79387 -  esac
79388 +fi
79389
79390 +echo "$ac_t""$ac_cv_type_uid_t" 1>&6
79391 +if test $ac_cv_type_uid_t = no; then
79392 +  cat >> confdefs.h <<\EOF
79393 +#define uid_t int
79394 +EOF
79395
79396 -    fi
79397 -   ;;
79398 -  esac
79399 +  cat >> confdefs.h <<\EOF
79400 +#define gid_t int
79401 +EOF
79402
79403 +fi
79404
79405 -    ;;
79406 -    -L*)
79407 -      ac_ii=`echo $ac_i|cut -c 3-`
79408 -
79409 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
79410 -
79411 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
79412 -    ai_p=$ac_ii
79413 -  else
79414 -
79415 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
79416 -
79417 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
79418 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
79419 -  fi
79420
79421 -
79422 -      if test "$ext_shared" = "yes"; then
79423 -        LDFLAGS="-L$ai_p $LDFLAGS"
79424 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
79425 -      else
79426 -
79427 -
79428 -
79429 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
79430 -
79431 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
79432 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
79433 -    eval "LIBPATH$unique=set"
79434 -
79435 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
79436 -    LDFLAGS="$LDFLAGS -L$ai_p"
79437 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
79438 -
79439 -  fi
79440
79441
79442 -      fi
79443 -
79444 -  fi
79445
79446 -    ;;
79447 -    esac
79448 -  done
79449
79450 -  echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6
79451 -echo "configure:95927: checking for tidyOptGetDoc in -ltidy" >&5
79452 -ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'`
79453 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
79454 +# Standard XMLRPC list
79455 +for ac_func in \
79456 + strtoul strtoull snprintf \
79457 + strstr strpbrk strerror\
79458 + memcpy memmove
79459 +do
79460 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
79461 +echo "configure:102670: checking for $ac_func" >&5
79462 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
79463    echo $ac_n "(cached) $ac_c" 1>&6
79464  else
79465 -  ac_save_LIBS="$LIBS"
79466 -LIBS="-ltidy  $LIBS"
79467 -cat > conftest.$ac_ext <<EOF
79468 -#line 95935 "configure"
79469 +  cat > conftest.$ac_ext <<EOF
79470 +#line 102675 "configure"
79471  #include "confdefs.h"
79472 +/* System header to define __stub macros and hopefully few prototypes,
79473 +    which can conflict with char $ac_func(); below.  */
79474 +#include <assert.h>
79475  /* Override any gcc2 internal prototype to avoid an error.  */
79476  /* We use char because int might match the return type of a gcc2
79477      builtin and then its argument prototype would still apply.  */
79478 -char tidyOptGetDoc();
79479 +char $ac_func();
79480
79481  int main() {
79482 -tidyOptGetDoc()
79483 +
79484 +/* The GNU C library defines this for functions which it implements
79485 +    to always fail with ENOSYS.  Some functions are actually named
79486 +    something starting with __ and the normal name is an alias.  */
79487 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
79488 +choke me
79489 +#else
79490 +$ac_func();
79491 +#endif
79492 +
79493  ; return 0; }
79494  EOF
79495 -if { (eval echo configure:95946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
79496 +if { (eval echo configure:102698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
79497    rm -rf conftest*
79498 -  eval "ac_cv_lib_$ac_lib_var=yes"
79499 +  eval "ac_cv_func_$ac_func=yes"
79500  else
79501    echo "configure: failed program was:" >&5
79502    cat conftest.$ac_ext >&5
79503    rm -rf conftest*
79504 -  eval "ac_cv_lib_$ac_lib_var=no"
79505 +  eval "ac_cv_func_$ac_func=no"
79506  fi
79507  rm -f conftest*
79508 -LIBS="$ac_save_LIBS"
79509 -
79510  fi
79511 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
79512 +
79513 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
79514    echo "$ac_t""yes" 1>&6
79515 -
79516 -    LDFLAGS=$save_old_LDFLAGS
79517 -    ext_shared=$save_ext_shared
79518 -
79519 -  cat >> confdefs.h <<\EOF
79520 -#define HAVE_TIDYOPTGETDOC 1
79521 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
79522 +  cat >> confdefs.h <<EOF
79523 +#define $ac_tr_func 1
79524  EOF
79525 -
79526 -
79527 -
79528 +
79529  else
79530    echo "$ac_t""no" 1>&6
79531 -
79532 -    LDFLAGS=$save_old_LDFLAGS
79533 -    ext_shared=$save_ext_shared
79534 -    unset ac_cv_lib_tidy_tidyOptGetDoc
79535 -
79536 -
79537  fi
79538 +done
79539 +
79540
79541
79542
79543
79544 -  ext_builddir=ext/tidy
79545 -  ext_srcdir=$abs_srcdir/ext/tidy
79546 +  ext_builddir=ext/xmlrpc
79547 +  ext_srcdir=$abs_srcdir/ext/xmlrpc
79548
79549 -  ac_extra=
79550 +  ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
79551
79552    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
79553 -    PHP_TIDY_SHARED=no
79554 +    PHP_XMLRPC_SHARED=no
79555
79556
79557 -  case ext/tidy in
79558 +  case ext/xmlrpc in
79559    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
79560 -  /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
79561 -  *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
79562 +  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
79563 +  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
79564    esac
79565
79566
79567 @@ -96007,7 +102749,12 @@ fi
79568
79569
79570    old_IFS=$IFS
79571 -  for ac_src in tidy.c; do
79572 +  for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
79573 +          libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
79574 +          libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
79575 +          libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
79576 +          libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
79577 +          libxmlrpc/xml_to_soap.c; do
79578
79579        IFS=.
79580        set $ac_src
79581 @@ -96030,18 +102777,18 @@ EOF
79582    done
79583
79584
79585 -    EXT_STATIC="$EXT_STATIC tidy"
79586 +    EXT_STATIC="$EXT_STATIC xmlrpc"
79587      if test "$ext_shared" != "nocli"; then
79588 -      EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
79589 +      EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
79590      fi
79591    else
79592      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
79593 -      PHP_TIDY_SHARED=yes
79594 +      PHP_XMLRPC_SHARED=yes
79595
79596 -  case ext/tidy in
79597 +  case ext/xmlrpc in
79598    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
79599 -  /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
79600 -  *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
79601 +  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
79602 +  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
79603    esac
79604
79605
79606 @@ -96056,14 +102803,19 @@ EOF
79607
79608
79609    old_IFS=$IFS
79610 -  for ac_src in tidy.c; do
79611 +  for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
79612 +          libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
79613 +          libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
79614 +          libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
79615 +          libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
79616 +          libxmlrpc/xml_to_soap.c; do
79617
79618        IFS=.
79619        set $ac_src
79620        ac_obj=$1
79621        IFS=$old_IFS
79622
79623 -      shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo"
79624 +      shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
79625
79626        case $ac_src in
79627          *.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" ;;
79628 @@ -96086,31 +102838,31 @@ EOF
79629    case $host_alias in
79630      *aix*)
79631        suffix=so
79632 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptidy.so '$ext_builddir'/phptidy.so'
79633 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so'
79634        ;;
79635      *netware*)
79636        suffix=nlm
79637 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)'
79638 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)'
79639        ;;
79640      *)
79641        suffix=la
79642 -      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_tidy) $(PHPTIDY_SHARED_LIBADD)'
79643 +      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_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)'
79644        ;;
79645    esac
79646
79647    if test "x" = "xyes"; then
79648 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix"
79649 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix"
79650    else
79651 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix"
79652 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
79653    fi
79654
79655 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
79656 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
79657
79658    cat >>Makefile.objects<<EOF
79659 -\$(phplibdir)/phptidy.$suffix: $ext_builddir/phptidy.$suffix
79660 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phptidy.$suffix \$(phplibdir)
79661 +\$(phplibdir)/phpxmlrpc.$suffix: $ext_builddir/phpxmlrpc.$suffix
79662 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlrpc.$suffix \$(phplibdir)
79663
79664 -$ext_builddir/phptidy.$suffix: \$(shared_objects_tidy) \$(PHPTIDY_SHARED_DEPENDENCIES)
79665 +$ext_builddir/phpxmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(PHPXMLRPC_SHARED_DEPENDENCIES)
79666         $link_cmd
79667
79668  EOF
79669 @@ -96123,31 +102875,31 @@ EOF
79670    case $host_alias in
79671      *aix*)
79672        suffix=so
79673 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/tidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(TIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tidy.so '$ext_builddir'/tidy.so'
79674 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlrpc.so '$ext_builddir'/xmlrpc.so'
79675        ;;
79676      *netware*)
79677        suffix=nlm
79678 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TIDY, 3)_SHARED_LIBADD)'
79679 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)'
79680        ;;
79681      *)
79682        suffix=la
79683 -      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_tidy) $(TIDY_SHARED_LIBADD)'
79684 +      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_xmlrpc) $(XMLRPC_SHARED_LIBADD)'
79685        ;;
79686    esac
79687
79688    if test "x" = "xyes"; then
79689 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tidy.$suffix"
79690 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix"
79691    else
79692 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix"
79693 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
79694    fi
79695
79696 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
79697 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
79698
79699    cat >>Makefile.objects<<EOF
79700 -\$(phplibdir)/tidy.$suffix: $ext_builddir/tidy.$suffix
79701 -       \$(LIBTOOL) --mode=install cp $ext_builddir/tidy.$suffix \$(phplibdir)
79702 +\$(phplibdir)/xmlrpc.$suffix: $ext_builddir/xmlrpc.$suffix
79703 +       \$(LIBTOOL) --mode=install cp $ext_builddir/xmlrpc.$suffix \$(phplibdir)
79704
79705 -$ext_builddir/tidy.$suffix: \$(shared_objects_tidy) \$(TIDY_SHARED_DEPENDENCIES)
79706 +$ext_builddir/xmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(XMLRPC_SHARED_DEPENDENCIES)
79707         $link_cmd
79708
79709  EOF
79710 @@ -96155,22 +102907,22 @@ EOF
79711            ;;
79712        esac
79713        cat >> confdefs.h <<EOF
79714 -#define COMPILE_DL_TIDY 1
79715 +#define COMPILE_DL_XMLRPC 1
79716  EOF
79717
79718      fi
79719    fi
79720
79721    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
79722 -    PHP_TIDY_SHARED=no
79723 +    PHP_XMLRPC_SHARED=no
79724      case "$PHP_SAPI" in
79725        cgi|embed)
79726
79727
79728 -  case ext/tidy in
79729 +  case ext/xmlrpc in
79730    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
79731 -  /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
79732 -  *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
79733 +  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
79734 +  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
79735    esac
79736
79737
79738 @@ -96185,7 +102937,12 @@ EOF
79739
79740
79741    old_IFS=$IFS
79742 -  for ac_src in tidy.c; do
79743 +  for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
79744 +          libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
79745 +          libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
79746 +          libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
79747 +          libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
79748 +          libxmlrpc/xml_to_soap.c; do
79749
79750        IFS=.
79751        set $ac_src
79752 @@ -96208,15 +102965,15 @@ EOF
79753    done
79754
79755
79756 -        EXT_STATIC="$EXT_STATIC tidy"
79757 +        EXT_STATIC="$EXT_STATIC xmlrpc"
79758          ;;
79759        *)
79760
79761
79762 -  case ext/tidy in
79763 +  case ext/xmlrpc in
79764    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
79765 -  /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
79766 -  *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
79767 +  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
79768 +  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
79769    esac
79770
79771
79772 @@ -96231,7 +102988,12 @@ EOF
79773
79774
79775    old_IFS=$IFS
79776 -  for ac_src in tidy.c; do
79777 +  for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
79778 +          libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
79779 +          libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
79780 +          libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
79781 +          libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
79782 +          libxmlrpc/xml_to_soap.c; do
79783
79784        IFS=.
79785        set $ac_src
79786 @@ -96254,93 +103016,195 @@ EOF
79787    done
79788
79789
79790 -        ;;
79791 -    esac
79792 -    EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
79793 +        ;;
79794 +    esac
79795 +    EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
79796 +  fi
79797 +
79798 +
79799 +    BUILD_DIR="$BUILD_DIR $ext_builddir"
79800 +
79801 +
79802 +
79803 +  if test "$ext_builddir" = "."; then
79804 +    PHP_PECL_EXTENSION=xmlrpc
79805 +
79806 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
79807 +
79808 +  fi
79809 +
79810 +
79811 +
79812 +    BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc"
79813 +
79814 +
79815 +  XMLRPC_MODULE_TYPE=builtin
79816 +
79817 +elif test "$PHP_XMLRPC" != "no"; then
79818 +
79819 +  if test -r $PHP_XMLRPC/include/xmlrpc.h; then
79820 +    XMLRPC_DIR=$PHP_XMLRPC/include
79821 +  elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then
79822 +    XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
79823 +  else
79824 +    echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
79825 +echo "configure:103052: checking for XMLRPC-EPI in default path" >&5
79826 +    for i in /usr/local /usr; do
79827 +      if test -r $i/include/xmlrpc.h; then
79828 +        XMLRPC_DIR=$i/include
79829 +        echo "$ac_t""found in $i" 1>&6
79830 +        break
79831 +      fi
79832 +    done
79833 +  fi
79834 +
79835 +  if test -z "$XMLRPC_DIR"; then
79836 +    echo "$ac_t""not found" 1>&6
79837 +    { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; }
79838 +  fi
79839 +
79840 +
79841 +  if test "$XMLRPC_DIR" != "/usr/include"; then
79842 +
79843 +  if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then
79844 +    ai_p=$XMLRPC_DIR
79845 +  else
79846 +
79847 +    ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
79848 +
79849 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
79850 +    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`"
79851 +  fi
79852 +
79853 +
79854 +
79855 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
79856 +
79857 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
79858 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
79859 +    eval "INCLUDEPATH$unique=set"
79860 +
79861 +      if test ""; then
79862 +        INCLUDES="-I$ai_p $INCLUDES"
79863 +      else
79864 +        INCLUDES="$INCLUDES -I$ai_p"
79865 +      fi
79866 +
79867 +  fi
79868 +
79869    fi
79870 -
79871 -
79872 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
79873 -
79874
79875 +
79876
79877 -  if test "$ext_builddir" = "."; then
79878 -    PHP_PECL_EXTENSION=tidy
79879 +  if test "$ext_shared" = "yes"; then
79880 +    XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD"
79881 +    if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then
79882 +
79883 +  if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
79884
79885 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
79886 -
79887 +  if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
79888 +    ai_p=$XMLRPC_DIR/$PHP_LIBDIR
79889 +  else
79890 +
79891 +    ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
79892 +
79893 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
79894 +    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
79895    fi
79896
79897 +
79898 +      if test "$ext_shared" = "yes"; then
79899 +        XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
79900 +        test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
79901 +      else
79902 +
79903
79904 -  PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD"
79905 -
79906 -  cat >> confdefs.h <<\EOF
79907 -#define HAVE_TIDY 1
79908 -EOF
79909 -
79910 -fi
79911 +
79912 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
79913 +
79914 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
79915 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
79916 +    eval "LIBPATH$unique=set"
79917 +
79918 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
79919 +    LDFLAGS="$LDFLAGS -L$ai_p"
79920 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
79921 +
79922 +  fi
79923
79924
79925 +      fi
79926 +
79927 +  fi
79928
79929 +    fi
79930 +  else
79931 +
79932
79933 -php_enable_tokenizer=yes
79934 +  if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then
79935 +
79936 +  if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
79937 +
79938 +  if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
79939 +    ai_p=$XMLRPC_DIR/$PHP_LIBDIR
79940 +  else
79941 +
79942 +    ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
79943 +
79944 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
79945 +    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
79946 +  fi
79947
79948 -echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
79949 -echo "configure:96290: checking whether to enable tokenizer support" >&5
79950 -# Check whether --enable-tokenizer or --disable-tokenizer was given.
79951 -if test "${enable_tokenizer+set}" = set; then
79952 -  enableval="$enable_tokenizer"
79953 -  PHP_TOKENIZER=$enableval
79954 -else
79955 +
79956 +
79957
79958 -  PHP_TOKENIZER=yes
79959 -  test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL
79960 -
79961 -fi
79962 -
79963 +
79964 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
79965 +
79966 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
79967 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
79968 +    eval "LIBPATH$unique=set"
79969 +
79970 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
79971 +    LDFLAGS="$LDFLAGS -L$ai_p"
79972 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
79973 +
79974 +  fi
79975
79976
79977 -ext_output="yes, shared"
79978 -ext_shared=yes
79979 -case $PHP_TOKENIZER in
79980 -shared,*)
79981 -  PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'`
79982 -  ;;
79983 -shared)
79984 -  PHP_TOKENIZER=yes
79985 -  ;;
79986 -no)
79987 -  ext_output=no
79988 -  ext_shared=no
79989 -  ;;
79990 -*)
79991 -  ext_output=yes
79992 -  ext_shared=no
79993 -  ;;
79994 -esac
79995 +
79996 +  fi
79997
79998 +  fi
79999 +
80000 +
80001 +  case xmlrpc in
80002 +  c|c_r|pthread*) ;;
80003 +  *)
80004 +      LIBS="-lxmlrpc $LIBS"
80005 +   ;;
80006 +  esac
80007
80008
80009 -echo "$ac_t""$ext_output" 1>&6
80010
80011
80012 +  fi
80013
80014
80015 -if test "$PHP_TOKENIZER" != "no"; then
80016
80017 -  ext_builddir=ext/tokenizer
80018 -  ext_srcdir=$abs_srcdir/ext/tokenizer
80019 +  ext_builddir=ext/xmlrpc
80020 +  ext_srcdir=$abs_srcdir/ext/xmlrpc
80021
80022    ac_extra=
80023
80024    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
80025 -    PHP_TOKENIZER_SHARED=no
80026 +    PHP_XMLRPC_SHARED=no
80027
80028
80029 -  case ext/tokenizer in
80030 +  case ext/xmlrpc in
80031    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
80032 -  /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80033 -  *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80034 +  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80035 +  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80036    esac
80037
80038
80039 @@ -96355,7 +103219,7 @@ if test "$PHP_TOKENIZER" != "no"; then
80040
80041
80042    old_IFS=$IFS
80043 -  for ac_src in tokenizer.c tokenizer_data.c; do
80044 +  for ac_src in xmlrpc-epi-php.c; do
80045
80046        IFS=.
80047        set $ac_src
80048 @@ -96378,18 +103242,18 @@ EOF
80049    done
80050
80051
80052 -    EXT_STATIC="$EXT_STATIC tokenizer"
80053 +    EXT_STATIC="$EXT_STATIC xmlrpc"
80054      if test "$ext_shared" != "nocli"; then
80055 -      EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
80056 +      EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
80057      fi
80058    else
80059      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
80060 -      PHP_TOKENIZER_SHARED=yes
80061 +      PHP_XMLRPC_SHARED=yes
80062
80063 -  case ext/tokenizer in
80064 +  case ext/xmlrpc in
80065    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
80066 -  /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80067 -  *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80068 +  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80069 +  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80070    esac
80071
80072
80073 @@ -96404,14 +103268,14 @@ EOF
80074
80075
80076    old_IFS=$IFS
80077 -  for ac_src in tokenizer.c tokenizer_data.c; do
80078 +  for ac_src in xmlrpc-epi-php.c; do
80079
80080        IFS=.
80081        set $ac_src
80082        ac_obj=$1
80083        IFS=$old_IFS
80084
80085 -      shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo"
80086 +      shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
80087
80088        case $ac_src in
80089          *.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" ;;
80090 @@ -96434,31 +103298,31 @@ EOF
80091    case $host_alias in
80092      *aix*)
80093        suffix=so
80094 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptokenizer.so '$ext_builddir'/phptokenizer.so'
80095 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so'
80096        ;;
80097      *netware*)
80098        suffix=nlm
80099 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)'
80100 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)'
80101        ;;
80102      *)
80103        suffix=la
80104 -      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_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD)'
80105 +      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_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)'
80106        ;;
80107    esac
80108
80109    if test "x" = "xyes"; then
80110 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix"
80111 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix"
80112    else
80113 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix"
80114 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
80115    fi
80116
80117 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
80118 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
80119
80120    cat >>Makefile.objects<<EOF
80121 -\$(phplibdir)/phptokenizer.$suffix: $ext_builddir/phptokenizer.$suffix
80122 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phptokenizer.$suffix \$(phplibdir)
80123 +\$(phplibdir)/phpxmlrpc.$suffix: $ext_builddir/phpxmlrpc.$suffix
80124 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlrpc.$suffix \$(phplibdir)
80125
80126 -$ext_builddir/phptokenizer.$suffix: \$(shared_objects_tokenizer) \$(PHPTOKENIZER_SHARED_DEPENDENCIES)
80127 +$ext_builddir/phpxmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(PHPXMLRPC_SHARED_DEPENDENCIES)
80128         $link_cmd
80129
80130  EOF
80131 @@ -96471,31 +103335,31 @@ EOF
80132    case $host_alias in
80133      *aix*)
80134        suffix=so
80135 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/tokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(TOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tokenizer.so '$ext_builddir'/tokenizer.so'
80136 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlrpc.so '$ext_builddir'/xmlrpc.so'
80137        ;;
80138      *netware*)
80139        suffix=nlm
80140 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TOKENIZER, 3)_SHARED_LIBADD)'
80141 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)'
80142        ;;
80143      *)
80144        suffix=la
80145 -      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_tokenizer) $(TOKENIZER_SHARED_LIBADD)'
80146 +      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_xmlrpc) $(XMLRPC_SHARED_LIBADD)'
80147        ;;
80148    esac
80149
80150    if test "x" = "xyes"; then
80151 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tokenizer.$suffix"
80152 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix"
80153    else
80154 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix"
80155 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
80156    fi
80157
80158 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
80159 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
80160
80161    cat >>Makefile.objects<<EOF
80162 -\$(phplibdir)/tokenizer.$suffix: $ext_builddir/tokenizer.$suffix
80163 -       \$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir)
80164 +\$(phplibdir)/xmlrpc.$suffix: $ext_builddir/xmlrpc.$suffix
80165 +       \$(LIBTOOL) --mode=install cp $ext_builddir/xmlrpc.$suffix \$(phplibdir)
80166
80167 -$ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES)
80168 +$ext_builddir/xmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(XMLRPC_SHARED_DEPENDENCIES)
80169         $link_cmd
80170
80171  EOF
80172 @@ -96503,22 +103367,22 @@ EOF
80173            ;;
80174        esac
80175        cat >> confdefs.h <<EOF
80176 -#define COMPILE_DL_TOKENIZER 1
80177 +#define COMPILE_DL_XMLRPC 1
80178  EOF
80179
80180      fi
80181    fi
80182
80183    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
80184 -    PHP_TOKENIZER_SHARED=no
80185 +    PHP_XMLRPC_SHARED=no
80186      case "$PHP_SAPI" in
80187        cgi|embed)
80188
80189
80190 -  case ext/tokenizer in
80191 +  case ext/xmlrpc in
80192    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
80193 -  /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80194 -  *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80195 +  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80196 +  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80197    esac
80198
80199
80200 @@ -96533,7 +103397,7 @@ EOF
80201
80202
80203    old_IFS=$IFS
80204 -  for ac_src in tokenizer.c tokenizer_data.c; do
80205 +  for ac_src in xmlrpc-epi-php.c; do
80206
80207        IFS=.
80208        set $ac_src
80209 @@ -96556,15 +103420,15 @@ EOF
80210    done
80211
80212
80213 -        EXT_STATIC="$EXT_STATIC tokenizer"
80214 +        EXT_STATIC="$EXT_STATIC xmlrpc"
80215          ;;
80216        *)
80217
80218
80219 -  case ext/tokenizer in
80220 +  case ext/xmlrpc in
80221    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
80222 -  /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80223 -  *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80224 +  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80225 +  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80226    esac
80227
80228
80229 @@ -96579,7 +103443,7 @@ EOF
80230
80231
80232    old_IFS=$IFS
80233 -  for ac_src in tokenizer.c tokenizer_data.c; do
80234 +  for ac_src in xmlrpc-epi-php.c; do
80235
80236        IFS=.
80237        set $ac_src
80238 @@ -96604,7 +103468,7 @@ EOF
80239
80240          ;;
80241      esac
80242 -    EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
80243 +    EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
80244    fi
80245
80246
80247 @@ -96613,34 +103477,29 @@ EOF
80248
80249
80250    if test "$ext_builddir" = "."; then
80251 -    PHP_PECL_EXTENSION=tokenizer
80252 +    PHP_PECL_EXTENSION=xmlrpc
80253
80254    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
80255
80256    fi
80257
80258 -
80259 -  src=$ext_srcdir/Makefile.frag
80260 -  ac_srcdir=$ext_srcdir
80261 -  ac_builddir=$ext_builddir
80262 -  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
80263 -
80264 +  XMLRPC_MODULE_TYPE=external
80265  fi
80266
80267
80268
80269 -php_enable_wddx=no
80270 +php_enable_xmlwriter=yes
80271
80272 -echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
80273 -echo "configure:96636: checking whether to enable WDDX support" >&5
80274 -# Check whether --enable-wddx or --disable-wddx was given.
80275 -if test "${enable_wddx+set}" = set; then
80276 -  enableval="$enable_wddx"
80277 -  PHP_WDDX=$enableval
80278 +echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6
80279 +echo "configure:103495: checking whether to enable XMLWriter support" >&5
80280 +# Check whether --enable-xmlwriter or --disable-xmlwriter was given.
80281 +if test "${enable_xmlwriter+set}" = set; then
80282 +  enableval="$enable_xmlwriter"
80283 +  PHP_XMLWRITER=$enableval
80284  else
80285
80286 -  PHP_WDDX=no
80287 -  test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL
80288 +  PHP_XMLWRITER=yes
80289 +  test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL
80290
80291  fi
80292
80293 @@ -96648,12 +103507,12 @@ fi
80294
80295  ext_output="yes, shared"
80296  ext_shared=yes
80297 -case $PHP_WDDX in
80298 +case $PHP_XMLWRITER in
80299  shared,*)
80300 -  PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'`
80301 +  PHP_XMLWRITER=`echo "$PHP_XMLWRITER"|$SED 's/^shared,//'`
80302    ;;
80303  shared)
80304 -  PHP_WDDX=yes
80305 +  PHP_XMLWRITER=yes
80306    ;;
80307  no)
80308    ext_output=no
80309 @@ -96677,7 +103536,7 @@ if test -z "$PHP_LIBXML_DIR"; then
80310  php_with_libxml_dir=no
80311
80312  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
80313 -echo "configure:96681: checking libxml2 install dir" >&5
80314 +echo "configure:103540: checking libxml2 install dir" >&5
80315  # Check whether --with-libxml-dir or --without-libxml-dir was given.
80316  if test "${with_libxml_dir+set}" = set; then
80317    withval="$with_libxml_dir"
80318 @@ -96697,39 +103556,15 @@ echo "$ac_t""$ext_output" 1>&6
80319
80320  fi
80321
80322 +if test "$PHP_XMLWRITER" != "no"; then
80323
80324 -php_with_libexpat_dir=no
80325 +  if test "$PHP_LIBXML" = "no"; then
80326 +    { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
80327 +  fi
80328
80329 -echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6
80330 -echo "configure:96705: checking libexpat dir for WDDX" >&5
80331 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
80332 -if test "${with_libexpat_dir+set}" = set; then
80333 -  withval="$with_libexpat_dir"
80334 -  PHP_LIBEXPAT_DIR=$withval
80335 -else
80336 -
80337 -  PHP_LIBEXPAT_DIR=no
80338
80339 -
80340 -fi
80341 -
80342 -
80343 -ext_output=$PHP_LIBEXPAT_DIR
80344 -echo "$ac_t""$ext_output" 1>&6
80345 -
80346 -
80347 -
80348 -
80349 -if test "$PHP_WDDX" != "no"; then
80350 -
80351 -        if test "$PHP_LIBEXPAT_DIR" = "no"; then
80352 -    if test "$PHP_LIBXML" = "no"; then
80353 -      { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
80354 -    fi
80355 -
80356 -
80357  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
80358 -echo "configure:96733: checking for xml2-config path" >&5
80359 +echo "configure:103568: checking for xml2-config path" >&5
80360  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
80361    echo $ac_n "(cached) $ac_c" 1>&6
80362  else
80363 @@ -96761,7 +103596,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
80364      case $ac_i in
80365      -pthread)
80366        if test "$ext_shared" = "yes"; then
80367 -        WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread"
80368 +        XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread"
80369        else
80370
80371
80372 @@ -96783,7 +103618,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
80373    c|c_r|pthread*) ;;
80374    *)
80375      if test "$ext_shared" = "yes"; then
80376 -        WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii"
80377 +        XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii"
80378      else
80379
80380
80381 @@ -96818,8 +103653,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
80382
80383
80384        if test "$ext_shared" = "yes"; then
80385 -        WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
80386 -        test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD"
80387 +        XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD"
80388 +        test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD"
80389        else
80390
80391
80392 @@ -96887,7 +103722,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
80393
80394
80395              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
80396 -echo "configure:96891: checking whether libxml build works" >&5
80397 +echo "configure:103726: checking whether libxml build works" >&5
80398  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
80399    echo $ac_n "(cached) $ac_c" 1>&6
80400  else
80401 @@ -96895,7 +103730,7 @@ else
80402
80403    old_LIBS=$LIBS
80404    LIBS="
80405 -          $WDDX_SHARED_LIBADD
80406 +          $XMLWRITER_SHARED_LIBADD
80407           $LIBS"
80408    if test "$cross_compiling" = yes; then
80409
80410 @@ -96903,7 +103738,7 @@ else
80411
80412  else
80413    cat > conftest.$ac_ext <<EOF
80414 -#line 96907 "configure"
80415 +#line 103742 "configure"
80416  #include "confdefs.h"
80417
80418
80419 @@ -96914,7 +103749,7 @@ else
80420      }
80421
80422  EOF
80423 -if { (eval echo configure:96918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
80424 +if { (eval echo configure:103753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
80425  then
80426
80427      LIBS=$old_LIBS
80428 @@ -96925,255 +103760,48 @@ then
80429  else
80430    echo "configure: failed program was:" >&5
80431    cat conftest.$ac_ext >&5
80432 -  rm -fr conftest*
80433 -
80434 -    LIBS=$old_LIBS
80435 -
80436 -          echo "$ac_t""no" 1>&6
80437 -          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
80438 -
80439 -
80440 -fi
80441 -rm -fr conftest*
80442 -fi
80443 -
80444 -
80445 -
80446 -fi
80447 -
80448 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
80449 -      if test "$php_cv_libxml_build_works" = "yes"; then
80450 -        cat >> confdefs.h <<\EOF
80451 -#define HAVE_LIBXML 1
80452 -EOF
80453 -
80454 -      fi
80455 -
80456 -      if test "$PHP_XML" = "no"; then
80457 -
80458 -
80459 -  case ext/xml in
80460 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
80461 -  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80462 -  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80463 -  esac
80464 -
80465 -
80466 -
80467 -  b_c_pre=$php_c_pre
80468 -  b_cxx_pre=$php_cxx_pre
80469 -  b_c_meta=$php_c_meta
80470 -  b_cxx_meta=$php_cxx_meta
80471 -  b_c_post=$php_c_post
80472 -  b_cxx_post=$php_cxx_post
80473 -  b_lo=$php_lo
80474 -
80475 -
80476 -  old_IFS=$IFS
80477 -  for ac_src in compat.c; do
80478 -
80479 -      IFS=.
80480 -      set $ac_src
80481 -      ac_obj=$1
80482 -      IFS=$old_IFS
80483 -
80484 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
80485 -
80486 -      case $ac_src in
80487 -        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
80488 -        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
80489 -        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
80490 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
80491 -      esac
80492 -
80493 -    cat >>Makefile.objects<<EOF
80494 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
80495 -       $ac_comp
80496 -EOF
80497 -  done
80498 -
80499 -
80500 -
80501 -
80502 -    BUILD_DIR="$BUILD_DIR ext/xml"
80503 -
80504 -
80505 -      fi
80506 -
80507 -    else
80508 -      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
80509 -    fi
80510 -else
80511 -      { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
80512 -
80513 -  fi
80514 -
80515 -  fi
80516 -
80517 -        if test "$PHP_LIBEXPAT_DIR" != "no"; then
80518 -    for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
80519 -      if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
80520 -        EXPAT_DIR=$i
80521 -        break
80522 -      fi
80523 -    done
80524 -
80525 -    if test -z "$EXPAT_DIR"; then
80526 -      { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
80527 -    fi
80528 -
80529 -
80530 -  if test "$EXPAT_DIR/include" != "/usr/include"; then
80531 -
80532 -  if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
80533 -    ai_p=$EXPAT_DIR/include
80534 -  else
80535 -
80536 -    ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
80537 -
80538 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
80539 -    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
80540 -  fi
80541 -
80542 -
80543 -
80544 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
80545 -
80546 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
80547 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
80548 -    eval "INCLUDEPATH$unique=set"
80549 -
80550 -      if test ""; then
80551 -        INCLUDES="-I$ai_p $INCLUDES"
80552 -      else
80553 -        INCLUDES="$INCLUDES -I$ai_p"
80554 -      fi
80555 -
80556 -  fi
80557 -
80558 -  fi
80559 -
80560 -
80561 -
80562 -  if test "$ext_shared" = "yes"; then
80563 -    WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD"
80564 -    if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
80565 -
80566 -  if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
80567 -
80568 -  if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
80569 -    ai_p=$EXPAT_DIR/$PHP_LIBDIR
80570 -  else
80571 -
80572 -    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
80573 -
80574 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
80575 -    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
80576 -  fi
80577 -
80578 -
80579 -      if test "$ext_shared" = "yes"; then
80580 -        WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
80581 -        test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD"
80582 -      else
80583 -
80584 -
80585 -
80586 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
80587 -
80588 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
80589 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
80590 -    eval "LIBPATH$unique=set"
80591 -
80592 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
80593 -    LDFLAGS="$LDFLAGS -L$ai_p"
80594 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
80595 -
80596 -  fi
80597 -
80598 -
80599 -      fi
80600 -
80601 -  fi
80602 -
80603 -    fi
80604 -  else
80605 -
80606 -
80607 -  if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
80608 -
80609 -  if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
80610 -
80611 -  if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
80612 -    ai_p=$EXPAT_DIR/$PHP_LIBDIR
80613 -  else
80614 -
80615 -    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
80616 -
80617 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
80618 -    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
80619 -  fi
80620 -
80621 -
80622 -
80623 -
80624 -
80625 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
80626 -
80627 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
80628 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
80629 -    eval "LIBPATH$unique=set"
80630 -
80631 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
80632 -    LDFLAGS="$LDFLAGS -L$ai_p"
80633 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
80634 -
80635 -  fi
80636 -
80637 -
80638 -
80639 -  fi
80640 -
80641 -  fi
80642 -
80643 -
80644 -  case expat in
80645 -  c|c_r|pthread*) ;;
80646 -  *)
80647 -      LIBS="-lexpat $LIBS"
80648 -   ;;
80649 -  esac
80650 -
80651 -
80652 -
80653 +  rm -fr conftest*
80654 +
80655 +    LIBS=$old_LIBS
80656 +
80657 +          echo "$ac_t""no" 1>&6
80658 +          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
80659 +
80660 +
80661 +fi
80662 +rm -fr conftest*
80663 +fi
80664
80665 -  fi
80666
80667 +
80668 +fi
80669
80670 -    cat >> confdefs.h <<\EOF
80671 -#define HAVE_LIBEXPAT 1
80672 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
80673 +      if test "$php_cv_libxml_build_works" = "yes"; then
80674 +        cat >> confdefs.h <<\EOF
80675 +#define HAVE_LIBXML 1
80676  EOF
80677
80678 -  fi
80679 -
80680 -  cat >> confdefs.h <<\EOF
80681 -#define HAVE_WDDX 1
80682 +      fi
80683 +
80684 +    cat >> confdefs.h <<\EOF
80685 +#define HAVE_XMLWRITER 1
80686  EOF
80687
80688 -
80689 -  ext_builddir=ext/wddx
80690 -  ext_srcdir=$abs_srcdir/ext/wddx
80691 +
80692 +  ext_builddir=ext/xmlwriter
80693 +  ext_srcdir=$abs_srcdir/ext/xmlwriter
80694
80695    ac_extra=
80696
80697    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
80698 -    PHP_WDDX_SHARED=no
80699 +    PHP_XMLWRITER_SHARED=no
80700
80701
80702 -  case ext/wddx in
80703 +  case ext/xmlwriter in
80704    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
80705 -  /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80706 -  *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80707 +  /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80708 +  *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80709    esac
80710
80711
80712 @@ -97188,7 +103816,7 @@ EOF
80713
80714
80715    old_IFS=$IFS
80716 -  for ac_src in wddx.c; do
80717 +  for ac_src in php_xmlwriter.c; do
80718
80719        IFS=.
80720        set $ac_src
80721 @@ -97211,18 +103839,18 @@ EOF
80722    done
80723
80724
80725 -    EXT_STATIC="$EXT_STATIC wddx"
80726 +    EXT_STATIC="$EXT_STATIC xmlwriter"
80727      if test "$ext_shared" != "nocli"; then
80728 -      EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
80729 +      EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
80730      fi
80731    else
80732      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
80733 -      PHP_WDDX_SHARED=yes
80734 +      PHP_XMLWRITER_SHARED=yes
80735
80736 -  case ext/wddx in
80737 +  case ext/xmlwriter in
80738    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
80739 -  /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80740 -  *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80741 +  /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80742 +  *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80743    esac
80744
80745
80746 @@ -97237,14 +103865,14 @@ EOF
80747
80748
80749    old_IFS=$IFS
80750 -  for ac_src in wddx.c; do
80751 +  for ac_src in php_xmlwriter.c; do
80752
80753        IFS=.
80754        set $ac_src
80755        ac_obj=$1
80756        IFS=$old_IFS
80757
80758 -      shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo"
80759 +      shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo"
80760
80761        case $ac_src in
80762          *.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" ;;
80763 @@ -97267,31 +103895,31 @@ EOF
80764    case $host_alias in
80765      *aix*)
80766        suffix=so
80767 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpwddx.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(PHPWDDX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpwddx.so '$ext_builddir'/phpwddx.so'
80768 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlwriter.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlwriter.so '$ext_builddir'/phpxmlwriter.so'
80769        ;;
80770      *netware*)
80771        suffix=nlm
80772 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPWDDX, 3)_SHARED_LIBADD)'
80773 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)'
80774        ;;
80775      *)
80776        suffix=la
80777 -      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_wddx) $(PHPWDDX_SHARED_LIBADD)'
80778 +      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_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD)'
80779        ;;
80780    esac
80781
80782    if test "x" = "xyes"; then
80783 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpwddx.$suffix"
80784 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlwriter.$suffix"
80785    else
80786 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix"
80787 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix"
80788    fi
80789
80790 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
80791 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
80792
80793    cat >>Makefile.objects<<EOF
80794 -\$(phplibdir)/phpwddx.$suffix: $ext_builddir/phpwddx.$suffix
80795 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpwddx.$suffix \$(phplibdir)
80796 +\$(phplibdir)/phpxmlwriter.$suffix: $ext_builddir/phpxmlwriter.$suffix
80797 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlwriter.$suffix \$(phplibdir)
80798
80799 -$ext_builddir/phpwddx.$suffix: \$(shared_objects_wddx) \$(PHPWDDX_SHARED_DEPENDENCIES)
80800 +$ext_builddir/phpxmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(PHPXMLWRITER_SHARED_DEPENDENCIES)
80801         $link_cmd
80802
80803  EOF
80804 @@ -97304,31 +103932,31 @@ EOF
80805    case $host_alias in
80806      *aix*)
80807        suffix=so
80808 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/wddx.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(WDDX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/wddx.so '$ext_builddir'/wddx.so'
80809 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlwriter.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(XMLWRITER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlwriter.so '$ext_builddir'/xmlwriter.so'
80810        ;;
80811      *netware*)
80812        suffix=nlm
80813 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(WDDX, 3)_SHARED_LIBADD)'
80814 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLWRITER, 3)_SHARED_LIBADD)'
80815        ;;
80816      *)
80817        suffix=la
80818 -      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_wddx) $(WDDX_SHARED_LIBADD)'
80819 +      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_xmlwriter) $(XMLWRITER_SHARED_LIBADD)'
80820        ;;
80821    esac
80822
80823    if test "x" = "xyes"; then
80824 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/wddx.$suffix"
80825 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlwriter.$suffix"
80826    else
80827 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/wddx.$suffix"
80828 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlwriter.$suffix"
80829    fi
80830
80831 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
80832 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
80833
80834    cat >>Makefile.objects<<EOF
80835 -\$(phplibdir)/wddx.$suffix: $ext_builddir/wddx.$suffix
80836 -       \$(LIBTOOL) --mode=install cp $ext_builddir/wddx.$suffix \$(phplibdir)
80837 +\$(phplibdir)/xmlwriter.$suffix: $ext_builddir/xmlwriter.$suffix
80838 +       \$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir)
80839
80840 -$ext_builddir/wddx.$suffix: \$(shared_objects_wddx) \$(WDDX_SHARED_DEPENDENCIES)
80841 +$ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES)
80842         $link_cmd
80843
80844  EOF
80845 @@ -97336,22 +103964,22 @@ EOF
80846            ;;
80847        esac
80848        cat >> confdefs.h <<EOF
80849 -#define COMPILE_DL_WDDX 1
80850 +#define COMPILE_DL_XMLWRITER 1
80851  EOF
80852
80853      fi
80854    fi
80855
80856    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
80857 -    PHP_WDDX_SHARED=no
80858 +    PHP_XMLWRITER_SHARED=no
80859      case "$PHP_SAPI" in
80860        cgi|embed)
80861
80862
80863 -  case ext/wddx in
80864 +  case ext/xmlwriter in
80865    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
80866 -  /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80867 -  *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80868 +  /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80869 +  *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80870    esac
80871
80872
80873 @@ -97366,7 +103994,7 @@ EOF
80874
80875
80876    old_IFS=$IFS
80877 -  for ac_src in wddx.c; do
80878 +  for ac_src in php_xmlwriter.c; do
80879
80880        IFS=.
80881        set $ac_src
80882 @@ -97389,15 +104017,15 @@ EOF
80883    done
80884
80885
80886 -        EXT_STATIC="$EXT_STATIC wddx"
80887 +        EXT_STATIC="$EXT_STATIC xmlwriter"
80888          ;;
80889        *)
80890
80891
80892 -  case ext/wddx in
80893 +  case ext/xmlwriter in
80894    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
80895 -  /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80896 -  *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80897 +  /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
80898 +  *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
80899    esac
80900
80901
80902 @@ -97412,7 +104040,7 @@ EOF
80903
80904
80905    old_IFS=$IFS
80906 -  for ac_src in wddx.c; do
80907 +  for ac_src in php_xmlwriter.c; do
80908
80909        IFS=.
80910        set $ac_src
80911 @@ -97437,7 +104065,7 @@ EOF
80912
80913          ;;
80914      esac
80915 -    EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
80916 +    EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
80917    fi
80918
80919
80920 @@ -97446,50 +104074,40 @@ EOF
80921
80922
80923    if test "$ext_builddir" = "."; then
80924 -    PHP_PECL_EXTENSION=wddx
80925 +    PHP_PECL_EXTENSION=xmlwriter
80926
80927    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
80928
80929    fi
80930
80931 +
80932 +  PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD"
80933 +
80934
80935 -  am_i_shared=$PHP_WDDX_SHARED
80936 -  is_it_shared=$PHP_LIBXML_SHARED
80937 -  is_it_enabled=$PHP_LIBXML
80938 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
80939 -    { echo "configure: error:
80940 -You've configured extension wddx to build statically, but it
80941 -depends on extension libxml, which you've configured to build shared.
80942 -You either need to build wddx shared or build libxml statically for the
80943 -build to be successful.
80944 -" 1>&2; exit 1; }
80945 -  fi
80946 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
80947 -    { echo "configure: error:
80948 -You've configured extension wddx, which depends on extension libxml,
80949 -but you've either not enabled libxml, or have disabled it.
80950 -" 1>&2; exit 1; }
80951 -  fi
80952 -
80953 +    else
80954 +      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
80955 +    fi
80956 +else
80957 +    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
80958
80959 -  PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
80960 +  fi
80961
80962  fi
80963
80964
80965
80966 -php_enable_xml=yes
80967 +php_with_xsl=no
80968
80969 -echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
80970 -echo "configure:97485: checking whether to enable XML support" >&5
80971 -# Check whether --enable-xml or --disable-xml was given.
80972 -if test "${enable_xml+set}" = set; then
80973 -  enableval="$enable_xml"
80974 -  PHP_XML=$enableval
80975 +echo $ac_n "checking for XSL support""... $ac_c" 1>&6
80976 +echo "configure:104103: checking for XSL support" >&5
80977 +# Check whether --with-xsl or --without-xsl was given.
80978 +if test "${with_xsl+set}" = set; then
80979 +  withval="$with_xsl"
80980 +  PHP_XSL=$withval
80981  else
80982
80983 -  PHP_XML=yes
80984 -  test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL
80985 +  PHP_XSL=no
80986 +  test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL
80987
80988  fi
80989
80990 @@ -97497,12 +104115,12 @@ fi
80991
80992  ext_output="yes, shared"
80993  ext_shared=yes
80994 -case $PHP_XML in
80995 +case $PHP_XSL in
80996  shared,*)
80997 -  PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'`
80998 +  PHP_XSL=`echo "$PHP_XSL"|$SED 's/^shared,//'`
80999    ;;
81000  shared)
81001 -  PHP_XML=yes
81002 +  PHP_XSL=yes
81003    ;;
81004  no)
81005    ext_output=no
81006 @@ -97521,97 +104139,41 @@ echo "$ac_t""$ext_output" 1>&6
81007
81008
81009
81010 -if test -z "$PHP_LIBXML_DIR"; then
81011 -
81012 -php_with_libxml_dir=no
81013 -
81014 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
81015 -echo "configure:97530: checking libxml2 install dir" >&5
81016 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
81017 -if test "${with_libxml_dir+set}" = set; then
81018 -  withval="$with_libxml_dir"
81019 -  PHP_LIBXML_DIR=$withval
81020 -else
81021 -
81022 -  PHP_LIBXML_DIR=no
81023 -
81024 -
81025 -fi
81026 -
81027 -
81028 -ext_output=$PHP_LIBXML_DIR
81029 -echo "$ac_t""$ext_output" 1>&6
81030 -
81031 -
81032 -
81033 -fi
81034 -
81035 -
81036 -php_with_libexpat_dir=no
81037 +if test "$PHP_XSL" != "no"; then
81038
81039 -echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6
81040 -echo "configure:97554: checking libexpat install dir" >&5
81041 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
81042 -if test "${with_libexpat_dir+set}" = set; then
81043 -  withval="$with_libexpat_dir"
81044 -  PHP_LIBEXPAT_DIR=$withval
81045 -else
81046 -
81047 -  PHP_LIBEXPAT_DIR=no
81048 +  if test "$PHP_LIBXML" = "no"; then
81049 +    { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
81050 +  fi
81051
81052 +  if test "$PHP_DOM" = "no"; then
81053 +    { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; }
81054 +  fi
81055
81056 -fi
81057 -
81058 -
81059 -ext_output=$PHP_LIBEXPAT_DIR
81060 -echo "$ac_t""$ext_output" 1>&6
81061 -
81062 -
81063 -
81064 -
81065 -if test "$PHP_XML" != "no"; then
81066 -
81067 -        if test "$PHP_LIBEXPAT_DIR" = "no"; then
81068 -
81069 -    if test "$PHP_LIBXML" = "no"; then
81070 -      { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
81071 -    fi
81072 -
81073 -
81074 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
81075 -echo "configure:97583: checking for xml2-config path" >&5
81076 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
81077 -  echo $ac_n "(cached) $ac_c" 1>&6
81078 -else
81079 -
81080 -  for i in $PHP_LIBXML_DIR /usr/local /usr; do
81081 -    if test -x "$i/bin/xml2-config"; then
81082 -      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
81083 +  for i in $PHP_XSL /usr/local /usr; do
81084 +    if test -x "$i/bin/xslt-config"; then
81085 +      XSLT_CONFIG=$i/bin/xslt-config
81086        break
81087      fi
81088    done
81089
81090 -fi
81091 -
81092 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
81093 -
81094 -  if test -x "$ac_cv_php_xml2_config_path"; then
81095 -    XML2_CONFIG="$ac_cv_php_xml2_config_path"
81096 -    libxml_full_version=`$XML2_CONFIG --version`
81097 +  if test -z "$XSLT_CONFIG"; then
81098 +    { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; }
81099 +  else
81100 +    libxslt_full_version=`$XSLT_CONFIG --version`
81101      ac_IFS=$IFS
81102      IFS="."
81103 -    set $libxml_full_version
81104 +    set $libxslt_full_version
81105      IFS=$ac_IFS
81106 -    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
81107 -    if test "$LIBXML_VERSION" -ge "2006011"; then
81108 -      LIBXML_LIBS=`$XML2_CONFIG --libs`
81109 -      LIBXML_INCS=`$XML2_CONFIG --cflags`
81110 +    LIBXSLT_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
81111 +    if test "$LIBXSLT_VERSION" -ge "1001000"; then
81112 +      XSL_LIBS=`$XSLT_CONFIG --libs`
81113 +      XSL_INCS=`$XSLT_CONFIG --cflags`
81114
81115 -  for ac_i in $LIBXML_LIBS; do
81116 +  for ac_i in $XSL_LIBS; do
81117      case $ac_i in
81118      -pthread)
81119        if test "$ext_shared" = "yes"; then
81120 -        XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread"
81121 +        XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread"
81122        else
81123
81124
81125 @@ -97633,7 +104195,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
81126    c|c_r|pthread*) ;;
81127    *)
81128      if test "$ext_shared" = "yes"; then
81129 -        XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii"
81130 +        XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii"
81131      else
81132
81133
81134 @@ -97668,8 +104230,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
81135
81136
81137        if test "$ext_shared" = "yes"; then
81138 -        XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
81139 -        test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD"
81140 +        XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
81141 +        test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD"
81142        else
81143
81144
81145 @@ -97696,7 +104258,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
81146    done
81147
81148
81149 -  for ac_i in $LIBXML_INCS; do
81150 +  for ac_i in $XSL_INCS; do
81151      case $ac_i in
81152      -I*)
81153        ac_ii=`echo $ac_i|cut -c 3-`
81154 @@ -97735,166 +104297,41 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
81155      esac
81156    done
81157
81158 -
81159 -            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
81160 -echo "configure:97741: checking whether libxml build works" >&5
81161 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
81162 -  echo $ac_n "(cached) $ac_c" 1>&6
81163 -else
81164 -
81165 -
81166 -  old_LIBS=$LIBS
81167 -  LIBS="
81168 -          $XML_SHARED_LIBADD
81169 -         $LIBS"
81170 -  if test "$cross_compiling" = yes; then
81171 -
81172 -    LIBS=$old_LIBS
81173 -
81174 -else
81175 -  cat > conftest.$ac_ext <<EOF
81176 -#line 97757 "configure"
81177 -#include "confdefs.h"
81178 -
81179 -
81180 -    char xmlInitParser();
81181 -    int main() {
81182 -      xmlInitParser();
81183 -      return 0;
81184 -    }
81185 -
81186 -EOF
81187 -if { (eval echo configure:97768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
81188 -then
81189 -
81190 -    LIBS=$old_LIBS
81191 -
81192 -          php_cv_libxml_build_works=yes
81193 -
81194 -
81195 -else
81196 -  echo "configure: failed program was:" >&5
81197 -  cat conftest.$ac_ext >&5
81198 -  rm -fr conftest*
81199 -
81200 -    LIBS=$old_LIBS
81201 -
81202 -          echo "$ac_t""no" 1>&6
81203 -          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
81204 -
81205 -
81206 -fi
81207 -rm -fr conftest*
81208 -fi
81209 -
81210 -
81211 -
81212 -fi
81213 -
81214 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
81215 -      if test "$php_cv_libxml_build_works" = "yes"; then
81216 -        cat >> confdefs.h <<\EOF
81217 -#define HAVE_LIBXML 1
81218 -EOF
81219 -
81220 -      fi
81221 -
81222 -      xml_extra_sources="compat.c"
81223
81224 -  am_i_shared=$PHP_XML_SHARED
81225 -  is_it_shared=$PHP_LIBXML_SHARED
81226 -  is_it_enabled=$PHP_LIBXML
81227 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
81228 -    { echo "configure: error:
81229 -You've configured extension xml to build statically, but it
81230 -depends on extension libxml, which you've configured to build shared.
81231 -You either need to build xml shared or build libxml statically for the
81232 -build to be successful.
81233 -" 1>&2; exit 1; }
81234 -  fi
81235 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
81236 -    { echo "configure: error:
81237 -You've configured extension xml, which depends on extension libxml,
81238 -but you've either not enabled libxml, or have disabled it.
81239 -" 1>&2; exit 1; }
81240 -  fi
81241 -
81242 -
81243 -    else
81244 -      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
81245 -    fi
81246 -else
81247 -      { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
81248 -
81249 -  fi
81250 -
81251 -  fi
81252 -
81253 -        if test "$PHP_LIBEXPAT_DIR" != "no"; then
81254 -    for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
81255 -      if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
81256 -        EXPAT_DIR=$i
81257 -        break
81258 -      fi
81259 -    done
81260 -
81261 -    if test -z "$EXPAT_DIR"; then
81262 -      { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
81263 -    fi
81264 -
81265 -
81266 -  if test "$EXPAT_DIR/include" != "/usr/include"; then
81267 -
81268 -  if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
81269 -    ai_p=$EXPAT_DIR/include
81270 -  else
81271 -
81272 -    ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
81273 -
81274 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
81275 -    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
81276 -  fi
81277 -
81278 -
81279 -
81280 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
81281 -
81282 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
81283 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
81284 -    eval "INCLUDEPATH$unique=set"
81285 -
81286 -      if test ""; then
81287 -        INCLUDES="-I$ai_p $INCLUDES"
81288 -      else
81289 -        INCLUDES="$INCLUDES -I$ai_p"
81290 -      fi
81291 -
81292 -  fi
81293 -
81294 -  fi
81295 -
81296 -
81297 +      echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6
81298 +echo "configure:104303: checking for EXSLT support" >&5
81299 +      for i in $PHP_XSL /usr/local /usr; do
81300 +        if test -r "$i/include/libexslt/exslt.h"; then
81301 +          PHP_XSL_EXSL_DIR=$i
81302 +          break
81303 +        fi
81304 +      done
81305 +      if test -z "$PHP_XSL_EXSL_DIR"; then
81306 +        echo "$ac_t""not found" 1>&6
81307 +      else
81308 +        echo "$ac_t""found" 1>&6
81309 +
81310
81311    if test "$ext_shared" = "yes"; then
81312 -    XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD"
81313 -    if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
81314 +    XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD"
81315 +    if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
81316
81317 -  if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
81318 +  if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
81319
81320 -  if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
81321 -    ai_p=$EXPAT_DIR/$PHP_LIBDIR
81322 +  if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
81323 +    ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
81324    else
81325
81326 -    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
81327 +    ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
81328
81329      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
81330 -    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
81331 +    ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
81332    fi
81333
81334
81335        if test "$ext_shared" = "yes"; then
81336 -        XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
81337 -        test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD"
81338 +        XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
81339 +        test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD"
81340        else
81341
81342
81343 @@ -97920,18 +104357,18 @@ else
81344    else
81345
81346
81347 -  if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
81348 +  if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
81349
81350 -  if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
81351 +  if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
81352
81353 -  if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
81354 -    ai_p=$EXPAT_DIR/$PHP_LIBDIR
81355 +  if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
81356 +    ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
81357    else
81358
81359 -    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
81360 +    ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
81361
81362      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
81363 -    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
81364 +    ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
81365    fi
81366
81367
81368 @@ -97957,10 +104394,10 @@ else
81369    fi
81370
81371
81372 -  case expat in
81373 +  case exslt in
81374    c|c_r|pthread*) ;;
81375    *)
81376 -      LIBS="-lexpat $LIBS"
81377 +      LIBS="-lexslt $LIBS"
81378     ;;
81379    esac
81380
81381 @@ -97970,26 +104407,67 @@ else
81382    fi
81383
81384
81385 -    cat >> confdefs.h <<\EOF
81386 -#define HAVE_LIBEXPAT 1
81387 +
81388 +  if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then
81389 +
81390 +  if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then
81391 +    ai_p=$PHP_XSL_EXSL_DIR/include
81392 +  else
81393 +
81394 +    ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
81395 +
81396 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
81397 +    ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`"
81398 +  fi
81399 +
81400 +
81401 +
81402 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
81403 +
81404 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
81405 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
81406 +    eval "INCLUDEPATH$unique=set"
81407 +
81408 +      if test ""; then
81409 +        INCLUDES="-I$ai_p $INCLUDES"
81410 +      else
81411 +        INCLUDES="$INCLUDES -I$ai_p"
81412 +      fi
81413 +
81414 +  fi
81415 +
81416 +  fi
81417 +
81418 +        cat >> confdefs.h <<\EOF
81419 +#define HAVE_XSL_EXSLT 1
81420  EOF
81421
81422 +      fi
81423 +    else
81424 +      { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; }
81425 +    fi
81426 +
81427 +
81428    fi
81429 +
81430 +  cat >> confdefs.h <<\EOF
81431 +#define HAVE_XSL 1
81432 +EOF
81433
81434
81435 -  ext_builddir=ext/xml
81436 -  ext_srcdir=$abs_srcdir/ext/xml
81437 +  ext_builddir=ext/xsl
81438 +  ext_srcdir=$abs_srcdir/ext/xsl
81439
81440    ac_extra=
81441
81442    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
81443 -    PHP_XML_SHARED=no
81444 +    PHP_XSL_SHARED=no
81445
81446
81447 -  case ext/xml in
81448 +  case ext/xsl in
81449    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
81450 -  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
81451 -  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
81452 +  /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
81453 +  *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
81454    esac
81455
81456
81457 @@ -98004,7 +104482,7 @@ EOF
81458
81459
81460    old_IFS=$IFS
81461 -  for ac_src in xml.c $xml_extra_sources; do
81462 +  for ac_src in php_xsl.c xsltprocessor.c; do
81463
81464        IFS=.
81465        set $ac_src
81466 @@ -98027,18 +104505,18 @@ EOF
81467    done
81468
81469
81470 -    EXT_STATIC="$EXT_STATIC xml"
81471 +    EXT_STATIC="$EXT_STATIC xsl"
81472      if test "$ext_shared" != "nocli"; then
81473 -      EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
81474 +      EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
81475      fi
81476    else
81477      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
81478 -      PHP_XML_SHARED=yes
81479 +      PHP_XSL_SHARED=yes
81480
81481 -  case ext/xml in
81482 +  case ext/xsl in
81483    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
81484 -  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
81485 -  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
81486 +  /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
81487 +  *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
81488    esac
81489
81490
81491 @@ -98053,14 +104531,14 @@ EOF
81492
81493
81494    old_IFS=$IFS
81495 -  for ac_src in xml.c $xml_extra_sources; do
81496 +  for ac_src in php_xsl.c xsltprocessor.c; do
81497
81498        IFS=.
81499        set $ac_src
81500        ac_obj=$1
81501        IFS=$old_IFS
81502
81503 -      shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo"
81504 +      shared_objects_xsl="$shared_objects_xsl $ac_bdir$ac_obj.lo"
81505
81506        case $ac_src in
81507          *.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" ;;
81508 @@ -98083,31 +104561,31 @@ EOF
81509    case $host_alias in
81510      *aix*)
81511        suffix=so
81512 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxml.so '$ext_builddir'/phpxml.so'
81513 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxsl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(PHPXSL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxsl.so '$ext_builddir'/phpxsl.so'
81514        ;;
81515      *netware*)
81516        suffix=nlm
81517 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)'
81518 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXSL, 3)_SHARED_LIBADD)'
81519        ;;
81520      *)
81521        suffix=la
81522 -      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_xml) $(PHPXML_SHARED_LIBADD)'
81523 +      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_xsl) $(PHPXSL_SHARED_LIBADD)'
81524        ;;
81525    esac
81526
81527    if test "x" = "xyes"; then
81528 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix"
81529 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxsl.$suffix"
81530    else
81531 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix"
81532 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix"
81533    fi
81534
81535 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
81536 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
81537
81538    cat >>Makefile.objects<<EOF
81539 -\$(phplibdir)/phpxml.$suffix: $ext_builddir/phpxml.$suffix
81540 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxml.$suffix \$(phplibdir)
81541 +\$(phplibdir)/phpxsl.$suffix: $ext_builddir/phpxsl.$suffix
81542 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxsl.$suffix \$(phplibdir)
81543
81544 -$ext_builddir/phpxml.$suffix: \$(shared_objects_xml) \$(PHPXML_SHARED_DEPENDENCIES)
81545 +$ext_builddir/phpxsl.$suffix: \$(shared_objects_xsl) \$(PHPXSL_SHARED_DEPENDENCIES)
81546         $link_cmd
81547
81548  EOF
81549 @@ -98120,31 +104598,31 @@ EOF
81550    case $host_alias in
81551      *aix*)
81552        suffix=so
81553 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(XML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xml.so '$ext_builddir'/xml.so'
81554 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xsl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(XSL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xsl.so '$ext_builddir'/xsl.so'
81555        ;;
81556      *netware*)
81557        suffix=nlm
81558 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XML, 3)_SHARED_LIBADD)'
81559 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XSL, 3)_SHARED_LIBADD)'
81560        ;;
81561      *)
81562        suffix=la
81563 -      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_xml) $(XML_SHARED_LIBADD)'
81564 +      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_xsl) $(XSL_SHARED_LIBADD)'
81565        ;;
81566    esac
81567
81568    if test "x" = "xyes"; then
81569 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xml.$suffix"
81570 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xsl.$suffix"
81571    else
81572 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xml.$suffix"
81573 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xsl.$suffix"
81574    fi
81575
81576 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
81577 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
81578
81579    cat >>Makefile.objects<<EOF
81580 -\$(phplibdir)/xml.$suffix: $ext_builddir/xml.$suffix
81581 -       \$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir)
81582 +\$(phplibdir)/xsl.$suffix: $ext_builddir/xsl.$suffix
81583 +       \$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir)
81584
81585 -$ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES)
81586 +$ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES)
81587         $link_cmd
81588
81589  EOF
81590 @@ -98152,22 +104630,22 @@ EOF
81591            ;;
81592        esac
81593        cat >> confdefs.h <<EOF
81594 -#define COMPILE_DL_XML 1
81595 +#define COMPILE_DL_XSL 1
81596  EOF
81597
81598      fi
81599    fi
81600
81601    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
81602 -    PHP_XML_SHARED=no
81603 +    PHP_XSL_SHARED=no
81604      case "$PHP_SAPI" in
81605        cgi|embed)
81606
81607
81608 -  case ext/xml in
81609 +  case ext/xsl in
81610    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
81611 -  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
81612 -  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
81613 +  /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
81614 +  *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
81615    esac
81616
81617
81618 @@ -98182,7 +104660,7 @@ EOF
81619
81620
81621    old_IFS=$IFS
81622 -  for ac_src in xml.c $xml_extra_sources; do
81623 +  for ac_src in php_xsl.c xsltprocessor.c; do
81624
81625        IFS=.
81626        set $ac_src
81627 @@ -98205,15 +104683,15 @@ EOF
81628    done
81629
81630
81631 -        EXT_STATIC="$EXT_STATIC xml"
81632 +        EXT_STATIC="$EXT_STATIC xsl"
81633          ;;
81634        *)
81635
81636
81637 -  case ext/xml in
81638 +  case ext/xsl in
81639    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
81640 -  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
81641 -  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
81642 +  /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
81643 +  *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
81644    esac
81645
81646
81647 @@ -98228,7 +104706,7 @@ EOF
81648
81649
81650    old_IFS=$IFS
81651 -  for ac_src in xml.c $xml_extra_sources; do
81652 +  for ac_src in php_xsl.c xsltprocessor.c; do
81653
81654        IFS=.
81655        set $ac_src
81656 @@ -98253,7 +104731,7 @@ EOF
81657
81658          ;;
81659      esac
81660 -    EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
81661 +    EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
81662    fi
81663
81664
81665 @@ -98262,53 +104740,50 @@ EOF
81666
81667
81668    if test "$ext_builddir" = "."; then
81669 -    PHP_PECL_EXTENSION=xml
81670 +    PHP_PECL_EXTENSION=xsl
81671
81672    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
81673
81674    fi
81675
81676
81677 -  PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD"
81678 +  PHP_VAR_SUBST="$PHP_VAR_SUBST XSL_SHARED_LIBADD"
81679
81680
81681 -
81682 -    for header_file in ext/xml/; do
81683 -
81684 -
81685 -  unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
81686 -
81687 -  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
81688 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
81689 -    eval "INSTALLHEADERS$unique=set"
81690 -
81691 -        INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
81692 -
81693 +  am_i_shared=$PHP_XSL_SHARED
81694 +  is_it_shared=$PHP_LIBXML_SHARED
81695 +  is_it_enabled=$PHP_LIBXML
81696 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
81697 +    { echo "configure: error:
81698 +You've configured extension xsl to build statically, but it
81699 +depends on extension libxml, which you've configured to build shared.
81700 +You either need to build xsl shared or build libxml statically for the
81701 +build to be successful.
81702 +" 1>&2; exit 1; }
81703 +  fi
81704 +  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
81705 +    { echo "configure: error:
81706 +You've configured extension xsl, which depends on extension libxml,
81707 +but you've either not enabled libxml, or have disabled it.
81708 +" 1>&2; exit 1; }
81709    fi
81710 -
81711 -    done
81712
81713 -
81714 -  cat >> confdefs.h <<\EOF
81715 -#define HAVE_XML 1
81716 -EOF
81717 -
81718  fi
81719
81720
81721
81722 -php_enable_xmlreader=yes
81723 +php_enable_zip=no
81724
81725 -echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6
81726 -echo "configure:98304: checking whether to enable XMLReader support" >&5
81727 -# Check whether --enable-xmlreader or --disable-xmlreader was given.
81728 -if test "${enable_xmlreader+set}" = set; then
81729 -  enableval="$enable_xmlreader"
81730 -  PHP_XMLREADER=$enableval
81731 +echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6
81732 +echo "configure:104779: checking for zip archive read/writesupport" >&5
81733 +# Check whether --enable-zip or --disable-zip was given.
81734 +if test "${enable_zip+set}" = set; then
81735 +  enableval="$enable_zip"
81736 +  PHP_ZIP=$enableval
81737  else
81738
81739 -  PHP_XMLREADER=yes
81740 -  test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL
81741 +  PHP_ZIP=no
81742 +  test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL
81743
81744  fi
81745
81746 @@ -98316,12 +104791,12 @@ fi
81747
81748  ext_output="yes, shared"
81749  ext_shared=yes
81750 -case $PHP_XMLREADER in
81751 +case $PHP_ZIP in
81752  shared,*)
81753 -  PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'`
81754 +  PHP_ZIP=`echo "$PHP_ZIP"|$SED 's/^shared,//'`
81755    ;;
81756  shared)
81757 -  PHP_XMLREADER=yes
81758 +  PHP_ZIP=yes
81759    ;;
81760  no)
81761    ext_output=no
81762 @@ -98340,132 +104815,147 @@ echo "$ac_t""$ext_output" 1>&6
81763
81764
81765
81766 -if test -z "$PHP_LIBXML_DIR"; then
81767 +if test -z "$PHP_ZLIB_DIR"; then
81768
81769 -php_with_libxml_dir=no
81770 +php_with_zlib_dir=no
81771
81772 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
81773 -echo "configure:98349: checking libxml2 install dir" >&5
81774 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
81775 -if test "${with_libxml_dir+set}" = set; then
81776 -  withval="$with_libxml_dir"
81777 -  PHP_LIBXML_DIR=$withval
81778 +echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
81779 +echo "configure:104824: checking for the location of libz" >&5
81780 +# Check whether --with-zlib-dir or --without-zlib-dir was given.
81781 +if test "${with_zlib_dir+set}" = set; then
81782 +  withval="$with_zlib_dir"
81783 +  PHP_ZLIB_DIR=$withval
81784  else
81785
81786 -  PHP_LIBXML_DIR=no
81787 +  PHP_ZLIB_DIR=no
81788
81789
81790  fi
81791
81792
81793 -ext_output=$PHP_LIBXML_DIR
81794 +ext_output=$PHP_ZLIB_DIR
81795  echo "$ac_t""$ext_output" 1>&6
81796
81797
81798
81799  fi
81800
81801 -if test "$PHP_XMLREADER" != "no"; then
81802
81803 -  if test "$PHP_LIBXML" = "no"; then
81804 -    { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
81805 -  fi
81806 +php_with_pcre_dir=no
81807
81808 -
81809 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
81810 -echo "configure:98377: checking for xml2-config path" >&5
81811 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
81812 -  echo $ac_n "(cached) $ac_c" 1>&6
81813 +echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
81814 +echo "configure:104848: checking pcre install prefix" >&5
81815 +# Check whether --with-pcre-dir or --without-pcre-dir was given.
81816 +if test "${with_pcre_dir+set}" = set; then
81817 +  withval="$with_pcre_dir"
81818 +  PHP_PCRE_DIR=$withval
81819  else
81820
81821 -  for i in $PHP_LIBXML_DIR /usr/local /usr; do
81822 -    if test -x "$i/bin/xml2-config"; then
81823 -      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
81824 -      break
81825 -    fi
81826 -  done
81827 +  PHP_PCRE_DIR=no
81828 +
81829
81830  fi
81831
81832 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
81833
81834 -  if test -x "$ac_cv_php_xml2_config_path"; then
81835 -    XML2_CONFIG="$ac_cv_php_xml2_config_path"
81836 -    libxml_full_version=`$XML2_CONFIG --version`
81837 -    ac_IFS=$IFS
81838 -    IFS="."
81839 -    set $libxml_full_version
81840 -    IFS=$ac_IFS
81841 -    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
81842 -    if test "$LIBXML_VERSION" -ge "2006011"; then
81843 -      LIBXML_LIBS=`$XML2_CONFIG --libs`
81844 -      LIBXML_INCS=`$XML2_CONFIG --cflags`
81845 +ext_output=$PHP_PCRE_DIR
81846 +echo "$ac_t""$ext_output" 1>&6
81847 +
81848 +
81849 +
81850 +
81851 +if test "$PHP_ZIP" != "no"; then
81852 +
81853 +  if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
81854 +    if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
81855 +      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
81856 +      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
81857 +    elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
81858 +      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
81859 +      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
81860 +    else
81861 +      { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; }
81862 +    fi
81863 +  else
81864 +    for i in /usr/local /usr; do
81865 +      if test -f "$i/include/zlib/zlib.h"; then
81866 +        PHP_ZLIB_DIR="$i"
81867 +        PHP_ZLIB_INCDIR="$i/include/zlib"
81868 +      elif test -f "$i/include/zlib.h"; then
81869 +        PHP_ZLIB_DIR="$i"
81870 +        PHP_ZLIB_INCDIR="$i/include"
81871 +      fi
81872 +    done
81873 +  fi
81874 +
81875 +    echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
81876 +echo "configure:104892: checking for the location of zlib" >&5
81877 +  if test "$PHP_ZLIB_DIR" = "no"; then
81878 +    { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" 1>&2; exit 1; }
81879 +  else
81880 +    echo "$ac_t""$PHP_ZLIB_DIR" 1>&6
81881 +
81882 +
81883 +  if test "$ext_shared" = "yes"; then
81884 +    ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD"
81885 +    if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
81886
81887 -  for ac_i in $LIBXML_LIBS; do
81888 -    case $ac_i in
81889 -    -pthread)
81890 +  if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
81891 +
81892 +  if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
81893 +    ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
81894 +  else
81895 +
81896 +    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
81897 +
81898 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
81899 +    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
81900 +  fi
81901 +
81902 +
81903        if test "$ext_shared" = "yes"; then
81904 -        XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread"
81905 +        ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD"
81906 +        test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD"
81907        else
81908
81909
81910 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
81911
81912 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
81913 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
81914 +
81915 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
81916    if test -n "$unique" && test "`eval $cmd`" = "" ; then
81917 -    eval "EXTRA_LDFLAGS$unique=set"
81918 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
81919 +    eval "LIBPATH$unique=set"
81920 +
81921 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
81922 +    LDFLAGS="$LDFLAGS -L$ai_p"
81923 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
81924 +
81925    fi
81926
81927 -      fi
81928 -    ;;
81929 -    -l*)
81930 -      ac_ii=`echo $ac_i|cut -c 3-`
81931 -
81932 -
81933 -  case $ac_ii in
81934 -  c|c_r|pthread*) ;;
81935 -  *)
81936 -    if test "$ext_shared" = "yes"; then
81937 -        XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii"
81938 -    else
81939 -
81940 -
81941 -  case $ac_ii in
81942 -  c|c_r|pthread*) ;;
81943 -  *)
81944 -      LIBS="$LIBS -l$ac_ii"
81945 -   ;;
81946 -  esac
81947
81948 +      fi
81949 +
81950 +  fi
81951
81952      fi
81953 -   ;;
81954 -  esac
81955 -
81956 +  else
81957 +
81958
81959 -    ;;
81960 -    -L*)
81961 -      ac_ii=`echo $ac_i|cut -c 3-`
81962 -
81963 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
81964 +  if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
81965
81966 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
81967 -    ai_p=$ac_ii
81968 +  if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
81969 +
81970 +  if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
81971 +    ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
81972    else
81973
81974 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
81975 +    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
81976
81977      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
81978 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
81979 +    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
81980    fi
81981
81982
81983 -      if test "$ext_shared" = "yes"; then
81984 -        XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD"
81985 -        test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD"
81986 -      else
81987 -
81988 +
81989
81990
81991    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
81992 @@ -98481,30 +104971,36 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
81993    fi
81994
81995
81996 -      fi
81997
81998    fi
81999
82000 -    ;;
82001 -    esac
82002 -  done
82003 +  fi
82004 +
82005 +
82006 +  case z in
82007 +  c|c_r|pthread*) ;;
82008 +  *)
82009 +      LIBS="-lz $LIBS"
82010 +   ;;
82011 +  esac
82012 +
82013 +
82014 +
82015 +
82016 +  fi
82017 +
82018
82019 -
82020 -  for ac_i in $LIBXML_INCS; do
82021 -    case $ac_i in
82022 -    -I*)
82023 -      ac_ii=`echo $ac_i|cut -c 3-`
82024 -
82025 -  if test "$ac_ii" != "/usr/include"; then
82026
82027 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
82028 -    ai_p=$ac_ii
82029 +  if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then
82030 +
82031 +  if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then
82032 +    ai_p=$PHP_ZLIB_INCDIR
82033    else
82034
82035 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
82036 +    ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
82037
82038      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
82039 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
82040 +    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`"
82041    fi
82042
82043
82044 @@ -98525,92 +105021,97 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
82045
82046    fi
82047
82048 -    ;;
82049 -    esac
82050 -  done
82051 +  fi
82052
82053 +    old_CPPFLAGS=$CPPFLAGS
82054 +  CPPFLAGS=$INCLUDES
82055 +  cat > conftest.$ac_ext <<EOF
82056 +#line 105030 "configure"
82057 +#include "confdefs.h"
82058
82059 -            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
82060 -echo "configure:98535: checking whether libxml build works" >&5
82061 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
82062 -  echo $ac_n "(cached) $ac_c" 1>&6
82063 -else
82064 +#include <main/php_config.h>
82065 +#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
82066 +yes
82067 +#endif
82068
82069 -
82070 -  old_LIBS=$LIBS
82071 -  LIBS="
82072 -          $XMLREADER_SHARED_LIBADD
82073 -         $LIBS"
82074 -  if test "$cross_compiling" = yes; then
82075 +EOF
82076 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
82077 +  egrep "yes" >/dev/null 2>&1; then
82078 +  rm -rf conftest*
82079
82080 -    LIBS=$old_LIBS
82081 +    PHP_PCRE_REGEX=yes
82082
82083  else
82084 -  cat > conftest.$ac_ext <<EOF
82085 -#line 98551 "configure"
82086 +  rm -rf conftest*
82087 +
82088 +    cat > conftest.$ac_ext <<EOF
82089 +#line 105049 "configure"
82090  #include "confdefs.h"
82091
82092 +#include <main/php_config.h>
82093 +#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
82094 +yes
82095 +#endif
82096
82097 -    char xmlInitParser();
82098 -    int main() {
82099 -      xmlInitParser();
82100 -      return 0;
82101 -    }
82102 -
82103  EOF
82104 -if { (eval echo configure:98562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
82105 -then
82106 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
82107 +  egrep "yes" >/dev/null 2>&1; then
82108 +  rm -rf conftest*
82109
82110 -    LIBS=$old_LIBS
82111 +      PHP_PCRE_REGEX=pecl
82112
82113 -          php_cv_libxml_build_works=yes
82114 -
82115 -
82116  else
82117 -  echo "configure: failed program was:" >&5
82118 -  cat conftest.$ac_ext >&5
82119 -  rm -fr conftest*
82120 +  rm -rf conftest*
82121
82122 -    LIBS=$old_LIBS
82123 +      PHP_PCRE_REGEX=no
82124
82125 -          echo "$ac_t""no" 1>&6
82126 -          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
82127 -
82128 -
82129 -fi
82130 -rm -fr conftest*
82131  fi
82132 +rm -f conftest*
82133
82134 -
82135 -
82136 +
82137  fi
82138 +rm -f conftest*
82139
82140 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
82141 -      if test "$php_cv_libxml_build_works" = "yes"; then
82142 -        cat >> confdefs.h <<\EOF
82143 -#define HAVE_LIBXML 1
82144 -EOF
82145 +  CPPFLAGS=$old_CPPFLAGS
82146
82147 -      fi
82148 -
82149 -    cat >> confdefs.h <<\EOF
82150 -#define HAVE_XMLREADER 1
82151 +  PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
82152 +                         lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c  \
82153 +                         lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \
82154 +                         lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \
82155 +                         lib/zip_source_free.c lib/zip_unchange_all.c lib/zip_delete.c \
82156 +                         lib/zip_error_get_sys_type.c lib/zip_file_get_offset.c \
82157 +                         lib/zip_get_name.c lib/zip_replace.c lib/zip_source_function.c \
82158 +                         lib/zip_unchange.c lib/zip_dirent.c lib/zip_error_strerror.c \
82159 +                         lib/zip_filerange_crc.c lib/zip_file_strerror.c lib/zip_get_num_files.c \
82160 +                         lib/zip_get_archive_flag.c lib/zip_set_archive_flag.c \
82161 +                         lib/zip_set_name.c lib/zip_source_zip.c lib/zip_unchange_data.c \
82162 +                         lib/zip_entry_free.c lib/zip_error_to_str.c lib/zip_fopen.c \
82163 +                         lib/zip_name_locate.c lib/zip_source_buffer.c lib/zip_stat.c \
82164 +                         lib/zip_entry_new.c lib/zip_err_str.c lib/zip_fopen_index.c \
82165 +                         lib/zip_get_archive_comment.c lib/zip_get_file_comment.c \
82166 +                         lib/zip_new.c lib/zip_source_file.c lib/zip_stat_index.c \
82167 +                         lib/zip_set_archive_comment.c lib/zip_set_file_comment.c \
82168 +                         lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \
82169 +                         lib/zip_error_clear.c lib/zip_file_error_clear.c"
82170 +
82171 +  cat >> confdefs.h <<\EOF
82172 +#define HAVE_ZIP 1
82173  EOF
82174
82175 -
82176 -  ext_builddir=ext/xmlreader
82177 -  ext_srcdir=$abs_srcdir/ext/xmlreader
82178 +
82179 +  ext_builddir=ext/zip
82180 +  ext_srcdir=$abs_srcdir/ext/zip
82181
82182    ac_extra=
82183
82184    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
82185 -    PHP_XMLREADER_SHARED=no
82186 +    PHP_ZIP_SHARED=no
82187
82188
82189 -  case ext/xmlreader in
82190 +  case ext/zip in
82191    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
82192 -  /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
82193 -  *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
82194 +  /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
82195 +  *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
82196    esac
82197
82198
82199 @@ -98625,7 +105126,7 @@ EOF
82200
82201
82202    old_IFS=$IFS
82203 -  for ac_src in php_xmlreader.c; do
82204 +  for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
82205
82206        IFS=.
82207        set $ac_src
82208 @@ -98648,18 +105149,18 @@ EOF
82209    done
82210
82211
82212 -    EXT_STATIC="$EXT_STATIC xmlreader"
82213 +    EXT_STATIC="$EXT_STATIC zip"
82214      if test "$ext_shared" != "nocli"; then
82215 -      EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
82216 +      EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
82217      fi
82218    else
82219      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
82220 -      PHP_XMLREADER_SHARED=yes
82221 +      PHP_ZIP_SHARED=yes
82222
82223 -  case ext/xmlreader in
82224 +  case ext/zip in
82225    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
82226 -  /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
82227 -  *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
82228 +  /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
82229 +  *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
82230    esac
82231
82232
82233 @@ -98674,14 +105175,14 @@ EOF
82234
82235
82236    old_IFS=$IFS
82237 -  for ac_src in php_xmlreader.c; do
82238 +  for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
82239
82240        IFS=.
82241        set $ac_src
82242        ac_obj=$1
82243        IFS=$old_IFS
82244
82245 -      shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo"
82246 +      shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo"
82247
82248        case $ac_src in
82249          *.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" ;;
82250 @@ -98704,31 +105205,31 @@ EOF
82251    case $host_alias in
82252      *aix*)
82253        suffix=so
82254 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlreader.so '$ext_builddir'/phpxmlreader.so'
82255 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpzip.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) $(PHPZIP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpzip.so '$ext_builddir'/phpzip.so'
82256        ;;
82257      *netware*)
82258        suffix=nlm
82259 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)'
82260 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZIP, 3)_SHARED_LIBADD)'
82261        ;;
82262      *)
82263        suffix=la
82264 -      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_xmlreader) $(PHPXMLREADER_SHARED_LIBADD)'
82265 +      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_zip) $(PHPZIP_SHARED_LIBADD)'
82266        ;;
82267    esac
82268
82269    if test "x" = "xyes"; then
82270 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix"
82271 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpzip.$suffix"
82272    else
82273 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix"
82274 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix"
82275    fi
82276
82277 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
82278 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
82279
82280    cat >>Makefile.objects<<EOF
82281 -\$(phplibdir)/phpxmlreader.$suffix: $ext_builddir/phpxmlreader.$suffix
82282 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlreader.$suffix \$(phplibdir)
82283 +\$(phplibdir)/phpzip.$suffix: $ext_builddir/phpzip.$suffix
82284 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phpzip.$suffix \$(phplibdir)
82285
82286 -$ext_builddir/phpxmlreader.$suffix: \$(shared_objects_xmlreader) \$(PHPXMLREADER_SHARED_DEPENDENCIES)
82287 +$ext_builddir/phpzip.$suffix: \$(shared_objects_zip) \$(PHPZIP_SHARED_DEPENDENCIES)
82288         $link_cmd
82289
82290  EOF
82291 @@ -98741,31 +105242,31 @@ EOF
82292    case $host_alias in
82293      *aix*)
82294        suffix=so
82295 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(XMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlreader.so '$ext_builddir'/xmlreader.so'
82296 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/zip.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) $(ZIP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/zip.so '$ext_builddir'/zip.so'
82297        ;;
82298      *netware*)
82299        suffix=nlm
82300 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLREADER, 3)_SHARED_LIBADD)'
82301 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ZIP, 3)_SHARED_LIBADD)'
82302        ;;
82303      *)
82304        suffix=la
82305 -      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_xmlreader) $(XMLREADER_SHARED_LIBADD)'
82306 +      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_zip) $(ZIP_SHARED_LIBADD)'
82307        ;;
82308    esac
82309
82310    if test "x" = "xyes"; then
82311 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlreader.$suffix"
82312 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/zip.$suffix"
82313    else
82314 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlreader.$suffix"
82315 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/zip.$suffix"
82316    fi
82317
82318 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
82319 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
82320
82321    cat >>Makefile.objects<<EOF
82322 -\$(phplibdir)/xmlreader.$suffix: $ext_builddir/xmlreader.$suffix
82323 -       \$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir)
82324 +\$(phplibdir)/zip.$suffix: $ext_builddir/zip.$suffix
82325 +       \$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir)
82326
82327 -$ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES)
82328 +$ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES)
82329         $link_cmd
82330
82331  EOF
82332 @@ -98773,22 +105274,22 @@ EOF
82333            ;;
82334        esac
82335        cat >> confdefs.h <<EOF
82336 -#define COMPILE_DL_XMLREADER 1
82337 +#define COMPILE_DL_ZIP 1
82338  EOF
82339
82340      fi
82341    fi
82342
82343    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
82344 -    PHP_XMLREADER_SHARED=no
82345 +    PHP_ZIP_SHARED=no
82346      case "$PHP_SAPI" in
82347        cgi|embed)
82348
82349
82350 -  case ext/xmlreader in
82351 +  case ext/zip in
82352    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
82353 -  /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
82354 -  *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
82355 +  /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
82356 +  *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
82357    esac
82358
82359
82360 @@ -98803,7 +105304,7 @@ EOF
82361
82362
82363    old_IFS=$IFS
82364 -  for ac_src in php_xmlreader.c; do
82365 +  for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
82366
82367        IFS=.
82368        set $ac_src
82369 @@ -98826,15 +105327,15 @@ EOF
82370    done
82371
82372
82373 -        EXT_STATIC="$EXT_STATIC xmlreader"
82374 +        EXT_STATIC="$EXT_STATIC zip"
82375          ;;
82376        *)
82377
82378
82379 -  case ext/xmlreader in
82380 +  case ext/zip in
82381    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
82382 -  /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
82383 -  *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
82384 +  /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
82385 +  *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
82386    esac
82387
82388
82389 @@ -98849,7 +105350,7 @@ EOF
82390
82391
82392    old_IFS=$IFS
82393 -  for ac_src in php_xmlreader.c; do
82394 +  for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
82395
82396        IFS=.
82397        set $ac_src
82398 @@ -98874,7 +105375,7 @@ EOF
82399
82400          ;;
82401      esac
82402 -    EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
82403 +    EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
82404    fi
82405
82406
82407 @@ -98883,72 +105384,43 @@ EOF
82408
82409
82410    if test "$ext_builddir" = "."; then
82411 -    PHP_PECL_EXTENSION=xmlreader
82412 +    PHP_PECL_EXTENSION=zip
82413
82414    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
82415
82416    fi
82417
82418 -
82419 -  am_i_shared=$PHP_XMLREADER_SHARED
82420 -  is_it_shared=$PHP_DOM_SHARED
82421 -  is_it_enabled=$PHP_DOM
82422 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
82423 -    { echo "configure: error:
82424 -You've configured extension xmlreader to build statically, but it
82425 -depends on extension dom, which you've configured to build shared.
82426 -You either need to build xmlreader shared or build dom statically for the
82427 -build to be successful.
82428 -" 1>&2; exit 1; }
82429 -  fi
82430 -  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
82431 -    { echo "configure: error:
82432 -You've configured extension xmlreader, which depends on extension dom,
82433 -but you've either not enabled dom, or have disabled it.
82434 -" 1>&2; exit 1; }
82435 -  fi
82436
82437 -
82438 -  PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD"
82439 -
82440
82441 -    else
82442 -      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
82443 -    fi
82444 -else
82445 -    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
82446 +    $php_shtool mkdir -p $ext_builddir/lib
82447
82448 -  fi
82449 -
82450 -fi
82451 -
82452 -
82453 -# Local macros for automake & autoconf
82454 -
82455 -
82456 -
82457 -
82458 -
82459 -
82460
82461 +
82462 +  PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD"
82463
82464
82465 +
82466 +  src=$ext_srcdir/Makefile.frag
82467 +  ac_srcdir=$ext_srcdir
82468 +  ac_builddir=$ext_builddir
82469 +  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
82470
82471 +fi
82472
82473
82474
82475 -php_with_xmlrpc=no
82476 +php_enable_http=no
82477
82478 -echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
82479 -echo "configure:98944: checking for XMLRPC-EPI support" >&5
82480 -# Check whether --with-xmlrpc or --without-xmlrpc was given.
82481 -if test "${with_xmlrpc+set}" = set; then
82482 -  withval="$with_xmlrpc"
82483 -  PHP_XMLRPC=$withval
82484 +echo $ac_n "checking whether to enable extended HTTP support""... $ac_c" 1>&6
82485 +echo "configure:105416: checking whether to enable extended HTTP support" >&5
82486 +# Check whether --enable-http or --disable-http was given.
82487 +if test "${enable_http+set}" = set; then
82488 +  enableval="$enable_http"
82489 +  PHP_HTTP=$enableval
82490  else
82491
82492 -  PHP_XMLRPC=no
82493 -  test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL
82494 +  PHP_HTTP=no
82495 +  test "$PHP_ENABLE_ALL" && PHP_HTTP=$PHP_ENABLE_ALL
82496
82497  fi
82498
82499 @@ -98956,12 +105428,12 @@ fi
82500
82501  ext_output="yes, shared"
82502  ext_shared=yes
82503 -case $PHP_XMLRPC in
82504 +case $PHP_HTTP in
82505  shared,*)
82506 -  PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'`
82507 +  PHP_HTTP=`echo "$PHP_HTTP"|$SED 's/^shared,//'`
82508    ;;
82509  shared)
82510 -  PHP_XMLRPC=yes
82511 +  PHP_HTTP=yes
82512    ;;
82513  no)
82514    ext_output=no
82515 @@ -98973,828 +105445,482 @@ no)
82516    ;;
82517  esac
82518
82519 -
82520 -
82521 -echo "$ac_t""$ext_output" 1>&6
82522 -
82523 -
82524 -
82525 -
82526 -if test -z "$PHP_LIBXML_DIR"; then
82527 -
82528 -php_with_libxml_dir=no
82529 -
82530 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
82531 -echo "configure:98989: checking libxml2 install dir" >&5
82532 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
82533 -if test "${with_libxml_dir+set}" = set; then
82534 -  withval="$with_libxml_dir"
82535 -  PHP_LIBXML_DIR=$withval
82536 -else
82537 -
82538 -  PHP_LIBXML_DIR=no
82539 -
82540 -
82541 -fi
82542 -
82543 -
82544 -ext_output=$PHP_LIBXML_DIR
82545 -echo "$ac_t""$ext_output" 1>&6
82546 -
82547 -
82548 -
82549 -fi
82550 -
82551 -
82552 -php_with_libexpat_dir=no
82553 -
82554 -echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
82555 -echo "configure:99013: checking libexpat dir for XMLRPC-EPI" >&5
82556 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
82557 -if test "${with_libexpat_dir+set}" = set; then
82558 -  withval="$with_libexpat_dir"
82559 -  PHP_LIBEXPAT_DIR=$withval
82560 -else
82561 -
82562 -  PHP_LIBEXPAT_DIR=no
82563 -
82564 -
82565 -fi
82566 -
82567 -
82568 -ext_output=$PHP_LIBEXPAT_DIR
82569 -echo "$ac_t""$ext_output" 1>&6
82570 -
82571 -
82572 -
82573 -
82574 -
82575 -php_with_iconv_dir=no
82576 -
82577 -echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
82578 -echo "configure:99036: checking iconv dir for XMLRPC-EPI" >&5
82579 -# Check whether --with-iconv-dir or --without-iconv-dir was given.
82580 -if test "${with_iconv_dir+set}" = set; then
82581 -  withval="$with_iconv_dir"
82582 -  PHP_ICONV_DIR=$withval
82583 -else
82584 -
82585 -  PHP_ICONV_DIR=no
82586 -
82587 -
82588 -fi
82589 -
82590 -
82591 -ext_output=$PHP_ICONV_DIR
82592 -echo "$ac_t""$ext_output" 1>&6
82593 -
82594 -
82595 -
82596 -
82597 -if test "$PHP_XMLRPC" != "no"; then
82598 -
82599 -
82600 -  am_i_shared=$PHP_XMLRPC_SHARED
82601 -  is_it_shared=$PHP_LIBXML_SHARED
82602 -  is_it_enabled=$PHP_LIBXML
82603 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
82604 -    { echo "configure: error:
82605 -You've configured extension xmlrpc to build statically, but it
82606 -depends on extension libxml, which you've configured to build shared.
82607 -You either need to build xmlrpc shared or build libxml statically for the
82608 -build to be successful.
82609 -" 1>&2; exit 1; }
82610 -  fi
82611 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
82612 -    { echo "configure: error:
82613 -You've configured extension xmlrpc, which depends on extension libxml,
82614 -but you've either not enabled libxml, or have disabled it.
82615 -" 1>&2; exit 1; }
82616 -  fi
82617 -
82618 -
82619 -  PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
82620 -
82621 -  cat >> confdefs.h <<\EOF
82622 -#define HAVE_XMLRPC 1
82623 -EOF
82624 -
82625 -
82626 -        if test "$PHP_LIBEXPAT_DIR" = "no"; then
82627 -
82628 -    if test "$PHP_LIBXML" = "no"; then
82629 -      { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
82630 -    fi
82631 -
82632 -
82633 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
82634 -echo "configure:99092: checking for xml2-config path" >&5
82635 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
82636 -  echo $ac_n "(cached) $ac_c" 1>&6
82637 -else
82638 -
82639 -  for i in $PHP_LIBXML_DIR /usr/local /usr; do
82640 -    if test -x "$i/bin/xml2-config"; then
82641 -      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
82642 -      break
82643 -    fi
82644 -  done
82645 -
82646 -fi
82647 -
82648 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
82649 -
82650 -  if test -x "$ac_cv_php_xml2_config_path"; then
82651 -    XML2_CONFIG="$ac_cv_php_xml2_config_path"
82652 -    libxml_full_version=`$XML2_CONFIG --version`
82653 -    ac_IFS=$IFS
82654 -    IFS="."
82655 -    set $libxml_full_version
82656 -    IFS=$ac_IFS
82657 -    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
82658 -    if test "$LIBXML_VERSION" -ge "2006011"; then
82659 -      LIBXML_LIBS=`$XML2_CONFIG --libs`
82660 -      LIBXML_INCS=`$XML2_CONFIG --cflags`
82661 -
82662 -  for ac_i in $LIBXML_LIBS; do
82663 -    case $ac_i in
82664 -    -pthread)
82665 -      if test "$ext_shared" = "yes"; then
82666 -        XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread"
82667 -      else
82668 -
82669 -
82670 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
82671 -
82672 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
82673 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
82674 -    eval "EXTRA_LDFLAGS$unique=set"
82675 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
82676 -  fi
82677 -
82678 -      fi
82679 -    ;;
82680 -    -l*)
82681 -      ac_ii=`echo $ac_i|cut -c 3-`
82682 -
82683 -
82684 -  case $ac_ii in
82685 -  c|c_r|pthread*) ;;
82686 -  *)
82687 -    if test "$ext_shared" = "yes"; then
82688 -        XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii"
82689 -    else
82690 -
82691 -
82692 -  case $ac_ii in
82693 -  c|c_r|pthread*) ;;
82694 -  *)
82695 -      LIBS="$LIBS -l$ac_ii"
82696 -   ;;
82697 -  esac
82698 -
82699 -
82700 -    fi
82701 -   ;;
82702 -  esac
82703 -
82704 -
82705 -    ;;
82706 -    -L*)
82707 -      ac_ii=`echo $ac_i|cut -c 3-`
82708 -
82709 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
82710 -
82711 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
82712 -    ai_p=$ac_ii
82713 -  else
82714 -
82715 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
82716 -
82717 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
82718 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
82719 -  fi
82720 -
82721 -
82722 -      if test "$ext_shared" = "yes"; then
82723 -        XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
82724 -        test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
82725 -      else
82726 -
82727 -
82728 -
82729 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
82730 -
82731 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
82732 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
82733 -    eval "LIBPATH$unique=set"
82734 -
82735 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
82736 -    LDFLAGS="$LDFLAGS -L$ai_p"
82737 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
82738 -
82739 -  fi
82740 -
82741 -
82742 -      fi
82743 -
82744 -  fi
82745 -
82746 -    ;;
82747 -    esac
82748 -  done
82749 -
82750 -
82751 -  for ac_i in $LIBXML_INCS; do
82752 -    case $ac_i in
82753 -    -I*)
82754 -      ac_ii=`echo $ac_i|cut -c 3-`
82755 -
82756 -  if test "$ac_ii" != "/usr/include"; then
82757 -
82758 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
82759 -    ai_p=$ac_ii
82760 -  else
82761 -
82762 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
82763 -
82764 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
82765 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
82766 -  fi
82767 -
82768 -
82769 -
82770 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
82771 -
82772 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
82773 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
82774 -    eval "INCLUDEPATH$unique=set"
82775 -
82776 -      if test ""; then
82777 -        INCLUDES="-I$ai_p $INCLUDES"
82778 -      else
82779 -        INCLUDES="$INCLUDES -I$ai_p"
82780 -      fi
82781 -
82782 -  fi
82783 -
82784 -  fi
82785 -
82786 -    ;;
82787 -    esac
82788 -  done
82789 -
82790 -
82791 -            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
82792 -echo "configure:99250: checking whether libxml build works" >&5
82793 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
82794 -  echo $ac_n "(cached) $ac_c" 1>&6
82795 -else
82796 -
82797 -
82798 -  old_LIBS=$LIBS
82799 -  LIBS="
82800 -          $XMLRPC_SHARED_LIBADD
82801 -         $LIBS"
82802 -  if test "$cross_compiling" = yes; then
82803 -
82804 -    LIBS=$old_LIBS
82805 -
82806 -else
82807 -  cat > conftest.$ac_ext <<EOF
82808 -#line 99266 "configure"
82809 -#include "confdefs.h"
82810 -
82811 -
82812 -    char xmlInitParser();
82813 -    int main() {
82814 -      xmlInitParser();
82815 -      return 0;
82816 -    }
82817 -
82818 -EOF
82819 -if { (eval echo configure:99277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
82820 -then
82821 -
82822 -    LIBS=$old_LIBS
82823 -
82824 -          php_cv_libxml_build_works=yes
82825 -
82826 -
82827 -else
82828 -  echo "configure: failed program was:" >&5
82829 -  cat conftest.$ac_ext >&5
82830 -  rm -fr conftest*
82831 -
82832 -    LIBS=$old_LIBS
82833 -
82834 -          echo "$ac_t""no" 1>&6
82835 -          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
82836 -
82837 -
82838 -fi
82839 -rm -fr conftest*
82840 -fi
82841 -
82842 -
82843 -
82844 -fi
82845 -
82846 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
82847 -      if test "$php_cv_libxml_build_works" = "yes"; then
82848 -        cat >> confdefs.h <<\EOF
82849 -#define HAVE_LIBXML 1
82850 -EOF
82851 -
82852 -      fi
82853 -
82854 -      if test "$PHP_XML" = "no"; then
82855 -
82856 -
82857 -  case ext/xml in
82858 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
82859 -  /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
82860 -  *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
82861 -  esac
82862 -
82863 -
82864 -
82865 -  b_c_pre=$php_c_pre
82866 -  b_cxx_pre=$php_cxx_pre
82867 -  b_c_meta=$php_c_meta
82868 -  b_cxx_meta=$php_cxx_meta
82869 -  b_c_post=$php_c_post
82870 -  b_cxx_post=$php_cxx_post
82871 -  b_lo=$php_lo
82872 -
82873 -
82874 -  old_IFS=$IFS
82875 -  for ac_src in compat.c; do
82876 -
82877 -      IFS=.
82878 -      set $ac_src
82879 -      ac_obj=$1
82880 -      IFS=$old_IFS
82881 -
82882 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
82883 -
82884 -      case $ac_src in
82885 -        *.c) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
82886 -        *.s) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
82887 -        *.S) ac_comp="$b_c_pre  $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
82888 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre  $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
82889 -      esac
82890 -
82891 -    cat >>Makefile.objects<<EOF
82892 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
82893 -       $ac_comp
82894 -EOF
82895 -  done
82896 -
82897 -
82898 -
82899 -
82900 -    BUILD_DIR="$BUILD_DIR ext/xml"
82901 -
82902 -
82903 -      fi
82904 -
82905 -    else
82906 -      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
82907 -    fi
82908 -else
82909 -      { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
82910 -
82911 -  fi
82912 -
82913 -  else
82914 -    testval=no
82915 -    for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
82916 -      if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
82917 -        cat >> confdefs.h <<\EOF
82918 -#define HAVE_LIBEXPAT 1
82919 -EOF
82920 -
82921 -
82922 -
82923 -  if test "$ext_shared" = "yes"; then
82924 -    XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD"
82925 -    if test -n "$i/$PHP_LIBDIR"; then
82926 -
82927 -  if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
82928 -
82929 -  if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
82930 -    ai_p=$i/$PHP_LIBDIR
82931 -  else
82932 -
82933 -    ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
82934 -
82935 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
82936 -    ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
82937 -  fi
82938 -
82939 -
82940 -      if test "$ext_shared" = "yes"; then
82941 -        XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
82942 -        test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
82943 -      else
82944 -
82945 -
82946 -
82947 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
82948 +
82949 +
82950 +echo "$ac_t""$ext_output" 1>&6
82951 +
82952 +
82953 +
82954 +
82955 +php_with_http_shared_deps=$PHP_HTTP
82956 +
82957 +echo $ac_n "checking whether to depend on extensions which have been built shared""... $ac_c" 1>&6
82958 +echo "configure:105459: checking whether to depend on extensions which have been built shared" >&5
82959 +# Check whether --with-http-shared-deps or --without-http-shared-deps was given.
82960 +if test "${with_http_shared_deps+set}" = set; then
82961 +  withval="$with_http_shared_deps"
82962 +  PHP_HTTP_SHARED_DEPS=$withval
82963 +else
82964
82965 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
82966 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
82967 -    eval "LIBPATH$unique=set"
82968 -
82969 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
82970 -    LDFLAGS="$LDFLAGS -L$ai_p"
82971 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
82972 +  PHP_HTTP_SHARED_DEPS=$PHP_HTTP
82973
82974 -  fi
82975
82976 +fi
82977
82978 -      fi
82979 -
82980 -  fi
82981
82982 -    fi
82983 -  else
82984 -
82985 +ext_output=$PHP_HTTP_SHARED_DEPS
82986 +echo "$ac_t""$ext_output" 1>&6
82987
82988 -  if test -n "$i/$PHP_LIBDIR"; then
82989 -
82990 -  if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
82991 -
82992 -  if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
82993 -    ai_p=$i/$PHP_LIBDIR
82994 -  else
82995 -
82996 -    ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
82997 -
82998 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
82999 -    ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
83000 -  fi
83001
83002 -
83003 -
83004 +
83005 +
83006 +php_with_http_curl_requests=$PHP_HTTP
83007 +
83008 +echo $ac_n "checking whether to enable cURL HTTP request support""... $ac_c" 1>&6
83009 +echo "configure:105481: checking whether to enable cURL HTTP request support" >&5
83010 +# Check whether --with-http-curl-requests or --without-http-curl-requests was given.
83011 +if test "${with_http_curl_requests+set}" = set; then
83012 +  withval="$with_http_curl_requests"
83013 +  PHP_HTTP_CURL_REQUESTS=$withval
83014 +else
83015
83016 +  PHP_HTTP_CURL_REQUESTS=$PHP_HTTP
83017
83018 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
83019 +
83020 +fi
83021 +
83022 +
83023 +ext_output=$PHP_HTTP_CURL_REQUESTS
83024 +echo "$ac_t""$ext_output" 1>&6
83025 +
83026 +
83027 +
83028 +
83029 +php_with_http_curl_libevent=$PHP_HTTP_CURL_REQUESTS
83030 +
83031 +echo $ac_n "checking whether to enable libevent support fur cURL""... $ac_c" 1>&6
83032 +echo "configure:105503: checking whether to enable libevent support fur cURL" >&5
83033 +# Check whether --with-http-curl-libevent or --without-http-curl-libevent was given.
83034 +if test "${with_http_curl_libevent+set}" = set; then
83035 +  withval="$with_http_curl_libevent"
83036 +  PHP_HTTP_CURL_LIBEVENT=$withval
83037 +else
83038
83039 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
83040 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
83041 -    eval "LIBPATH$unique=set"
83042 -
83043 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
83044 -    LDFLAGS="$LDFLAGS -L$ai_p"
83045 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
83046 +  PHP_HTTP_CURL_LIBEVENT=$PHP_HTTP_CURL_REQUESTS
83047
83048 -  fi
83049
83050 +fi
83051
83052 -
83053 -  fi
83054
83055 -  fi
83056 +ext_output=$PHP_HTTP_CURL_LIBEVENT
83057 +echo "$ac_t""$ext_output" 1>&6
83058 +
83059 +
83060 +
83061 +
83062 +php_with_http_zlib_compression=$PHP_HTTP
83063 +
83064 +echo $ac_n "checking whether to enable zlib encodings support""... $ac_c" 1>&6
83065 +echo "configure:105525: checking whether to enable zlib encodings support" >&5
83066 +# Check whether --with-http-zlib-compression or --without-http-zlib-compression was given.
83067 +if test "${with_http_zlib_compression+set}" = set; then
83068 +  withval="$with_http_zlib_compression"
83069 +  PHP_HTTP_ZLIB_COMPRESSION=$withval
83070 +else
83071
83072 +  PHP_HTTP_ZLIB_COMPRESSION=$PHP_HTTP
83073
83074 -  case expat in
83075 -  c|c_r|pthread*) ;;
83076 -  *)
83077 -      LIBS="-lexpat $LIBS"
83078 -   ;;
83079 -  esac
83080
83081 +fi
83082
83083
83084 +ext_output=$PHP_HTTP_ZLIB_COMPRESSION
83085 +echo "$ac_t""$ext_output" 1>&6
83086
83087 -  fi
83088
83089
83090 -
83091 -  if test "$i/include" != "/usr/include"; then
83092 -
83093 -  if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then
83094 -    ai_p=$i/include
83095 -  else
83096 -
83097 -    ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`"
83098 -
83099 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
83100 -    ai_p="$ep_realdir/`basename \"$i/include\"`"
83101 -  fi
83102
83103 -
83104 +php_with_http_magic_mime="no"
83105 +
83106 +echo $ac_n "checking whether to enable response content type guessing""... $ac_c" 1>&6
83107 +echo "configure:105547: checking whether to enable response content type guessing" >&5
83108 +# Check whether --with-http-magic-mime or --without-http-magic-mime was given.
83109 +if test "${with_http_magic_mime+set}" = set; then
83110 +  withval="$with_http_magic_mime"
83111 +  PHP_HTTP_MAGIC_MIME=$withval
83112 +else
83113
83114 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
83115 +  PHP_HTTP_MAGIC_MIME="no"
83116
83117 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
83118 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
83119 -    eval "INCLUDEPATH$unique=set"
83120 -
83121 -      if test ""; then
83122 -        INCLUDES="-I$ai_p $INCLUDES"
83123 -      else
83124 -        INCLUDES="$INCLUDES -I$ai_p"
83125 -      fi
83126 -
83127 -  fi
83128
83129 -  fi
83130 +fi
83131
83132 -        testval=yes
83133 -        break
83134 -      fi
83135 -    done
83136
83137 -    if test "$testval" = "no"; then
83138 -      { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" 1>&2; exit 1; }
83139 -    fi
83140 -  fi
83141 +ext_output=$PHP_HTTP_MAGIC_MIME
83142 +echo "$ac_t""$ext_output" 1>&6
83143
83144 -    if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then
83145
83146 -    if test "$PHP_ICONV_DIR" != "no"; then
83147 -      PHP_ICONV=$PHP_ICONV_DIR
83148 +
83149 +
83150 +if test "$PHP_HTTP" != "no"; then
83151 +
83152 +
83153 +               echo $ac_n "checking for egrep""... $ac_c" 1>&6
83154 +echo "configure:105570: checking for egrep" >&5
83155 +if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then
83156 +  echo $ac_n "(cached) $ac_c" 1>&6
83157 +else
83158 +  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
83159 +    then ac_cv_prog_egrep='grep -E'
83160 +    else ac_cv_prog_egrep='egrep'
83161      fi
83162 -
83163 -    if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
83164 -      PHP_ICONV=yes
83165 +fi
83166 +
83167 +echo "$ac_t""$ac_cv_prog_egrep" 1>&6
83168 + EGREP=$ac_cv_prog_egrep
83169 +
83170 +
83171 +
83172 +
83173 +
83174 +                       echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
83175 +echo "configure:105588: checking for a sed that does not truncate output" >&5
83176 +if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
83177 +  echo $ac_n "(cached) $ac_c" 1>&6
83178 +else
83179 +  # Loop through the user's path and test for sed and gsed.
83180 +# Then use that list of sed's as ones to test for truncation.
83181 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
83182 +for as_dir in $PATH
83183 +do
83184 +  IFS=$as_save_IFS
83185 +  test -z "$as_dir" && as_dir=.
83186 +  for lt_ac_prog in sed gsed; do
83187 +    for ac_exec_ext in '' $ac_executable_extensions; do
83188 +      if test -f "$as_dir/$lt_ac_prog$ac_exec_ext"; then
83189 +        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
83190 +      fi
83191 +    done
83192 +  done
83193 +done
83194 +lt_ac_max=0
83195 +lt_ac_count=0
83196 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris
83197 +# along with /bin/sed that truncates output.
83198 +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
83199 +  test ! -f $lt_ac_sed && continue
83200 +  cat /dev/null > conftest.in
83201 +  lt_ac_count=0
83202 +  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
83203 +  # Check for GNU sed and select it if it is found.
83204 +  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
83205 +    lt_cv_path_SED=$lt_ac_sed
83206 +    break
83207 +  fi
83208 +  while true; do
83209 +    cat conftest.in conftest.in >conftest.tmp
83210 +    mv conftest.tmp conftest.in
83211 +    cp conftest.in conftest.nl
83212 +    echo >>conftest.nl
83213 +    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
83214 +    cmp -s conftest.out conftest.nl || break
83215 +    # 10000 chars as input seems more than enough
83216 +    test $lt_ac_count -gt 10 && break
83217 +    lt_ac_count=`expr $lt_ac_count + 1`
83218 +    if test $lt_ac_count -gt $lt_ac_max; then
83219 +      lt_ac_max=$lt_ac_count
83220 +      lt_cv_path_SED=$lt_ac_sed
83221      fi
83222 -
83223 -
83224 -  found_iconv=no
83225 -  unset ICONV_DIR
83226 +  done
83227 +done
83228
83229 -  # Create the directories for a VPATH build:
83230 -  $php_shtool mkdir -p ext/iconv
83231 +fi
83232
83233 -  echo > ext/iconv/php_have_bsd_iconv.h
83234 -  echo > ext/iconv/php_have_ibm_iconv.h
83235 -  echo > ext/iconv/php_have_glibc_iconv.h
83236 -  echo > ext/iconv/php_have_libiconv.h
83237 -  echo > ext/iconv/php_have_iconv.h
83238 -  echo > ext/iconv/php_php_iconv_impl.h
83239 -  echo > ext/iconv/php_iconv_aliased_libiconv.h
83240 -  echo > ext/iconv/php_php_iconv_h_path.h
83241 -  echo > ext/iconv/php_iconv_supports_errno.h
83242 +SED=$lt_cv_path_SED
83243 +echo "$ac_t""$SED" 1>&6
83244
83245 -        if test "$PHP_ICONV" = "yes"; then
83246 -    echo $ac_n "checking for iconv""... $ac_c" 1>&6
83247 -echo "configure:99546: checking for iconv" >&5
83248 -if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
83249 +
83250 +
83251 +
83252 +       echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
83253 +echo "configure:105647: checking how to run the C preprocessor" >&5
83254 +# On Suns, sometimes $CPP names a directory.
83255 +if test -n "$CPP" && test -d "$CPP"; then
83256 +  CPP=
83257 +fi
83258 +if test -z "$CPP"; then
83259 +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
83260    echo $ac_n "(cached) $ac_c" 1>&6
83261  else
83262 +    # This must be in double quotes, not single quotes, because CPP may get
83263 +  # substituted into the Makefile and "${CC-cc}" will confuse make.
83264 +  CPP="${CC-cc} -E"
83265 +  # On the NeXT, cc -E runs the code through the compiler's parser,
83266 +  # not just through cpp.
83267    cat > conftest.$ac_ext <<EOF
83268 -#line 99551 "configure"
83269 +#line 105662 "configure"
83270  #include "confdefs.h"
83271 -/* System header to define __stub macros and hopefully few prototypes,
83272 -    which can conflict with char iconv(); below.  */
83273  #include <assert.h>
83274 -/* Override any gcc2 internal prototype to avoid an error.  */
83275 -/* We use char because int might match the return type of a gcc2
83276 -    builtin and then its argument prototype would still apply.  */
83277 -char iconv();
83278 +Syntax Error
83279 +EOF
83280 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
83281 +{ (eval echo configure:105668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
83282 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
83283 +if test -z "$ac_err"; then
83284 +  :
83285 +else
83286 +  echo "$ac_err" >&5
83287 +  echo "configure: failed program was:" >&5
83288 +  cat conftest.$ac_ext >&5
83289 +  rm -rf conftest*
83290 +  CPP="${CC-cc} -E -traditional-cpp"
83291 +  cat > conftest.$ac_ext <<EOF
83292 +#line 105679 "configure"
83293 +#include "confdefs.h"
83294 +#include <assert.h>
83295 +Syntax Error
83296 +EOF
83297 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
83298 +{ (eval echo configure:105685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
83299 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
83300 +if test -z "$ac_err"; then
83301 +  :
83302 +else
83303 +  echo "$ac_err" >&5
83304 +  echo "configure: failed program was:" >&5
83305 +  cat conftest.$ac_ext >&5
83306 +  rm -rf conftest*
83307 +  CPP="${CC-cc} -nologo -E"
83308 +  cat > conftest.$ac_ext <<EOF
83309 +#line 105696 "configure"
83310 +#include "confdefs.h"
83311 +#include <assert.h>
83312 +Syntax Error
83313 +EOF
83314 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
83315 +{ (eval echo configure:105702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
83316 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
83317 +if test -z "$ac_err"; then
83318 +  :
83319 +else
83320 +  echo "$ac_err" >&5
83321 +  echo "configure: failed program was:" >&5
83322 +  cat conftest.$ac_ext >&5
83323 +  rm -rf conftest*
83324 +  CPP=/lib/cpp
83325 +fi
83326 +rm -f conftest*
83327 +fi
83328 +rm -f conftest*
83329 +fi
83330 +rm -f conftest*
83331 +  ac_cv_prog_CPP="$CPP"
83332 +fi
83333 +  CPP="$ac_cv_prog_CPP"
83334 +else
83335 +  ac_cv_prog_CPP="$CPP"
83336 +fi
83337 +echo "$ac_t""$CPP" 1>&6
83338
83339 -int main() {
83340 +
83341 +       if test "$PHP_HTTP_SHARED_DEPS" != "no"; then
83342 +               cat >> confdefs.h <<\EOF
83343 +#define HTTP_SHARED_DEPS 1
83344 +EOF
83345
83346 -/* The GNU C library defines this for functions which it implements
83347 -    to always fail with ENOSYS.  Some functions are actually named
83348 -    something starting with __ and the normal name is an alias.  */
83349 -#if defined (__stub_iconv) || defined (__stub___iconv)
83350 -choke me
83351 -#else
83352 -iconv();
83353 -#endif
83354 +       else
83355 +               cat >> confdefs.h <<\EOF
83356 +#define HTTP_SHARED_DEPS 0
83357 +EOF
83358
83359 -; return 0; }
83360 +       fi
83361 +
83362 +
83363 +
83364 +
83365 +
83366 +                               if test "x$PHP_LIBDIR" = "x"; then
83367 +               PHP_LIBDIR=lib
83368 +       fi
83369 +
83370 +       for ac_hdr in netdb.h unistd.h
83371 +do
83372 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
83373 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
83374 +echo "configure:105751: checking for $ac_hdr" >&5
83375 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
83376 +  echo $ac_n "(cached) $ac_c" 1>&6
83377 +else
83378 +  cat > conftest.$ac_ext <<EOF
83379 +#line 105756 "configure"
83380 +#include "confdefs.h"
83381 +#include <$ac_hdr>
83382  EOF
83383 -if { (eval echo configure:99574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
83384 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
83385 +{ (eval echo configure:105761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
83386 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
83387 +if test -z "$ac_err"; then
83388    rm -rf conftest*
83389 -  eval "ac_cv_func_iconv=yes"
83390 +  eval "ac_cv_header_$ac_safe=yes"
83391  else
83392 +  echo "$ac_err" >&5
83393    echo "configure: failed program was:" >&5
83394    cat conftest.$ac_ext >&5
83395    rm -rf conftest*
83396 -  eval "ac_cv_func_iconv=no"
83397 +  eval "ac_cv_header_$ac_safe=no"
83398  fi
83399  rm -f conftest*
83400  fi
83401 -
83402 -if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
83403 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
83404    echo "$ac_t""yes" 1>&6
83405 -
83406 -      found_iconv=yes
83407 -
83408 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
83409 +  cat >> confdefs.h <<EOF
83410 +#define $ac_tr_hdr 1
83411 +EOF
83412 +
83413  else
83414    echo "$ac_t""no" 1>&6
83415 +fi
83416 +done
83417
83418 -      echo $ac_n "checking for libiconv""... $ac_c" 1>&6
83419 -echo "configure:99595: checking for libiconv" >&5
83420 -if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
83421 +
83422 +  unset ac_cv_func_gethostname
83423 +  unset ac_cv_func___gethostname
83424 +  unset found
83425 +
83426 +  echo $ac_n "checking for gethostname""... $ac_c" 1>&6
83427 +echo "configure:105793: checking for gethostname" >&5
83428 +if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
83429    echo $ac_n "(cached) $ac_c" 1>&6
83430  else
83431    cat > conftest.$ac_ext <<EOF
83432 -#line 99600 "configure"
83433 +#line 105798 "configure"
83434  #include "confdefs.h"
83435  /* System header to define __stub macros and hopefully few prototypes,
83436 -    which can conflict with char libiconv(); below.  */
83437 +    which can conflict with char gethostname(); below.  */
83438  #include <assert.h>
83439  /* Override any gcc2 internal prototype to avoid an error.  */
83440  /* We use char because int might match the return type of a gcc2
83441      builtin and then its argument prototype would still apply.  */
83442 -char libiconv();
83443 +char gethostname();
83444
83445  int main() {
83446
83447  /* The GNU C library defines this for functions which it implements
83448      to always fail with ENOSYS.  Some functions are actually named
83449      something starting with __ and the normal name is an alias.  */
83450 -#if defined (__stub_libiconv) || defined (__stub___libiconv)
83451 +#if defined (__stub_gethostname) || defined (__stub___gethostname)
83452  choke me
83453  #else
83454 -libiconv();
83455 +gethostname();
83456  #endif
83457
83458  ; return 0; }
83459  EOF
83460 -if { (eval echo configure:99623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
83461 +if { (eval echo configure:105821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
83462    rm -rf conftest*
83463 -  eval "ac_cv_func_libiconv=yes"
83464 +  eval "ac_cv_func_gethostname=yes"
83465  else
83466    echo "configure: failed program was:" >&5
83467    cat conftest.$ac_ext >&5
83468    rm -rf conftest*
83469 -  eval "ac_cv_func_libiconv=no"
83470 +  eval "ac_cv_func_gethostname=no"
83471  fi
83472  rm -f conftest*
83473  fi
83474
83475 -if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then
83476 +if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then
83477    echo "$ac_t""yes" 1>&6
83478 -
83479 -
83480 -  echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
83481 -
83482 -        cat >> confdefs.h <<\EOF
83483 -#define HAVE_LIBICONV 1
83484 -EOF
83485 -
83486 -        found_iconv=yes
83487 -
83488 +  found=yes
83489  else
83490    echo "$ac_t""no" 1>&6
83491 -fi
83492 -
83493 -
83494 -fi
83495 -
83496 -  fi
83497 -
83498 -        if test "$found_iconv" = "no"; then
83499 -
83500 -    for i in $PHP_ICONV /usr/local /usr; do
83501 -      if test -r $i/include/giconv.h; then
83502 -        cat >> confdefs.h <<\EOF
83503 -#define HAVE_GICONV_H 1
83504 -EOF
83505 -
83506 -        ICONV_DIR=$i
83507 -        iconv_lib_name=giconv
83508 -        break
83509 -      elif test -r $i/include/iconv.h; then
83510 -        ICONV_DIR=$i
83511 -        iconv_lib_name=iconv
83512 -        break
83513 -      fi
83514 -    done
83515 -
83516 -    if test -z "$ICONV_DIR"; then
83517 -      { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
83518 -    fi
83519 -
83520 -    if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
83521 -       test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
83522 -    then
83523 -
83524 -  save_old_LDFLAGS=$LDFLAGS
83525 -  ac_stuff="
83526 -        -L$ICONV_DIR/$PHP_LIBDIR
83527 -      "
83528 -
83529 -  save_ext_shared=$ext_shared
83530 -  ext_shared=yes
83531 -
83532 -  for ac_i in $ac_stuff; do
83533 -    case $ac_i in
83534 -    -pthread)
83535 -      if test "$ext_shared" = "yes"; then
83536 -        LDFLAGS="$LDFLAGS -pthread"
83537 -      else
83538 -
83539 -
83540 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
83541 -
83542 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
83543 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
83544 -    eval "EXTRA_LDFLAGS$unique=set"
83545 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
83546 -  fi
83547 -
83548 -      fi
83549 -    ;;
83550 -    -l*)
83551 -      ac_ii=`echo $ac_i|cut -c 3-`
83552 -
83553 -
83554 -  case $ac_ii in
83555 -  c|c_r|pthread*) ;;
83556 -  *)
83557 -    if test "$ext_shared" = "yes"; then
83558 -        LDFLAGS="$LDFLAGS -l$ac_ii"
83559 -    else
83560 -
83561 -
83562 -  case $ac_ii in
83563 -  c|c_r|pthread*) ;;
83564 -  *)
83565 -      LIBS="$LIBS -l$ac_ii"
83566 -   ;;
83567 -  esac
83568 -
83569 -
83570 -    fi
83571 -   ;;
83572 -  esac
83573 -
83574 + echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
83575 +echo "configure:105839: checking for __gethostname" >&5
83576 +if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then
83577 +  echo $ac_n "(cached) $ac_c" 1>&6
83578 +else
83579 +  cat > conftest.$ac_ext <<EOF
83580 +#line 105844 "configure"
83581 +#include "confdefs.h"
83582 +/* System header to define __stub macros and hopefully few prototypes,
83583 +    which can conflict with char __gethostname(); below.  */
83584 +#include <assert.h>
83585 +/* Override any gcc2 internal prototype to avoid an error.  */
83586 +/* We use char because int might match the return type of a gcc2
83587 +    builtin and then its argument prototype would still apply.  */
83588 +char __gethostname();
83589
83590 -    ;;
83591 -    -L*)
83592 -      ac_ii=`echo $ac_i|cut -c 3-`
83593 -
83594 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
83595 -
83596 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
83597 -    ai_p=$ac_ii
83598 -  else
83599 -
83600 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
83601 -
83602 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
83603 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
83604 -  fi
83605 +int main() {
83606
83607 -
83608 -      if test "$ext_shared" = "yes"; then
83609 -        LDFLAGS="-L$ai_p $LDFLAGS"
83610 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
83611 -      else
83612 -
83613 -
83614 -
83615 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
83616 -
83617 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
83618 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
83619 -    eval "LIBPATH$unique=set"
83620 -
83621 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
83622 -    LDFLAGS="$LDFLAGS -L$ai_p"
83623 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
83624 -
83625 -  fi
83626 +/* The GNU C library defines this for functions which it implements
83627 +    to always fail with ENOSYS.  Some functions are actually named
83628 +    something starting with __ and the normal name is an alias.  */
83629 +#if defined (__stub___gethostname) || defined (__stub_____gethostname)
83630 +choke me
83631 +#else
83632 +__gethostname();
83633 +#endif
83634
83635 +; return 0; }
83636 +EOF
83637 +if { (eval echo configure:105867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
83638 +  rm -rf conftest*
83639 +  eval "ac_cv_func___gethostname=yes"
83640 +else
83641 +  echo "configure: failed program was:" >&5
83642 +  cat conftest.$ac_ext >&5
83643 +  rm -rf conftest*
83644 +  eval "ac_cv_func___gethostname=no"
83645 +fi
83646 +rm -f conftest*
83647 +fi
83648
83649 -      fi
83650 -
83651 -  fi
83652 +if eval "test \"`echo '$ac_cv_func_'__gethostname`\" = yes"; then
83653 +  echo "$ac_t""yes" 1>&6
83654 +  found=yes
83655 +else
83656 +  echo "$ac_t""no" 1>&6
83657 +found=no
83658 +fi
83659 +
83660 +fi
83661
83662 -    ;;
83663 -    esac
83664 -  done
83665
83666 -  echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
83667 -echo "configure:99779: checking for libiconv in -l$iconv_lib_name" >&5
83668 -ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
83669 +  case $found in
83670 +  yes)
83671 +    cat >> confdefs.h <<\EOF
83672 +#define HAVE_GETHOSTNAME 1
83673 +EOF
83674 +
83675 +    ac_cv_func_gethostname=yes
83676 +  ;;
83677 +
83678 +    *)
83679 +
83680 +  unset ac_cv_lib_nsl_gethostname
83681 +  unset ac_cv_lib_nsl___gethostname
83682 +  unset found
83683 +  echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
83684 +echo "configure:105905: checking for gethostname in -lnsl" >&5
83685 +ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
83686  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
83687    echo $ac_n "(cached) $ac_c" 1>&6
83688  else
83689    ac_save_LIBS="$LIBS"
83690 -LIBS="-l$iconv_lib_name  $LIBS"
83691 +LIBS="-lnsl  $LIBS"
83692  cat > conftest.$ac_ext <<EOF
83693 -#line 99787 "configure"
83694 +#line 105913 "configure"
83695  #include "confdefs.h"
83696  /* Override any gcc2 internal prototype to avoid an error.  */
83697  /* We use char because int might match the return type of a gcc2
83698      builtin and then its argument prototype would still apply.  */
83699 -char libiconv();
83700 +char gethostname();
83701
83702  int main() {
83703 -libiconv()
83704 +gethostname()
83705  ; return 0; }
83706  EOF
83707 -if { (eval echo configure:99798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
83708 +if { (eval echo configure:105924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
83709    rm -rf conftest*
83710    eval "ac_cv_lib_$ac_lib_var=yes"
83711  else
83712 @@ -99809,152 +105935,31 @@ LIBS="$ac_save_LIBS"
83713  fi
83714  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
83715    echo "$ac_t""yes" 1>&6
83716 -
83717 -    LDFLAGS=$save_old_LDFLAGS
83718 -    ext_shared=$save_ext_shared
83719 -
83720 -        found_iconv=yes
83721 -
83722 -  echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
83723 -
83724 -        cat >> confdefs.h <<\EOF
83725 -#define HAVE_LIBICONV 1
83726 -EOF
83727 -
83728 -
83729 -  echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h
83730 -
83731 -        cat >> confdefs.h <<\EOF
83732 -#define ICONV_ALIASED_LIBICONV 1
83733 -EOF
83734 -
83735 -
83736 -
83737 +  found=yes
83738  else
83739    echo "$ac_t""no" 1>&6
83740
83741 -    LDFLAGS=$save_old_LDFLAGS
83742 -    ext_shared=$save_ext_shared
83743 -    unset ac_cv_lib_$iconv_lib_name_libiconv
83744 -
83745 -
83746 -  save_old_LDFLAGS=$LDFLAGS
83747 -  ac_stuff="
83748 -          -L$ICONV_DIR/$PHP_LIBDIR
83749 -        "
83750 -
83751 -  save_ext_shared=$ext_shared
83752 -  ext_shared=yes
83753 -
83754 -  for ac_i in $ac_stuff; do
83755 -    case $ac_i in
83756 -    -pthread)
83757 -      if test "$ext_shared" = "yes"; then
83758 -        LDFLAGS="$LDFLAGS -pthread"
83759 -      else
83760 -
83761 -
83762 -  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
83763 -
83764 -  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
83765 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
83766 -    eval "EXTRA_LDFLAGS$unique=set"
83767 -    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
83768 -  fi
83769 -
83770 -      fi
83771 -    ;;
83772 -    -l*)
83773 -      ac_ii=`echo $ac_i|cut -c 3-`
83774 -
83775 -
83776 -  case $ac_ii in
83777 -  c|c_r|pthread*) ;;
83778 -  *)
83779 -    if test "$ext_shared" = "yes"; then
83780 -        LDFLAGS="$LDFLAGS -l$ac_ii"
83781 -    else
83782 -
83783 -
83784 -  case $ac_ii in
83785 -  c|c_r|pthread*) ;;
83786 -  *)
83787 -      LIBS="$LIBS -l$ac_ii"
83788 -   ;;
83789 -  esac
83790 -
83791 -
83792 -    fi
83793 -   ;;
83794 -  esac
83795 -
83796 -
83797 -    ;;
83798 -    -L*)
83799 -      ac_ii=`echo $ac_i|cut -c 3-`
83800 -
83801 -  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
83802 -
83803 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
83804 -    ai_p=$ac_ii
83805 -  else
83806 -
83807 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
83808 -
83809 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
83810 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
83811 -  fi
83812 -
83813 -
83814 -      if test "$ext_shared" = "yes"; then
83815 -        LDFLAGS="-L$ai_p $LDFLAGS"
83816 -        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
83817 -      else
83818 -
83819 -
83820 -
83821 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
83822 -
83823 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
83824 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
83825 -    eval "LIBPATH$unique=set"
83826 -
83827 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
83828 -    LDFLAGS="$LDFLAGS -L$ai_p"
83829 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
83830 -
83831 -  fi
83832 -
83833 -
83834 -      fi
83835 -
83836 -  fi
83837 -
83838 -    ;;
83839 -    esac
83840 -  done
83841 -
83842 -  echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
83843 -echo "configure:99939: checking for iconv in -l$iconv_lib_name" >&5
83844 -ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
83845 +    echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
83846 +echo "configure:105944: checking for __gethostname in -lnsl" >&5
83847 +ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'`
83848  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
83849    echo $ac_n "(cached) $ac_c" 1>&6
83850  else
83851    ac_save_LIBS="$LIBS"
83852 -LIBS="-l$iconv_lib_name  $LIBS"
83853 +LIBS="-lnsl  $LIBS"
83854  cat > conftest.$ac_ext <<EOF
83855 -#line 99947 "configure"
83856 +#line 105952 "configure"
83857  #include "confdefs.h"
83858  /* Override any gcc2 internal prototype to avoid an error.  */
83859  /* We use char because int might match the return type of a gcc2
83860      builtin and then its argument prototype would still apply.  */
83861 -char iconv();
83862 +char __gethostname();
83863
83864  int main() {
83865 -iconv()
83866 +__gethostname()
83867  ; return 0; }
83868  EOF
83869 -if { (eval echo configure:99958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
83870 +if { (eval echo configure:105963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
83871    rm -rf conftest*
83872    eval "ac_cv_lib_$ac_lib_var=yes"
83873  else
83874 @@ -99969,1088 +105974,1259 @@ LIBS="$ac_save_LIBS"
83875  fi
83876  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
83877    echo "$ac_t""yes" 1>&6
83878 -
83879 -    LDFLAGS=$save_old_LDFLAGS
83880 -    ext_shared=$save_ext_shared
83881 -
83882 -          found_iconv=yes
83883 -
83884 -
83885 +  found=yes
83886  else
83887    echo "$ac_t""no" 1>&6
83888 -
83889 -    LDFLAGS=$save_old_LDFLAGS
83890 -    ext_shared=$save_ext_shared
83891 -    unset ac_cv_lib_$iconv_lib_name_iconv
83892 -
83893 -
83894 +found=no
83895  fi
83896
83897 -
83898
83899  fi
83900
83901 -    fi
83902 -  fi
83903 -
83904 -  if test "$found_iconv" = "yes"; then
83905 -
83906 -  echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h
83907
83908 -    cat >> confdefs.h <<\EOF
83909 -#define HAVE_ICONV 1
83910 +  if test "$found" = "yes"; then
83911 +    ac_libs=$LIBS
83912 +    LIBS="$LIBS -lnsl"
83913 +    if test "$cross_compiling" = yes; then
83914 +  found=no
83915 +else
83916 +  cat > conftest.$ac_ext <<EOF
83917 +#line 105995 "configure"
83918 +#include "confdefs.h"
83919 +main() { return (0); }
83920  EOF
83921 +if { (eval echo configure:105999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
83922 +then
83923 +  found=yes
83924 +else
83925 +  echo "configure: failed program was:" >&5
83926 +  cat conftest.$ac_ext >&5
83927 +  rm -fr conftest*
83928 +  found=no
83929 +fi
83930 +rm -fr conftest*
83931 +fi
83932
83933 -    if test -n "$ICONV_DIR"; then
83934 -
83935 -
83936 -  if test "$ext_shared" = "yes"; then
83937 -    XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD"
83938 -    if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
83939 -
83940 -  if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
83941 -
83942 -  if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
83943 -    ai_p=$ICONV_DIR/$PHP_LIBDIR
83944 -  else
83945 -
83946 -    ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
83947 -
83948 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
83949 -    ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
83950 -  fi
83951 -
83952 -
83953 -      if test "$ext_shared" = "yes"; then
83954 -        XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
83955 -        test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
83956 -      else
83957 -
83958 -
83959 -
83960 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
83961 -
83962 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
83963 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
83964 -    eval "LIBPATH$unique=set"
83965 -
83966 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
83967 -    LDFLAGS="$LDFLAGS -L$ai_p"
83968 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
83969 -
83970 -  fi
83971 -
83972 -
83973 -      fi
83974 -
83975 -  fi
83976 -
83977 -    fi
83978 -  else
83979 -
83980 -
83981 -  if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
83982 -
83983 -  if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
83984 -
83985 -  if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
83986 -    ai_p=$ICONV_DIR/$PHP_LIBDIR
83987 -  else
83988 -
83989 -    ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
83990 -
83991 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
83992 -    ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
83993 -  fi
83994 -
83995 -
83996 -
83997 -
83998 -
83999 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
84000 -
84001 -  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
84002 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
84003 -    eval "LIBPATH$unique=set"
84004 -
84005 -    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
84006 -    LDFLAGS="$LDFLAGS -L$ai_p"
84007 -    PHP_RPATHS="$PHP_RPATHS $ai_p"
84008 -
84009 +    LIBS=$ac_libs
84010    fi
84011
84012 -
84013 +  if test "$found" = "yes"; then
84014
84015 -  fi
84016 -
84017 -  fi
84018
84019 -
84020 -  case $iconv_lib_name in
84021 +  case nsl in
84022    c|c_r|pthread*) ;;
84023    *)
84024 -      LIBS="-l$iconv_lib_name $LIBS"
84025 +      LIBS="-lnsl $LIBS"
84026     ;;
84027    esac
84028
84029
84030 +    cat >> confdefs.h <<\EOF
84031 +#define HAVE_GETHOSTNAME 1
84032 +EOF
84033
84034 +    cat >> confdefs.h <<\EOF
84035 +#define HAVE_LIBNSL 1
84036 +EOF
84037
84038 -  fi
84039 -
84040 -
84041 -
84042 -  if test "$ICONV_DIR/include" != "/usr/include"; then
84043 -
84044 -  if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then
84045 -    ai_p=$ICONV_DIR/include
84046 +    ac_cv_func_gethostname=yes
84047    else
84048
84049 -    ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
84050 -
84051 -    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
84052 -    ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`"
84053 -  fi
84054 +  :
84055
84056 -
84057 +  fi
84058
84059 -  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
84060 + ;;
84061
84062 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
84063 -  if test -n "$unique" && test "`eval $cmd`" = "" ; then
84064 -    eval "INCLUDEPATH$unique=set"
84065 -
84066 -      if test ""; then
84067 -        INCLUDES="-I$ai_p $INCLUDES"
84068 -      else
84069 -        INCLUDES="$INCLUDES -I$ai_p"
84070 -      fi
84071 -
84072 -  fi
84073 +  esac
84074
84075 -  fi
84076 +
84077 +  unset ac_cv_func_getdomainname
84078 +  unset ac_cv_func___getdomainname
84079 +  unset found
84080 +
84081 +  echo $ac_n "checking for getdomainname""... $ac_c" 1>&6
84082 +echo "configure:106050: checking for getdomainname" >&5
84083 +if eval "test \"`echo '$''{'ac_cv_func_getdomainname'+set}'`\" = set"; then
84084 +  echo $ac_n "(cached) $ac_c" 1>&6
84085 +else
84086 +  cat > conftest.$ac_ext <<EOF
84087 +#line 106055 "configure"
84088 +#include "confdefs.h"
84089 +/* System header to define __stub macros and hopefully few prototypes,
84090 +    which can conflict with char getdomainname(); below.  */
84091 +#include <assert.h>
84092 +/* Override any gcc2 internal prototype to avoid an error.  */
84093 +/* We use char because int might match the return type of a gcc2
84094 +    builtin and then its argument prototype would still apply.  */
84095 +char getdomainname();
84096
84097 -    fi
84098 -
84099 -else
84100 -      { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; }
84101 -
84102 -  fi
84103 +int main() {
84104
84105 -  fi
84106 -fi
84107 +/* The GNU C library defines this for functions which it implements
84108 +    to always fail with ENOSYS.  Some functions are actually named
84109 +    something starting with __ and the normal name is an alias.  */
84110 +#if defined (__stub_getdomainname) || defined (__stub___getdomainname)
84111 +choke me
84112 +#else
84113 +getdomainname();
84114 +#endif
84115
84116 -if test "$PHP_XMLRPC" = "yes"; then
84117 -  # Extract the first word of "ranlib", so it can be a program name with args.
84118 -set dummy ranlib; ac_word=$2
84119 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
84120 -echo "configure:100148: checking for $ac_word" >&5
84121 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
84122 -  echo $ac_n "(cached) $ac_c" 1>&6
84123 -else
84124 -  if test -n "$RANLIB"; then
84125 -  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
84126 +; return 0; }
84127 +EOF
84128 +if { (eval echo configure:106078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84129 +  rm -rf conftest*
84130 +  eval "ac_cv_func_getdomainname=yes"
84131  else
84132 -  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
84133 -  ac_dummy="$PATH"
84134 -  for ac_dir in $ac_dummy; do
84135 -    test -z "$ac_dir" && ac_dir=.
84136 -    if test -f $ac_dir/$ac_word; then
84137 -      ac_cv_prog_RANLIB="ranlib"
84138 -      break
84139 -    fi
84140 -  done
84141 -  IFS="$ac_save_ifs"
84142 -  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
84143 +  echo "configure: failed program was:" >&5
84144 +  cat conftest.$ac_ext >&5
84145 +  rm -rf conftest*
84146 +  eval "ac_cv_func_getdomainname=no"
84147  fi
84148 +rm -f conftest*
84149  fi
84150 -RANLIB="$ac_cv_prog_RANLIB"
84151 -if test -n "$RANLIB"; then
84152 -  echo "$ac_t""$RANLIB" 1>&6
84153 +
84154 +if eval "test \"`echo '$ac_cv_func_'getdomainname`\" = yes"; then
84155 +  echo "$ac_t""yes" 1>&6
84156 +  found=yes
84157  else
84158    echo "$ac_t""no" 1>&6
84159 -fi
84160 -
84161 -echo $ac_n "checking for inline""... $ac_c" 1>&6
84162 -echo "configure:100176: checking for inline" >&5
84163 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
84164 + echo $ac_n "checking for __getdomainname""... $ac_c" 1>&6
84165 +echo "configure:106096: checking for __getdomainname" >&5
84166 +if eval "test \"`echo '$''{'ac_cv_func___getdomainname'+set}'`\" = set"; then
84167    echo $ac_n "(cached) $ac_c" 1>&6
84168  else
84169 -  ac_cv_c_inline=no
84170 -for ac_kw in inline __inline__ __inline; do
84171    cat > conftest.$ac_ext <<EOF
84172 -#line 100183 "configure"
84173 +#line 106101 "configure"
84174  #include "confdefs.h"
84175 +/* System header to define __stub macros and hopefully few prototypes,
84176 +    which can conflict with char __getdomainname(); below.  */
84177 +#include <assert.h>
84178 +/* Override any gcc2 internal prototype to avoid an error.  */
84179 +/* We use char because int might match the return type of a gcc2
84180 +    builtin and then its argument prototype would still apply.  */
84181 +char __getdomainname();
84182
84183  int main() {
84184 -} $ac_kw foo() {
84185 +
84186 +/* The GNU C library defines this for functions which it implements
84187 +    to always fail with ENOSYS.  Some functions are actually named
84188 +    something starting with __ and the normal name is an alias.  */
84189 +#if defined (__stub___getdomainname) || defined (__stub_____getdomainname)
84190 +choke me
84191 +#else
84192 +__getdomainname();
84193 +#endif
84194 +
84195  ; return 0; }
84196  EOF
84197 -if { (eval echo configure:100190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
84198 +if { (eval echo configure:106124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84199    rm -rf conftest*
84200 -  ac_cv_c_inline=$ac_kw; break
84201 +  eval "ac_cv_func___getdomainname=yes"
84202  else
84203    echo "configure: failed program was:" >&5
84204    cat conftest.$ac_ext >&5
84205 +  rm -rf conftest*
84206 +  eval "ac_cv_func___getdomainname=no"
84207  fi
84208  rm -f conftest*
84209 -done
84210 -
84211  fi
84212
84213 -echo "$ac_t""$ac_cv_c_inline" 1>&6
84214 -case "$ac_cv_c_inline" in
84215 -  inline | yes) ;;
84216 -  no) cat >> confdefs.h <<\EOF
84217 -#define inline
84218 -EOF
84219 - ;;
84220 -  *)  cat >> confdefs.h <<EOF
84221 -#define inline $ac_cv_c_inline
84222 -EOF
84223 - ;;
84224 -esac
84225 -
84226 -
84227 -
84228 -
84229 -
84230 +if eval "test \"`echo '$ac_cv_func_'__getdomainname`\" = yes"; then
84231 +  echo "$ac_t""yes" 1>&6
84232 +  found=yes
84233 +else
84234 +  echo "$ac_t""no" 1>&6
84235 +found=no
84236 +fi
84237 +
84238 +fi
84239
84240
84241 -cat >> confdefs.h <<\EOF
84242 -#define UNDEF_THREADS_HACK
84243 +  case $found in
84244 +  yes)
84245 +    cat >> confdefs.h <<\EOF
84246 +#define HAVE_GETDOMAINNAME 1
84247  EOF
84248
84249 -
84250 -
84251 -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
84252 -echo "configure:100228: checking for ANSI C header files" >&5
84253 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
84254 +    ac_cv_func_getdomainname=yes
84255 +  ;;
84256 +
84257 +    *)
84258 +
84259 +  unset ac_cv_lib_nsl_getdomainname
84260 +  unset ac_cv_lib_nsl___getdomainname
84261 +  unset found
84262 +  echo $ac_n "checking for getdomainname in -lnsl""... $ac_c" 1>&6
84263 +echo "configure:106162: checking for getdomainname in -lnsl" >&5
84264 +ac_lib_var=`echo nsl'_'getdomainname | sed 'y%./+-%__p_%'`
84265 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
84266    echo $ac_n "(cached) $ac_c" 1>&6
84267  else
84268 -  cat > conftest.$ac_ext <<EOF
84269 -#line 100233 "configure"
84270 -#include "confdefs.h"
84271 -#include <stdlib.h>
84272 -#include <stdarg.h>
84273 -#include <string.h>
84274 -#include <float.h>
84275 -EOF
84276 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
84277 -{ (eval echo configure:100241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
84278 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
84279 -if test -z "$ac_err"; then
84280 -  rm -rf conftest*
84281 -  ac_cv_header_stdc=yes
84282 -else
84283 -  echo "$ac_err" >&5
84284 -  echo "configure: failed program was:" >&5
84285 -  cat conftest.$ac_ext >&5
84286 -  rm -rf conftest*
84287 -  ac_cv_header_stdc=no
84288 -fi
84289 -rm -f conftest*
84290 -
84291 -if test $ac_cv_header_stdc = yes; then
84292 -  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
84293 +  ac_save_LIBS="$LIBS"
84294 +LIBS="-lnsl  $LIBS"
84295  cat > conftest.$ac_ext <<EOF
84296 -#line 100258 "configure"
84297 +#line 106170 "configure"
84298  #include "confdefs.h"
84299 -#include <string.h>
84300 +/* Override any gcc2 internal prototype to avoid an error.  */
84301 +/* We use char because int might match the return type of a gcc2
84302 +    builtin and then its argument prototype would still apply.  */
84303 +char getdomainname();
84304 +
84305 +int main() {
84306 +getdomainname()
84307 +; return 0; }
84308  EOF
84309 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
84310 -  egrep "memchr" >/dev/null 2>&1; then
84311 -  :
84312 +if { (eval echo configure:106181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84313 +  rm -rf conftest*
84314 +  eval "ac_cv_lib_$ac_lib_var=yes"
84315  else
84316 +  echo "configure: failed program was:" >&5
84317 +  cat conftest.$ac_ext >&5
84318    rm -rf conftest*
84319 -  ac_cv_header_stdc=no
84320 +  eval "ac_cv_lib_$ac_lib_var=no"
84321  fi
84322  rm -f conftest*
84323 +LIBS="$ac_save_LIBS"
84324
84325  fi
84326 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
84327 +  echo "$ac_t""yes" 1>&6
84328 +  found=yes
84329 +else
84330 +  echo "$ac_t""no" 1>&6
84331
84332 -if test $ac_cv_header_stdc = yes; then
84333 -  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
84334 +    echo $ac_n "checking for __getdomainname in -lnsl""... $ac_c" 1>&6
84335 +echo "configure:106201: checking for __getdomainname in -lnsl" >&5
84336 +ac_lib_var=`echo nsl'_'__getdomainname | sed 'y%./+-%__p_%'`
84337 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
84338 +  echo $ac_n "(cached) $ac_c" 1>&6
84339 +else
84340 +  ac_save_LIBS="$LIBS"
84341 +LIBS="-lnsl  $LIBS"
84342  cat > conftest.$ac_ext <<EOF
84343 -#line 100276 "configure"
84344 +#line 106209 "configure"
84345  #include "confdefs.h"
84346 -#include <stdlib.h>
84347 +/* Override any gcc2 internal prototype to avoid an error.  */
84348 +/* We use char because int might match the return type of a gcc2
84349 +    builtin and then its argument prototype would still apply.  */
84350 +char __getdomainname();
84351 +
84352 +int main() {
84353 +__getdomainname()
84354 +; return 0; }
84355  EOF
84356 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
84357 -  egrep "free" >/dev/null 2>&1; then
84358 -  :
84359 +if { (eval echo configure:106220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84360 +  rm -rf conftest*
84361 +  eval "ac_cv_lib_$ac_lib_var=yes"
84362  else
84363 +  echo "configure: failed program was:" >&5
84364 +  cat conftest.$ac_ext >&5
84365    rm -rf conftest*
84366 -  ac_cv_header_stdc=no
84367 +  eval "ac_cv_lib_$ac_lib_var=no"
84368  fi
84369  rm -f conftest*
84370 +LIBS="$ac_save_LIBS"
84371
84372  fi
84373 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
84374 +  echo "$ac_t""yes" 1>&6
84375 +  found=yes
84376 +else
84377 +  echo "$ac_t""no" 1>&6
84378 +found=no
84379 +fi
84380
84381 -if test $ac_cv_header_stdc = yes; then
84382 -  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
84383 -if test "$cross_compiling" = yes; then
84384 -  :
84385 +
84386 +fi
84387 +
84388 +
84389 +  if test "$found" = "yes"; then
84390 +    ac_libs=$LIBS
84391 +    LIBS="$LIBS -lnsl"
84392 +    if test "$cross_compiling" = yes; then
84393 +  found=no
84394  else
84395    cat > conftest.$ac_ext <<EOF
84396 -#line 100297 "configure"
84397 +#line 106252 "configure"
84398  #include "confdefs.h"
84399 -#include <ctype.h>
84400 -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
84401 -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
84402 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
84403 -int main () { int i; for (i = 0; i < 256; i++)
84404 -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
84405 -exit (0); }
84406 -
84407 +main() { return (0); }
84408  EOF
84409 -if { (eval echo configure:100308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
84410 +if { (eval echo configure:106256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
84411  then
84412 -  :
84413 +  found=yes
84414  else
84415    echo "configure: failed program was:" >&5
84416    cat conftest.$ac_ext >&5
84417    rm -fr conftest*
84418 -  ac_cv_header_stdc=no
84419 +  found=no
84420  fi
84421  rm -fr conftest*
84422  fi
84423
84424 -fi
84425 -fi
84426 +    LIBS=$ac_libs
84427 +  fi
84428
84429 -echo "$ac_t""$ac_cv_header_stdc" 1>&6
84430 -if test $ac_cv_header_stdc = yes; then
84431 -  cat >> confdefs.h <<\EOF
84432 -#define STDC_HEADERS 1
84433 +  if test "$found" = "yes"; then
84434 +
84435 +
84436 +  case nsl in
84437 +  c|c_r|pthread*) ;;
84438 +  *)
84439 +      LIBS="-lnsl $LIBS"
84440 +   ;;
84441 +  esac
84442 +
84443 +
84444 +    cat >> confdefs.h <<\EOF
84445 +#define HAVE_GETDOMAINNAME 1
84446  EOF
84447
84448 -fi
84449 +    cat >> confdefs.h <<\EOF
84450 +#define HAVE_LIBNSL 1
84451 +EOF
84452
84453 -for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h
84454 -do
84455 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
84456 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
84457 -echo "configure:100335: checking for $ac_hdr" >&5
84458 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
84459 +    ac_cv_func_getdomainname=yes
84460 +  else
84461 +
84462 +  :
84463 +
84464 +  fi
84465 +
84466 + ;;
84467 +
84468 +  esac
84469 +
84470 +
84471 +  unset ac_cv_func_getservbyport
84472 +  unset ac_cv_func___getservbyport
84473 +  unset found
84474 +
84475 +  echo $ac_n "checking for getservbyport""... $ac_c" 1>&6
84476 +echo "configure:106307: checking for getservbyport" >&5
84477 +if eval "test \"`echo '$''{'ac_cv_func_getservbyport'+set}'`\" = set"; then
84478    echo $ac_n "(cached) $ac_c" 1>&6
84479  else
84480    cat > conftest.$ac_ext <<EOF
84481 -#line 100340 "configure"
84482 +#line 106312 "configure"
84483  #include "confdefs.h"
84484 -#include <$ac_hdr>
84485 +/* System header to define __stub macros and hopefully few prototypes,
84486 +    which can conflict with char getservbyport(); below.  */
84487 +#include <assert.h>
84488 +/* Override any gcc2 internal prototype to avoid an error.  */
84489 +/* We use char because int might match the return type of a gcc2
84490 +    builtin and then its argument prototype would still apply.  */
84491 +char getservbyport();
84492 +
84493 +int main() {
84494 +
84495 +/* The GNU C library defines this for functions which it implements
84496 +    to always fail with ENOSYS.  Some functions are actually named
84497 +    something starting with __ and the normal name is an alias.  */
84498 +#if defined (__stub_getservbyport) || defined (__stub___getservbyport)
84499 +choke me
84500 +#else
84501 +getservbyport();
84502 +#endif
84503 +
84504 +; return 0; }
84505  EOF
84506 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
84507 -{ (eval echo configure:100345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
84508 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
84509 -if test -z "$ac_err"; then
84510 +if { (eval echo configure:106335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84511    rm -rf conftest*
84512 -  eval "ac_cv_header_$ac_safe=yes"
84513 +  eval "ac_cv_func_getservbyport=yes"
84514  else
84515 -  echo "$ac_err" >&5
84516    echo "configure: failed program was:" >&5
84517    cat conftest.$ac_ext >&5
84518    rm -rf conftest*
84519 -  eval "ac_cv_header_$ac_safe=no"
84520 +  eval "ac_cv_func_getservbyport=no"
84521  fi
84522  rm -f conftest*
84523  fi
84524 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
84525 +
84526 +if eval "test \"`echo '$ac_cv_func_'getservbyport`\" = yes"; then
84527    echo "$ac_t""yes" 1>&6
84528 -    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
84529 -  cat >> confdefs.h <<EOF
84530 -#define $ac_tr_hdr 1
84531 -EOF
84532 -
84533 +  found=yes
84534  else
84535    echo "$ac_t""no" 1>&6
84536 -fi
84537 -done
84538 -
84539 -
84540 -
84541 -
84542 -
84543 -
84544 -echo $ac_n "checking size of char""... $ac_c" 1>&6
84545 -echo "configure:100377: checking size of char" >&5
84546 -if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
84547 + echo $ac_n "checking for __getservbyport""... $ac_c" 1>&6
84548 +echo "configure:106353: checking for __getservbyport" >&5
84549 +if eval "test \"`echo '$''{'ac_cv_func___getservbyport'+set}'`\" = set"; then
84550    echo $ac_n "(cached) $ac_c" 1>&6
84551  else
84552 -  if test "$cross_compiling" = yes; then
84553 -  ac_cv_sizeof_char=1
84554 -else
84555    cat > conftest.$ac_ext <<EOF
84556 -#line 100385 "configure"
84557 +#line 106358 "configure"
84558  #include "confdefs.h"
84559 -#include <stdio.h>
84560 -int main()
84561 -{
84562 -  FILE *f=fopen("conftestval", "w");
84563 -  if (!f) return(1);
84564 -  fprintf(f, "%d\n", sizeof(char));
84565 -  return(0);
84566 -}
84567 +/* System header to define __stub macros and hopefully few prototypes,
84568 +    which can conflict with char __getservbyport(); below.  */
84569 +#include <assert.h>
84570 +/* Override any gcc2 internal prototype to avoid an error.  */
84571 +/* We use char because int might match the return type of a gcc2
84572 +    builtin and then its argument prototype would still apply.  */
84573 +char __getservbyport();
84574 +
84575 +int main() {
84576 +
84577 +/* The GNU C library defines this for functions which it implements
84578 +    to always fail with ENOSYS.  Some functions are actually named
84579 +    something starting with __ and the normal name is an alias.  */
84580 +#if defined (__stub___getservbyport) || defined (__stub_____getservbyport)
84581 +choke me
84582 +#else
84583 +__getservbyport();
84584 +#endif
84585 +
84586 +; return 0; }
84587  EOF
84588 -if { (eval echo configure:100396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
84589 -then
84590 -  ac_cv_sizeof_char=`cat conftestval`
84591 +if { (eval echo configure:106381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84592 +  rm -rf conftest*
84593 +  eval "ac_cv_func___getservbyport=yes"
84594  else
84595    echo "configure: failed program was:" >&5
84596    cat conftest.$ac_ext >&5
84597 -  rm -fr conftest*
84598 -  ac_cv_sizeof_char=0
84599 +  rm -rf conftest*
84600 +  eval "ac_cv_func___getservbyport=no"
84601  fi
84602 -rm -fr conftest*
84603 +rm -f conftest*
84604  fi
84605
84606 +if eval "test \"`echo '$ac_cv_func_'__getservbyport`\" = yes"; then
84607 +  echo "$ac_t""yes" 1>&6
84608 +  found=yes
84609 +else
84610 +  echo "$ac_t""no" 1>&6
84611 +found=no
84612 +fi
84613 +
84614  fi
84615 -echo "$ac_t""$ac_cv_sizeof_char" 1>&6
84616 -cat >> confdefs.h <<EOF
84617 -#define SIZEOF_CHAR $ac_cv_sizeof_char
84618 -EOF
84619
84620
84621 +  case $found in
84622 +  yes)
84623 +    cat >> confdefs.h <<\EOF
84624 +#define HAVE_GETSERVBYPORT 1
84625 +EOF
84626
84627 -echo $ac_n "checking size of int""... $ac_c" 1>&6
84628 -echo "configure:100417: checking size of int" >&5
84629 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
84630 +    ac_cv_func_getservbyport=yes
84631 +  ;;
84632 +
84633 +    *)
84634 +
84635 +  unset ac_cv_lib_nsl_getservbyport
84636 +  unset ac_cv_lib_nsl___getservbyport
84637 +  unset found
84638 +  echo $ac_n "checking for getservbyport in -lnsl""... $ac_c" 1>&6
84639 +echo "configure:106419: checking for getservbyport in -lnsl" >&5
84640 +ac_lib_var=`echo nsl'_'getservbyport | sed 'y%./+-%__p_%'`
84641 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
84642    echo $ac_n "(cached) $ac_c" 1>&6
84643  else
84644 -  if test "$cross_compiling" = yes; then
84645 -  ac_cv_sizeof_int=4
84646 -else
84647 -  cat > conftest.$ac_ext <<EOF
84648 -#line 100425 "configure"
84649 +  ac_save_LIBS="$LIBS"
84650 +LIBS="-lnsl  $LIBS"
84651 +cat > conftest.$ac_ext <<EOF
84652 +#line 106427 "configure"
84653  #include "confdefs.h"
84654 -#include <stdio.h>
84655 -int main()
84656 -{
84657 -  FILE *f=fopen("conftestval", "w");
84658 -  if (!f) return(1);
84659 -  fprintf(f, "%d\n", sizeof(int));
84660 -  return(0);
84661 -}
84662 +/* Override any gcc2 internal prototype to avoid an error.  */
84663 +/* We use char because int might match the return type of a gcc2
84664 +    builtin and then its argument prototype would still apply.  */
84665 +char getservbyport();
84666 +
84667 +int main() {
84668 +getservbyport()
84669 +; return 0; }
84670  EOF
84671 -if { (eval echo configure:100436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
84672 -then
84673 -  ac_cv_sizeof_int=`cat conftestval`
84674 +if { (eval echo configure:106438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84675 +  rm -rf conftest*
84676 +  eval "ac_cv_lib_$ac_lib_var=yes"
84677  else
84678    echo "configure: failed program was:" >&5
84679    cat conftest.$ac_ext >&5
84680 -  rm -fr conftest*
84681 -  ac_cv_sizeof_int=0
84682 -fi
84683 -rm -fr conftest*
84684 +  rm -rf conftest*
84685 +  eval "ac_cv_lib_$ac_lib_var=no"
84686  fi
84687 +rm -f conftest*
84688 +LIBS="$ac_save_LIBS"
84689
84690  fi
84691 -echo "$ac_t""$ac_cv_sizeof_int" 1>&6
84692 -cat >> confdefs.h <<EOF
84693 -#define SIZEOF_INT $ac_cv_sizeof_int
84694 -EOF
84695 -
84696 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
84697 +  echo "$ac_t""yes" 1>&6
84698 +  found=yes
84699 +else
84700 +  echo "$ac_t""no" 1>&6
84701
84702 -echo $ac_n "checking size of long""... $ac_c" 1>&6
84703 -echo "configure:100456: checking size of long" >&5
84704 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
84705 +    echo $ac_n "checking for __getservbyport in -lnsl""... $ac_c" 1>&6
84706 +echo "configure:106458: checking for __getservbyport in -lnsl" >&5
84707 +ac_lib_var=`echo nsl'_'__getservbyport | sed 'y%./+-%__p_%'`
84708 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
84709    echo $ac_n "(cached) $ac_c" 1>&6
84710  else
84711 -  if test "$cross_compiling" = yes; then
84712 -  ac_cv_sizeof_long=4
84713 -else
84714 -  cat > conftest.$ac_ext <<EOF
84715 -#line 100464 "configure"
84716 +  ac_save_LIBS="$LIBS"
84717 +LIBS="-lnsl  $LIBS"
84718 +cat > conftest.$ac_ext <<EOF
84719 +#line 106466 "configure"
84720  #include "confdefs.h"
84721 -#include <stdio.h>
84722 -int main()
84723 -{
84724 -  FILE *f=fopen("conftestval", "w");
84725 -  if (!f) return(1);
84726 -  fprintf(f, "%d\n", sizeof(long));
84727 -  return(0);
84728 -}
84729 +/* Override any gcc2 internal prototype to avoid an error.  */
84730 +/* We use char because int might match the return type of a gcc2
84731 +    builtin and then its argument prototype would still apply.  */
84732 +char __getservbyport();
84733 +
84734 +int main() {
84735 +__getservbyport()
84736 +; return 0; }
84737  EOF
84738 -if { (eval echo configure:100475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
84739 -then
84740 -  ac_cv_sizeof_long=`cat conftestval`
84741 +if { (eval echo configure:106477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84742 +  rm -rf conftest*
84743 +  eval "ac_cv_lib_$ac_lib_var=yes"
84744  else
84745    echo "configure: failed program was:" >&5
84746    cat conftest.$ac_ext >&5
84747 -  rm -fr conftest*
84748 -  ac_cv_sizeof_long=0
84749 +  rm -rf conftest*
84750 +  eval "ac_cv_lib_$ac_lib_var=no"
84751  fi
84752 -rm -fr conftest*
84753 +rm -f conftest*
84754 +LIBS="$ac_save_LIBS"
84755 +
84756 +fi
84757 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
84758 +  echo "$ac_t""yes" 1>&6
84759 +  found=yes
84760 +else
84761 +  echo "$ac_t""no" 1>&6
84762 +found=no
84763  fi
84764
84765 +
84766  fi
84767 -echo "$ac_t""$ac_cv_sizeof_long" 1>&6
84768 -cat >> confdefs.h <<EOF
84769 -#define SIZEOF_LONG $ac_cv_sizeof_long
84770 -EOF
84771
84772
84773 -echo $ac_n "checking size of long long""... $ac_c" 1>&6
84774 -echo "configure:100495: checking size of long long" >&5
84775 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
84776 -  echo $ac_n "(cached) $ac_c" 1>&6
84777 -else
84778 -  if test "$cross_compiling" = yes; then
84779 -  ac_cv_sizeof_long_long=8
84780 +  if test "$found" = "yes"; then
84781 +    ac_libs=$LIBS
84782 +    LIBS="$LIBS -lnsl"
84783 +    if test "$cross_compiling" = yes; then
84784 +  found=no
84785  else
84786    cat > conftest.$ac_ext <<EOF
84787 -#line 100503 "configure"
84788 +#line 106509 "configure"
84789  #include "confdefs.h"
84790 -#include <stdio.h>
84791 -int main()
84792 -{
84793 -  FILE *f=fopen("conftestval", "w");
84794 -  if (!f) return(1);
84795 -  fprintf(f, "%d\n", sizeof(long long));
84796 -  return(0);
84797 -}
84798 +main() { return (0); }
84799  EOF
84800 -if { (eval echo configure:100514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
84801 +if { (eval echo configure:106513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
84802  then
84803 -  ac_cv_sizeof_long_long=`cat conftestval`
84804 +  found=yes
84805  else
84806    echo "configure: failed program was:" >&5
84807    cat conftest.$ac_ext >&5
84808    rm -fr conftest*
84809 -  ac_cv_sizeof_long_long=0
84810 +  found=no
84811  fi
84812  rm -fr conftest*
84813  fi
84814
84815 -fi
84816 -echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
84817 -cat >> confdefs.h <<EOF
84818 -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
84819 +    LIBS=$ac_libs
84820 +  fi
84821 +
84822 +  if test "$found" = "yes"; then
84823 +
84824 +
84825 +  case nsl in
84826 +  c|c_r|pthread*) ;;
84827 +  *)
84828 +      LIBS="-lnsl $LIBS"
84829 +   ;;
84830 +  esac
84831 +
84832 +
84833 +    cat >> confdefs.h <<\EOF
84834 +#define HAVE_GETSERVBYPORT 1
84835  EOF
84836
84837 +    cat >> confdefs.h <<\EOF
84838 +#define HAVE_LIBNSL 1
84839 +EOF
84840
84841 -echo $ac_n "checking for size_t""... $ac_c" 1>&6
84842 -echo "configure:100534: checking for size_t" >&5
84843 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
84844 +    ac_cv_func_getservbyport=yes
84845 +  else
84846 +
84847 +  :
84848 +
84849 +  fi
84850 +
84851 + ;;
84852 +
84853 +  esac
84854 +
84855 +
84856 +  unset ac_cv_func_getservbyname
84857 +  unset ac_cv_func___getservbyname
84858 +  unset found
84859 +
84860 +  echo $ac_n "checking for getservbyname""... $ac_c" 1>&6
84861 +echo "configure:106564: checking for getservbyname" >&5
84862 +if eval "test \"`echo '$''{'ac_cv_func_getservbyname'+set}'`\" = set"; then
84863    echo $ac_n "(cached) $ac_c" 1>&6
84864  else
84865    cat > conftest.$ac_ext <<EOF
84866 -#line 100539 "configure"
84867 +#line 106569 "configure"
84868  #include "confdefs.h"
84869 -#include <sys/types.h>
84870 -#if STDC_HEADERS
84871 -#include <stdlib.h>
84872 -#include <stddef.h>
84873 +/* System header to define __stub macros and hopefully few prototypes,
84874 +    which can conflict with char getservbyname(); below.  */
84875 +#include <assert.h>
84876 +/* Override any gcc2 internal prototype to avoid an error.  */
84877 +/* We use char because int might match the return type of a gcc2
84878 +    builtin and then its argument prototype would still apply.  */
84879 +char getservbyname();
84880 +
84881 +int main() {
84882 +
84883 +/* The GNU C library defines this for functions which it implements
84884 +    to always fail with ENOSYS.  Some functions are actually named
84885 +    something starting with __ and the normal name is an alias.  */
84886 +#if defined (__stub_getservbyname) || defined (__stub___getservbyname)
84887 +choke me
84888 +#else
84889 +getservbyname();
84890  #endif
84891 +
84892 +; return 0; }
84893  EOF
84894 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
84895 -  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
84896 +if { (eval echo configure:106592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84897    rm -rf conftest*
84898 -  ac_cv_type_size_t=yes
84899 +  eval "ac_cv_func_getservbyname=yes"
84900  else
84901 +  echo "configure: failed program was:" >&5
84902 +  cat conftest.$ac_ext >&5
84903    rm -rf conftest*
84904 -  ac_cv_type_size_t=no
84905 +  eval "ac_cv_func_getservbyname=no"
84906  fi
84907  rm -f conftest*
84908 -
84909 -fi
84910 -echo "$ac_t""$ac_cv_type_size_t" 1>&6
84911 -if test $ac_cv_type_size_t = no; then
84912 -  cat >> confdefs.h <<\EOF
84913 -#define size_t unsigned
84914 -EOF
84915 -
84916  fi
84917
84918 -echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
84919 -echo "configure:100567: checking whether time.h and sys/time.h may both be included" >&5
84920 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
84921 +if eval "test \"`echo '$ac_cv_func_'getservbyname`\" = yes"; then
84922 +  echo "$ac_t""yes" 1>&6
84923 +  found=yes
84924 +else
84925 +  echo "$ac_t""no" 1>&6
84926 + echo $ac_n "checking for __getservbyname""... $ac_c" 1>&6
84927 +echo "configure:106610: checking for __getservbyname" >&5
84928 +if eval "test \"`echo '$''{'ac_cv_func___getservbyname'+set}'`\" = set"; then
84929    echo $ac_n "(cached) $ac_c" 1>&6
84930  else
84931    cat > conftest.$ac_ext <<EOF
84932 -#line 100572 "configure"
84933 +#line 106615 "configure"
84934  #include "confdefs.h"
84935 -#include <sys/types.h>
84936 -#include <sys/time.h>
84937 -#include <time.h>
84938 +/* System header to define __stub macros and hopefully few prototypes,
84939 +    which can conflict with char __getservbyname(); below.  */
84940 +#include <assert.h>
84941 +/* Override any gcc2 internal prototype to avoid an error.  */
84942 +/* We use char because int might match the return type of a gcc2
84943 +    builtin and then its argument prototype would still apply.  */
84944 +char __getservbyname();
84945 +
84946  int main() {
84947 -struct tm *tp;
84948 +
84949 +/* The GNU C library defines this for functions which it implements
84950 +    to always fail with ENOSYS.  Some functions are actually named
84951 +    something starting with __ and the normal name is an alias.  */
84952 +#if defined (__stub___getservbyname) || defined (__stub_____getservbyname)
84953 +choke me
84954 +#else
84955 +__getservbyname();
84956 +#endif
84957 +
84958  ; return 0; }
84959  EOF
84960 -if { (eval echo configure:100581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
84961 +if { (eval echo configure:106638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
84962    rm -rf conftest*
84963 -  ac_cv_header_time=yes
84964 +  eval "ac_cv_func___getservbyname=yes"
84965  else
84966    echo "configure: failed program was:" >&5
84967    cat conftest.$ac_ext >&5
84968    rm -rf conftest*
84969 -  ac_cv_header_time=no
84970 +  eval "ac_cv_func___getservbyname=no"
84971  fi
84972  rm -f conftest*
84973  fi
84974
84975 -echo "$ac_t""$ac_cv_header_time" 1>&6
84976 -if test $ac_cv_header_time = yes; then
84977 -  cat >> confdefs.h <<\EOF
84978 -#define TIME_WITH_SYS_TIME 1
84979 -EOF
84980 -
84981 +if eval "test \"`echo '$ac_cv_func_'__getservbyname`\" = yes"; then
84982 +  echo "$ac_t""yes" 1>&6
84983 +  found=yes
84984 +else
84985 +  echo "$ac_t""no" 1>&6
84986 +found=no
84987 +fi
84988 +
84989  fi
84990
84991 -echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
84992 -echo "configure:100602: checking for uid_t in sys/types.h" >&5
84993 -if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
84994 +
84995 +  case $found in
84996 +  yes)
84997 +    cat >> confdefs.h <<\EOF
84998 +#define HAVE_GETSERVBYNAME 1
84999 +EOF
85000 +
85001 +    ac_cv_func_getservbyname=yes
85002 +  ;;
85003 +
85004 +    *)
85005 +
85006 +  unset ac_cv_lib_nsl_getservbyname
85007 +  unset ac_cv_lib_nsl___getservbyname
85008 +  unset found
85009 +  echo $ac_n "checking for getservbyname in -lnsl""... $ac_c" 1>&6
85010 +echo "configure:106676: checking for getservbyname in -lnsl" >&5
85011 +ac_lib_var=`echo nsl'_'getservbyname | sed 'y%./+-%__p_%'`
85012 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
85013    echo $ac_n "(cached) $ac_c" 1>&6
85014  else
85015 -  cat > conftest.$ac_ext <<EOF
85016 -#line 100607 "configure"
85017 +  ac_save_LIBS="$LIBS"
85018 +LIBS="-lnsl  $LIBS"
85019 +cat > conftest.$ac_ext <<EOF
85020 +#line 106684 "configure"
85021  #include "confdefs.h"
85022 -#include <sys/types.h>
85023 +/* Override any gcc2 internal prototype to avoid an error.  */
85024 +/* We use char because int might match the return type of a gcc2
85025 +    builtin and then its argument prototype would still apply.  */
85026 +char getservbyname();
85027 +
85028 +int main() {
85029 +getservbyname()
85030 +; return 0; }
85031  EOF
85032 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
85033 -  egrep "uid_t" >/dev/null 2>&1; then
85034 +if { (eval echo configure:106695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
85035    rm -rf conftest*
85036 -  ac_cv_type_uid_t=yes
85037 +  eval "ac_cv_lib_$ac_lib_var=yes"
85038  else
85039 +  echo "configure: failed program was:" >&5
85040 +  cat conftest.$ac_ext >&5
85041    rm -rf conftest*
85042 -  ac_cv_type_uid_t=no
85043 +  eval "ac_cv_lib_$ac_lib_var=no"
85044  fi
85045  rm -f conftest*
85046 +LIBS="$ac_save_LIBS"
85047
85048  fi
85049 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
85050 +  echo "$ac_t""yes" 1>&6
85051 +  found=yes
85052 +else
85053 +  echo "$ac_t""no" 1>&6
85054
85055 -echo "$ac_t""$ac_cv_type_uid_t" 1>&6
85056 -if test $ac_cv_type_uid_t = no; then
85057 -  cat >> confdefs.h <<\EOF
85058 -#define uid_t int
85059 -EOF
85060 -
85061 -  cat >> confdefs.h <<\EOF
85062 -#define gid_t int
85063 -EOF
85064 -
85065 -fi
85066 -
85067 -
85068 -
85069 -
85070 -
85071 -
85072 -# Standard XMLRPC list
85073 -for ac_func in \
85074 - strtoul strtoull snprintf \
85075 - strstr strpbrk strerror\
85076 - memcpy memmove
85077 -do
85078 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
85079 -echo "configure:100647: checking for $ac_func" >&5
85080 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
85081 +    echo $ac_n "checking for __getservbyname in -lnsl""... $ac_c" 1>&6
85082 +echo "configure:106715: checking for __getservbyname in -lnsl" >&5
85083 +ac_lib_var=`echo nsl'_'__getservbyname | sed 'y%./+-%__p_%'`
85084 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
85085    echo $ac_n "(cached) $ac_c" 1>&6
85086  else
85087 -  cat > conftest.$ac_ext <<EOF
85088 -#line 100652 "configure"
85089 +  ac_save_LIBS="$LIBS"
85090 +LIBS="-lnsl  $LIBS"
85091 +cat > conftest.$ac_ext <<EOF
85092 +#line 106723 "configure"
85093  #include "confdefs.h"
85094 -/* System header to define __stub macros and hopefully few prototypes,
85095 -    which can conflict with char $ac_func(); below.  */
85096 -#include <assert.h>
85097  /* Override any gcc2 internal prototype to avoid an error.  */
85098 -/* We use char because int might match the return type of a gcc2
85099 -    builtin and then its argument prototype would still apply.  */
85100 -char $ac_func();
85101 -
85102 -int main() {
85103 -
85104 -/* The GNU C library defines this for functions which it implements
85105 -    to always fail with ENOSYS.  Some functions are actually named
85106 -    something starting with __ and the normal name is an alias.  */
85107 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
85108 -choke me
85109 -#else
85110 -$ac_func();
85111 -#endif
85112 +/* We use char because int might match the return type of a gcc2
85113 +    builtin and then its argument prototype would still apply.  */
85114 +char __getservbyname();
85115
85116 +int main() {
85117 +__getservbyname()
85118  ; return 0; }
85119  EOF
85120 -if { (eval echo configure:100675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
85121 +if { (eval echo configure:106734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
85122    rm -rf conftest*
85123 -  eval "ac_cv_func_$ac_func=yes"
85124 +  eval "ac_cv_lib_$ac_lib_var=yes"
85125  else
85126    echo "configure: failed program was:" >&5
85127    cat conftest.$ac_ext >&5
85128    rm -rf conftest*
85129 -  eval "ac_cv_func_$ac_func=no"
85130 +  eval "ac_cv_lib_$ac_lib_var=no"
85131  fi
85132  rm -f conftest*
85133 -fi
85134 +LIBS="$ac_save_LIBS"
85135
85136 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
85137 +fi
85138 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
85139    echo "$ac_t""yes" 1>&6
85140 -    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
85141 -  cat >> confdefs.h <<EOF
85142 -#define $ac_tr_func 1
85143 -EOF
85144 -
85145 +  found=yes
85146  else
85147    echo "$ac_t""no" 1>&6
85148 +found=no
85149  fi
85150 -done
85151 -
85152
85153 +
85154 +fi
85155
85156
85157 -
85158 -  ext_builddir=ext/xmlrpc
85159 -  ext_srcdir=$abs_srcdir/ext/xmlrpc
85160 +  if test "$found" = "yes"; then
85161 +    ac_libs=$LIBS
85162 +    LIBS="$LIBS -lnsl"
85163 +    if test "$cross_compiling" = yes; then
85164 +  found=no
85165 +else
85166 +  cat > conftest.$ac_ext <<EOF
85167 +#line 106766 "configure"
85168 +#include "confdefs.h"
85169 +main() { return (0); }
85170 +EOF
85171 +if { (eval echo configure:106770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
85172 +then
85173 +  found=yes
85174 +else
85175 +  echo "configure: failed program was:" >&5
85176 +  cat conftest.$ac_ext >&5
85177 +  rm -fr conftest*
85178 +  found=no
85179 +fi
85180 +rm -fr conftest*
85181 +fi
85182
85183 -  ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
85184 +    LIBS=$ac_libs
85185 +  fi
85186
85187 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
85188 -    PHP_XMLRPC_SHARED=no
85189 +  if test "$found" = "yes"; then
85190
85191
85192 -  case ext/xmlrpc in
85193 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
85194 -  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
85195 -  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
85196 +  case nsl in
85197 +  c|c_r|pthread*) ;;
85198 +  *)
85199 +      LIBS="-lnsl $LIBS"
85200 +   ;;
85201    esac
85202 -
85203 -
85204 -
85205 -  b_c_pre=$php_c_pre
85206 -  b_cxx_pre=$php_cxx_pre
85207 -  b_c_meta=$php_c_meta
85208 -  b_cxx_meta=$php_cxx_meta
85209 -  b_c_post=$php_c_post
85210 -  b_cxx_post=$php_cxx_post
85211 -  b_lo=$php_lo
85212 -
85213 -
85214 -  old_IFS=$IFS
85215 -  for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
85216 -          libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
85217 -          libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
85218 -          libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
85219 -          libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
85220 -          libxmlrpc/xml_to_soap.c; do
85221 -
85222 -      IFS=.
85223 -      set $ac_src
85224 -      ac_obj=$1
85225 -      IFS=$old_IFS
85226 -
85227 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
85228
85229 -      case $ac_src in
85230 -        *.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" ;;
85231 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
85232 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
85233 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
85234 -      esac
85235
85236 -    cat >>Makefile.objects<<EOF
85237 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
85238 -       $ac_comp
85239 +    cat >> confdefs.h <<\EOF
85240 +#define HAVE_GETSERVBYNAME 1
85241  EOF
85242 -  done
85243 -
85244 -
85245 -    EXT_STATIC="$EXT_STATIC xmlrpc"
85246 -    if test "$ext_shared" != "nocli"; then
85247 -      EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
85248 -    fi
85249 -  else
85250 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
85251 -      PHP_XMLRPC_SHARED=yes
85252 -
85253 -  case ext/xmlrpc in
85254 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
85255 -  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
85256 -  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
85257 -  esac
85258 -
85259 -
85260 -
85261 -  b_c_pre=$shared_c_pre
85262 -  b_cxx_pre=$shared_cxx_pre
85263 -  b_c_meta=$shared_c_meta
85264 -  b_cxx_meta=$shared_cxx_meta
85265 -  b_c_post=$shared_c_post
85266 -  b_cxx_post=$shared_cxx_post
85267 -  b_lo=$shared_lo
85268 -
85269 -
85270 -  old_IFS=$IFS
85271 -  for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
85272 -          libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
85273 -          libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
85274 -          libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
85275 -          libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
85276 -          libxmlrpc/xml_to_soap.c; do
85277 -
85278 -      IFS=.
85279 -      set $ac_src
85280 -      ac_obj=$1
85281 -      IFS=$old_IFS
85282 -
85283 -      shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
85284 -
85285 -      case $ac_src in
85286 -        *.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" ;;
85287 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
85288 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
85289 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
85290 -      esac
85291
85292 -    cat >>Makefile.objects<<EOF
85293 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
85294 -       $ac_comp
85295 +    cat >> confdefs.h <<\EOF
85296 +#define HAVE_LIBNSL 1
85297  EOF
85298 -  done
85299 -
85300 -      case $host_alias in
85301 -        *netware*)
85302 -
85303 -  install_modules="install-modules"
85304 -
85305 -  case $host_alias in
85306 -    *aix*)
85307 -      suffix=so
85308 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so'
85309 -      ;;
85310 -    *netware*)
85311 -      suffix=nlm
85312 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)'
85313 -      ;;
85314 -    *)
85315 -      suffix=la
85316 -      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_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)'
85317 -      ;;
85318 -  esac
85319
85320 -  if test "x" = "xyes"; then
85321 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix"
85322 +    ac_cv_func_getservbyname=yes
85323    else
85324 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
85325 +
85326 +  :
85327 +
85328    fi
85329
85330 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
85331 -
85332 -  cat >>Makefile.objects<<EOF
85333 -\$(phplibdir)/phpxmlrpc.$suffix: $ext_builddir/phpxmlrpc.$suffix
85334 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlrpc.$suffix \$(phplibdir)
85335 -
85336 -$ext_builddir/phpxmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(PHPXMLRPC_SHARED_DEPENDENCIES)
85337 -       $link_cmd
85338 -
85339 -EOF
85340 -
85341 -          ;;
85342 -        *)
85343 -
85344 -  install_modules="install-modules"
85345 -
85346 -  case $host_alias in
85347 -    *aix*)
85348 -      suffix=so
85349 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlrpc.so '$ext_builddir'/xmlrpc.so'
85350 -      ;;
85351 -    *netware*)
85352 -      suffix=nlm
85353 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)'
85354 -      ;;
85355 -    *)
85356 -      suffix=la
85357 -      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_xmlrpc) $(XMLRPC_SHARED_LIBADD)'
85358 -      ;;
85359 + ;;
85360 +
85361    esac
85362
85363 -  if test "x" = "xyes"; then
85364 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix"
85365 +
85366 +       if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then
85367 +               echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
85368 +echo "configure:106818: checking for zlib.h" >&5
85369 +               ZLIB_DIR=
85370 +               for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do
85371 +                       if test -f "$i/include/zlib.h"; then
85372 +                               ZLIB_DIR=$i
85373 +                               break;
85374 +                       fi
85375 +               done
85376 +               if test "x$ZLIB_DIR" = "x"; then
85377 +                       echo "$ac_t""not found" 1>&6
85378 +                       { echo "configure: error: could not find zlib.h" 1>&2; exit 1; }
85379 +               else
85380 +                       echo "$ac_t""found in $ZLIB_DIR" 1>&6
85381 +                       echo $ac_n "checking for zlib version >= 1.2.0.4""... $ac_c" 1>&6
85382 +echo "configure:106832: checking for zlib version >= 1.2.0.4" >&5
85383 +                       ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[^0-9\.]//g'`
85384 +                       echo "$ac_t""$ZLIB_VERSION" 1>&6
85385 +                       if test `echo $ZLIB_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then
85386 +                               { echo "configure: error: libz version greater or equal to 1.2.0.4 required" 1>&2; exit 1; }
85387 +                       else
85388 +
85389 +  if test "$ZLIB_DIR/include" != "/usr/include"; then
85390 +
85391 +  if test -z "$ZLIB_DIR/include" || echo "$ZLIB_DIR/include" | grep '^/' >/dev/null ; then
85392 +    ai_p=$ZLIB_DIR/include
85393    else
85394 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
85395 +
85396 +    ep_dir="`echo $ZLIB_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
85397 +
85398 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
85399 +    ai_p="$ep_realdir/`basename \"$ZLIB_DIR/include\"`"
85400    fi
85401 -
85402 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
85403 -
85404 -  cat >>Makefile.objects<<EOF
85405 -\$(phplibdir)/xmlrpc.$suffix: $ext_builddir/xmlrpc.$suffix
85406 -       \$(LIBTOOL) --mode=install cp $ext_builddir/xmlrpc.$suffix \$(phplibdir)
85407
85408 -$ext_builddir/xmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(XMLRPC_SHARED_DEPENDENCIES)
85409 -       $link_cmd
85410 +
85411 +
85412 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
85413 +
85414 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
85415 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
85416 +    eval "INCLUDEPATH$unique=set"
85417 +
85418 +      if test ""; then
85419 +        INCLUDES="-I$ai_p $INCLUDES"
85420 +      else
85421 +        INCLUDES="$INCLUDES -I$ai_p"
85422 +      fi
85423 +
85424 +  fi
85425
85426 -EOF
85427 +  fi
85428
85429 -          ;;
85430 -      esac
85431 -      cat >> confdefs.h <<EOF
85432 -#define COMPILE_DL_XMLRPC 1
85433 -EOF
85434 +
85435
85436 -    fi
85437 +  if test "$ext_shared" = "yes"; then
85438 +    HTTP_SHARED_LIBADD="-lz $HTTP_SHARED_LIBADD"
85439 +    if test -n "$ZLIB_DIR/$PHP_LIBDIR"; then
85440 +
85441 +  if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
85442 +
85443 +  if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
85444 +    ai_p=$ZLIB_DIR/$PHP_LIBDIR
85445 +  else
85446 +
85447 +    ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
85448 +
85449 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
85450 +    ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`"
85451    fi
85452
85453 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
85454 -    PHP_XMLRPC_SHARED=no
85455 -    case "$PHP_SAPI" in
85456 -      cgi|embed)
85457 +
85458 +      if test "$ext_shared" = "yes"; then
85459 +        HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
85460 +        test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
85461 +      else
85462
85463
85464 -  case ext/xmlrpc in
85465 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
85466 -  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
85467 -  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
85468 -  esac
85469
85470 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
85471
85472 -
85473 -  b_c_pre=$php_c_pre
85474 -  b_cxx_pre=$php_cxx_pre
85475 -  b_c_meta=$php_c_meta
85476 -  b_cxx_meta=$php_cxx_meta
85477 -  b_c_post=$php_c_post
85478 -  b_cxx_post=$php_cxx_post
85479 -  b_lo=$php_lo
85480 -
85481 -
85482 -  old_IFS=$IFS
85483 -  for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
85484 -          libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
85485 -          libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
85486 -          libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
85487 -          libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
85488 -          libxmlrpc/xml_to_soap.c; do
85489 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
85490 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
85491 +    eval "LIBPATH$unique=set"
85492 +
85493 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
85494 +    LDFLAGS="$LDFLAGS -L$ai_p"
85495 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
85496
85497 -      IFS=.
85498 -      set $ac_src
85499 -      ac_obj=$1
85500 -      IFS=$old_IFS
85501 -
85502 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
85503 +  fi
85504
85505 -      case $ac_src in
85506 -        *.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" ;;
85507 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
85508 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
85509 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
85510 -      esac
85511
85512 -    cat >>Makefile.objects<<EOF
85513 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
85514 -       $ac_comp
85515 -EOF
85516 -  done
85517 +      fi
85518 +
85519 +  fi
85520
85521 +    fi
85522 +  else
85523 +
85524
85525 -        EXT_STATIC="$EXT_STATIC xmlrpc"
85526 -        ;;
85527 -      *)
85528 -
85529 +  if test -n "$ZLIB_DIR/$PHP_LIBDIR"; then
85530 +
85531 +  if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
85532 +
85533 +  if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
85534 +    ai_p=$ZLIB_DIR/$PHP_LIBDIR
85535 +  else
85536 +
85537 +    ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
85538 +
85539 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
85540 +    ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`"
85541 +  fi
85542 +
85543 +
85544 +
85545
85546 -  case ext/xmlrpc in
85547 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
85548 -  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
85549 -  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
85550 -  esac
85551
85552 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
85553
85554 -
85555 -  b_c_pre=$php_c_pre
85556 -  b_cxx_pre=$php_cxx_pre
85557 -  b_c_meta=$php_c_meta
85558 -  b_cxx_meta=$php_cxx_meta
85559 -  b_c_post=$php_c_post
85560 -  b_cxx_post=$php_cxx_post
85561 -  b_lo=$php_lo
85562 -
85563 -
85564 -  old_IFS=$IFS
85565 -  for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
85566 -          libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
85567 -          libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
85568 -          libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
85569 -          libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
85570 -          libxmlrpc/xml_to_soap.c; do
85571 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
85572 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
85573 +    eval "LIBPATH$unique=set"
85574 +
85575 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
85576 +    LDFLAGS="$LDFLAGS -L$ai_p"
85577 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
85578
85579 -      IFS=.
85580 -      set $ac_src
85581 -      ac_obj=$1
85582 -      IFS=$old_IFS
85583 -
85584 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
85585 -
85586 -      case $ac_src in
85587 -        *.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" ;;
85588 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
85589 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
85590 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
85591 -      esac
85592 +  fi
85593
85594 -    cat >>Makefile.objects<<EOF
85595 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
85596 -       $ac_comp
85597 -EOF
85598 -  done
85599
85600 +
85601 +  fi
85602
85603 -        ;;
85604 -    esac
85605 -    EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
85606    fi
85607
85608
85609 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
85610 -
85611 +  case z in
85612 +  c|c_r|pthread*) ;;
85613 +  *)
85614 +      LIBS="-lz $LIBS"
85615 +   ;;
85616 +  esac
85617 +
85618
85619
85620 -  if test "$ext_builddir" = "."; then
85621 -    PHP_PECL_EXTENSION=xmlrpc
85622 -
85623 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
85624
85625    fi
85626
85627 +
85628 +                               cat >> confdefs.h <<\EOF
85629 +#define HTTP_HAVE_ZLIB 1
85630 +EOF
85631 +
85632 +                       fi
85633 +               fi
85634 +       fi
85635 +
85636 +       if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then
85637 +               echo $ac_n "checking for curl/curl.h""... $ac_c" 1>&6
85638 +echo "configure:106976: checking for curl/curl.h" >&5
85639 +               CURL_DIR=
85640 +               for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do
85641 +                       if test -f "$i/include/curl/curl.h"; then
85642 +                               CURL_DIR=$i
85643 +                               break
85644 +                       fi
85645 +               done
85646 +               if test "x$CURL_DIR" = "x"; then
85647 +                       echo "$ac_t""not found" 1>&6
85648 +                       { echo "configure: error: could not find curl/curl.h" 1>&2; exit 1; }
85649 +               else
85650 +                       echo "$ac_t""found in $CURL_DIR" 1>&6
85651 +               fi
85652 +
85653 +               echo $ac_n "checking for curl-config""... $ac_c" 1>&6
85654 +echo "configure:106992: checking for curl-config" >&5
85655 +               CURL_CONFIG=
85656 +               for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do
85657 +                       if test -x "$i"; then
85658 +                               CURL_CONFIG=$i
85659 +                               break
85660 +                       fi
85661 +               done
85662 +               if test "x$CURL_CONFIG" = "x"; then
85663 +                       echo "$ac_t""not found" 1>&6
85664 +                       { echo "configure: error: could not find curl-config" 1>&2; exit 1; }
85665 +               else
85666 +                       echo "$ac_t""found: $CURL_CONFIG" 1>&6
85667 +               fi
85668 +
85669 +                               echo $ac_n "checking for curl version >= 7.12.3""... $ac_c" 1>&6
85670 +echo "configure:107008: checking for curl version >= 7.12.3" >&5
85671 +               CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[^0-9\.]//g'`
85672 +               echo "$ac_t""$CURL_VERSION" 1>&6
85673 +               if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then
85674 +                       { echo "configure: error: libcurl version greater or equal to 7.12.3 required" 1>&2; exit 1; }
85675 +               fi
85676 +
85677 +
85678 +               save_INCLUDES="$INCLUDES"
85679 +               INCLUDES=
85680 +               save_LIBS="$LIBS"
85681 +               LIBS=
85682 +               save_CFLAGS="$CFLAGS"
85683 +               CFLAGS=`$CURL_CONFIG --cflags`
85684 +               save_LDFLAGS="$LDFLAGS"
85685 +               LDFLAGS=`$CURL_CONFIG --libs`
85686 +               LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
85687 +
85688 +               echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
85689 +echo "configure:107027: checking for SSL support in libcurl" >&5
85690 +               CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
85691 +               if test "$CURL_SSL" = "SSL"; then
85692 +                       echo "$ac_t""yes" 1>&6
85693 +                       cat >> confdefs.h <<\EOF
85694 +#define HTTP_HAVE_SSL 1
85695 +EOF
85696 +
85697 +
85698 +                       echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
85699 +echo "configure:107037: checking for openssl support in libcurl" >&5
85700 +                       if test "$cross_compiling" = yes; then
85701 +
85702 +                               echo "$ac_t""no" 1>&6
85703 +
85704 +else
85705 +  cat > conftest.$ac_ext <<EOF
85706 +#line 107044 "configure"
85707 +#include "confdefs.h"
85708 +
85709 +                               #include <curl/curl.h>
85710 +                               int main(int argc, char *argv[]) {
85711 +                                       curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
85712 +                                       if (data && data->ssl_version && *data->ssl_version) {
85713 +                                               const char *ptr = data->ssl_version;
85714 +                                               while(*ptr == ' ') ++ptr;
85715 +                                               return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
85716 +                                       }
85717 +                                       return 1;
85718 +                               }
85719 +
85720 +EOF
85721 +if { (eval echo configure:107059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
85722 +then
85723
85724 +                               echo "$ac_t""yes" 1>&6
85725 +                               ac_safe=`echo "openssl/crypto.h" | sed 'y%./+-%__p_%'`
85726 +echo $ac_n "checking for openssl/crypto.h""... $ac_c" 1>&6
85727 +echo "configure:107065: checking for openssl/crypto.h" >&5
85728 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
85729 +  echo $ac_n "(cached) $ac_c" 1>&6
85730 +else
85731 +  cat > conftest.$ac_ext <<EOF
85732 +#line 107070 "configure"
85733 +#include "confdefs.h"
85734 +#include <openssl/crypto.h>
85735 +EOF
85736 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
85737 +{ (eval echo configure:107075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
85738 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
85739 +if test -z "$ac_err"; then
85740 +  rm -rf conftest*
85741 +  eval "ac_cv_header_$ac_safe=yes"
85742 +else
85743 +  echo "$ac_err" >&5
85744 +  echo "configure: failed program was:" >&5
85745 +  cat conftest.$ac_ext >&5
85746 +  rm -rf conftest*
85747 +  eval "ac_cv_header_$ac_safe=no"
85748 +fi
85749 +rm -f conftest*
85750 +fi
85751 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
85752 +  echo "$ac_t""yes" 1>&6
85753
85754 -    BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc"
85755 -
85756 +                                       cat >> confdefs.h <<\EOF
85757 +#define HTTP_HAVE_OPENSSL 1
85758 +EOF
85759
85760 -  XMLRPC_MODULE_TYPE=builtin
85761 +
85762 +else
85763 +  echo "$ac_t""no" 1>&6
85764 +fi
85765
85766 -elif test "$PHP_XMLRPC" != "no"; then
85767 +
85768 +else
85769 +  echo "configure: failed program was:" >&5
85770 +  cat conftest.$ac_ext >&5
85771 +  rm -fr conftest*
85772 +
85773 +                               echo "$ac_t""no" 1>&6
85774 +
85775 +fi
85776 +rm -fr conftest*
85777 +fi
85778
85779 -  if test -r $PHP_XMLRPC/include/xmlrpc.h; then
85780 -    XMLRPC_DIR=$PHP_XMLRPC/include
85781 -  elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then
85782 -    XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
85783 -  else
85784 -    echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
85785 -echo "configure:101029: checking for XMLRPC-EPI in default path" >&5
85786 -    for i in /usr/local /usr; do
85787 -      if test -r $i/include/xmlrpc.h; then
85788 -        XMLRPC_DIR=$i/include
85789 -        echo "$ac_t""found in $i" 1>&6
85790 -        break
85791 -      fi
85792 -    done
85793 -  fi
85794 +
85795 +                       echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
85796 +echo "configure:107115: checking for gnutls support in libcurl" >&5
85797 +                       if test "$cross_compiling" = yes; then
85798 +
85799 +                               echo "$ac_t""no" 1>&6
85800 +
85801 +else
85802 +  cat > conftest.$ac_ext <<EOF
85803 +#line 107122 "configure"
85804 +#include "confdefs.h"
85805 +
85806 +                               #include <curl/curl.h>
85807 +                               int main(int argc, char *argv[]) {
85808 +                                       curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
85809 +                                       if (data && data->ssl_version && *data->ssl_version) {
85810 +                                               const char *ptr = data->ssl_version;
85811 +                                               while(*ptr == ' ') ++ptr;
85812 +                                               return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
85813 +                                       }
85814 +                                       return 1;
85815 +                               }
85816 +
85817 +EOF
85818 +if { (eval echo configure:107137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
85819 +then
85820 +
85821 +                               echo "$ac_t""yes" 1>&6
85822 +                               ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
85823 +echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
85824 +echo "configure:107143: checking for gcrypt.h" >&5
85825 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
85826 +  echo $ac_n "(cached) $ac_c" 1>&6
85827 +else
85828 +  cat > conftest.$ac_ext <<EOF
85829 +#line 107148 "configure"
85830 +#include "confdefs.h"
85831 +#include <gcrypt.h>
85832 +EOF
85833 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
85834 +{ (eval echo configure:107153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
85835 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
85836 +if test -z "$ac_err"; then
85837 +  rm -rf conftest*
85838 +  eval "ac_cv_header_$ac_safe=yes"
85839 +else
85840 +  echo "$ac_err" >&5
85841 +  echo "configure: failed program was:" >&5
85842 +  cat conftest.$ac_ext >&5
85843 +  rm -rf conftest*
85844 +  eval "ac_cv_header_$ac_safe=no"
85845 +fi
85846 +rm -f conftest*
85847 +fi
85848 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
85849 +  echo "$ac_t""yes" 1>&6
85850 +
85851 +                                       cat >> confdefs.h <<\EOF
85852 +#define HTTP_HAVE_GNUTLS 1
85853 +EOF
85854
85855 -  if test -z "$XMLRPC_DIR"; then
85856 -    echo "$ac_t""not found" 1>&6
85857 -    { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; }
85858 -  fi
85859 +
85860 +else
85861 +  echo "$ac_t""no" 1>&6
85862 +fi
85863
85864 +
85865 +else
85866 +  echo "configure: failed program was:" >&5
85867 +  cat conftest.$ac_ext >&5
85868 +  rm -fr conftest*
85869
85870 -  if test "$XMLRPC_DIR" != "/usr/include"; then
85871 +                               echo "$ac_t""no" 1>&6
85872 +
85873 +fi
85874 +rm -fr conftest*
85875 +fi
85876 +
85877 +               else
85878 +                       echo "$ac_t""no" 1>&6
85879 +               fi
85880 +
85881 +               INCLUDES="$save_INCLUDES"
85882 +               LIBS="$save_LIBS"
85883 +               CFLAGS="$save_CFLAGS"
85884 +               LDFLAGS="$save_LDFLAGS"
85885 +
85886 +
85887 +               echo $ac_n "checking for bundled SSL CA info""... $ac_c" 1>&6
85888 +echo "configure:107202: checking for bundled SSL CA info" >&5
85889 +               CURL_CAINFO=
85890 +               for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do
85891 +                       if test -f "$i"; then
85892 +                               CURL_CAINFO="$i"
85893 +                               break
85894 +                       fi
85895 +               done
85896 +               if test "x$CURL_CAINFO" = "x"; then
85897 +                       echo "$ac_t""not found" 1>&6
85898 +               else
85899 +                       echo "$ac_t""$CURL_CAINFO" 1>&6
85900 +                       cat >> confdefs.h <<EOF
85901 +#define HTTP_CURL_CAINFO "$CURL_CAINFO"
85902 +EOF
85903 +
85904 +               fi
85905 +
85906 +
85907 +  if test "$CURL_DIR/include" != "/usr/include"; then
85908
85909 -  if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then
85910 -    ai_p=$XMLRPC_DIR
85911 +  if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then
85912 +    ai_p=$CURL_DIR/include
85913    else
85914
85915 -    ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
85916 +    ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
85917
85918      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
85919 -    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`"
85920 +    ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`"
85921    fi
85922
85923
85924 @@ -101071,28 +107247,28 @@ echo "configure:101029: checking for XML
85925
85926    fi
85927
85928 -
85929 +
85930
85931    if test "$ext_shared" = "yes"; then
85932 -    XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD"
85933 -    if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then
85934 +    HTTP_SHARED_LIBADD="-lcurl $HTTP_SHARED_LIBADD"
85935 +    if test -n "$CURL_DIR/$PHP_LIBDIR"; then
85936
85937 -  if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
85938 +  if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
85939
85940 -  if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
85941 -    ai_p=$XMLRPC_DIR/$PHP_LIBDIR
85942 +  if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
85943 +    ai_p=$CURL_DIR/$PHP_LIBDIR
85944    else
85945
85946 -    ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
85947 +    ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
85948
85949      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
85950 -    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
85951 +    ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
85952    fi
85953
85954
85955        if test "$ext_shared" = "yes"; then
85956 -        XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
85957 -        test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
85958 +        HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
85959 +        test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
85960        else
85961
85962
85963 @@ -101118,18 +107294,18 @@ echo "configure:101029: checking for XML
85964    else
85965
85966
85967 -  if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then
85968 +  if test -n "$CURL_DIR/$PHP_LIBDIR"; then
85969
85970 -  if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
85971 +  if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
85972
85973 -  if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
85974 -    ai_p=$XMLRPC_DIR/$PHP_LIBDIR
85975 +  if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
85976 +    ai_p=$CURL_DIR/$PHP_LIBDIR
85977    else
85978
85979 -    ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
85980 +    ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
85981
85982      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
85983 -    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
85984 +    ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
85985    fi
85986
85987
85988 @@ -101155,10 +107331,10 @@ echo "configure:101029: checking for XML
85989    fi
85990
85991
85992 -  case xmlrpc in
85993 +  case curl in
85994    c|c_r|pthread*) ;;
85995    *)
85996 -      LIBS="-lxmlrpc $LIBS"
85997 +      LIBS="-lcurl $LIBS"
85998     ;;
85999    esac
86000
86001 @@ -101168,412 +107344,262 @@ echo "configure:101029: checking for XML
86002    fi
86003
86004
86005 +
86006 +  for ac_i in `$CURL_CONFIG --libs`; do
86007 +    case $ac_i in
86008 +    -pthread)
86009 +      if test "$ext_shared" = "yes"; then
86010 +        HTTP_SHARED_LIBADD="$HTTP_SHARED_LIBADD -pthread"
86011 +      else
86012 +
86013
86014 -  ext_builddir=ext/xmlrpc
86015 -  ext_srcdir=$abs_srcdir/ext/xmlrpc
86016 -
86017 -  ac_extra=
86018 -
86019 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
86020 -    PHP_XMLRPC_SHARED=no
86021 -
86022 -
86023 -  case ext/xmlrpc in
86024 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
86025 -  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
86026 -  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
86027 -  esac
86028 -
86029 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
86030
86031 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
86032 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
86033 +    eval "EXTRA_LDFLAGS$unique=set"
86034 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
86035 +  fi
86036
86037 -  b_c_pre=$php_c_pre
86038 -  b_cxx_pre=$php_cxx_pre
86039 -  b_c_meta=$php_c_meta
86040 -  b_cxx_meta=$php_cxx_meta
86041 -  b_c_post=$php_c_post
86042 -  b_cxx_post=$php_cxx_post
86043 -  b_lo=$php_lo
86044 -
86045 -
86046 -  old_IFS=$IFS
86047 -  for ac_src in xmlrpc-epi-php.c; do
86048 +      fi
86049 +    ;;
86050 +    -l*)
86051 +      ac_ii=`echo $ac_i|cut -c 3-`
86052 +
86053
86054 -      IFS=.
86055 -      set $ac_src
86056 -      ac_obj=$1
86057 -      IFS=$old_IFS
86058 +  case $ac_ii in
86059 +  c|c_r|pthread*) ;;
86060 +  *)
86061 +    if test "$ext_shared" = "yes"; then
86062 +        HTTP_SHARED_LIBADD="$HTTP_SHARED_LIBADD -l$ac_ii"
86063 +    else
86064
86065 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
86066 -
86067 -      case $ac_src in
86068 -        *.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" ;;
86069 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86070 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86071 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
86072 -      esac
86073 -
86074 -    cat >>Makefile.objects<<EOF
86075 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
86076 -       $ac_comp
86077 -EOF
86078 -  done
86079 +
86080 +  case $ac_ii in
86081 +  c|c_r|pthread*) ;;
86082 +  *)
86083 +      LIBS="$LIBS -l$ac_ii"
86084 +   ;;
86085 +  esac
86086
86087
86088 -    EXT_STATIC="$EXT_STATIC xmlrpc"
86089 -    if test "$ext_shared" != "nocli"; then
86090 -      EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
86091      fi
86092 -  else
86093 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
86094 -      PHP_XMLRPC_SHARED=yes
86095 -
86096 -  case ext/xmlrpc in
86097 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
86098 -  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
86099 -  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
86100 +   ;;
86101    esac
86102 -
86103 -
86104 -
86105 -  b_c_pre=$shared_c_pre
86106 -  b_cxx_pre=$shared_cxx_pre
86107 -  b_c_meta=$shared_c_meta
86108 -  b_cxx_meta=$shared_cxx_meta
86109 -  b_c_post=$shared_c_post
86110 -  b_cxx_post=$shared_cxx_post
86111 -  b_lo=$shared_lo
86112
86113
86114 -  old_IFS=$IFS
86115 -  for ac_src in xmlrpc-epi-php.c; do
86116 -
86117 -      IFS=.
86118 -      set $ac_src
86119 -      ac_obj=$1
86120 -      IFS=$old_IFS
86121 +    ;;
86122 +    -L*)
86123 +      ac_ii=`echo $ac_i|cut -c 3-`
86124
86125 -      shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
86126 -
86127 -      case $ac_src in
86128 -        *.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" ;;
86129 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86130 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86131 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
86132 -      esac
86133 -
86134 -    cat >>Makefile.objects<<EOF
86135 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
86136 -       $ac_comp
86137 -EOF
86138 -  done
86139 -
86140 -      case $host_alias in
86141 -        *netware*)
86142 -
86143 -  install_modules="install-modules"
86144 -
86145 -  case $host_alias in
86146 -    *aix*)
86147 -      suffix=so
86148 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so'
86149 -      ;;
86150 -    *netware*)
86151 -      suffix=nlm
86152 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)'
86153 -      ;;
86154 -    *)
86155 -      suffix=la
86156 -      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_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)'
86157 -      ;;
86158 -  esac
86159 -
86160 -  if test "x" = "xyes"; then
86161 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix"
86162 -  else
86163 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
86164 -  fi
86165 -
86166 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
86167 -
86168 -  cat >>Makefile.objects<<EOF
86169 -\$(phplibdir)/phpxmlrpc.$suffix: $ext_builddir/phpxmlrpc.$suffix
86170 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlrpc.$suffix \$(phplibdir)
86171 -
86172 -$ext_builddir/phpxmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(PHPXMLRPC_SHARED_DEPENDENCIES)
86173 -       $link_cmd
86174 -
86175 -EOF
86176 -
86177 -          ;;
86178 -        *)
86179 -
86180 -  install_modules="install-modules"
86181 -
86182 -  case $host_alias in
86183 -    *aix*)
86184 -      suffix=so
86185 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlrpc.so '$ext_builddir'/xmlrpc.so'
86186 -      ;;
86187 -    *netware*)
86188 -      suffix=nlm
86189 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)'
86190 -      ;;
86191 -    *)
86192 -      suffix=la
86193 -      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_xmlrpc) $(XMLRPC_SHARED_LIBADD)'
86194 -      ;;
86195 -  esac
86196 -
86197 -  if test "x" = "xyes"; then
86198 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix"
86199 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
86200 +
86201 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
86202 +    ai_p=$ac_ii
86203    else
86204 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
86205 -  fi
86206 -
86207 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
86208 -
86209 -  cat >>Makefile.objects<<EOF
86210 -\$(phplibdir)/xmlrpc.$suffix: $ext_builddir/xmlrpc.$suffix
86211 -       \$(LIBTOOL) --mode=install cp $ext_builddir/xmlrpc.$suffix \$(phplibdir)
86212 -
86213 -$ext_builddir/xmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(XMLRPC_SHARED_DEPENDENCIES)
86214 -       $link_cmd
86215 -
86216 -EOF
86217 -
86218 -          ;;
86219 -      esac
86220 -      cat >> confdefs.h <<EOF
86221 -#define COMPILE_DL_XMLRPC 1
86222 -EOF
86223 -
86224 -    fi
86225 +
86226 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
86227 +
86228 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
86229 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
86230    fi
86231
86232 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
86233 -    PHP_XMLRPC_SHARED=no
86234 -    case "$PHP_SAPI" in
86235 -      cgi|embed)
86236 +
86237 +      if test "$ext_shared" = "yes"; then
86238 +        HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
86239 +        test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
86240 +      else
86241
86242
86243 -  case ext/xmlrpc in
86244 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
86245 -  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
86246 -  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
86247 -  esac
86248
86249 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
86250
86251 -
86252 -  b_c_pre=$php_c_pre
86253 -  b_cxx_pre=$php_cxx_pre
86254 -  b_c_meta=$php_c_meta
86255 -  b_cxx_meta=$php_cxx_meta
86256 -  b_c_post=$php_c_post
86257 -  b_cxx_post=$php_cxx_post
86258 -  b_lo=$php_lo
86259 -
86260 -
86261 -  old_IFS=$IFS
86262 -  for ac_src in xmlrpc-epi-php.c; do
86263 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
86264 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
86265 +    eval "LIBPATH$unique=set"
86266 +
86267 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
86268 +    LDFLAGS="$LDFLAGS -L$ai_p"
86269 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
86270
86271 -      IFS=.
86272 -      set $ac_src
86273 -      ac_obj=$1
86274 -      IFS=$old_IFS
86275 -
86276 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
86277 +  fi
86278
86279 -      case $ac_src in
86280 -        *.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" ;;
86281 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86282 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86283 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
86284 -      esac
86285
86286 -    cat >>Makefile.objects<<EOF
86287 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
86288 -       $ac_comp
86289 -EOF
86290 +      fi
86291 +
86292 +  fi
86293 +
86294 +    ;;
86295 +    esac
86296    done
86297
86298 +               cat >> confdefs.h <<\EOF
86299 +#define HTTP_HAVE_CURL 1
86300 +EOF
86301
86302 -        EXT_STATIC="$EXT_STATIC xmlrpc"
86303 -        ;;
86304 -      *)
86305 -
86306 +
86307 +
86308 +  save_old_LDFLAGS=$LDFLAGS
86309 +  ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
86310 +               "
86311
86312 -  case ext/xmlrpc in
86313 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
86314 -  /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
86315 -  *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
86316 -  esac
86317 +  save_ext_shared=$ext_shared
86318 +  ext_shared=yes
86319 +
86320 +  for ac_i in $ac_stuff; do
86321 +    case $ac_i in
86322 +    -pthread)
86323 +      if test "$ext_shared" = "yes"; then
86324 +        LDFLAGS="$LDFLAGS -pthread"
86325 +      else
86326 +
86327
86328 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
86329
86330 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
86331 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
86332 +    eval "EXTRA_LDFLAGS$unique=set"
86333 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
86334 +  fi
86335
86336 -  b_c_pre=$php_c_pre
86337 -  b_cxx_pre=$php_cxx_pre
86338 -  b_c_meta=$php_c_meta
86339 -  b_cxx_meta=$php_cxx_meta
86340 -  b_c_post=$php_c_post
86341 -  b_cxx_post=$php_cxx_post
86342 -  b_lo=$php_lo
86343 -
86344 -
86345 -  old_IFS=$IFS
86346 -  for ac_src in xmlrpc-epi-php.c; do
86347 +      fi
86348 +    ;;
86349 +    -l*)
86350 +      ac_ii=`echo $ac_i|cut -c 3-`
86351 +
86352
86353 -      IFS=.
86354 -      set $ac_src
86355 -      ac_obj=$1
86356 -      IFS=$old_IFS
86357 +  case $ac_ii in
86358 +  c|c_r|pthread*) ;;
86359 +  *)
86360 +    if test "$ext_shared" = "yes"; then
86361 +        LDFLAGS="$LDFLAGS -l$ac_ii"
86362 +    else
86363
86364 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
86365 -
86366 -      case $ac_src in
86367 -        *.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" ;;
86368 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86369 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86370 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
86371 -      esac
86372 -
86373 -    cat >>Makefile.objects<<EOF
86374 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
86375 -       $ac_comp
86376 -EOF
86377 -  done
86378 +
86379 +  case $ac_ii in
86380 +  c|c_r|pthread*) ;;
86381 +  *)
86382 +      LIBS="$LIBS -l$ac_ii"
86383 +   ;;
86384 +  esac
86385
86386
86387 -        ;;
86388 -    esac
86389 -    EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
86390 -  fi
86391 -
86392 -
86393 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
86394 -
86395 +    fi
86396 +   ;;
86397 +  esac
86398
86399
86400 -  if test "$ext_builddir" = "."; then
86401 -    PHP_PECL_EXTENSION=xmlrpc
86402 +    ;;
86403 +    -L*)
86404 +      ac_ii=`echo $ac_i|cut -c 3-`
86405 +
86406 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
86407
86408 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
86409 -
86410 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
86411 +    ai_p=$ac_ii
86412 +  else
86413 +
86414 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
86415 +
86416 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
86417 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
86418    fi
86419
86420 -  XMLRPC_MODULE_TYPE=external
86421 -fi
86422 -
86423 -
86424 -
86425 -php_enable_xmlwriter=yes
86426 -
86427 -echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6
86428 -echo "configure:101472: checking whether to enable XMLWriter support" >&5
86429 -# Check whether --enable-xmlwriter or --disable-xmlwriter was given.
86430 -if test "${enable_xmlwriter+set}" = set; then
86431 -  enableval="$enable_xmlwriter"
86432 -  PHP_XMLWRITER=$enableval
86433 -else
86434 +
86435 +      if test "$ext_shared" = "yes"; then
86436 +        LDFLAGS="-L$ai_p $LDFLAGS"
86437 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
86438 +      else
86439 +
86440
86441 -  PHP_XMLWRITER=yes
86442 -  test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL
86443 -
86444 -fi
86445 -
86446 -
86447 -
86448 -ext_output="yes, shared"
86449 -ext_shared=yes
86450 -case $PHP_XMLWRITER in
86451 -shared,*)
86452 -  PHP_XMLWRITER=`echo "$PHP_XMLWRITER"|$SED 's/^shared,//'`
86453 -  ;;
86454 -shared)
86455 -  PHP_XMLWRITER=yes
86456 -  ;;
86457 -no)
86458 -  ext_output=no
86459 -  ext_shared=no
86460 -  ;;
86461 -*)
86462 -  ext_output=yes
86463 -  ext_shared=no
86464 -  ;;
86465 -esac
86466 -
86467 -
86468 -
86469 -echo "$ac_t""$ext_output" 1>&6
86470 -
86471 -
86472 -
86473 -
86474 -if test -z "$PHP_LIBXML_DIR"; then
86475
86476 -php_with_libxml_dir=no
86477 -
86478 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
86479 -echo "configure:101517: checking libxml2 install dir" >&5
86480 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
86481 -if test "${with_libxml_dir+set}" = set; then
86482 -  withval="$with_libxml_dir"
86483 -  PHP_LIBXML_DIR=$withval
86484 -else
86485 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
86486
86487 -  PHP_LIBXML_DIR=no
86488 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
86489 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
86490 +    eval "LIBPATH$unique=set"
86491 +
86492 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
86493 +    LDFLAGS="$LDFLAGS -L$ai_p"
86494 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
86495
86496 -
86497 -fi
86498 +  fi
86499
86500
86501 -ext_output=$PHP_LIBXML_DIR
86502 -echo "$ac_t""$ext_output" 1>&6
86503 +      fi
86504 +
86505 +  fi
86506
86507 +    ;;
86508 +    esac
86509 +  done
86510
86511 +  echo $ac_n "checking for curl_share_strerror in -lcurl""... $ac_c" 1>&6
86512 +echo "configure:107539: checking for curl_share_strerror in -lcurl" >&5
86513 +ac_lib_var=`echo curl'_'curl_share_strerror | sed 'y%./+-%__p_%'`
86514 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
86515 +  echo $ac_n "(cached) $ac_c" 1>&6
86516 +else
86517 +  ac_save_LIBS="$LIBS"
86518 +LIBS="-lcurl  $LIBS"
86519 +cat > conftest.$ac_ext <<EOF
86520 +#line 107547 "configure"
86521 +#include "confdefs.h"
86522 +/* Override any gcc2 internal prototype to avoid an error.  */
86523 +/* We use char because int might match the return type of a gcc2
86524 +    builtin and then its argument prototype would still apply.  */
86525 +char curl_share_strerror();
86526
86527 +int main() {
86528 +curl_share_strerror()
86529 +; return 0; }
86530 +EOF
86531 +if { (eval echo configure:107558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
86532 +  rm -rf conftest*
86533 +  eval "ac_cv_lib_$ac_lib_var=yes"
86534 +else
86535 +  echo "configure: failed program was:" >&5
86536 +  cat conftest.$ac_ext >&5
86537 +  rm -rf conftest*
86538 +  eval "ac_cv_lib_$ac_lib_var=no"
86539  fi
86540 +rm -f conftest*
86541 +LIBS="$ac_save_LIBS"
86542
86543 -if test "$PHP_XMLWRITER" != "no"; then
86544 -
86545 -  if test "$PHP_LIBXML" = "no"; then
86546 -    { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
86547 -  fi
86548 +fi
86549 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
86550 +  echo "$ac_t""yes" 1>&6
86551 +
86552 +    LDFLAGS=$save_old_LDFLAGS
86553 +    ext_shared=$save_ext_shared
86554 +    cat >> confdefs.h <<\EOF
86555 +#define HAVE_CURL_SHARE_STRERROR 1
86556 +EOF
86557
86558
86559 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
86560 -echo "configure:101545: checking for xml2-config path" >&5
86561 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
86562 -  echo $ac_n "(cached) $ac_c" 1>&6
86563  else
86564 -
86565 -  for i in $PHP_LIBXML_DIR /usr/local /usr; do
86566 -    if test -x "$i/bin/xml2-config"; then
86567 -      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
86568 -      break
86569 -    fi
86570 -  done
86571 +  echo "$ac_t""no" 1>&6
86572
86573 +    LDFLAGS=$save_old_LDFLAGS
86574 +    ext_shared=$save_ext_shared
86575 +    unset ac_cv_lib_curl_curl_share_strerror
86576 +
86577 +
86578  fi
86579
86580 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
86581 -
86582 -  if test -x "$ac_cv_php_xml2_config_path"; then
86583 -    XML2_CONFIG="$ac_cv_php_xml2_config_path"
86584 -    libxml_full_version=`$XML2_CONFIG --version`
86585 -    ac_IFS=$IFS
86586 -    IFS="."
86587 -    set $libxml_full_version
86588 -    IFS=$ac_IFS
86589 -    LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
86590 -    if test "$LIBXML_VERSION" -ge "2006011"; then
86591 -      LIBXML_LIBS=`$XML2_CONFIG --libs`
86592 -      LIBXML_INCS=`$XML2_CONFIG --cflags`
86593 -
86594 -  for ac_i in $LIBXML_LIBS; do
86595 +
86596 +  save_old_LDFLAGS=$LDFLAGS
86597 +  ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
86598 +               "
86599 +
86600 +  save_ext_shared=$ext_shared
86601 +  ext_shared=yes
86602 +
86603 +  for ac_i in $ac_stuff; do
86604      case $ac_i in
86605      -pthread)
86606        if test "$ext_shared" = "yes"; then
86607 -        XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread"
86608 +        LDFLAGS="$LDFLAGS -pthread"
86609        else
86610
86611
86612 @@ -101595,7 +107621,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
86613    c|c_r|pthread*) ;;
86614    *)
86615      if test "$ext_shared" = "yes"; then
86616 -        XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii"
86617 +        LDFLAGS="$LDFLAGS -l$ac_ii"
86618      else
86619
86620
86621 @@ -101630,8 +107656,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
86622
86623
86624        if test "$ext_shared" = "yes"; then
86625 -        XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD"
86626 -        test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD"
86627 +        LDFLAGS="-L$ai_p $LDFLAGS"
86628 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
86629        else
86630
86631
86632 @@ -101657,13 +107683,115 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
86633      esac
86634    done
86635
86636 -
86637 -  for ac_i in $LIBXML_INCS; do
86638 +  echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6
86639 +echo "configure:107688: checking for curl_multi_strerror in -lcurl" >&5
86640 +ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'`
86641 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
86642 +  echo $ac_n "(cached) $ac_c" 1>&6
86643 +else
86644 +  ac_save_LIBS="$LIBS"
86645 +LIBS="-lcurl  $LIBS"
86646 +cat > conftest.$ac_ext <<EOF
86647 +#line 107696 "configure"
86648 +#include "confdefs.h"
86649 +/* Override any gcc2 internal prototype to avoid an error.  */
86650 +/* We use char because int might match the return type of a gcc2
86651 +    builtin and then its argument prototype would still apply.  */
86652 +char curl_multi_strerror();
86653 +
86654 +int main() {
86655 +curl_multi_strerror()
86656 +; return 0; }
86657 +EOF
86658 +if { (eval echo configure:107707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
86659 +  rm -rf conftest*
86660 +  eval "ac_cv_lib_$ac_lib_var=yes"
86661 +else
86662 +  echo "configure: failed program was:" >&5
86663 +  cat conftest.$ac_ext >&5
86664 +  rm -rf conftest*
86665 +  eval "ac_cv_lib_$ac_lib_var=no"
86666 +fi
86667 +rm -f conftest*
86668 +LIBS="$ac_save_LIBS"
86669 +
86670 +fi
86671 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
86672 +  echo "$ac_t""yes" 1>&6
86673 +
86674 +    LDFLAGS=$save_old_LDFLAGS
86675 +    ext_shared=$save_ext_shared
86676 +    cat >> confdefs.h <<\EOF
86677 +#define HAVE_CURL_MULTI_STRERROR 1
86678 +EOF
86679 +
86680 +
86681 +else
86682 +  echo "$ac_t""no" 1>&6
86683 +
86684 +    LDFLAGS=$save_old_LDFLAGS
86685 +    ext_shared=$save_ext_shared
86686 +    unset ac_cv_lib_curl_curl_multi_strerror
86687 +
86688 +
86689 +fi
86690 +
86691 +
86692 +  save_old_LDFLAGS=$LDFLAGS
86693 +  ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
86694 +               "
86695 +
86696 +  save_ext_shared=$ext_shared
86697 +  ext_shared=yes
86698 +
86699 +  for ac_i in $ac_stuff; do
86700      case $ac_i in
86701 -    -I*)
86702 +    -pthread)
86703 +      if test "$ext_shared" = "yes"; then
86704 +        LDFLAGS="$LDFLAGS -pthread"
86705 +      else
86706 +
86707 +
86708 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
86709 +
86710 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
86711 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
86712 +    eval "EXTRA_LDFLAGS$unique=set"
86713 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
86714 +  fi
86715 +
86716 +      fi
86717 +    ;;
86718 +    -l*)
86719        ac_ii=`echo $ac_i|cut -c 3-`
86720
86721 -  if test "$ac_ii" != "/usr/include"; then
86722 +
86723 +  case $ac_ii in
86724 +  c|c_r|pthread*) ;;
86725 +  *)
86726 +    if test "$ext_shared" = "yes"; then
86727 +        LDFLAGS="$LDFLAGS -l$ac_ii"
86728 +    else
86729 +
86730 +
86731 +  case $ac_ii in
86732 +  c|c_r|pthread*) ;;
86733 +  *)
86734 +      LIBS="$LIBS -l$ac_ii"
86735 +   ;;
86736 +  esac
86737 +
86738 +
86739 +    fi
86740 +   ;;
86741 +  esac
86742 +
86743 +
86744 +    ;;
86745 +    -L*)
86746 +      ac_ii=`echo $ac_i|cut -c 3-`
86747 +
86748 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
86749
86750    if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
86751      ai_p=$ac_ii
86752 @@ -101676,481 +107804,547 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
86753    fi
86754
86755
86756 +      if test "$ext_shared" = "yes"; then
86757 +        LDFLAGS="-L$ai_p $LDFLAGS"
86758 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
86759 +      else
86760 +
86761 +
86762
86763    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
86764
86765 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
86766 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
86767    if test -n "$unique" && test "`eval $cmd`" = "" ; then
86768 -    eval "INCLUDEPATH$unique=set"
86769 -
86770 -      if test ""; then
86771 -        INCLUDES="-I$ai_p $INCLUDES"
86772 -      else
86773 -        INCLUDES="$INCLUDES -I$ai_p"
86774 -      fi
86775 +    eval "LIBPATH$unique=set"
86776
86777 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
86778 +    LDFLAGS="$LDFLAGS -L$ai_p"
86779 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
86780 +
86781    fi
86782
86783 +
86784 +      fi
86785 +
86786    fi
86787
86788      ;;
86789      esac
86790    done
86791
86792 -
86793 -            echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
86794 -echo "configure:101703: checking whether libxml build works" >&5
86795 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
86796 +  echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6
86797 +echo "configure:107837: checking for curl_easy_strerror in -lcurl" >&5
86798 +ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'`
86799 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
86800    echo $ac_n "(cached) $ac_c" 1>&6
86801  else
86802 -
86803 -
86804 -  old_LIBS=$LIBS
86805 -  LIBS="
86806 -          $XMLWRITER_SHARED_LIBADD
86807 -         $LIBS"
86808 -  if test "$cross_compiling" = yes; then
86809 -
86810 -    LIBS=$old_LIBS
86811 -
86812 -else
86813 -  cat > conftest.$ac_ext <<EOF
86814 -#line 101719 "configure"
86815 +  ac_save_LIBS="$LIBS"
86816 +LIBS="-lcurl  $LIBS"
86817 +cat > conftest.$ac_ext <<EOF
86818 +#line 107845 "configure"
86819  #include "confdefs.h"
86820 +/* Override any gcc2 internal prototype to avoid an error.  */
86821 +/* We use char because int might match the return type of a gcc2
86822 +    builtin and then its argument prototype would still apply.  */
86823 +char curl_easy_strerror();
86824
86825 -
86826 -    char xmlInitParser();
86827 -    int main() {
86828 -      xmlInitParser();
86829 -      return 0;
86830 -    }
86831 -
86832 +int main() {
86833 +curl_easy_strerror()
86834 +; return 0; }
86835  EOF
86836 -if { (eval echo configure:101730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
86837 -then
86838 -
86839 -    LIBS=$old_LIBS
86840 -
86841 -          php_cv_libxml_build_works=yes
86842 -
86843 -
86844 +if { (eval echo configure:107856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
86845 +  rm -rf conftest*
86846 +  eval "ac_cv_lib_$ac_lib_var=yes"
86847  else
86848    echo "configure: failed program was:" >&5
86849    cat conftest.$ac_ext >&5
86850 -  rm -fr conftest*
86851 -
86852 -    LIBS=$old_LIBS
86853 -
86854 -          echo "$ac_t""no" 1>&6
86855 -          { echo "configure: error: build test failed.  Please check the config.log for details." 1>&2; exit 1; }
86856 -
86857 -
86858 -fi
86859 -rm -fr conftest*
86860 +  rm -rf conftest*
86861 +  eval "ac_cv_lib_$ac_lib_var=no"
86862  fi
86863 +rm -f conftest*
86864 +LIBS="$ac_save_LIBS"
86865
86866 -
86867 -
86868  fi
86869 -
86870 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
86871 -      if test "$php_cv_libxml_build_works" = "yes"; then
86872 -        cat >> confdefs.h <<\EOF
86873 -#define HAVE_LIBXML 1
86874 -EOF
86875 -
86876 -      fi
86877 -
86878 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
86879 +  echo "$ac_t""yes" 1>&6
86880 +
86881 +    LDFLAGS=$save_old_LDFLAGS
86882 +    ext_shared=$save_ext_shared
86883      cat >> confdefs.h <<\EOF
86884 -#define HAVE_XMLWRITER 1
86885 +#define HAVE_CURL_EASY_STRERROR 1
86886  EOF
86887
86888 -
86889 -  ext_builddir=ext/xmlwriter
86890 -  ext_srcdir=$abs_srcdir/ext/xmlwriter
86891 +
86892 +else
86893 +  echo "$ac_t""no" 1>&6
86894
86895 -  ac_extra=
86896 +    LDFLAGS=$save_old_LDFLAGS
86897 +    ext_shared=$save_ext_shared
86898 +    unset ac_cv_lib_curl_curl_easy_strerror
86899 +
86900 +
86901 +fi
86902
86903 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
86904 -    PHP_XMLWRITER_SHARED=no
86905 -
86906 +
86907 +  save_old_LDFLAGS=$LDFLAGS
86908 +  ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
86909 +               "
86910
86911 -  case ext/xmlwriter in
86912 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
86913 -  /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
86914 -  *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
86915 -  esac
86916 +  save_ext_shared=$ext_shared
86917 +  ext_shared=yes
86918
86919 +  for ac_i in $ac_stuff; do
86920 +    case $ac_i in
86921 +    -pthread)
86922 +      if test "$ext_shared" = "yes"; then
86923 +        LDFLAGS="$LDFLAGS -pthread"
86924 +      else
86925 +
86926
86927 -
86928 -  b_c_pre=$php_c_pre
86929 -  b_cxx_pre=$php_cxx_pre
86930 -  b_c_meta=$php_c_meta
86931 -  b_cxx_meta=$php_cxx_meta
86932 -  b_c_post=$php_c_post
86933 -  b_cxx_post=$php_cxx_post
86934 -  b_lo=$php_lo
86935 -
86936 -
86937 -  old_IFS=$IFS
86938 -  for ac_src in php_xmlwriter.c; do
86939 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
86940
86941 -      IFS=.
86942 -      set $ac_src
86943 -      ac_obj=$1
86944 -      IFS=$old_IFS
86945 -
86946 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
86947 -
86948 -      case $ac_src in
86949 -        *.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" ;;
86950 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86951 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
86952 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
86953 -      esac
86954 -
86955 -    cat >>Makefile.objects<<EOF
86956 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
86957 -       $ac_comp
86958 -EOF
86959 -  done
86960 -
86961 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
86962 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
86963 +    eval "EXTRA_LDFLAGS$unique=set"
86964 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
86965 +  fi
86966
86967 -    EXT_STATIC="$EXT_STATIC xmlwriter"
86968 -    if test "$ext_shared" != "nocli"; then
86969 -      EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
86970 -    fi
86971 -  else
86972 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
86973 -      PHP_XMLWRITER_SHARED=yes
86974 +      fi
86975 +    ;;
86976 +    -l*)
86977 +      ac_ii=`echo $ac_i|cut -c 3-`
86978
86979 -  case ext/xmlwriter in
86980 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
86981 -  /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
86982 -  *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
86983 -  esac
86984 -
86985 -
86986 -
86987 -  b_c_pre=$shared_c_pre
86988 -  b_cxx_pre=$shared_cxx_pre
86989 -  b_c_meta=$shared_c_meta
86990 -  b_cxx_meta=$shared_cxx_meta
86991 -  b_c_post=$shared_c_post
86992 -  b_cxx_post=$shared_cxx_post
86993 -  b_lo=$shared_lo
86994 -
86995 -
86996 -  old_IFS=$IFS
86997 -  for ac_src in php_xmlwriter.c; do
86998
86999 -      IFS=.
87000 -      set $ac_src
87001 -      ac_obj=$1
87002 -      IFS=$old_IFS
87003 +  case $ac_ii in
87004 +  c|c_r|pthread*) ;;
87005 +  *)
87006 +    if test "$ext_shared" = "yes"; then
87007 +        LDFLAGS="$LDFLAGS -l$ac_ii"
87008 +    else
87009
87010 -      shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo"
87011 -
87012 -      case $ac_src in
87013 -        *.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" ;;
87014 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
87015 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
87016 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
87017 -      esac
87018 -
87019 -    cat >>Makefile.objects<<EOF
87020 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
87021 -       $ac_comp
87022 -EOF
87023 -  done
87024 -
87025 -      case $host_alias in
87026 -        *netware*)
87027 -
87028 -  install_modules="install-modules"
87029 -
87030 -  case $host_alias in
87031 -    *aix*)
87032 -      suffix=so
87033 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlwriter.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlwriter.so '$ext_builddir'/phpxmlwriter.so'
87034 -      ;;
87035 -    *netware*)
87036 -      suffix=nlm
87037 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)'
87038 -      ;;
87039 -    *)
87040 -      suffix=la
87041 -      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_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD)'
87042 -      ;;
87043 -  esac
87044 -
87045 -  if test "x" = "xyes"; then
87046 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlwriter.$suffix"
87047 -  else
87048 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix"
87049 -  fi
87050
87051 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
87052 -
87053 -  cat >>Makefile.objects<<EOF
87054 -\$(phplibdir)/phpxmlwriter.$suffix: $ext_builddir/phpxmlwriter.$suffix
87055 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlwriter.$suffix \$(phplibdir)
87056 -
87057 -$ext_builddir/phpxmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(PHPXMLWRITER_SHARED_DEPENDENCIES)
87058 -       $link_cmd
87059 -
87060 -EOF
87061 -
87062 -          ;;
87063 -        *)
87064 -
87065 -  install_modules="install-modules"
87066 -
87067 -  case $host_alias in
87068 -    *aix*)
87069 -      suffix=so
87070 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlwriter.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(XMLWRITER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlwriter.so '$ext_builddir'/xmlwriter.so'
87071 -      ;;
87072 -    *netware*)
87073 -      suffix=nlm
87074 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLWRITER, 3)_SHARED_LIBADD)'
87075 -      ;;
87076 -    *)
87077 -      suffix=la
87078 -      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_xmlwriter) $(XMLWRITER_SHARED_LIBADD)'
87079 -      ;;
87080 +  case $ac_ii in
87081 +  c|c_r|pthread*) ;;
87082 +  *)
87083 +      LIBS="$LIBS -l$ac_ii"
87084 +   ;;
87085    esac
87086
87087 -  if test "x" = "xyes"; then
87088 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlwriter.$suffix"
87089 -  else
87090 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlwriter.$suffix"
87091 -  fi
87092 -
87093 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
87094 -
87095 -  cat >>Makefile.objects<<EOF
87096 -\$(phplibdir)/xmlwriter.$suffix: $ext_builddir/xmlwriter.$suffix
87097 -       \$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir)
87098 -
87099 -$ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES)
87100 -       $link_cmd
87101
87102 -EOF
87103 +    fi
87104 +   ;;
87105 +  esac
87106
87107 -          ;;
87108 -      esac
87109 -      cat >> confdefs.h <<EOF
87110 -#define COMPILE_DL_XMLWRITER 1
87111 -EOF
87112
87113 -    fi
87114 +    ;;
87115 +    -L*)
87116 +      ac_ii=`echo $ac_i|cut -c 3-`
87117 +
87118 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
87119 +
87120 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
87121 +    ai_p=$ac_ii
87122 +  else
87123 +
87124 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
87125 +
87126 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
87127 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
87128    fi
87129
87130 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
87131 -    PHP_XMLWRITER_SHARED=no
87132 -    case "$PHP_SAPI" in
87133 -      cgi|embed)
87134 +
87135 +      if test "$ext_shared" = "yes"; then
87136 +        LDFLAGS="-L$ai_p $LDFLAGS"
87137 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
87138 +      else
87139
87140
87141 -  case ext/xmlwriter in
87142 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
87143 -  /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
87144 -  *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
87145 -  esac
87146
87147 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
87148 +
87149 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
87150 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
87151 +    eval "LIBPATH$unique=set"
87152 +
87153 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
87154 +    LDFLAGS="$LDFLAGS -L$ai_p"
87155 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
87156
87157 +  fi
87158
87159 -  b_c_pre=$php_c_pre
87160 -  b_cxx_pre=$php_cxx_pre
87161 -  b_c_meta=$php_c_meta
87162 -  b_cxx_meta=$php_cxx_meta
87163 -  b_c_post=$php_c_post
87164 -  b_cxx_post=$php_cxx_post
87165 -  b_lo=$php_lo
87166
87167 +      fi
87168 +
87169 +  fi
87170
87171 -  old_IFS=$IFS
87172 -  for ac_src in php_xmlwriter.c; do
87173 -
87174 -      IFS=.
87175 -      set $ac_src
87176 -      ac_obj=$1
87177 -      IFS=$old_IFS
87178 -
87179 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
87180 +    ;;
87181 +    esac
87182 +  done
87183
87184 -      case $ac_src in
87185 -        *.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" ;;
87186 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
87187 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
87188 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
87189 -      esac
87190 +  echo $ac_n "checking for curl_easy_reset in -lcurl""... $ac_c" 1>&6
87191 +echo "configure:107986: checking for curl_easy_reset in -lcurl" >&5
87192 +ac_lib_var=`echo curl'_'curl_easy_reset | sed 'y%./+-%__p_%'`
87193 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
87194 +  echo $ac_n "(cached) $ac_c" 1>&6
87195 +else
87196 +  ac_save_LIBS="$LIBS"
87197 +LIBS="-lcurl  $LIBS"
87198 +cat > conftest.$ac_ext <<EOF
87199 +#line 107994 "configure"
87200 +#include "confdefs.h"
87201 +/* Override any gcc2 internal prototype to avoid an error.  */
87202 +/* We use char because int might match the return type of a gcc2
87203 +    builtin and then its argument prototype would still apply.  */
87204 +char curl_easy_reset();
87205
87206 -    cat >>Makefile.objects<<EOF
87207 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
87208 -       $ac_comp
87209 +int main() {
87210 +curl_easy_reset()
87211 +; return 0; }
87212  EOF
87213 -  done
87214 -
87215 +if { (eval echo configure:108005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
87216 +  rm -rf conftest*
87217 +  eval "ac_cv_lib_$ac_lib_var=yes"
87218 +else
87219 +  echo "configure: failed program was:" >&5
87220 +  cat conftest.$ac_ext >&5
87221 +  rm -rf conftest*
87222 +  eval "ac_cv_lib_$ac_lib_var=no"
87223 +fi
87224 +rm -f conftest*
87225 +LIBS="$ac_save_LIBS"
87226
87227 -        EXT_STATIC="$EXT_STATIC xmlwriter"
87228 -        ;;
87229 -      *)
87230 -
87231 -
87232 -  case ext/xmlwriter in
87233 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
87234 -  /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
87235 -  *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
87236 -  esac
87237 +fi
87238 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
87239 +  echo "$ac_t""yes" 1>&6
87240
87241 +    LDFLAGS=$save_old_LDFLAGS
87242 +    ext_shared=$save_ext_shared
87243 +    cat >> confdefs.h <<\EOF
87244 +#define HAVE_CURL_EASY_RESET 1
87245 +EOF
87246 +
87247
87248 +else
87249 +  echo "$ac_t""no" 1>&6
87250
87251 -  b_c_pre=$php_c_pre
87252 -  b_cxx_pre=$php_cxx_pre
87253 -  b_c_meta=$php_c_meta
87254 -  b_cxx_meta=$php_cxx_meta
87255 -  b_c_post=$php_c_post
87256 -  b_cxx_post=$php_cxx_post
87257 -  b_lo=$php_lo
87258 +    LDFLAGS=$save_old_LDFLAGS
87259 +    ext_shared=$save_ext_shared
87260 +    unset ac_cv_lib_curl_curl_easy_reset
87261 +
87262 +
87263 +fi
87264
87265 +
87266 +  save_old_LDFLAGS=$LDFLAGS
87267 +  ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
87268 +               "
87269 +
87270 +  save_ext_shared=$ext_shared
87271 +  ext_shared=yes
87272 +
87273 +  for ac_i in $ac_stuff; do
87274 +    case $ac_i in
87275 +    -pthread)
87276 +      if test "$ext_shared" = "yes"; then
87277 +        LDFLAGS="$LDFLAGS -pthread"
87278 +      else
87279 +
87280 +
87281 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
87282 +
87283 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
87284 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
87285 +    eval "EXTRA_LDFLAGS$unique=set"
87286 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
87287 +  fi
87288
87289 -  old_IFS=$IFS
87290 -  for ac_src in php_xmlwriter.c; do
87291 +      fi
87292 +    ;;
87293 +    -l*)
87294 +      ac_ii=`echo $ac_i|cut -c 3-`
87295 +
87296
87297 -      IFS=.
87298 -      set $ac_src
87299 -      ac_obj=$1
87300 -      IFS=$old_IFS
87301 +  case $ac_ii in
87302 +  c|c_r|pthread*) ;;
87303 +  *)
87304 +    if test "$ext_shared" = "yes"; then
87305 +        LDFLAGS="$LDFLAGS -l$ac_ii"
87306 +    else
87307
87308 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
87309 +
87310 +  case $ac_ii in
87311 +  c|c_r|pthread*) ;;
87312 +  *)
87313 +      LIBS="$LIBS -l$ac_ii"
87314 +   ;;
87315 +  esac
87316
87317 -      case $ac_src in
87318 -        *.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" ;;
87319 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
87320 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
87321 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
87322 -      esac
87323
87324 -    cat >>Makefile.objects<<EOF
87325 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
87326 -       $ac_comp
87327 -EOF
87328 -  done
87329 +    fi
87330 +   ;;
87331 +  esac
87332
87333
87334 -        ;;
87335 -    esac
87336 -    EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
87337 +    ;;
87338 +    -L*)
87339 +      ac_ii=`echo $ac_i|cut -c 3-`
87340 +
87341 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
87342 +
87343 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
87344 +    ai_p=$ac_ii
87345 +  else
87346 +
87347 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
87348 +
87349 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
87350 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
87351    fi
87352 +
87353 +
87354 +      if test "$ext_shared" = "yes"; then
87355 +        LDFLAGS="-L$ai_p $LDFLAGS"
87356 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
87357 +      else
87358 +
87359
87360
87361 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
87362 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
87363 +
87364 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
87365 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
87366 +    eval "LIBPATH$unique=set"
87367 +
87368 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
87369 +    LDFLAGS="$LDFLAGS -L$ai_p"
87370 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
87371
87372 +  fi
87373
87374
87375 -  if test "$ext_builddir" = "."; then
87376 -    PHP_PECL_EXTENSION=xmlwriter
87377 +      fi
87378
87379 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
87380 -
87381    fi
87382
87383 -
87384 -  PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD"
87385 +    ;;
87386 +    esac
87387 +  done
87388
87389 -
87390 -    else
87391 -      { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
87392 -    fi
87393 -else
87394 -    { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
87395 -
87396 -  fi
87397 +  echo $ac_n "checking for curl_formget in -lcurl""... $ac_c" 1>&6
87398 +echo "configure:108135: checking for curl_formget in -lcurl" >&5
87399 +ac_lib_var=`echo curl'_'curl_formget | sed 'y%./+-%__p_%'`
87400 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
87401 +  echo $ac_n "(cached) $ac_c" 1>&6
87402 +else
87403 +  ac_save_LIBS="$LIBS"
87404 +LIBS="-lcurl  $LIBS"
87405 +cat > conftest.$ac_ext <<EOF
87406 +#line 108143 "configure"
87407 +#include "confdefs.h"
87408 +/* Override any gcc2 internal prototype to avoid an error.  */
87409 +/* We use char because int might match the return type of a gcc2
87410 +    builtin and then its argument prototype would still apply.  */
87411 +char curl_formget();
87412 +
87413 +int main() {
87414 +curl_formget()
87415 +; return 0; }
87416 +EOF
87417 +if { (eval echo configure:108154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
87418 +  rm -rf conftest*
87419 +  eval "ac_cv_lib_$ac_lib_var=yes"
87420 +else
87421 +  echo "configure: failed program was:" >&5
87422 +  cat conftest.$ac_ext >&5
87423 +  rm -rf conftest*
87424 +  eval "ac_cv_lib_$ac_lib_var=no"
87425 +fi
87426 +rm -f conftest*
87427 +LIBS="$ac_save_LIBS"
87428
87429  fi
87430 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
87431 +  echo "$ac_t""yes" 1>&6
87432 +
87433 +    LDFLAGS=$save_old_LDFLAGS
87434 +    ext_shared=$save_ext_shared
87435 +    cat >> confdefs.h <<\EOF
87436 +#define HAVE_CURL_FORMGET 1
87437 +EOF
87438
87439 +
87440 +else
87441 +  echo "$ac_t""no" 1>&6
87442
87443 +    LDFLAGS=$save_old_LDFLAGS
87444 +    ext_shared=$save_ext_shared
87445 +    unset ac_cv_lib_curl_curl_formget
87446 +
87447 +
87448 +fi
87449
87450 -php_with_xsl=no
87451 +
87452 +  save_old_LDFLAGS=$LDFLAGS
87453 +  ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
87454 +               "
87455 +
87456 +  save_ext_shared=$ext_shared
87457 +  ext_shared=yes
87458 +
87459 +  for ac_i in $ac_stuff; do
87460 +    case $ac_i in
87461 +    -pthread)
87462 +      if test "$ext_shared" = "yes"; then
87463 +        LDFLAGS="$LDFLAGS -pthread"
87464 +      else
87465 +
87466 +
87467 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
87468 +
87469 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
87470 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
87471 +    eval "EXTRA_LDFLAGS$unique=set"
87472 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
87473 +  fi
87474
87475 -echo $ac_n "checking for XSL support""... $ac_c" 1>&6
87476 -echo "configure:102080: checking for XSL support" >&5
87477 -# Check whether --with-xsl or --without-xsl was given.
87478 -if test "${with_xsl+set}" = set; then
87479 -  withval="$with_xsl"
87480 -  PHP_XSL=$withval
87481 -else
87482 +      fi
87483 +    ;;
87484 +    -l*)
87485 +      ac_ii=`echo $ac_i|cut -c 3-`
87486 +
87487
87488 -  PHP_XSL=no
87489 -  test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL
87490 +  case $ac_ii in
87491 +  c|c_r|pthread*) ;;
87492 +  *)
87493 +    if test "$ext_shared" = "yes"; then
87494 +        LDFLAGS="$LDFLAGS -l$ac_ii"
87495 +    else
87496 +
87497 +
87498 +  case $ac_ii in
87499 +  c|c_r|pthread*) ;;
87500 +  *)
87501 +      LIBS="$LIBS -l$ac_ii"
87502 +   ;;
87503 +  esac
87504
87505 -fi
87506
87507 +    fi
87508 +   ;;
87509 +  esac
87510
87511
87512 -ext_output="yes, shared"
87513 -ext_shared=yes
87514 -case $PHP_XSL in
87515 -shared,*)
87516 -  PHP_XSL=`echo "$PHP_XSL"|$SED 's/^shared,//'`
87517 -  ;;
87518 -shared)
87519 -  PHP_XSL=yes
87520 -  ;;
87521 -no)
87522 -  ext_output=no
87523 -  ext_shared=no
87524 -  ;;
87525 -*)
87526 -  ext_output=yes
87527 -  ext_shared=no
87528 -  ;;
87529 -esac
87530 +    ;;
87531 +    -L*)
87532 +      ac_ii=`echo $ac_i|cut -c 3-`
87533 +
87534 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
87535 +
87536 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
87537 +    ai_p=$ac_ii
87538 +  else
87539 +
87540 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
87541 +
87542 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
87543 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
87544 +  fi
87545
87546 +
87547 +      if test "$ext_shared" = "yes"; then
87548 +        LDFLAGS="-L$ai_p $LDFLAGS"
87549 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
87550 +      else
87551 +
87552 +
87553 +
87554 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
87555 +
87556 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
87557 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
87558 +    eval "LIBPATH$unique=set"
87559 +
87560 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
87561 +    LDFLAGS="$LDFLAGS -L$ai_p"
87562 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
87563 +
87564 +  fi
87565
87566
87567 -echo "$ac_t""$ext_output" 1>&6
87568 +      fi
87569 +
87570 +  fi
87571
87572 +    ;;
87573 +    esac
87574 +  done
87575
87576 +  echo $ac_n "checking for curl_multi_setopt in -lcurl""... $ac_c" 1>&6
87577 +echo "configure:108284: checking for curl_multi_setopt in -lcurl" >&5
87578 +ac_lib_var=`echo curl'_'curl_multi_setopt | sed 'y%./+-%__p_%'`
87579 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
87580 +  echo $ac_n "(cached) $ac_c" 1>&6
87581 +else
87582 +  ac_save_LIBS="$LIBS"
87583 +LIBS="-lcurl  $LIBS"
87584 +cat > conftest.$ac_ext <<EOF
87585 +#line 108292 "configure"
87586 +#include "confdefs.h"
87587 +/* Override any gcc2 internal prototype to avoid an error.  */
87588 +/* We use char because int might match the return type of a gcc2
87589 +    builtin and then its argument prototype would still apply.  */
87590 +char curl_multi_setopt();
87591
87592 +int main() {
87593 +curl_multi_setopt()
87594 +; return 0; }
87595 +EOF
87596 +if { (eval echo configure:108303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
87597 +  rm -rf conftest*
87598 +  eval "ac_cv_lib_$ac_lib_var=yes"
87599 +else
87600 +  echo "configure: failed program was:" >&5
87601 +  cat conftest.$ac_ext >&5
87602 +  rm -rf conftest*
87603 +  eval "ac_cv_lib_$ac_lib_var=no"
87604 +fi
87605 +rm -f conftest*
87606 +LIBS="$ac_save_LIBS"
87607
87608 -if test "$PHP_XSL" != "no"; then
87609 +fi
87610 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
87611 +  echo "$ac_t""yes" 1>&6
87612 +
87613 +    LDFLAGS=$save_old_LDFLAGS
87614 +    ext_shared=$save_ext_shared
87615 +    cat >> confdefs.h <<\EOF
87616 +#define HAVE_CURL_MULTI_SETOPT 1
87617 +EOF
87618
87619 -  if test "$PHP_LIBXML" = "no"; then
87620 -    { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
87621 -  fi
87622
87623 -  if test "$PHP_DOM" = "no"; then
87624 -    { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; }
87625 -  fi
87626 +else
87627 +  echo "$ac_t""no" 1>&6
87628
87629 -  for i in $PHP_XSL /usr/local /usr; do
87630 -    if test -x "$i/bin/xslt-config"; then
87631 -      XSLT_CONFIG=$i/bin/xslt-config
87632 -      break
87633 -    fi
87634 -  done
87635 +    LDFLAGS=$save_old_LDFLAGS
87636 +    ext_shared=$save_ext_shared
87637 +    unset ac_cv_lib_curl_curl_multi_setopt
87638 +
87639 +
87640 +fi
87641
87642 -  if test -z "$XSLT_CONFIG"; then
87643 -    { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; }
87644 -  else
87645 -    libxslt_full_version=`$XSLT_CONFIG --version`
87646 -    ac_IFS=$IFS
87647 -    IFS="."
87648 -    set $libxslt_full_version
87649 -    IFS=$ac_IFS
87650 -    LIBXSLT_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
87651 -    if test "$LIBXSLT_VERSION" -ge "1001000"; then
87652 -      XSL_LIBS=`$XSLT_CONFIG --libs`
87653 -      XSL_INCS=`$XSLT_CONFIG --cflags`
87654 -
87655 -  for ac_i in $XSL_LIBS; do
87656 +
87657 +  save_old_LDFLAGS=$LDFLAGS
87658 +  ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
87659 +               "
87660 +
87661 +  save_ext_shared=$ext_shared
87662 +  ext_shared=yes
87663 +
87664 +  for ac_i in $ac_stuff; do
87665      case $ac_i in
87666      -pthread)
87667        if test "$ext_shared" = "yes"; then
87668 -        XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread"
87669 +        LDFLAGS="$LDFLAGS -pthread"
87670        else
87671
87672
87673 @@ -102172,7 +108366,7 @@ if test "$PHP_XSL" != "no"; then
87674    c|c_r|pthread*) ;;
87675    *)
87676      if test "$ext_shared" = "yes"; then
87677 -        XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii"
87678 +        LDFLAGS="$LDFLAGS -l$ac_ii"
87679      else
87680
87681
87682 @@ -102207,8 +108401,8 @@ if test "$PHP_XSL" != "no"; then
87683
87684
87685        if test "$ext_shared" = "yes"; then
87686 -        XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
87687 -        test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD"
87688 +        LDFLAGS="-L$ai_p $LDFLAGS"
87689 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
87690        else
87691
87692
87693 @@ -102234,22 +108428,128 @@ if test "$PHP_XSL" != "no"; then
87694      esac
87695    done
87696
87697 -
87698 -  for ac_i in $XSL_INCS; do
87699 -    case $ac_i in
87700 -    -I*)
87701 -      ac_ii=`echo $ac_i|cut -c 3-`
87702 -
87703 -  if test "$ac_ii" != "/usr/include"; then
87704 +  echo $ac_n "checking for curl_multi_timeout in -lcurl""... $ac_c" 1>&6
87705 +echo "configure:108433: checking for curl_multi_timeout in -lcurl" >&5
87706 +ac_lib_var=`echo curl'_'curl_multi_timeout | sed 'y%./+-%__p_%'`
87707 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
87708 +  echo $ac_n "(cached) $ac_c" 1>&6
87709 +else
87710 +  ac_save_LIBS="$LIBS"
87711 +LIBS="-lcurl  $LIBS"
87712 +cat > conftest.$ac_ext <<EOF
87713 +#line 108441 "configure"
87714 +#include "confdefs.h"
87715 +/* Override any gcc2 internal prototype to avoid an error.  */
87716 +/* We use char because int might match the return type of a gcc2
87717 +    builtin and then its argument prototype would still apply.  */
87718 +char curl_multi_timeout();
87719 +
87720 +int main() {
87721 +curl_multi_timeout()
87722 +; return 0; }
87723 +EOF
87724 +if { (eval echo configure:108452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
87725 +  rm -rf conftest*
87726 +  eval "ac_cv_lib_$ac_lib_var=yes"
87727 +else
87728 +  echo "configure: failed program was:" >&5
87729 +  cat conftest.$ac_ext >&5
87730 +  rm -rf conftest*
87731 +  eval "ac_cv_lib_$ac_lib_var=no"
87732 +fi
87733 +rm -f conftest*
87734 +LIBS="$ac_save_LIBS"
87735 +
87736 +fi
87737 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
87738 +  echo "$ac_t""yes" 1>&6
87739 +
87740 +    LDFLAGS=$save_old_LDFLAGS
87741 +    ext_shared=$save_ext_shared
87742 +    cat >> confdefs.h <<\EOF
87743 +#define HAVE_CURL_MULTI_TIMEOUT 1
87744 +EOF
87745 +
87746 +
87747 +else
87748 +  echo "$ac_t""no" 1>&6
87749 +
87750 +    LDFLAGS=$save_old_LDFLAGS
87751 +    ext_shared=$save_ext_shared
87752 +    unset ac_cv_lib_curl_curl_multi_timeout
87753 +
87754 +
87755 +fi
87756 +
87757 +
87758 +
87759 +               if test "$PHP_HTTP_CURL_LIBEVENT" != "no"; then
87760 +
87761 +               extname=event
87762 +               haveext=$PHP_EVENT
87763 +
87764 +               echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6
87765 +echo "configure:108493: checking for ext/$extname support" >&5
87766 +               if test -x "$PHP_EXECUTABLE"; then
87767 +                       grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
87768 +                       if test "$grepext" = "$extname"; then
87769 +                               HTTP_HAVE_EXT_EVENT=1
87770 +                               echo "$ac_t""yes" 1>&6
87771 +
87772 +                               echo "configure: warning: event support is incompatible with pecl/event; continuing without libevent support" 1>&2
87773 +
87774 +                       else
87775 +                               HTTP_HAVE_EXT_EVENT=
87776 +                               echo "$ac_t""no" 1>&6
87777 +
87778 +                               echo $ac_n "checking for event.h""... $ac_c" 1>&6
87779 +echo "configure:108507: checking for event.h" >&5
87780 +                               EVENT_DIR=
87781 +                               for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do
87782 +                                       if test -f "$i/include/event.h"; then
87783 +                                               EVENT_DIR=$i
87784 +                                               break
87785 +                                       fi
87786 +                               done
87787 +                               if test "x$EVENT_DIR" = "x"; then
87788 +                                       echo "$ac_t""not found" 1>&6
87789 +                                       echo "configure: warning: continuing without libevent support" 1>&2
87790 +                               else
87791 +                                       echo "$ac_t""found in $EVENT_DIR" 1>&6
87792 +
87793 +                                       echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6
87794 +echo "configure:108522: checking for libevent version, roughly" >&5
87795 +                                       EVENT_VER="1.1b or lower"
87796 +                                       if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
87797 +                                               if test -f "$EVENT_DIR/include/evrpc.h"; then
87798 +                                                       EVENT_VER="1.4 or greater"
87799 +                                               else
87800 +                                                       EVENT_VER="1.2 or greater"
87801 +                                               fi
87802 +                                       fi
87803 +                                       cat >> confdefs.h <<EOF
87804 +#define HTTP_EVENT_VERSION "$EVENT_VER"
87805 +EOF
87806 +
87807 +                                       echo "$ac_t""$EVENT_VER" 1>&6
87808 +
87809 +                                       echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6
87810 +echo "configure:108538: checking for libcurl version >= 7.16.0" >&5
87811 +                                       echo "$ac_t""$CURL_VERSION" 1>&6
87812 +                                       if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then
87813 +                                               echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2
87814 +                                       else
87815 +
87816 +  if test "$EVENT_DIR/include" != "/usr/include"; then
87817
87818 -  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
87819 -    ai_p=$ac_ii
87820 +  if test -z "$EVENT_DIR/include" || echo "$EVENT_DIR/include" | grep '^/' >/dev/null ; then
87821 +    ai_p=$EVENT_DIR/include
87822    else
87823
87824 -    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
87825 +    ep_dir="`echo $EVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
87826
87827      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
87828 -    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
87829 +    ai_p="$ep_realdir/`basename \"$EVENT_DIR/include\"`"
87830    fi
87831
87832
87833 @@ -102270,45 +108570,28 @@ if test "$PHP_XSL" != "no"; then
87834
87835    fi
87836
87837 -    ;;
87838 -    esac
87839 -  done
87840 -
87841 -
87842 -      echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6
87843 -echo "configure:102280: checking for EXSLT support" >&5
87844 -      for i in $PHP_XSL /usr/local /usr; do
87845 -        if test -r "$i/include/libexslt/exslt.h"; then
87846 -          PHP_XSL_EXSL_DIR=$i
87847 -          break
87848 -        fi
87849 -      done
87850 -      if test -z "$PHP_XSL_EXSL_DIR"; then
87851 -        echo "$ac_t""not found" 1>&6
87852 -      else
87853 -        echo "$ac_t""found" 1>&6
87854 -
87855 +
87856
87857    if test "$ext_shared" = "yes"; then
87858 -    XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD"
87859 -    if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
87860 +    HTTP_SHARED_LIBADD="-levent $HTTP_SHARED_LIBADD"
87861 +    if test -n "$EVENT_DIR/$PHP_LIBDIR"; then
87862
87863 -  if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
87864 +  if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
87865
87866 -  if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
87867 -    ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
87868 +  if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
87869 +    ai_p=$EVENT_DIR/$PHP_LIBDIR
87870    else
87871
87872 -    ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
87873 +    ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
87874
87875      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
87876 -    ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
87877 +    ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`"
87878    fi
87879
87880
87881        if test "$ext_shared" = "yes"; then
87882 -        XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
87883 -        test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD"
87884 +        HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
87885 +        test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
87886        else
87887
87888
87889 @@ -102334,18 +108617,18 @@ echo "configure:102280: checking for EXS
87890    else
87891
87892
87893 -  if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
87894 +  if test -n "$EVENT_DIR/$PHP_LIBDIR"; then
87895
87896 -  if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
87897 +  if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
87898
87899 -  if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
87900 -    ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
87901 +  if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
87902 +    ai_p=$EVENT_DIR/$PHP_LIBDIR
87903    else
87904
87905 -    ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
87906 +    ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
87907
87908      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
87909 -    ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
87910 +    ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`"
87911    fi
87912
87913
87914 @@ -102371,10 +108654,10 @@ echo "configure:102280: checking for EXS
87915    fi
87916
87917
87918 -  case exslt in
87919 +  case event in
87920    c|c_r|pthread*) ;;
87921    *)
87922 -      LIBS="-lexslt $LIBS"
87923 +      LIBS="-levent $LIBS"
87924     ;;
87925    esac
87926
87927 @@ -102384,514 +108667,569 @@ echo "configure:102280: checking for EXS
87928    fi
87929
87930
87931 +                                               cat >> confdefs.h <<\EOF
87932 +#define HTTP_HAVE_EVENT 1
87933 +EOF
87934 +
87935 +
87936 +  save_old_LDFLAGS=$LDFLAGS
87937 +  ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
87938 +                                               "
87939 +
87940 +  save_ext_shared=$ext_shared
87941 +  ext_shared=yes
87942 +
87943 +  for ac_i in $ac_stuff; do
87944 +    case $ac_i in
87945 +    -pthread)
87946 +      if test "$ext_shared" = "yes"; then
87947 +        LDFLAGS="$LDFLAGS -pthread"
87948 +      else
87949
87950 -  if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then
87951 +
87952 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
87953 +
87954 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
87955 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
87956 +    eval "EXTRA_LDFLAGS$unique=set"
87957 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
87958 +  fi
87959 +
87960 +      fi
87961 +    ;;
87962 +    -l*)
87963 +      ac_ii=`echo $ac_i|cut -c 3-`
87964 +
87965 +
87966 +  case $ac_ii in
87967 +  c|c_r|pthread*) ;;
87968 +  *)
87969 +    if test "$ext_shared" = "yes"; then
87970 +        LDFLAGS="$LDFLAGS -l$ac_ii"
87971 +    else
87972 +
87973 +
87974 +  case $ac_ii in
87975 +  c|c_r|pthread*) ;;
87976 +  *)
87977 +      LIBS="$LIBS -l$ac_ii"
87978 +   ;;
87979 +  esac
87980 +
87981 +
87982 +    fi
87983 +   ;;
87984 +  esac
87985 +
87986 +
87987 +    ;;
87988 +    -L*)
87989 +      ac_ii=`echo $ac_i|cut -c 3-`
87990 +
87991 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
87992
87993 -  if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then
87994 -    ai_p=$PHP_XSL_EXSL_DIR/include
87995 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
87996 +    ai_p=$ac_ii
87997    else
87998
87999 -    ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
88000 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
88001
88002      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
88003 -    ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`"
88004 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
88005    fi
88006
88007
88008 +      if test "$ext_shared" = "yes"; then
88009 +        LDFLAGS="-L$ai_p $LDFLAGS"
88010 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
88011 +      else
88012 +
88013 +
88014
88015    unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
88016
88017 -  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
88018 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
88019    if test -n "$unique" && test "`eval $cmd`" = "" ; then
88020 -    eval "INCLUDEPATH$unique=set"
88021 -
88022 -      if test ""; then
88023 -        INCLUDES="-I$ai_p $INCLUDES"
88024 -      else
88025 -        INCLUDES="$INCLUDES -I$ai_p"
88026 -      fi
88027 +    eval "LIBPATH$unique=set"
88028
88029 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
88030 +    LDFLAGS="$LDFLAGS -L$ai_p"
88031 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
88032 +
88033    fi
88034
88035 -  fi
88036 -
88037 -        cat >> confdefs.h <<\EOF
88038 -#define HAVE_XSL_EXSLT 1
88039 -EOF
88040
88041        fi
88042 -    else
88043 -      { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; }
88044 -    fi
88045
88046 -
88047    fi
88048 -
88049 -  cat >> confdefs.h <<\EOF
88050 -#define HAVE_XSL 1
88051 -EOF
88052 -
88053 -
88054 -  ext_builddir=ext/xsl
88055 -  ext_srcdir=$abs_srcdir/ext/xsl
88056 -
88057 -  ac_extra=
88058 -
88059 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
88060 -    PHP_XSL_SHARED=no
88061 -
88062 -
88063 -  case ext/xsl in
88064 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
88065 -  /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
88066 -  *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
88067 -  esac
88068 -
88069 -
88070 -
88071 -  b_c_pre=$php_c_pre
88072 -  b_cxx_pre=$php_cxx_pre
88073 -  b_c_meta=$php_c_meta
88074 -  b_cxx_meta=$php_cxx_meta
88075 -  b_c_post=$php_c_post
88076 -  b_cxx_post=$php_cxx_post
88077 -  b_lo=$php_lo
88078 -
88079 -
88080 -  old_IFS=$IFS
88081 -  for ac_src in php_xsl.c xsltprocessor.c; do
88082 -
88083 -      IFS=.
88084 -      set $ac_src
88085 -      ac_obj=$1
88086 -      IFS=$old_IFS
88087 -
88088 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
88089 -
88090 -      case $ac_src in
88091 -        *.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" ;;
88092 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
88093 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
88094 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
88095 -      esac
88096
88097 -    cat >>Makefile.objects<<EOF
88098 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
88099 -       $ac_comp
88100 -EOF
88101 +    ;;
88102 +    esac
88103    done
88104
88105 +  echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6
88106 +echo "configure:108772: checking for curl_multi_socket_action in -lcurl" >&5
88107 +ac_lib_var=`echo curl'_'curl_multi_socket_action | sed 'y%./+-%__p_%'`
88108 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
88109 +  echo $ac_n "(cached) $ac_c" 1>&6
88110 +else
88111 +  ac_save_LIBS="$LIBS"
88112 +LIBS="-lcurl  $LIBS"
88113 +cat > conftest.$ac_ext <<EOF
88114 +#line 108780 "configure"
88115 +#include "confdefs.h"
88116 +/* Override any gcc2 internal prototype to avoid an error.  */
88117 +/* We use char because int might match the return type of a gcc2
88118 +    builtin and then its argument prototype would still apply.  */
88119 +char curl_multi_socket_action();
88120
88121 -    EXT_STATIC="$EXT_STATIC xsl"
88122 -    if test "$ext_shared" != "nocli"; then
88123 -      EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
88124 -    fi
88125 -  else
88126 -    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
88127 -      PHP_XSL_SHARED=yes
88128 -
88129 -  case ext/xsl in
88130 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
88131 -  /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
88132 -  *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
88133 -  esac
88134 -
88135 -
88136 -
88137 -  b_c_pre=$shared_c_pre
88138 -  b_cxx_pre=$shared_cxx_pre
88139 -  b_c_meta=$shared_c_meta
88140 -  b_cxx_meta=$shared_cxx_meta
88141 -  b_c_post=$shared_c_post
88142 -  b_cxx_post=$shared_cxx_post
88143 -  b_lo=$shared_lo
88144 -
88145 -
88146 -  old_IFS=$IFS
88147 -  for ac_src in php_xsl.c xsltprocessor.c; do
88148 -
88149 -      IFS=.
88150 -      set $ac_src
88151 -      ac_obj=$1
88152 -      IFS=$old_IFS
88153 -
88154 -      shared_objects_xsl="$shared_objects_xsl $ac_bdir$ac_obj.lo"
88155 -
88156 -      case $ac_src in
88157 -        *.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" ;;
88158 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
88159 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
88160 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
88161 -      esac
88162 -
88163 -    cat >>Makefile.objects<<EOF
88164 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
88165 -       $ac_comp
88166 +int main() {
88167 +curl_multi_socket_action()
88168 +; return 0; }
88169  EOF
88170 -  done
88171 -
88172 -      case $host_alias in
88173 -        *netware*)
88174 -
88175 -  install_modules="install-modules"
88176 -
88177 -  case $host_alias in
88178 -    *aix*)
88179 -      suffix=so
88180 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxsl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(PHPXSL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxsl.so '$ext_builddir'/phpxsl.so'
88181 -      ;;
88182 -    *netware*)
88183 -      suffix=nlm
88184 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXSL, 3)_SHARED_LIBADD)'
88185 -      ;;
88186 -    *)
88187 -      suffix=la
88188 -      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_xsl) $(PHPXSL_SHARED_LIBADD)'
88189 -      ;;
88190 -  esac
88191 +if { (eval echo configure:108791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
88192 +  rm -rf conftest*
88193 +  eval "ac_cv_lib_$ac_lib_var=yes"
88194 +else
88195 +  echo "configure: failed program was:" >&5
88196 +  cat conftest.$ac_ext >&5
88197 +  rm -rf conftest*
88198 +  eval "ac_cv_lib_$ac_lib_var=no"
88199 +fi
88200 +rm -f conftest*
88201 +LIBS="$ac_save_LIBS"
88202
88203 -  if test "x" = "xyes"; then
88204 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxsl.$suffix"
88205 -  else
88206 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix"
88207 -  fi
88208 +fi
88209 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
88210 +  echo "$ac_t""yes" 1>&6
88211
88212 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
88213 -
88214 -  cat >>Makefile.objects<<EOF
88215 -\$(phplibdir)/phpxsl.$suffix: $ext_builddir/phpxsl.$suffix
88216 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpxsl.$suffix \$(phplibdir)
88217 -
88218 -$ext_builddir/phpxsl.$suffix: \$(shared_objects_xsl) \$(PHPXSL_SHARED_DEPENDENCIES)
88219 -       $link_cmd
88220 -
88221 +    LDFLAGS=$save_old_LDFLAGS
88222 +    ext_shared=$save_ext_shared
88223 +    cat >> confdefs.h <<\EOF
88224 +#define HAVE_CURL_MULTI_SOCKET_ACTION 1
88225  EOF
88226
88227 -          ;;
88228 -        *)
88229 -
88230 -  install_modules="install-modules"
88231 -
88232 -  case $host_alias in
88233 -    *aix*)
88234 -      suffix=so
88235 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xsl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(XSL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xsl.so '$ext_builddir'/xsl.so'
88236 -      ;;
88237 -    *netware*)
88238 -      suffix=nlm
88239 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XSL, 3)_SHARED_LIBADD)'
88240 -      ;;
88241 -    *)
88242 -      suffix=la
88243 -      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_xsl) $(XSL_SHARED_LIBADD)'
88244 -      ;;
88245 -  esac
88246 -
88247 -  if test "x" = "xyes"; then
88248 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xsl.$suffix"
88249 -  else
88250 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/xsl.$suffix"
88251 -  fi
88252
88253 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
88254 -
88255 -  cat >>Makefile.objects<<EOF
88256 -\$(phplibdir)/xsl.$suffix: $ext_builddir/xsl.$suffix
88257 -       \$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir)
88258 -
88259 -$ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES)
88260 -       $link_cmd
88261 -
88262 -EOF
88263 +else
88264 +  echo "$ac_t""no" 1>&6
88265
88266 -          ;;
88267 -      esac
88268 -      cat >> confdefs.h <<EOF
88269 -#define COMPILE_DL_XSL 1
88270 -EOF
88271 +    LDFLAGS=$save_old_LDFLAGS
88272 +    ext_shared=$save_ext_shared
88273 +    unset ac_cv_lib_curl_curl_multi_socket_action
88274 +
88275 +
88276 +fi
88277
88278 -    fi
88279 +                                       fi
88280 +                               fi
88281 +
88282 +                       fi
88283 +               elif test "$haveext" != "no" && test "x$haveext" != "x"; then
88284 +                       HTTP_HAVE_EXT_EVENT=1
88285 +                       echo "$ac_t""yes" 1>&6
88286 +
88287 +                               echo "configure: warning: event support is incompatible with pecl/event; continuing without libevent support" 1>&2
88288 +
88289 +               else
88290 +                       HTTP_HAVE_EXT_EVENT=
88291 +                       echo "$ac_t""no" 1>&6
88292 +
88293 +                               echo $ac_n "checking for event.h""... $ac_c" 1>&6
88294 +echo "configure:108839: checking for event.h" >&5
88295 +                               EVENT_DIR=
88296 +                               for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do
88297 +                                       if test -f "$i/include/event.h"; then
88298 +                                               EVENT_DIR=$i
88299 +                                               break
88300 +                                       fi
88301 +                               done
88302 +                               if test "x$EVENT_DIR" = "x"; then
88303 +                                       echo "$ac_t""not found" 1>&6
88304 +                                       echo "configure: warning: continuing without libevent support" 1>&2
88305 +                               else
88306 +                                       echo "$ac_t""found in $EVENT_DIR" 1>&6
88307 +
88308 +                                       echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6
88309 +echo "configure:108854: checking for libevent version, roughly" >&5
88310 +                                       EVENT_VER="1.1b or lower"
88311 +                                       if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
88312 +                                               if test -f "$EVENT_DIR/include/evrpc.h"; then
88313 +                                                       EVENT_VER="1.4 or greater"
88314 +                                               else
88315 +                                                       EVENT_VER="1.2 or greater"
88316 +                                               fi
88317 +                                       fi
88318 +                                       cat >> confdefs.h <<EOF
88319 +#define HTTP_EVENT_VERSION "$EVENT_VER"
88320 +EOF
88321 +
88322 +                                       echo "$ac_t""$EVENT_VER" 1>&6
88323 +
88324 +                                       echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6
88325 +echo "configure:108870: checking for libcurl version >= 7.16.0" >&5
88326 +                                       echo "$ac_t""$CURL_VERSION" 1>&6
88327 +                                       if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then
88328 +                                               echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2
88329 +                                       else
88330 +
88331 +  if test "$EVENT_DIR/include" != "/usr/include"; then
88332 +
88333 +  if test -z "$EVENT_DIR/include" || echo "$EVENT_DIR/include" | grep '^/' >/dev/null ; then
88334 +    ai_p=$EVENT_DIR/include
88335 +  else
88336 +
88337 +    ep_dir="`echo $EVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
88338 +
88339 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
88340 +    ai_p="$ep_realdir/`basename \"$EVENT_DIR/include\"`"
88341    fi
88342
88343 -  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
88344 -    PHP_XSL_SHARED=no
88345 -    case "$PHP_SAPI" in
88346 -      cgi|embed)
88347 -
88348 -
88349 -  case ext/xsl in
88350 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
88351 -  /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
88352 -  *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
88353 -  esac
88354 +
88355
88356 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
88357
88358 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
88359 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
88360 +    eval "INCLUDEPATH$unique=set"
88361 +
88362 +      if test ""; then
88363 +        INCLUDES="-I$ai_p $INCLUDES"
88364 +      else
88365 +        INCLUDES="$INCLUDES -I$ai_p"
88366 +      fi
88367 +
88368 +  fi
88369
88370 -  b_c_pre=$php_c_pre
88371 -  b_cxx_pre=$php_cxx_pre
88372 -  b_c_meta=$php_c_meta
88373 -  b_cxx_meta=$php_cxx_meta
88374 -  b_c_post=$php_c_post
88375 -  b_cxx_post=$php_cxx_post
88376 -  b_lo=$php_lo
88377 +  fi
88378
88379 +
88380
88381 -  old_IFS=$IFS
88382 -  for ac_src in php_xsl.c xsltprocessor.c; do
88383 -
88384 -      IFS=.
88385 -      set $ac_src
88386 -      ac_obj=$1
88387 -      IFS=$old_IFS
88388 +  if test "$ext_shared" = "yes"; then
88389 +    HTTP_SHARED_LIBADD="-levent $HTTP_SHARED_LIBADD"
88390 +    if test -n "$EVENT_DIR/$PHP_LIBDIR"; then
88391
88392 -      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
88393 -
88394 -      case $ac_src in
88395 -        *.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" ;;
88396 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
88397 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
88398 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
88399 -      esac
88400 -
88401 -    cat >>Makefile.objects<<EOF
88402 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
88403 -       $ac_comp
88404 -EOF
88405 -  done
88406 -
88407 +  if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
88408 +
88409 +  if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
88410 +    ai_p=$EVENT_DIR/$PHP_LIBDIR
88411 +  else
88412 +
88413 +    ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
88414 +
88415 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
88416 +    ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`"
88417 +  fi
88418
88419 -        EXT_STATIC="$EXT_STATIC xsl"
88420 -        ;;
88421 -      *)
88422 +
88423 +      if test "$ext_shared" = "yes"; then
88424 +        HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
88425 +        test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
88426 +      else
88427
88428
88429 -  case ext/xsl in
88430 -  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
88431 -  /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
88432 -  *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
88433 -  esac
88434
88435 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
88436
88437 -
88438 -  b_c_pre=$php_c_pre
88439 -  b_cxx_pre=$php_cxx_pre
88440 -  b_c_meta=$php_c_meta
88441 -  b_cxx_meta=$php_cxx_meta
88442 -  b_c_post=$php_c_post
88443 -  b_cxx_post=$php_cxx_post
88444 -  b_lo=$php_lo
88445 -
88446 -
88447 -  old_IFS=$IFS
88448 -  for ac_src in php_xsl.c xsltprocessor.c; do
88449 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
88450 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
88451 +    eval "LIBPATH$unique=set"
88452 +
88453 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
88454 +    LDFLAGS="$LDFLAGS -L$ai_p"
88455 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
88456
88457 -      IFS=.
88458 -      set $ac_src
88459 -      ac_obj=$1
88460 -      IFS=$old_IFS
88461 -
88462 -      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
88463 -
88464 -      case $ac_src in
88465 -        *.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" ;;
88466 -        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
88467 -        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
88468 -        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
88469 -      esac
88470 -
88471 -    cat >>Makefile.objects<<EOF
88472 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
88473 -       $ac_comp
88474 -EOF
88475 -  done
88476 +  fi
88477
88478
88479 -        ;;
88480 -    esac
88481 -    EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
88482 +      fi
88483 +
88484    fi
88485 -
88486 -
88487 -    BUILD_DIR="$BUILD_DIR $ext_builddir"
88488 -
88489
88490 -
88491 -  if test "$ext_builddir" = "."; then
88492 -    PHP_PECL_EXTENSION=xsl
88493 +    fi
88494 +  else
88495
88496 -  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
88497
88498 +  if test -n "$EVENT_DIR/$PHP_LIBDIR"; then
88499 +
88500 +  if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
88501 +
88502 +  if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
88503 +    ai_p=$EVENT_DIR/$PHP_LIBDIR
88504 +  else
88505 +
88506 +    ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
88507 +
88508 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
88509 +    ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`"
88510    fi
88511
88512 +
88513 +
88514
88515 -  PHP_VAR_SUBST="$PHP_VAR_SUBST XSL_SHARED_LIBADD"
88516 -
88517
88518 -  am_i_shared=$PHP_XSL_SHARED
88519 -  is_it_shared=$PHP_LIBXML_SHARED
88520 -  is_it_enabled=$PHP_LIBXML
88521 -  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
88522 -    { echo "configure: error:
88523 -You've configured extension xsl to build statically, but it
88524 -depends on extension libxml, which you've configured to build shared.
88525 -You either need to build xsl shared or build libxml statically for the
88526 -build to be successful.
88527 -" 1>&2; exit 1; }
88528 -  fi
88529 -  if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
88530 -    { echo "configure: error:
88531 -You've configured extension xsl, which depends on extension libxml,
88532 -but you've either not enabled libxml, or have disabled it.
88533 -" 1>&2; exit 1; }
88534 -  fi
88535 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
88536
88537 -fi
88538 -
88539 -
88540 -
88541 -php_enable_zip=no
88542 -
88543 -echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6
88544 -echo "configure:102756: checking for zip archive read/writesupport" >&5
88545 -# Check whether --enable-zip or --disable-zip was given.
88546 -if test "${enable_zip+set}" = set; then
88547 -  enableval="$enable_zip"
88548 -  PHP_ZIP=$enableval
88549 -else
88550 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
88551 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
88552 +    eval "LIBPATH$unique=set"
88553 +
88554 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
88555 +    LDFLAGS="$LDFLAGS -L$ai_p"
88556 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
88557
88558 -  PHP_ZIP=no
88559 -  test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL
88560 -
88561 -fi
88562 +  fi
88563
88564
88565 +
88566 +  fi
88567
88568 -ext_output="yes, shared"
88569 -ext_shared=yes
88570 -case $PHP_ZIP in
88571 -shared,*)
88572 -  PHP_ZIP=`echo "$PHP_ZIP"|$SED 's/^shared,//'`
88573 -  ;;
88574 -shared)
88575 -  PHP_ZIP=yes
88576 -  ;;
88577 -no)
88578 -  ext_output=no
88579 -  ext_shared=no
88580 -  ;;
88581 -*)
88582 -  ext_output=yes
88583 -  ext_shared=no
88584 -  ;;
88585 -esac
88586 +  fi
88587 +
88588 +
88589 +  case event in
88590 +  c|c_r|pthread*) ;;
88591 +  *)
88592 +      LIBS="-levent $LIBS"
88593 +   ;;
88594 +  esac
88595
88596
88597
88598 -echo "$ac_t""$ext_output" 1>&6
88599
88600 +  fi
88601
88602
88603 +                                               cat >> confdefs.h <<\EOF
88604 +#define HTTP_HAVE_EVENT 1
88605 +EOF
88606
88607 -if test -z "$PHP_ZLIB_DIR"; then
88608 +
88609 +  save_old_LDFLAGS=$LDFLAGS
88610 +  ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
88611 +                                               "
88612
88613 -php_with_zlib_dir=no
88614 +  save_ext_shared=$ext_shared
88615 +  ext_shared=yes
88616 +
88617 +  for ac_i in $ac_stuff; do
88618 +    case $ac_i in
88619 +    -pthread)
88620 +      if test "$ext_shared" = "yes"; then
88621 +        LDFLAGS="$LDFLAGS -pthread"
88622 +      else
88623 +
88624 +
88625 +  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
88626 +
88627 +  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
88628 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
88629 +    eval "EXTRA_LDFLAGS$unique=set"
88630 +    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
88631 +  fi
88632
88633 -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
88634 -echo "configure:102801: checking for the location of libz" >&5
88635 -# Check whether --with-zlib-dir or --without-zlib-dir was given.
88636 -if test "${with_zlib_dir+set}" = set; then
88637 -  withval="$with_zlib_dir"
88638 -  PHP_ZLIB_DIR=$withval
88639 -else
88640 +      fi
88641 +    ;;
88642 +    -l*)
88643 +      ac_ii=`echo $ac_i|cut -c 3-`
88644 +
88645
88646 -  PHP_ZLIB_DIR=no
88647 +  case $ac_ii in
88648 +  c|c_r|pthread*) ;;
88649 +  *)
88650 +    if test "$ext_shared" = "yes"; then
88651 +        LDFLAGS="$LDFLAGS -l$ac_ii"
88652 +    else
88653 +
88654
88655 +  case $ac_ii in
88656 +  c|c_r|pthread*) ;;
88657 +  *)
88658 +      LIBS="$LIBS -l$ac_ii"
88659 +   ;;
88660 +  esac
88661
88662 -fi
88663
88664 +    fi
88665 +   ;;
88666 +  esac
88667
88668 -ext_output=$PHP_ZLIB_DIR
88669 -echo "$ac_t""$ext_output" 1>&6
88670
88671 +    ;;
88672 +    -L*)
88673 +      ac_ii=`echo $ac_i|cut -c 3-`
88674 +
88675 +  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
88676 +
88677 +  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
88678 +    ai_p=$ac_ii
88679 +  else
88680 +
88681 +    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
88682 +
88683 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
88684 +    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
88685 +  fi
88686
88687 +
88688 +      if test "$ext_shared" = "yes"; then
88689 +        LDFLAGS="-L$ai_p $LDFLAGS"
88690 +        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
88691 +      else
88692 +
88693 +
88694 +
88695 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
88696 +
88697 +  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
88698 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
88699 +    eval "LIBPATH$unique=set"
88700 +
88701 +    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
88702 +    LDFLAGS="$LDFLAGS -L$ai_p"
88703 +    PHP_RPATHS="$PHP_RPATHS $ai_p"
88704 +
88705 +  fi
88706
88707 -fi
88708
88709 +      fi
88710 +
88711 +  fi
88712
88713 -php_with_pcre_dir=no
88714 +    ;;
88715 +    esac
88716 +  done
88717
88718 -echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
88719 -echo "configure:102825: checking pcre install prefix" >&5
88720 -# Check whether --with-pcre-dir or --without-pcre-dir was given.
88721 -if test "${with_pcre_dir+set}" = set; then
88722 -  withval="$with_pcre_dir"
88723 -  PHP_PCRE_DIR=$withval
88724 +  echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6
88725 +echo "configure:109104: checking for curl_multi_socket_action in -lcurl" >&5
88726 +ac_lib_var=`echo curl'_'curl_multi_socket_action | sed 'y%./+-%__p_%'`
88727 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
88728 +  echo $ac_n "(cached) $ac_c" 1>&6
88729  else
88730 -
88731 -  PHP_PCRE_DIR=no
88732 -
88733 +  ac_save_LIBS="$LIBS"
88734 +LIBS="-lcurl  $LIBS"
88735 +cat > conftest.$ac_ext <<EOF
88736 +#line 109112 "configure"
88737 +#include "confdefs.h"
88738 +/* Override any gcc2 internal prototype to avoid an error.  */
88739 +/* We use char because int might match the return type of a gcc2
88740 +    builtin and then its argument prototype would still apply.  */
88741 +char curl_multi_socket_action();
88742
88743 +int main() {
88744 +curl_multi_socket_action()
88745 +; return 0; }
88746 +EOF
88747 +if { (eval echo configure:109123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
88748 +  rm -rf conftest*
88749 +  eval "ac_cv_lib_$ac_lib_var=yes"
88750 +else
88751 +  echo "configure: failed program was:" >&5
88752 +  cat conftest.$ac_ext >&5
88753 +  rm -rf conftest*
88754 +  eval "ac_cv_lib_$ac_lib_var=no"
88755  fi
88756 +rm -f conftest*
88757 +LIBS="$ac_save_LIBS"
88758
88759 +fi
88760 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
88761 +  echo "$ac_t""yes" 1>&6
88762 +
88763 +    LDFLAGS=$save_old_LDFLAGS
88764 +    ext_shared=$save_ext_shared
88765 +    cat >> confdefs.h <<\EOF
88766 +#define HAVE_CURL_MULTI_SOCKET_ACTION 1
88767 +EOF
88768
88769 -ext_output=$PHP_PCRE_DIR
88770 -echo "$ac_t""$ext_output" 1>&6
88771 -
88772 -
88773 +
88774 +else
88775 +  echo "$ac_t""no" 1>&6
88776
88777 +    LDFLAGS=$save_old_LDFLAGS
88778 +    ext_shared=$save_ext_shared
88779 +    unset ac_cv_lib_curl_curl_multi_socket_action
88780 +
88781 +
88782 +fi
88783
88784 -if test "$PHP_ZIP" != "no"; then
88785 +                                       fi
88786 +                               fi
88787 +
88788 +               fi
88789 +
88790 +               fi
88791 +       fi
88792
88793 -  if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
88794 -    if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
88795 -      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
88796 -      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
88797 -    elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
88798 -      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
88799 -      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
88800 -    else
88801 -      { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; }
88802 -    fi
88803 +       if test "$PHP_HTTP_MAGIC_MIME" != "no"; then
88804 +               echo $ac_n "checking for magic.h""... $ac_c" 1>&6
88805 +echo "configure:109166: checking for magic.h" >&5
88806 +               MAGIC_DIR=
88807 +               for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do
88808 +                       if test -f "$i/include/magic.h"; then
88809 +                               MAGIC_DIR=$i
88810 +                               break
88811 +                       fi
88812 +               done
88813 +               if test "x$MAGIC_DIR" = "x"; then
88814 +                       echo "$ac_t""not found" 1>&6
88815 +                       { echo "configure: error: could not find magic.h" 1>&2; exit 1; }
88816 +               else
88817 +                       echo "$ac_t""found in $MAGIC_DIR" 1>&6
88818 +               fi
88819 +
88820 +
88821 +  if test "$MAGIC_DIR/include" != "/usr/include"; then
88822 +
88823 +  if test -z "$MAGIC_DIR/include" || echo "$MAGIC_DIR/include" | grep '^/' >/dev/null ; then
88824 +    ai_p=$MAGIC_DIR/include
88825    else
88826 -    for i in /usr/local /usr; do
88827 -      if test -f "$i/include/zlib/zlib.h"; then
88828 -        PHP_ZLIB_DIR="$i"
88829 -        PHP_ZLIB_INCDIR="$i/include/zlib"
88830 -      elif test -f "$i/include/zlib.h"; then
88831 -        PHP_ZLIB_DIR="$i"
88832 -        PHP_ZLIB_INCDIR="$i/include"
88833 -      fi
88834 -    done
88835 +
88836 +    ep_dir="`echo $MAGIC_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
88837 +
88838 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
88839 +    ai_p="$ep_realdir/`basename \"$MAGIC_DIR/include\"`"
88840    fi
88841
88842 -    echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
88843 -echo "configure:102869: checking for the location of zlib" >&5
88844 -  if test "$PHP_ZLIB_DIR" = "no"; then
88845 -    { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" 1>&2; exit 1; }
88846 -  else
88847 -    echo "$ac_t""$PHP_ZLIB_DIR" 1>&6
88848
88849 +
88850 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
88851 +
88852 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
88853 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
88854 +    eval "INCLUDEPATH$unique=set"
88855 +
88856 +      if test ""; then
88857 +        INCLUDES="-I$ai_p $INCLUDES"
88858 +      else
88859 +        INCLUDES="$INCLUDES -I$ai_p"
88860 +      fi
88861 +
88862 +  fi
88863 +
88864 +  fi
88865 +
88866 +
88867
88868    if test "$ext_shared" = "yes"; then
88869 -    ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD"
88870 -    if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
88871 +    HTTP_SHARED_LIBADD="-lmagic $HTTP_SHARED_LIBADD"
88872 +    if test -n "$MAGIC_DIR/$PHP_LIBDIR"; then
88873
88874 -  if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
88875 +  if test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
88876
88877 -  if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
88878 -    ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
88879 +  if test -z "$MAGIC_DIR/$PHP_LIBDIR" || echo "$MAGIC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
88880 +    ai_p=$MAGIC_DIR/$PHP_LIBDIR
88881    else
88882
88883 -    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
88884 +    ep_dir="`echo $MAGIC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
88885
88886      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
88887 -    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
88888 +    ai_p="$ep_realdir/`basename \"$MAGIC_DIR/$PHP_LIBDIR\"`"
88889    fi
88890
88891
88892        if test "$ext_shared" = "yes"; then
88893 -        ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD"
88894 -        test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD"
88895 +        HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
88896 +        test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
88897        else
88898
88899
88900 @@ -102917,18 +109255,18 @@ echo "configure:102869: checking for the
88901    else
88902
88903
88904 -  if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
88905 +  if test -n "$MAGIC_DIR/$PHP_LIBDIR"; then
88906
88907 -  if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
88908 +  if test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
88909
88910 -  if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
88911 -    ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
88912 +  if test -z "$MAGIC_DIR/$PHP_LIBDIR" || echo "$MAGIC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
88913 +    ai_p=$MAGIC_DIR/$PHP_LIBDIR
88914    else
88915
88916 -    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
88917 +    ep_dir="`echo $MAGIC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
88918
88919      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
88920 -    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
88921 +    ai_p="$ep_realdir/`basename \"$MAGIC_DIR/$PHP_LIBDIR\"`"
88922    fi
88923
88924
88925 @@ -102954,10 +109292,10 @@ echo "configure:102869: checking for the
88926    fi
88927
88928
88929 -  case z in
88930 +  case magic in
88931    c|c_r|pthread*) ;;
88932    *)
88933 -      LIBS="-lz $LIBS"
88934 +      LIBS="-lmagic $LIBS"
88935     ;;
88936    esac
88937
88938 @@ -102967,17 +109305,57 @@ echo "configure:102869: checking for the
88939    fi
88940
88941
88942 +               cat >> confdefs.h <<\EOF
88943 +#define HTTP_HAVE_MAGIC 1
88944 +EOF
88945 +
88946 +       fi
88947 +
88948 +
88949 +               extname=hash
88950 +               haveext=$PHP_HASH
88951 +
88952 +               echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6
88953 +echo "configure:109320: checking for ext/$extname support" >&5
88954 +               if test -x "$PHP_EXECUTABLE"; then
88955 +                       grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
88956 +                       if test "$grepext" = "$extname"; then
88957 +                               HTTP_HAVE_EXT_HASH=1
88958 +                               echo "$ac_t""yes" 1>&6
88959 +
88960 +               echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6
88961 +echo "configure:109328: checking for php_hash.h" >&5
88962 +               HTTP_EXT_HASH_INCDIR=
88963 +               for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do
88964 +                       if test -d $i; then
88965 +                               if test -f $i/php_hash.h; then
88966 +                                       HTTP_EXT_HASH_INCDIR=$i
88967 +                                       break
88968 +                               elif test -f $i/ext/hash/php_hash.h; then
88969 +                                       HTTP_EXT_HASH_INCDIR=$i/ext/hash
88970 +                                       break
88971 +                               fi
88972 +                       fi
88973 +               done
88974 +               if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then
88975 +                       echo "$ac_t""not found" 1>&6
88976 +               else
88977 +                       echo "$ac_t""$HTTP_EXT_HASH_INCDIR" 1>&6
88978 +                       cat >> confdefs.h <<\EOF
88979 +#define HTTP_HAVE_PHP_HASH_H 1
88980 +EOF
88981 +
88982 +
88983 +  if test "$HTTP_EXT_HASH_INCDIR" != "/usr/include"; then
88984
88985 -  if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then
88986 -
88987 -  if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then
88988 -    ai_p=$PHP_ZLIB_INCDIR
88989 +  if test -z "$HTTP_EXT_HASH_INCDIR" || echo "$HTTP_EXT_HASH_INCDIR" | grep '^/' >/dev/null ; then
88990 +    ai_p=$HTTP_EXT_HASH_INCDIR
88991    else
88992
88993 -    ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
88994 +    ep_dir="`echo $HTTP_EXT_HASH_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
88995
88996      ep_realdir="`(cd \"$ep_dir\" && pwd)`"
88997 -    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`"
88998 +    ai_p="$ep_realdir/`basename \"$HTTP_EXT_HASH_INCDIR\"`"
88999    fi
89000
89001
89002 @@ -102998,97 +109376,160 @@ echo "configure:102869: checking for the
89003
89004    fi
89005
89006 -  fi
89007 -
89008 -    old_CPPFLAGS=$CPPFLAGS
89009 -  CPPFLAGS=$INCLUDES
89010 -  cat > conftest.$ac_ext <<EOF
89011 -#line 103007 "configure"
89012 -#include "confdefs.h"
89013 -
89014 -#include <main/php_config.h>
89015 -#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
89016 -yes
89017 -#endif
89018 -
89019 +               fi
89020 +
89021 +                       else
89022 +                               HTTP_HAVE_EXT_HASH=
89023 +                               echo "$ac_t""no" 1>&6
89024 +
89025 +                       fi
89026 +               elif test "$haveext" != "no" && test "x$haveext" != "x"; then
89027 +                       HTTP_HAVE_EXT_HASH=1
89028 +                       echo "$ac_t""yes" 1>&6
89029 +
89030 +               echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6
89031 +echo "configure:109392: checking for php_hash.h" >&5
89032 +               HTTP_EXT_HASH_INCDIR=
89033 +               for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do
89034 +                       if test -d $i; then
89035 +                               if test -f $i/php_hash.h; then
89036 +                                       HTTP_EXT_HASH_INCDIR=$i
89037 +                                       break
89038 +                               elif test -f $i/ext/hash/php_hash.h; then
89039 +                                       HTTP_EXT_HASH_INCDIR=$i/ext/hash
89040 +                                       break
89041 +                               fi
89042 +                       fi
89043 +               done
89044 +               if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then
89045 +                       echo "$ac_t""not found" 1>&6
89046 +               else
89047 +                       echo "$ac_t""$HTTP_EXT_HASH_INCDIR" 1>&6
89048 +                       cat >> confdefs.h <<\EOF
89049 +#define HTTP_HAVE_PHP_HASH_H 1
89050  EOF
89051 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
89052 -  egrep "yes" >/dev/null 2>&1; then
89053 -  rm -rf conftest*
89054 -
89055 -    PHP_PCRE_REGEX=yes
89056 -
89057 -else
89058 -  rm -rf conftest*
89059 -
89060 -    cat > conftest.$ac_ext <<EOF
89061 -#line 103026 "configure"
89062 -#include "confdefs.h"
89063
89064 -#include <main/php_config.h>
89065 -#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
89066 -yes
89067 -#endif
89068 +
89069 +  if test "$HTTP_EXT_HASH_INCDIR" != "/usr/include"; then
89070
89071 -EOF
89072 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
89073 -  egrep "yes" >/dev/null 2>&1; then
89074 -  rm -rf conftest*
89075 -
89076 -      PHP_PCRE_REGEX=pecl
89077 +  if test -z "$HTTP_EXT_HASH_INCDIR" || echo "$HTTP_EXT_HASH_INCDIR" | grep '^/' >/dev/null ; then
89078 +    ai_p=$HTTP_EXT_HASH_INCDIR
89079 +  else
89080
89081 -else
89082 -  rm -rf conftest*
89083 -
89084 -      PHP_PCRE_REGEX=no
89085 +    ep_dir="`echo $HTTP_EXT_HASH_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
89086
89087 -fi
89088 -rm -f conftest*
89089 +    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
89090 +    ai_p="$ep_realdir/`basename \"$HTTP_EXT_HASH_INCDIR\"`"
89091 +  fi
89092
89093 +
89094
89095 -fi
89096 -rm -f conftest*
89097 +  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
89098 +
89099 +  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
89100 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
89101 +    eval "INCLUDEPATH$unique=set"
89102 +
89103 +      if test ""; then
89104 +        INCLUDES="-I$ai_p $INCLUDES"
89105 +      else
89106 +        INCLUDES="$INCLUDES -I$ai_p"
89107 +      fi
89108 +
89109 +  fi
89110
89111 -  CPPFLAGS=$old_CPPFLAGS
89112 +  fi
89113
89114 -  PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
89115 -                         lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c  \
89116 -                         lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \
89117 -                         lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \
89118 -                         lib/zip_source_free.c lib/zip_unchange_all.c lib/zip_delete.c \
89119 -                         lib/zip_error_get_sys_type.c lib/zip_file_get_offset.c \
89120 -                         lib/zip_get_name.c lib/zip_replace.c lib/zip_source_function.c \
89121 -                         lib/zip_unchange.c lib/zip_dirent.c lib/zip_error_strerror.c \
89122 -                         lib/zip_filerange_crc.c lib/zip_file_strerror.c lib/zip_get_num_files.c \
89123 -                         lib/zip_get_archive_flag.c lib/zip_set_archive_flag.c \
89124 -                         lib/zip_set_name.c lib/zip_source_zip.c lib/zip_unchange_data.c \
89125 -                         lib/zip_entry_free.c lib/zip_error_to_str.c lib/zip_fopen.c \
89126 -                         lib/zip_name_locate.c lib/zip_source_buffer.c lib/zip_stat.c \
89127 -                         lib/zip_entry_new.c lib/zip_err_str.c lib/zip_fopen_index.c \
89128 -                         lib/zip_get_archive_comment.c lib/zip_get_file_comment.c \
89129 -                         lib/zip_new.c lib/zip_source_file.c lib/zip_stat_index.c \
89130 -                         lib/zip_set_archive_comment.c lib/zip_set_file_comment.c \
89131 -                         lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \
89132 -                         lib/zip_error_clear.c lib/zip_file_error_clear.c"
89133 +               fi
89134 +
89135 +               else
89136 +                       HTTP_HAVE_EXT_HASH=
89137 +                       echo "$ac_t""no" 1>&6
89138 +
89139 +               fi
89140 +
89141
89142 -  cat >> confdefs.h <<\EOF
89143 -#define HAVE_ZIP 1
89144 -EOF
89145 +
89146 +               extname=iconv
89147 +               haveext=$PHP_ICONV
89148 +
89149 +               echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6
89150 +echo "configure:109458: checking for ext/$extname support" >&5
89151 +               if test -x "$PHP_EXECUTABLE"; then
89152 +                       grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
89153 +                       if test "$grepext" = "$extname"; then
89154 +                               HTTP_HAVE_EXT_ICONV=1
89155 +                               echo "$ac_t""yes" 1>&6
89156 +
89157 +                       else
89158 +                               HTTP_HAVE_EXT_ICONV=
89159 +                               echo "$ac_t""no" 1>&6
89160 +
89161 +                       fi
89162 +               elif test "$haveext" != "no" && test "x$haveext" != "x"; then
89163 +                       HTTP_HAVE_EXT_ICONV=1
89164 +                       echo "$ac_t""yes" 1>&6
89165 +
89166 +               else
89167 +                       HTTP_HAVE_EXT_ICONV=
89168 +                       echo "$ac_t""no" 1>&6
89169 +
89170 +               fi
89171 +
89172
89173 -
89174 -  ext_builddir=ext/zip
89175 -  ext_srcdir=$abs_srcdir/ext/zip
89176 +
89177 +               extname=session
89178 +               haveext=$PHP_SESSION
89179 +
89180 +               echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6
89181 +echo "configure:109486: checking for ext/$extname support" >&5
89182 +               if test -x "$PHP_EXECUTABLE"; then
89183 +                       grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
89184 +                       if test "$grepext" = "$extname"; then
89185 +                               HTTP_HAVE_EXT_SESSION=1
89186 +                               echo "$ac_t""yes" 1>&6
89187 +
89188 +                       else
89189 +                               HTTP_HAVE_EXT_SESSION=
89190 +                               echo "$ac_t""no" 1>&6
89191 +
89192 +                       fi
89193 +               elif test "$haveext" != "no" && test "x$haveext" != "x"; then
89194 +                       HTTP_HAVE_EXT_SESSION=1
89195 +                       echo "$ac_t""yes" 1>&6
89196 +
89197 +               else
89198 +                       HTTP_HAVE_EXT_SESSION=
89199 +                       echo "$ac_t""no" 1>&6
89200 +
89201 +               fi
89202 +
89203 +
89204 +       PHP_HTTP_SOURCES="missing.c http.c http_functions.c phpstr/phpstr.c \
89205 +               http_util_object.c http_message_object.c http_request_object.c http_request_pool_api.c \
89206 +               http_response_object.c http_exception_object.c http_requestpool_object.c \
89207 +               http_api.c http_cache_api.c http_request_api.c http_request_info.c http_date_api.c \
89208 +               http_headers_api.c http_message_api.c http_send_api.c http_url_api.c \
89209 +               http_info_api.c http_request_method_api.c http_encoding_api.c \
89210 +               http_filter_api.c http_request_body_api.c http_querystring_object.c \
89211 +               http_deflatestream_object.c http_inflatestream_object.c http_cookie_api.c \
89212 +               http_querystring_api.c http_request_datashare_api.c http_requestdatashare_object.c \
89213 +               http_persistent_handle_api.c"
89214 +
89215 +
89216 +  ext_builddir=ext/http
89217 +  ext_srcdir=$abs_srcdir/ext/http
89218
89219    ac_extra=
89220
89221    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
89222 -    PHP_ZIP_SHARED=no
89223 +    PHP_HTTP_SHARED=no
89224
89225
89226 -  case ext/zip in
89227 +  case ext/http in
89228    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
89229 -  /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
89230 -  *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
89231 +  /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
89232 +  *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
89233    esac
89234
89235
89236 @@ -103103,7 +109544,7 @@ EOF
89237
89238
89239    old_IFS=$IFS
89240 -  for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
89241 +  for ac_src in $PHP_HTTP_SOURCES; do
89242
89243        IFS=.
89244        set $ac_src
89245 @@ -103126,18 +109567,18 @@ EOF
89246    done
89247
89248
89249 -    EXT_STATIC="$EXT_STATIC zip"
89250 +    EXT_STATIC="$EXT_STATIC http"
89251      if test "$ext_shared" != "nocli"; then
89252 -      EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
89253 +      EXT_CLI_STATIC="$EXT_CLI_STATIC http"
89254      fi
89255    else
89256      if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
89257 -      PHP_ZIP_SHARED=yes
89258 +      PHP_HTTP_SHARED=yes
89259
89260 -  case ext/zip in
89261 +  case ext/http in
89262    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
89263 -  /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
89264 -  *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
89265 +  /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
89266 +  *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
89267    esac
89268
89269
89270 @@ -103152,14 +109593,14 @@ EOF
89271
89272
89273    old_IFS=$IFS
89274 -  for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
89275 +  for ac_src in $PHP_HTTP_SOURCES; do
89276
89277        IFS=.
89278        set $ac_src
89279        ac_obj=$1
89280        IFS=$old_IFS
89281
89282 -      shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo"
89283 +      shared_objects_http="$shared_objects_http $ac_bdir$ac_obj.lo"
89284
89285        case $ac_src in
89286          *.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" ;;
89287 @@ -103182,31 +109623,31 @@ EOF
89288    case $host_alias in
89289      *aix*)
89290        suffix=so
89291 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpzip.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) $(PHPZIP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpzip.so '$ext_builddir'/phpzip.so'
89292 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phphttp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_http) $(PHPHTTP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phphttp.so '$ext_builddir'/phphttp.so'
89293        ;;
89294      *netware*)
89295        suffix=nlm
89296 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZIP, 3)_SHARED_LIBADD)'
89297 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_http) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPHTTP, 3)_SHARED_LIBADD)'
89298        ;;
89299      *)
89300        suffix=la
89301 -      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_zip) $(PHPZIP_SHARED_LIBADD)'
89302 +      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_http) $(PHPHTTP_SHARED_LIBADD)'
89303        ;;
89304    esac
89305
89306    if test "x" = "xyes"; then
89307 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpzip.$suffix"
89308 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phphttp.$suffix"
89309    else
89310 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix"
89311 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phphttp.$suffix"
89312    fi
89313
89314 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
89315 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_http"
89316
89317    cat >>Makefile.objects<<EOF
89318 -\$(phplibdir)/phpzip.$suffix: $ext_builddir/phpzip.$suffix
89319 -       \$(LIBTOOL) --mode=install cp $ext_builddir/phpzip.$suffix \$(phplibdir)
89320 +\$(phplibdir)/phphttp.$suffix: $ext_builddir/phphttp.$suffix
89321 +       \$(LIBTOOL) --mode=install cp $ext_builddir/phphttp.$suffix \$(phplibdir)
89322
89323 -$ext_builddir/phpzip.$suffix: \$(shared_objects_zip) \$(PHPZIP_SHARED_DEPENDENCIES)
89324 +$ext_builddir/phphttp.$suffix: \$(shared_objects_http) \$(PHPHTTP_SHARED_DEPENDENCIES)
89325         $link_cmd
89326
89327  EOF
89328 @@ -103219,31 +109660,31 @@ EOF
89329    case $host_alias in
89330      *aix*)
89331        suffix=so
89332 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/zip.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) $(ZIP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/zip.so '$ext_builddir'/zip.so'
89333 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/http.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_http) $(HTTP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/http.so '$ext_builddir'/http.so'
89334        ;;
89335      *netware*)
89336        suffix=nlm
89337 -      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ZIP, 3)_SHARED_LIBADD)'
89338 +      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_http) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(HTTP, 3)_SHARED_LIBADD)'
89339        ;;
89340      *)
89341        suffix=la
89342 -      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_zip) $(ZIP_SHARED_LIBADD)'
89343 +      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_http) $(HTTP_SHARED_LIBADD)'
89344        ;;
89345    esac
89346
89347    if test "x" = "xyes"; then
89348 -    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/zip.$suffix"
89349 +    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/http.$suffix"
89350    else
89351 -    PHP_MODULES="$PHP_MODULES \$(phplibdir)/zip.$suffix"
89352 +    PHP_MODULES="$PHP_MODULES \$(phplibdir)/http.$suffix"
89353    fi
89354
89355 -  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
89356 +  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_http"
89357
89358    cat >>Makefile.objects<<EOF
89359 -\$(phplibdir)/zip.$suffix: $ext_builddir/zip.$suffix
89360 -       \$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir)
89361 +\$(phplibdir)/http.$suffix: $ext_builddir/http.$suffix
89362 +       \$(LIBTOOL) --mode=install cp $ext_builddir/http.$suffix \$(phplibdir)
89363
89364 -$ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES)
89365 +$ext_builddir/http.$suffix: \$(shared_objects_http) \$(HTTP_SHARED_DEPENDENCIES)
89366         $link_cmd
89367
89368  EOF
89369 @@ -103251,22 +109692,22 @@ EOF
89370            ;;
89371        esac
89372        cat >> confdefs.h <<EOF
89373 -#define COMPILE_DL_ZIP 1
89374 +#define COMPILE_DL_HTTP 1
89375  EOF
89376
89377      fi
89378    fi
89379
89380    if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
89381 -    PHP_ZIP_SHARED=no
89382 +    PHP_HTTP_SHARED=no
89383      case "$PHP_SAPI" in
89384        cgi|embed)
89385
89386
89387 -  case ext/zip in
89388 +  case ext/http in
89389    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
89390 -  /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
89391 -  *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
89392 +  /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
89393 +  *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
89394    esac
89395
89396
89397 @@ -103281,7 +109722,7 @@ EOF
89398
89399
89400    old_IFS=$IFS
89401 -  for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
89402 +  for ac_src in $PHP_HTTP_SOURCES; do
89403
89404        IFS=.
89405        set $ac_src
89406 @@ -103304,15 +109745,15 @@ EOF
89407    done
89408
89409
89410 -        EXT_STATIC="$EXT_STATIC zip"
89411 +        EXT_STATIC="$EXT_STATIC http"
89412          ;;
89413        *)
89414
89415
89416 -  case ext/zip in
89417 +  case ext/http in
89418    "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
89419 -  /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
89420 -  *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
89421 +  /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
89422 +  *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
89423    esac
89424
89425
89426 @@ -103327,7 +109768,7 @@ EOF
89427
89428
89429    old_IFS=$IFS
89430 -  for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
89431 +  for ac_src in $PHP_HTTP_SOURCES; do
89432
89433        IFS=.
89434        set $ac_src
89435 @@ -103352,7 +109793,7 @@ EOF
89436
89437          ;;
89438      esac
89439 -    EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
89440 +    EXT_CLI_STATIC="$EXT_CLI_STATIC http"
89441    fi
89442
89443
89444 @@ -103361,26 +109802,172 @@ EOF
89445
89446
89447    if test "$ext_builddir" = "."; then
89448 -    PHP_PECL_EXTENSION=zip
89449 +    PHP_PECL_EXTENSION=http
89450
89451    PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
89452
89453    fi
89454
89455 +
89456 +
89457 +               extname=hash
89458 +               haveext=$HTTP_HAVE_EXT_HASH
89459 +
89460 +               echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6
89461 +echo "configure:109818: checking whether to add a dependency on ext/$extname" >&5
89462 +               if test "$PHP_HTTP_SHARED_DEPS" = "no"; then
89463 +                       echo "$ac_t""no" 1>&6
89464 +
89465 +               elif test "$haveext"; then
89466 +                       echo "$ac_t""yes" 1>&6
89467 +
89468 +
89469 +  am_i_shared=$PHP_HTTP_SHARED
89470 +  is_it_shared=$PHP_HASH_SHARED
89471 +  is_it_enabled=$PHP_HASH
89472 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
89473 +    { echo "configure: error:
89474 +You've configured extension http to build statically, but it
89475 +depends on extension hash, which you've configured to build shared.
89476 +You either need to build http shared or build hash statically for the
89477 +build to be successful.
89478 +" 1>&2; exit 1; }
89479 +  fi
89480 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
89481 +    { echo "configure: error:
89482 +You've configured extension http, which depends on extension hash,
89483 +but you've either not enabled hash, or have disabled it.
89484 +" 1>&2; exit 1; }
89485 +  fi
89486 +
89487 +
89488 +
89489 +               else
89490 +                       echo "$ac_t""no" 1>&6
89491 +
89492 +               fi
89493 +
89494 +
89495 +               extname=iconv
89496 +               haveext=$HTTP_HAVE_EXT_ICONV
89497 +
89498 +               echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6
89499 +echo "configure:109856: checking whether to add a dependency on ext/$extname" >&5
89500 +               if test "$PHP_HTTP_SHARED_DEPS" = "no"; then
89501 +                       echo "$ac_t""no" 1>&6
89502 +
89503 +               elif test "$haveext"; then
89504 +                       echo "$ac_t""yes" 1>&6
89505 +
89506 +
89507 +  am_i_shared=$PHP_HTTP_SHARED
89508 +  is_it_shared=$PHP_ICONV_SHARED
89509 +  is_it_enabled=$PHP_ICONV
89510 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
89511 +    { echo "configure: error:
89512 +You've configured extension http to build statically, but it
89513 +depends on extension iconv, which you've configured to build shared.
89514 +You either need to build http shared or build iconv statically for the
89515 +build to be successful.
89516 +" 1>&2; exit 1; }
89517 +  fi
89518 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
89519 +    { echo "configure: error:
89520 +You've configured extension http, which depends on extension iconv,
89521 +but you've either not enabled iconv, or have disabled it.
89522 +" 1>&2; exit 1; }
89523 +  fi
89524 +
89525 +
89526 +
89527 +               else
89528 +                       echo "$ac_t""no" 1>&6
89529 +
89530 +               fi
89531 +
89532 +
89533 +               extname=session
89534 +               haveext=$HTTP_HAVE_EXT_SESSION
89535 +
89536 +               echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6
89537 +echo "configure:109894: checking whether to add a dependency on ext/$extname" >&5
89538 +               if test "$PHP_HTTP_SHARED_DEPS" = "no"; then
89539 +                       echo "$ac_t""no" 1>&6
89540 +
89541 +               elif test "$haveext"; then
89542 +                       echo "$ac_t""yes" 1>&6
89543 +
89544 +
89545 +  am_i_shared=$PHP_HTTP_SHARED
89546 +  is_it_shared=$PHP_SESSION_SHARED
89547 +  is_it_enabled=$PHP_SESSION
89548 +  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
89549 +    { echo "configure: error:
89550 +You've configured extension http to build statically, but it
89551 +depends on extension session, which you've configured to build shared.
89552 +You either need to build http shared or build session statically for the
89553 +build to be successful.
89554 +" 1>&2; exit 1; }
89555 +  fi
89556 +  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
89557 +    { echo "configure: error:
89558 +You've configured extension http, which depends on extension session,
89559 +but you've either not enabled session, or have disabled it.
89560 +" 1>&2; exit 1; }
89561 +  fi
89562 +
89563 +
89564 +
89565 +               else
89566 +                       echo "$ac_t""no" 1>&6
89567 +
89568 +               fi
89569 +
89570 +
89571 +
89572 +
89573 +    $php_shtool mkdir -p $ext_builddir/phpstr
89574 +
89575 +
89576 +
89577 +  PHP_VAR_SUBST="$PHP_VAR_SUBST HTTP_SHARED_LIBADD"
89578 +
89579 +
89580 +       PHP_HTTP_HEADERS="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \
89581 +               php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \
89582 +               php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h \
89583 +               php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.h \
89584 +               php_http_exception_object.h php_http_message_object.h php_http_request_object.h \
89585 +               php_http_requestpool_object.h php_http_response_object.h php_http_util_object.h \
89586 +               php_http_querystring_object.h php_http_deflatestream_object.h php_http_inflatestream_object.h \
89587 +               php_http_cookie_api.h php_http_querystring_api.h php_http_request_datashare_api.h php_http_requestdatashare_object.h \
89588 +               php_http_persistent_handle_api.h"
89589 +
89590 +
89591
89592 +    header_path=ext/http
89593 +    for header_file in $PHP_HTTP_HEADERS; do
89594 +      hp_hf="$header_path/$header_file"
89595 +
89596
89597 -    $php_shtool mkdir -p $ext_builddir/lib
89598 +  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
89599
89600 +  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
89601 +  if test -n "$unique" && test "`eval $cmd`" = "" ; then
89602 +    eval "INSTALLHEADERS$unique=set"
89603 +
89604 +        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
89605 +
89606 +  fi
89607
89608 +    done
89609
89610 -  PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD"
89611
89612 +
89613
89614 -
89615 -  src=$ext_srcdir/Makefile.frag
89616 -  ac_srcdir=$ext_srcdir
89617 -  ac_builddir=$ext_builddir
89618 -  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
89619 +       cat >> confdefs.h <<\EOF
89620 +#define HAVE_HTTP 1
89621 +EOF
89622
89623  fi
89624
89625 @@ -103390,7 +109977,7 @@ fi
89626  php_enable_disable_mysqlnd_compression_support=yes
89627
89628  echo $ac_n "checking whether to disable compressed protocol support in mysqlnd""... $ac_c" 1>&6
89629 -echo "configure:103394: checking whether to disable compressed protocol support in mysqlnd" >&5
89630 +echo "configure:109981: checking whether to disable compressed protocol support in mysqlnd" >&5
89631  # Check whether --enable-disable_mysqlnd_compression_support or --disable-disable_mysqlnd_compression_support was given.
89632  if test "${enable_disable_mysqlnd_compression_support+set}" = set; then
89633    enableval="$enable_disable_mysqlnd_compression_support"
89634 @@ -103435,7 +110022,7 @@ if test -z "$PHP_ZLIB_DIR"; then
89635  php_with_zlib_dir=no
89636
89637  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
89638 -echo "configure:103439: checking for the location of libz" >&5
89639 +echo "configure:110026: checking for the location of libz" >&5
89640  # Check whether --with-zlib-dir or --without-zlib-dir was given.
89641  if test "${with_zlib_dir+set}" = set; then
89642    withval="$with_zlib_dir"
89643 @@ -103901,7 +110488,7 @@ if test "$PHP_MYSQLND_ENABLED" = "yes" |
89644
89645    for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do
89646      echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6
89647 -echo "configure:103905: checking whether $php_typename exists" >&5
89648 +echo "configure:110492: checking whether $php_typename exists" >&5
89649
89650    php_cache_value=php_cv_sizeof_$php_typename
89651    if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then
89652 @@ -103918,7 +110505,7 @@ else
89653
89654  else
89655    cat > conftest.$ac_ext <<EOF
89656 -#line 103922 "configure"
89657 +#line 110509 "configure"
89658  #include "confdefs.h"
89659  #include <stdio.h>
89660  #if STDC_HEADERS
89661 @@ -103948,7 +110535,7 @@ int main()
89662  }
89663
89664  EOF
89665 -if { (eval echo configure:103952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
89666 +if { (eval echo configure:110539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
89667  then
89668
89669      eval $php_cache_value=`cat conftestval`
89670 @@ -104088,7 +110675,7 @@ if test "$PHP_RECODE" != "no"; then
89671    done
89672
89673    echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
89674 -echo "configure:104092: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
89675 +echo "configure:110679: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
89676  ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'`
89677  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
89678    echo $ac_n "(cached) $ac_c" 1>&6
89679 @@ -104096,7 +110683,7 @@ else
89680    ac_save_LIBS="$LIBS"
89681  LIBS="-l$MYSQL_LIBNAME  $LIBS"
89682  cat > conftest.$ac_ext <<EOF
89683 -#line 104100 "configure"
89684 +#line 110687 "configure"
89685  #include "confdefs.h"
89686  /* Override any gcc2 internal prototype to avoid an error.  */
89687  /* We use char because int might match the return type of a gcc2
89688 @@ -104107,7 +110694,7 @@ int main() {
89689  hash_insert()
89690  ; return 0; }
89691  EOF
89692 -if { (eval echo configure:104111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89693 +if { (eval echo configure:110698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89694    rm -rf conftest*
89695    eval "ac_cv_lib_$ac_lib_var=yes"
89696  else
89697 @@ -104209,7 +110796,7 @@ fi
89698  php_with_pear=DEFAULT
89699
89700  echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6
89701 -echo "configure:104213: checking whether to install PEAR" >&5
89702 +echo "configure:110800: checking whether to install PEAR" >&5
89703  # Check whether --with-pear or --without-pear was given.
89704  if test "${with_pear+set}" = set; then
89705    withval="$with_pear"
89706 @@ -104311,7 +110898,7 @@ fi
89707    bison_version=none
89708    if test "$YACC"; then
89709      echo $ac_n "checking for bison version""... $ac_c" 1>&6
89710 -echo "configure:104315: checking for bison version" >&5
89711 +echo "configure:110902: checking for bison version" >&5
89712  if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then
89713    echo $ac_n "(cached) $ac_c" 1>&6
89714  else
89715 @@ -104367,17 +110954,17 @@ dlfcn.h
89716  do
89717  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
89718  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
89719 -echo "configure:104371: checking for $ac_hdr" >&5
89720 +echo "configure:110958: checking for $ac_hdr" >&5
89721  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
89722    echo $ac_n "(cached) $ac_c" 1>&6
89723  else
89724    cat > conftest.$ac_ext <<EOF
89725 -#line 104376 "configure"
89726 +#line 110963 "configure"
89727  #include "confdefs.h"
89728  #include <$ac_hdr>
89729  EOF
89730  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
89731 -{ (eval echo configure:104381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
89732 +{ (eval echo configure:110968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
89733  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
89734  if test -z "$ac_err"; then
89735    rm -rf conftest*
89736 @@ -104405,12 +110992,12 @@ done
89737
89738
89739  echo $ac_n "checking for size_t""... $ac_c" 1>&6
89740 -echo "configure:104409: checking for size_t" >&5
89741 +echo "configure:110996: checking for size_t" >&5
89742  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
89743    echo $ac_n "(cached) $ac_c" 1>&6
89744  else
89745    cat > conftest.$ac_ext <<EOF
89746 -#line 104414 "configure"
89747 +#line 111001 "configure"
89748  #include "confdefs.h"
89749  #include <sys/types.h>
89750  #if STDC_HEADERS
89751 @@ -104438,12 +111025,12 @@ EOF
89752  fi
89753
89754  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
89755 -echo "configure:104442: checking return type of signal handlers" >&5
89756 +echo "configure:111029: checking return type of signal handlers" >&5
89757  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
89758    echo $ac_n "(cached) $ac_c" 1>&6
89759  else
89760    cat > conftest.$ac_ext <<EOF
89761 -#line 104447 "configure"
89762 +#line 111034 "configure"
89763  #include "confdefs.h"
89764  #include <sys/types.h>
89765  #include <signal.h>
89766 @@ -104460,7 +111047,7 @@ int main() {
89767  int i;
89768  ; return 0; }
89769  EOF
89770 -if { (eval echo configure:104464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
89771 +if { (eval echo configure:111051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
89772    rm -rf conftest*
89773    ac_cv_type_signal=void
89774  else
89775 @@ -104484,12 +111071,12 @@ EOF
89776
89777
89778  echo $ac_n "checking for uint""... $ac_c" 1>&6
89779 -echo "configure:104488: checking for uint" >&5
89780 +echo "configure:111075: checking for uint" >&5
89781  if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then
89782    echo $ac_n "(cached) $ac_c" 1>&6
89783  else
89784    cat > conftest.$ac_ext <<EOF
89785 -#line 104493 "configure"
89786 +#line 111080 "configure"
89787  #include "confdefs.h"
89788  #include <sys/types.h>
89789  #if STDC_HEADERS
89790 @@ -104517,12 +111104,12 @@ EOF
89791  fi
89792
89793  echo $ac_n "checking for ulong""... $ac_c" 1>&6
89794 -echo "configure:104521: checking for ulong" >&5
89795 +echo "configure:111108: checking for ulong" >&5
89796  if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then
89797    echo $ac_n "(cached) $ac_c" 1>&6
89798  else
89799    cat > conftest.$ac_ext <<EOF
89800 -#line 104526 "configure"
89801 +#line 111113 "configure"
89802  #include "confdefs.h"
89803  #include <sys/types.h>
89804  #if STDC_HEADERS
89805 @@ -104552,9 +111139,9 @@ fi
89806
89807
89808  echo $ac_n "checking for int32_t""... $ac_c" 1>&6
89809 -echo "configure:104556: checking for int32_t" >&5
89810 +echo "configure:111143: checking for int32_t" >&5
89811  cat > conftest.$ac_ext <<EOF
89812 -#line 104558 "configure"
89813 +#line 111145 "configure"
89814  #include "confdefs.h"
89815
89816  #if HAVE_SYS_TYPES_H
89817 @@ -104573,7 +111160,7 @@ if (sizeof (int32_t))
89818
89819  ; return 0; }
89820  EOF
89821 -if { (eval echo configure:104577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
89822 +if { (eval echo configure:111164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
89823    rm -rf conftest*
89824
89825    cat >> confdefs.h <<EOF
89826 @@ -104592,9 +111179,9 @@ fi
89827  rm -f conftest*
89828
89829  echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
89830 -echo "configure:104596: checking for uint32_t" >&5
89831 +echo "configure:111183: checking for uint32_t" >&5
89832  cat > conftest.$ac_ext <<EOF
89833 -#line 104598 "configure"
89834 +#line 111185 "configure"
89835  #include "confdefs.h"
89836
89837  #if HAVE_SYS_TYPES_H
89838 @@ -104613,7 +111200,7 @@ if (sizeof (uint32_t))
89839
89840  ; return 0; }
89841  EOF
89842 -if { (eval echo configure:104617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
89843 +if { (eval echo configure:111204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
89844    rm -rf conftest*
89845
89846    cat >> confdefs.h <<EOF
89847 @@ -104632,12 +111219,12 @@ fi
89848  rm -f conftest*
89849
89850  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
89851 -echo "configure:104636: checking for vprintf" >&5
89852 +echo "configure:111223: checking for vprintf" >&5
89853  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
89854    echo $ac_n "(cached) $ac_c" 1>&6
89855  else
89856    cat > conftest.$ac_ext <<EOF
89857 -#line 104641 "configure"
89858 +#line 111228 "configure"
89859  #include "confdefs.h"
89860  /* System header to define __stub macros and hopefully few prototypes,
89861      which can conflict with char vprintf(); below.  */
89862 @@ -104660,7 +111247,7 @@ vprintf();
89863
89864  ; return 0; }
89865  EOF
89866 -if { (eval echo configure:104664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89867 +if { (eval echo configure:111251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89868    rm -rf conftest*
89869    eval "ac_cv_func_vprintf=yes"
89870  else
89871 @@ -104684,12 +111271,12 @@ fi
89872
89873  if test "$ac_cv_func_vprintf" != yes; then
89874  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
89875 -echo "configure:104688: checking for _doprnt" >&5
89876 +echo "configure:111275: checking for _doprnt" >&5
89877  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
89878    echo $ac_n "(cached) $ac_c" 1>&6
89879  else
89880    cat > conftest.$ac_ext <<EOF
89881 -#line 104693 "configure"
89882 +#line 111280 "configure"
89883  #include "confdefs.h"
89884  /* System header to define __stub macros and hopefully few prototypes,
89885      which can conflict with char _doprnt(); below.  */
89886 @@ -104712,7 +111299,7 @@ _doprnt();
89887
89888  ; return 0; }
89889  EOF
89890 -if { (eval echo configure:104716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89891 +if { (eval echo configure:111303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89892    rm -rf conftest*
89893    eval "ac_cv_func__doprnt=yes"
89894  else
89895 @@ -104737,7 +111324,7 @@ fi
89896  fi
89897
89898  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
89899 -echo "configure:104741: checking for 8-bit clean memcmp" >&5
89900 +echo "configure:111328: checking for 8-bit clean memcmp" >&5
89901  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
89902    echo $ac_n "(cached) $ac_c" 1>&6
89903  else
89904 @@ -104745,7 +111332,7 @@ else
89905    ac_cv_func_memcmp_clean=no
89906  else
89907    cat > conftest.$ac_ext <<EOF
89908 -#line 104749 "configure"
89909 +#line 111336 "configure"
89910  #include "confdefs.h"
89911
89912  main()
89913 @@ -104755,7 +111342,7 @@ main()
89914  }
89915
89916  EOF
89917 -if { (eval echo configure:104759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
89918 +if { (eval echo configure:111346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
89919  then
89920    ac_cv_func_memcmp_clean=yes
89921  else
89922 @@ -104775,19 +111362,19 @@ test $ac_cv_func_memcmp_clean = no && LI
89923  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
89924  # for constant arguments.  Useless!
89925  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
89926 -echo "configure:104779: checking for working alloca.h" >&5
89927 +echo "configure:111366: checking for working alloca.h" >&5
89928  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
89929    echo $ac_n "(cached) $ac_c" 1>&6
89930  else
89931    cat > conftest.$ac_ext <<EOF
89932 -#line 104784 "configure"
89933 +#line 111371 "configure"
89934  #include "confdefs.h"
89935  #include <alloca.h>
89936  int main() {
89937  char *p = alloca(2 * sizeof(int));
89938  ; return 0; }
89939  EOF
89940 -if { (eval echo configure:104791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89941 +if { (eval echo configure:111378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89942    rm -rf conftest*
89943    ac_cv_header_alloca_h=yes
89944  else
89945 @@ -104808,12 +111395,12 @@ EOF
89946  fi
89947
89948  echo $ac_n "checking for alloca""... $ac_c" 1>&6
89949 -echo "configure:104812: checking for alloca" >&5
89950 +echo "configure:111399: checking for alloca" >&5
89951  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
89952    echo $ac_n "(cached) $ac_c" 1>&6
89953  else
89954    cat > conftest.$ac_ext <<EOF
89955 -#line 104817 "configure"
89956 +#line 111404 "configure"
89957  #include "confdefs.h"
89958
89959  #ifdef __GNUC__
89960 @@ -104841,7 +111428,7 @@ int main() {
89961  char *p = (char *) alloca(1);
89962  ; return 0; }
89963  EOF
89964 -if { (eval echo configure:104845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89965 +if { (eval echo configure:111432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
89966    rm -rf conftest*
89967    ac_cv_func_alloca_works=yes
89968  else
89969 @@ -104873,12 +111460,12 @@ EOF
89970
89971
89972  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
89973 -echo "configure:104877: checking whether alloca needs Cray hooks" >&5
89974 +echo "configure:111464: checking whether alloca needs Cray hooks" >&5
89975  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
89976    echo $ac_n "(cached) $ac_c" 1>&6
89977  else
89978    cat > conftest.$ac_ext <<EOF
89979 -#line 104882 "configure"
89980 +#line 111469 "configure"
89981  #include "confdefs.h"
89982  #if defined(CRAY) && ! defined(CRAY2)
89983  webecray
89984 @@ -104903,12 +111490,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
89985  if test $ac_cv_os_cray = yes; then
89986  for ac_func in _getb67 GETB67 getb67; do
89987    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
89988 -echo "configure:104907: checking for $ac_func" >&5
89989 +echo "configure:111494: checking for $ac_func" >&5
89990  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
89991    echo $ac_n "(cached) $ac_c" 1>&6
89992  else
89993    cat > conftest.$ac_ext <<EOF
89994 -#line 104912 "configure"
89995 +#line 111499 "configure"
89996  #include "confdefs.h"
89997  /* System header to define __stub macros and hopefully few prototypes,
89998      which can conflict with char $ac_func(); below.  */
89999 @@ -104931,7 +111518,7 @@ $ac_func();
90000
90001  ; return 0; }
90002  EOF
90003 -if { (eval echo configure:104935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90004 +if { (eval echo configure:111522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90005    rm -rf conftest*
90006    eval "ac_cv_func_$ac_func=yes"
90007  else
90008 @@ -104958,7 +111545,7 @@ done
90009  fi
90010
90011  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
90012 -echo "configure:104962: checking stack direction for C alloca" >&5
90013 +echo "configure:111549: checking stack direction for C alloca" >&5
90014  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
90015    echo $ac_n "(cached) $ac_c" 1>&6
90016  else
90017 @@ -104966,7 +111553,7 @@ else
90018    ac_cv_c_stack_direction=0
90019  else
90020    cat > conftest.$ac_ext <<EOF
90021 -#line 104970 "configure"
90022 +#line 111557 "configure"
90023  #include "confdefs.h"
90024  find_stack_direction ()
90025  {
90026 @@ -104985,7 +111572,7 @@ main ()
90027    exit (find_stack_direction() < 0);
90028  }
90029  EOF
90030 -if { (eval echo configure:104989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90031 +if { (eval echo configure:111576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90032  then
90033    ac_cv_c_stack_direction=1
90034  else
90035 @@ -105009,12 +111596,12 @@ fi
90036  for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp
90037  do
90038  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
90039 -echo "configure:105013: checking for $ac_func" >&5
90040 +echo "configure:111600: checking for $ac_func" >&5
90041  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
90042    echo $ac_n "(cached) $ac_c" 1>&6
90043  else
90044    cat > conftest.$ac_ext <<EOF
90045 -#line 105018 "configure"
90046 +#line 111605 "configure"
90047  #include "confdefs.h"
90048  /* System header to define __stub macros and hopefully few prototypes,
90049      which can conflict with char $ac_func(); below.  */
90050 @@ -105037,7 +111624,7 @@ $ac_func();
90051
90052  ; return 0; }
90053  EOF
90054 -if { (eval echo configure:105041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90055 +if { (eval echo configure:111628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90056    rm -rf conftest*
90057    eval "ac_cv_func_$ac_func=yes"
90058  else
90059 @@ -105063,7 +111650,7 @@ done
90060
90061
90062    echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6
90063 -echo "configure:105067: checking whether sprintf is broken" >&5
90064 +echo "configure:111654: checking whether sprintf is broken" >&5
90065  if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then
90066    echo $ac_n "(cached) $ac_c" 1>&6
90067  else
90068 @@ -105074,11 +111661,11 @@ else
90069
90070  else
90071    cat > conftest.$ac_ext <<EOF
90072 -#line 105078 "configure"
90073 +#line 111665 "configure"
90074  #include "confdefs.h"
90075  main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }
90076  EOF
90077 -if { (eval echo configure:105082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90078 +if { (eval echo configure:111669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90079  then
90080
90081        ac_cv_broken_sprintf=no
90082 @@ -105112,12 +111699,12 @@ EOF
90083  for ac_func in finite isfinite isinf isnan
90084  do
90085  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
90086 -echo "configure:105116: checking for $ac_func" >&5
90087 +echo "configure:111703: checking for $ac_func" >&5
90088  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
90089    echo $ac_n "(cached) $ac_c" 1>&6
90090  else
90091    cat > conftest.$ac_ext <<EOF
90092 -#line 105121 "configure"
90093 +#line 111708 "configure"
90094  #include "confdefs.h"
90095  /* System header to define __stub macros and hopefully few prototypes,
90096      which can conflict with char $ac_func(); below.  */
90097 @@ -105140,7 +111727,7 @@ $ac_func();
90098
90099  ; return 0; }
90100  EOF
90101 -if { (eval echo configure:105144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90102 +if { (eval echo configure:111731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90103    rm -rf conftest*
90104    eval "ac_cv_func_$ac_func=yes"
90105  else
90106 @@ -105167,13 +111754,13 @@ done
90107
90108
90109    echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6
90110 -echo "configure:105171: checking whether fp_except is defined" >&5
90111 +echo "configure:111758: checking whether fp_except is defined" >&5
90112  if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then
90113    echo $ac_n "(cached) $ac_c" 1>&6
90114  else
90115
90116      cat > conftest.$ac_ext <<EOF
90117 -#line 105177 "configure"
90118 +#line 111764 "configure"
90119  #include "confdefs.h"
90120
90121  #include <floatingpoint.h>
90122 @@ -105184,7 +111771,7 @@ fp_except x = (fp_except) 0;
90123
90124  ; return 0; }
90125  EOF
90126 -if { (eval echo configure:105188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90127 +if { (eval echo configure:111775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90128    rm -rf conftest*
90129
90130       ac_cv_type_fp_except=yes
90131 @@ -105211,9 +111798,9 @@ EOF
90132
90133
90134    echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6
90135 -echo "configure:105215: checking for usable _FPU_SETCW" >&5
90136 +echo "configure:111802: checking for usable _FPU_SETCW" >&5
90137    cat > conftest.$ac_ext <<EOF
90138 -#line 105217 "configure"
90139 +#line 111804 "configure"
90140  #include "confdefs.h"
90141
90142      #include <fpu_control.h>
90143 @@ -105233,7 +111820,7 @@ int main() {
90144
90145  ; return 0; }
90146  EOF
90147 -if { (eval echo configure:105237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90148 +if { (eval echo configure:111824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90149    rm -rf conftest*
90150    ac_cfp_have__fpu_setcw=yes
90151  else
90152 @@ -105254,9 +111841,9 @@ EOF
90153    fi
90154
90155    echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6
90156 -echo "configure:105258: checking for usable fpsetprec" >&5
90157 +echo "configure:111845: checking for usable fpsetprec" >&5
90158    cat > conftest.$ac_ext <<EOF
90159 -#line 105260 "configure"
90160 +#line 111847 "configure"
90161  #include "confdefs.h"
90162
90163      #include <machine/ieeefp.h>
90164 @@ -105275,7 +111862,7 @@ int main() {
90165
90166  ; return 0; }
90167  EOF
90168 -if { (eval echo configure:105279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90169 +if { (eval echo configure:111866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90170    rm -rf conftest*
90171    ac_cfp_have_fpsetprec=yes
90172  else
90173 @@ -105296,9 +111883,9 @@ EOF
90174    fi
90175
90176    echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6
90177 -echo "configure:105300: checking for usable _controlfp" >&5
90178 +echo "configure:111887: checking for usable _controlfp" >&5
90179    cat > conftest.$ac_ext <<EOF
90180 -#line 105302 "configure"
90181 +#line 111889 "configure"
90182  #include "confdefs.h"
90183
90184      #include <float.h>
90185 @@ -105317,7 +111904,7 @@ int main() {
90186
90187  ; return 0; }
90188  EOF
90189 -if { (eval echo configure:105321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90190 +if { (eval echo configure:111908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90191    rm -rf conftest*
90192    ac_cfp_have__controlfp=yes
90193  else
90194 @@ -105338,9 +111925,9 @@ EOF
90195    fi
90196
90197    echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6
90198 -echo "configure:105342: checking for usable _controlfp_s" >&5
90199 +echo "configure:111929: checking for usable _controlfp_s" >&5
90200    cat > conftest.$ac_ext <<EOF
90201 -#line 105344 "configure"
90202 +#line 111931 "configure"
90203  #include "confdefs.h"
90204
90205     #include <float.h>
90206 @@ -105360,7 +111947,7 @@ int main() {
90207
90208  ; return 0; }
90209  EOF
90210 -if { (eval echo configure:105364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90211 +if { (eval echo configure:111951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90212    rm -rf conftest*
90213    ac_cfp_have__controlfp_s=yes
90214  else
90215 @@ -105381,9 +111968,9 @@ EOF
90216    fi
90217
90218    echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6
90219 -echo "configure:105385: checking whether FPU control word can be manipulated by inline assembler" >&5
90220 +echo "configure:111972: checking whether FPU control word can be manipulated by inline assembler" >&5
90221    cat > conftest.$ac_ext <<EOF
90222 -#line 105387 "configure"
90223 +#line 111974 "configure"
90224  #include "confdefs.h"
90225
90226      /* nothing */
90227 @@ -105405,7 +111992,7 @@ int main() {
90228
90229  ; return 0; }
90230  EOF
90231 -if { (eval echo configure:105409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90232 +if { (eval echo configure:111996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90233    rm -rf conftest*
90234    ac_cfp_have_fpu_inline_asm_x86=yes
90235  else
90236 @@ -105427,7 +112014,7 @@ EOF
90237
90238
90239  echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6
90240 -echo "configure:105431: checking whether double cast to long preserves least significant bits" >&5
90241 +echo "configure:112018: checking whether double cast to long preserves least significant bits" >&5
90242
90243  if test "$cross_compiling" = yes; then
90244
90245 @@ -105435,7 +112022,7 @@ if test "$cross_compiling" = yes; then
90246
90247  else
90248    cat > conftest.$ac_ext <<EOF
90249 -#line 105439 "configure"
90250 +#line 112026 "configure"
90251  #include "confdefs.h"
90252
90253  #include <limits.h>
90254 @@ -105459,7 +112046,7 @@ int main()
90255  }
90256
90257  EOF
90258 -if { (eval echo configure:105463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90259 +if { (eval echo configure:112050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90260  then
90261
90262    cat >> confdefs.h <<\EOF
90263 @@ -105485,17 +112072,17 @@ for ac_hdr in dlfcn.h
90264  do
90265  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
90266  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
90267 -echo "configure:105489: checking for $ac_hdr" >&5
90268 +echo "configure:112076: checking for $ac_hdr" >&5
90269  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
90270    echo $ac_n "(cached) $ac_c" 1>&6
90271  else
90272    cat > conftest.$ac_ext <<EOF
90273 -#line 105494 "configure"
90274 +#line 112081 "configure"
90275  #include "confdefs.h"
90276  #include <$ac_hdr>
90277  EOF
90278  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
90279 -{ (eval echo configure:105499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
90280 +{ (eval echo configure:112086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
90281  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
90282  if test -z "$ac_err"; then
90283    rm -rf conftest*
90284 @@ -105523,14 +112110,14 @@ done
90285
90286
90287  echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6
90288 -echo "configure:105527: checking whether dlsym() requires a leading underscore in symbol names" >&5
90289 +echo "configure:112114: checking whether dlsym() requires a leading underscore in symbol names" >&5
90290  if test "$cross_compiling" = yes; then :
90291
90292  else
90293    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
90294    lt_status=$lt_dlunknown
90295    cat > conftest.$ac_ext <<EOF
90296 -#line 105534 "configure"
90297 +#line 112121 "configure"
90298  #include "confdefs.h"
90299
90300  #if HAVE_DLFCN_H
90301 @@ -105593,7 +112180,7 @@ int main ()
90302      exit (status);
90303  }
90304  EOF
90305 -  if { (eval echo configure:105597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
90306 +  if { (eval echo configure:112184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
90307      (./conftest; exit; ) >&5 2>/dev/null
90308      lt_status=$?
90309      case x$lt_status in
90310 @@ -105676,23 +112263,23 @@ fi
90311
90312
90313  echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6
90314 -echo "configure:105680: checking virtual machine dispatch method" >&5
90315 +echo "configure:112267: checking virtual machine dispatch method" >&5
90316  echo "$ac_t""$PHP_ZEND_VM" 1>&6
90317
90318  echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6
90319 -echo "configure:105684: checking whether to enable thread-safety" >&5
90320 +echo "configure:112271: checking whether to enable thread-safety" >&5
90321  echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6
90322
90323  echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6
90324 -echo "configure:105688: checking whether to enable inline optimization for GCC" >&5
90325 +echo "configure:112275: checking whether to enable inline optimization for GCC" >&5
90326  echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6
90327
90328  echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6
90329 -echo "configure:105692: checking whether to enable Zend debugging" >&5
90330 +echo "configure:112279: checking whether to enable Zend debugging" >&5
90331  echo "$ac_t""$ZEND_DEBUG" 1>&6
90332
90333  echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6
90334 -echo "configure:105696: checking whether to enable Zend multibyte" >&5
90335 +echo "configure:112283: checking whether to enable Zend multibyte" >&5
90336  echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
90337
90338  case $PHP_ZEND_VM in
90339 @@ -105765,21 +112352,21 @@ fi
90340
90341
90342  echo $ac_n "checking for inline""... $ac_c" 1>&6
90343 -echo "configure:105769: checking for inline" >&5
90344 +echo "configure:112356: checking for inline" >&5
90345  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
90346    echo $ac_n "(cached) $ac_c" 1>&6
90347  else
90348    ac_cv_c_inline=no
90349  for ac_kw in inline __inline__ __inline; do
90350    cat > conftest.$ac_ext <<EOF
90351 -#line 105776 "configure"
90352 +#line 112363 "configure"
90353  #include "confdefs.h"
90354
90355  int main() {
90356  } $ac_kw foo() {
90357  ; return 0; }
90358  EOF
90359 -if { (eval echo configure:105783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90360 +if { (eval echo configure:112370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90361    rm -rf conftest*
90362    ac_cv_c_inline=$ac_kw; break
90363  else
90364 @@ -105808,7 +112395,7 @@ esac
90365
90366
90367  echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6
90368 -echo "configure:105812: checking target system is Darwin" >&5
90369 +echo "configure:112399: checking target system is Darwin" >&5
90370  if echo "$target" | grep "darwin" > /dev/null; then
90371    cat >> confdefs.h <<\EOF
90372  #define DARWIN 1
90373 @@ -105820,7 +112407,7 @@ else
90374  fi
90375
90376  echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6
90377 -echo "configure:105824: checking for MM alignment and log values" >&5
90378 +echo "configure:112411: checking for MM alignment and log values" >&5
90379
90380  if test "$cross_compiling" = yes; then
90381
90382 @@ -105828,7 +112415,7 @@ if test "$cross_compiling" = yes; then
90383
90384  else
90385    cat > conftest.$ac_ext <<EOF
90386 -#line 105832 "configure"
90387 +#line 112419 "configure"
90388  #include "confdefs.h"
90389
90390  #include <stdio.h>
90391 @@ -105864,7 +112451,7 @@ int main()
90392  }
90393
90394  EOF
90395 -if { (eval echo configure:105868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90396 +if { (eval echo configure:112455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90397  then
90398
90399    LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
90400 @@ -105889,7 +112476,7 @@ fi
90401  echo "$ac_t""done" 1>&6
90402
90403  echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6
90404 -echo "configure:105893: checking for memory allocation using mmap(MAP_ANON)" >&5
90405 +echo "configure:112480: checking for memory allocation using mmap(MAP_ANON)" >&5
90406
90407  if test "$cross_compiling" = yes; then
90408
90409 @@ -105897,7 +112484,7 @@ if test "$cross_compiling" = yes; then
90410
90411  else
90412    cat > conftest.$ac_ext <<EOF
90413 -#line 105901 "configure"
90414 +#line 112488 "configure"
90415  #include "confdefs.h"
90416
90417  #include <sys/types.h>
90418 @@ -105933,7 +112520,7 @@ int main()
90419  }
90420
90421  EOF
90422 -if { (eval echo configure:105937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90423 +if { (eval echo configure:112524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90424  then
90425
90426    cat >> confdefs.h <<\EOF
90427 @@ -105955,7 +112542,7 @@ fi
90428
90429
90430  echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6
90431 -echo "configure:105959: checking for memory allocation using mmap("/dev/zero")" >&5
90432 +echo "configure:112546: checking for memory allocation using mmap("/dev/zero")" >&5
90433
90434  if test "$cross_compiling" = yes; then
90435
90436 @@ -105963,7 +112550,7 @@ if test "$cross_compiling" = yes; then
90437
90438  else
90439    cat > conftest.$ac_ext <<EOF
90440 -#line 105967 "configure"
90441 +#line 112554 "configure"
90442  #include "confdefs.h"
90443
90444  #include <sys/types.h>
90445 @@ -106009,7 +112596,7 @@ int main()
90446  }
90447
90448  EOF
90449 -if { (eval echo configure:106013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90450 +if { (eval echo configure:112600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90451  then
90452
90453    cat >> confdefs.h <<\EOF
90454 @@ -106033,12 +112620,12 @@ fi
90455  for ac_func in mremap
90456  do
90457  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
90458 -echo "configure:106037: checking for $ac_func" >&5
90459 +echo "configure:112624: checking for $ac_func" >&5
90460  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
90461    echo $ac_n "(cached) $ac_c" 1>&6
90462  else
90463    cat > conftest.$ac_ext <<EOF
90464 -#line 106042 "configure"
90465 +#line 112629 "configure"
90466  #include "confdefs.h"
90467  /* System header to define __stub macros and hopefully few prototypes,
90468      which can conflict with char $ac_func(); below.  */
90469 @@ -106061,7 +112648,7 @@ $ac_func();
90470
90471  ; return 0; }
90472  EOF
90473 -if { (eval echo configure:106065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90474 +if { (eval echo configure:112652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90475    rm -rf conftest*
90476    eval "ac_cv_func_$ac_func=yes"
90477  else
90478 @@ -106128,17 +112715,17 @@ for ac_hdr in stdarg.h
90479  do
90480  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
90481  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
90482 -echo "configure:106132: checking for $ac_hdr" >&5
90483 +echo "configure:112719: checking for $ac_hdr" >&5
90484  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
90485    echo $ac_n "(cached) $ac_c" 1>&6
90486  else
90487    cat > conftest.$ac_ext <<EOF
90488 -#line 106137 "configure"
90489 +#line 112724 "configure"
90490  #include "confdefs.h"
90491  #include <$ac_hdr>
90492  EOF
90493  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
90494 -{ (eval echo configure:106142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
90495 +{ (eval echo configure:112729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
90496  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
90497  if test -z "$ac_err"; then
90498    rm -rf conftest*
90499 @@ -106215,7 +112802,7 @@ if test "$TSRM_PTH" != "no"; then
90500
90501
90502  echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6
90503 -echo "configure:106219: checking for GNU Pth" >&5
90504 +echo "configure:112806: checking for GNU Pth" >&5
90505  PTH_PREFIX="`$TSRM_PTH --prefix`"
90506  if test -z "$PTH_PREFIX"; then
90507    echo "$ac_t""Please check your Pth installation" 1>&6
90508 @@ -106245,17 +112832,17 @@ elif test "$TSRM_ST" != "no"; then
90509  do
90510  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
90511  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
90512 -echo "configure:106249: checking for $ac_hdr" >&5
90513 +echo "configure:112836: checking for $ac_hdr" >&5
90514  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
90515    echo $ac_n "(cached) $ac_c" 1>&6
90516  else
90517    cat > conftest.$ac_ext <<EOF
90518 -#line 106254 "configure"
90519 +#line 112841 "configure"
90520  #include "confdefs.h"
90521  #include <$ac_hdr>
90522  EOF
90523  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
90524 -{ (eval echo configure:106259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
90525 +{ (eval echo configure:112846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
90526  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
90527  if test -z "$ac_err"; then
90528    rm -rf conftest*
90529 @@ -106285,7 +112872,7 @@ done
90530
90531    LIBS="$LIBS -lst"
90532    echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6
90533 -echo "configure:106289: checking for SGI's State Threads" >&5
90534 +echo "configure:112876: checking for SGI's State Threads" >&5
90535    echo "$ac_t""yes" 1>&6
90536    cat >> confdefs.h <<\EOF
90537  #define TSRM_ST 1
90538 @@ -106324,7 +112911,7 @@ if test "$cross_compiling" = yes; then
90539
90540  else
90541    cat > conftest.$ac_ext <<EOF
90542 -#line 106328 "configure"
90543 +#line 112915 "configure"
90544  #include "confdefs.h"
90545
90546  #include <pthread.h>
90547 @@ -106342,7 +112929,7 @@ int main() {
90548      return pthread_create(&thd, NULL, thread_routine, &data);
90549  }
90550  EOF
90551 -if { (eval echo configure:106346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90552 +if { (eval echo configure:112933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90553  then
90554
90555    pthreads_working=yes
90556 @@ -106362,7 +112949,7 @@ fi
90557    CFLAGS=$save_CFLAGS
90558
90559    echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
90560 -echo "configure:106366: checking for pthreads_cflags" >&5
90561 +echo "configure:112953: checking for pthreads_cflags" >&5
90562  if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
90563    echo $ac_n "(cached) $ac_c" 1>&6
90564  else
90565 @@ -106384,7 +112971,7 @@ if test "$cross_compiling" = yes; then
90566
90567  else
90568    cat > conftest.$ac_ext <<EOF
90569 -#line 106388 "configure"
90570 +#line 112975 "configure"
90571  #include "confdefs.h"
90572
90573  #include <pthread.h>
90574 @@ -106402,7 +112989,7 @@ int main() {
90575      return pthread_create(&thd, NULL, thread_routine, &data);
90576  }
90577  EOF
90578 -if { (eval echo configure:106406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90579 +if { (eval echo configure:112993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90580  then
90581
90582    pthreads_working=yes
90583 @@ -106432,7 +113019,7 @@ fi
90584  echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
90585
90586  echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
90587 -echo "configure:106436: checking for pthreads_lib" >&5
90588 +echo "configure:113023: checking for pthreads_lib" >&5
90589  if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
90590    echo $ac_n "(cached) $ac_c" 1>&6
90591  else
90592 @@ -106454,7 +113041,7 @@ if test "$cross_compiling" = yes; then
90593
90594  else
90595    cat > conftest.$ac_ext <<EOF
90596 -#line 106458 "configure"
90597 +#line 113045 "configure"
90598  #include "confdefs.h"
90599
90600  #include <pthread.h>
90601 @@ -106472,7 +113059,7 @@ int main() {
90602      return pthread_create(&thd, NULL, thread_routine, &data);
90603  }
90604  EOF
90605 -if { (eval echo configure:106476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90606 +if { (eval echo configure:113063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
90607  then
90608
90609    pthreads_working=yes
90610 @@ -106523,7 +113110,7 @@ EOF
90611
90612
90613    echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
90614 -echo "configure:106527: checking for POSIX threads" >&5
90615 +echo "configure:113114: checking for POSIX threads" >&5
90616    echo "$ac_t""yes" 1>&6
90617  fi
90618
90619 @@ -107157,7 +113744,7 @@ fi
90620
90621
90622  echo $ac_n "checking build system type""... $ac_c" 1>&6
90623 -echo "configure:107161: checking build system type" >&5
90624 +echo "configure:113748: checking build system type" >&5
90625
90626  build_alias=$build
90627  case "$build_alias" in
90628 @@ -107186,7 +113773,7 @@ ac_prog=ld
90629  if test "$GCC" = yes; then
90630    # Check if gcc -print-prog-name=ld gives a path.
90631    echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
90632 -echo "configure:107190: checking for ld used by $CC" >&5
90633 +echo "configure:113777: checking for ld used by $CC" >&5
90634    case $host in
90635    *-*-mingw*)
90636      # gcc leaves a trailing carriage return which upsets mingw
90637 @@ -107216,10 +113803,10 @@ echo "configure:107190: checking for ld
90638    esac
90639  elif test "$with_gnu_ld" = yes; then
90640    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
90641 -echo "configure:107220: checking for GNU ld" >&5
90642 +echo "configure:113807: checking for GNU ld" >&5
90643  else
90644    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
90645 -echo "configure:107223: checking for non-GNU ld" >&5
90646 +echo "configure:113810: checking for non-GNU ld" >&5
90647  fi
90648  if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
90649    echo $ac_n "(cached) $ac_c" 1>&6
90650 @@ -107258,7 +113845,7 @@ else
90651  fi
90652  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
90653  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
90654 -echo "configure:107262: checking if the linker ($LD) is GNU ld" >&5
90655 +echo "configure:113849: checking if the linker ($LD) is GNU ld" >&5
90656  if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
90657    echo $ac_n "(cached) $ac_c" 1>&6
90658  else
90659 @@ -107278,7 +113865,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
90660
90661
90662  echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
90663 -echo "configure:107282: checking for $LD option to reload object files" >&5
90664 +echo "configure:113869: checking for $LD option to reload object files" >&5
90665  if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
90666    echo $ac_n "(cached) $ac_c" 1>&6
90667  else
90668 @@ -107303,7 +113890,7 @@ case $host_os in
90669  esac
90670
90671  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
90672 -echo "configure:107307: checking for BSD-compatible nm" >&5
90673 +echo "configure:113894: checking for BSD-compatible nm" >&5
90674  if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
90675    echo $ac_n "(cached) $ac_c" 1>&6
90676  else
90677 @@ -107356,7 +113943,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6
90678  NM="$lt_cv_path_NM"
90679
90680  echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6
90681 -echo "configure:107360: checking how to recognize dependent libraries" >&5
90682 +echo "configure:113947: checking how to recognize dependent libraries" >&5
90683  if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
90684    echo $ac_n "(cached) $ac_c" 1>&6
90685  else
90686 @@ -107548,13 +114135,13 @@ deplibs_check_method=$lt_cv_deplibs_chec
90687  test -z "$deplibs_check_method" && deplibs_check_method=unknown
90688
90689  echo $ac_n "checking for object suffix""... $ac_c" 1>&6
90690 -echo "configure:107552: checking for object suffix" >&5
90691 +echo "configure:114139: checking for object suffix" >&5
90692  if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
90693    echo $ac_n "(cached) $ac_c" 1>&6
90694  else
90695    rm -f conftest*
90696  echo 'int i = 1;' > conftest.$ac_ext
90697 -if { (eval echo configure:107558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90698 +if { (eval echo configure:114145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90699    for ac_file in conftest.*; do
90700      case $ac_file in
90701      *.c) ;;
90702 @@ -107574,7 +114161,7 @@ ac_objext=$ac_cv_objext
90703
90704
90705  echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
90706 -echo "configure:107578: checking for executable suffix" >&5
90707 +echo "configure:114165: checking for executable suffix" >&5
90708  if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
90709    echo $ac_n "(cached) $ac_c" 1>&6
90710  else
90711 @@ -107584,10 +114171,10 @@ else
90712    rm -f conftest*
90713    echo 'int main () { return 0; }' > conftest.$ac_ext
90714    ac_cv_exeext=
90715 -  if { (eval echo configure:107588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
90716 +  if { (eval echo configure:114175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
90717      for file in conftest.*; do
90718        case $file in
90719 -      *.c | *.o | *.obj) ;;
90720 +      *.$ac_ext | *.c | *.o | *.obj) ;;
90721        *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
90722        esac
90723      done
90724 @@ -107630,7 +114217,7 @@ case $host in
90725  ia64-*-hpux*)
90726    # Find out which ABI we are using.
90727    echo 'int i;' > conftest.$ac_ext
90728 -  if { (eval echo configure:107634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90729 +  if { (eval echo configure:114221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90730      case `/usr/bin/file conftest.$ac_objext` in
90731      *ELF-32*)
90732        HPUX_IA64_MODE="32"
90733 @@ -107644,8 +114231,8 @@ ia64-*-hpux*)
90734    ;;
90735  *-*-irix6*)
90736    # Find out which ABI we are using.
90737 -  echo '#line 107648 "configure"' > conftest.$ac_ext
90738 -  if { (eval echo configure:107649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90739 +  echo '#line 114235 "configure"' > conftest.$ac_ext
90740 +  if { (eval echo configure:114236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90741     if test "$lt_cv_prog_gnu_ld" = yes; then
90742      case `/usr/bin/file conftest.$ac_objext` in
90743      *32-bit*)
90744 @@ -107679,7 +114266,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
90745  s390*-*linux*|sparc*-*linux*)
90746    # Find out which ABI we are using.
90747    echo 'int i;' > conftest.$ac_ext
90748 -  if { (eval echo configure:107683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90749 +  if { (eval echo configure:114270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90750      case `/usr/bin/file conftest.o` in
90751      *32-bit*)
90752        case $host in
90753 @@ -107729,7 +114316,7 @@ s390*-*linux*|sparc*-*linux*)
90754    SAVE_CFLAGS="$CFLAGS"
90755    CFLAGS="$CFLAGS -belf"
90756    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
90757 -echo "configure:107733: checking whether the C compiler needs -belf" >&5
90758 +echo "configure:114320: checking whether the C compiler needs -belf" >&5
90759  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
90760    echo $ac_n "(cached) $ac_c" 1>&6
90761  else
90762 @@ -107742,14 +114329,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext
90763  cross_compiling=$ac_cv_prog_cc_cross
90764
90765       cat > conftest.$ac_ext <<EOF
90766 -#line 107746 "configure"
90767 +#line 114333 "configure"
90768  #include "confdefs.h"
90769
90770  int main() {
90771
90772  ; return 0; }
90773  EOF
90774 -if { (eval echo configure:107753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90775 +if { (eval echo configure:114340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90776    rm -rf conftest*
90777    lt_cv_cc_needs_belf=yes
90778  else
90779 @@ -107777,7 +114364,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
90780  sparc*-*solaris*)
90781    # Find out which ABI we are using.
90782    echo 'int i;' > conftest.$ac_ext
90783 -  if { (eval echo configure:107781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90784 +  if { (eval echo configure:114368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90785      case `/usr/bin/file conftest.o` in
90786      *64-bit*)
90787        case $lt_cv_prog_gnu_ld in
90788 @@ -107806,7 +114393,7 @@ if test -n "$CXX" && ( test "X$CXX" != "
90789      ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
90790      (test "X$CXX" != "Xg++"))) ; then
90791    echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
90792 -echo "configure:107810: checking how to run the C++ preprocessor" >&5
90793 +echo "configure:114397: checking how to run the C++ preprocessor" >&5
90794  if test -z "$CXXCPP"; then
90795  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
90796    echo $ac_n "(cached) $ac_c" 1>&6
90797 @@ -107819,12 +114406,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee
90798  cross_compiling=$ac_cv_prog_cxx_cross
90799    CXXCPP="${CXX-g++} -E"
90800    cat > conftest.$ac_ext <<EOF
90801 -#line 107823 "configure"
90802 +#line 114410 "configure"
90803  #include "confdefs.h"
90804  #include <stdlib.h>
90805  EOF
90806  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
90807 -{ (eval echo configure:107828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
90808 +{ (eval echo configure:114415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
90809  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
90810  if test -z "$ac_err"; then
90811    :
90812 @@ -107854,7 +114441,7 @@ fi
90813  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
90814  # find the maximum length of command line arguments
90815  echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6
90816 -echo "configure:107858: checking the maximum length of command line arguments" >&5
90817 +echo "configure:114445: checking the maximum length of command line arguments" >&5
90818  if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then
90819    echo $ac_n "(cached) $ac_c" 1>&6
90820  else
90821 @@ -107976,7 +114563,7 @@ fi
90822
90823  # Check for command to grab the raw symbol name followed by C symbol from nm.
90824  echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6
90825 -echo "configure:107980: checking command to parse $NM output from $compiler object" >&5
90826 +echo "configure:114567: checking command to parse $NM output from $compiler object" >&5
90827  if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
90828    echo $ac_n "(cached) $ac_c" 1>&6
90829  else
90830 @@ -108080,10 +114667,10 @@ void nm_test_func(){}
90831  int main(){nm_test_var='a';nm_test_func();return(0);}
90832  EOF
90833
90834 -  if { (eval echo configure:108084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90835 +  if { (eval echo configure:114671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
90836      # Now try to grab the symbols.
90837      nlist=conftest.nm
90838 -    if { (eval echo configure:108087: \"$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
90839 +    if { (eval echo configure:114674: \"$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
90840        # Try sorting and uniquifying the output.
90841        if sort "$nlist" | uniq > "$nlist"T; then
90842         mv -f "$nlist"T "$nlist"
90843 @@ -108134,7 +114721,7 @@ EOF
90844           lt_save_CFLAGS="$CFLAGS"
90845           LIBS="conftstm.$ac_objext"
90846           CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
90847 -         if { (eval echo configure:108138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90848 +         if { (eval echo configure:114725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90849             pipe_works=yes
90850           fi
90851           LIBS="$lt_save_LIBS"
90852 @@ -108174,7 +114761,7 @@ else
90853  fi
90854
90855  echo $ac_n "checking for objdir""... $ac_c" 1>&6
90856 -echo "configure:108178: checking for objdir" >&5
90857 +echo "configure:114765: checking for objdir" >&5
90858  if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then
90859    echo $ac_n "(cached) $ac_c" 1>&6
90860  else
90861 @@ -108240,7 +114827,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
90862  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
90863  set dummy ${ac_tool_prefix}ar; ac_word=$2
90864  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90865 -echo "configure:108244: checking for $ac_word" >&5
90866 +echo "configure:114831: checking for $ac_word" >&5
90867  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
90868    echo $ac_n "(cached) $ac_c" 1>&6
90869  else
90870 @@ -108272,7 +114859,7 @@ if test -n "$ac_tool_prefix"; then
90871    # Extract the first word of "ar", so it can be a program name with args.
90872  set dummy ar; ac_word=$2
90873  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90874 -echo "configure:108276: checking for $ac_word" >&5
90875 +echo "configure:114863: checking for $ac_word" >&5
90876  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
90877    echo $ac_n "(cached) $ac_c" 1>&6
90878  else
90879 @@ -108307,7 +114894,7 @@ fi
90880  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
90881  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
90882  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90883 -echo "configure:108311: checking for $ac_word" >&5
90884 +echo "configure:114898: checking for $ac_word" >&5
90885  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
90886    echo $ac_n "(cached) $ac_c" 1>&6
90887  else
90888 @@ -108339,7 +114926,7 @@ if test -n "$ac_tool_prefix"; then
90889    # Extract the first word of "ranlib", so it can be a program name with args.
90890  set dummy ranlib; ac_word=$2
90891  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90892 -echo "configure:108343: checking for $ac_word" >&5
90893 +echo "configure:114930: checking for $ac_word" >&5
90894  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
90895    echo $ac_n "(cached) $ac_c" 1>&6
90896  else
90897 @@ -108374,7 +114961,7 @@ fi
90898  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
90899  set dummy ${ac_tool_prefix}strip; ac_word=$2
90900  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90901 -echo "configure:108378: checking for $ac_word" >&5
90902 +echo "configure:114965: checking for $ac_word" >&5
90903  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
90904    echo $ac_n "(cached) $ac_c" 1>&6
90905  else
90906 @@ -108406,7 +114993,7 @@ if test -n "$ac_tool_prefix"; then
90907    # Extract the first word of "strip", so it can be a program name with args.
90908  set dummy strip; ac_word=$2
90909  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90910 -echo "configure:108410: checking for $ac_word" >&5
90911 +echo "configure:114997: checking for $ac_word" >&5
90912  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
90913    echo $ac_n "(cached) $ac_c" 1>&6
90914  else
90915 @@ -108493,7 +115080,7 @@ case $deplibs_check_method in
90916  file_magic*)
90917    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
90918      echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
90919 -echo "configure:108497: checking for ${ac_tool_prefix}file" >&5
90920 +echo "configure:115084: checking for ${ac_tool_prefix}file" >&5
90921  if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
90922    echo $ac_n "(cached) $ac_c" 1>&6
90923  else
90924 @@ -108553,7 +115140,7 @@ fi
90925  if test -z "$lt_cv_path_MAGIC_CMD"; then
90926    if test -n "$ac_tool_prefix"; then
90927      echo $ac_n "checking for file""... $ac_c" 1>&6
90928 -echo "configure:108557: checking for file" >&5
90929 +echo "configure:115144: checking for file" >&5
90930  if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
90931    echo $ac_n "(cached) $ac_c" 1>&6
90932  else
90933 @@ -108625,7 +115212,7 @@ esac
90934      # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
90935  set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
90936  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90937 -echo "configure:108629: checking for $ac_word" >&5
90938 +echo "configure:115216: checking for $ac_word" >&5
90939  if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then
90940    echo $ac_n "(cached) $ac_c" 1>&6
90941  else
90942 @@ -108657,7 +115244,7 @@ if test -n "$ac_tool_prefix"; then
90943    # Extract the first word of "dsymutil", so it can be a program name with args.
90944  set dummy dsymutil; ac_word=$2
90945  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90946 -echo "configure:108661: checking for $ac_word" >&5
90947 +echo "configure:115248: checking for $ac_word" >&5
90948  if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then
90949    echo $ac_n "(cached) $ac_c" 1>&6
90950  else
90951 @@ -108692,7 +115279,7 @@ fi
90952      # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
90953  set dummy ${ac_tool_prefix}nmedit; ac_word=$2
90954  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90955 -echo "configure:108696: checking for $ac_word" >&5
90956 +echo "configure:115283: checking for $ac_word" >&5
90957  if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then
90958    echo $ac_n "(cached) $ac_c" 1>&6
90959  else
90960 @@ -108724,7 +115311,7 @@ if test -n "$ac_tool_prefix"; then
90961    # Extract the first word of "nmedit", so it can be a program name with args.
90962  set dummy nmedit; ac_word=$2
90963  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
90964 -echo "configure:108728: checking for $ac_word" >&5
90965 +echo "configure:115315: checking for $ac_word" >&5
90966  if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then
90967    echo $ac_n "(cached) $ac_c" 1>&6
90968  else
90969 @@ -108758,7 +115345,7 @@ fi
90970
90971
90972      echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6
90973 -echo "configure:108762: checking for -single_module linker flag" >&5
90974 +echo "configure:115349: checking for -single_module linker flag" >&5
90975  if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then
90976    echo $ac_n "(cached) $ac_c" 1>&6
90977  else
90978 @@ -108781,7 +115368,7 @@ fi
90979
90980  echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6
90981      echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6
90982 -echo "configure:108785: checking for -exported_symbols_list linker flag" >&5
90983 +echo "configure:115372: checking for -exported_symbols_list linker flag" >&5
90984  if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then
90985    echo $ac_n "(cached) $ac_c" 1>&6
90986  else
90987 @@ -108791,12 +115378,12 @@ else
90988        LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
90989
90990  cat > conftest.$ac_ext <<EOF
90991 -#line 108795 "configure"
90992 +#line 115382 "configure"
90993  #include "confdefs.h"
90994  int main() {
90995  ; return 0; }
90996  EOF
90997 -if { (eval echo configure:108800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90998 +if { (eval echo configure:115387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
90999   lt_cv_ld_exported_symbols_list=yes
91000    rm -rf conftest*
91001  else
91002 @@ -108930,7 +115517,7 @@ if test "$GCC" = yes; then
91003
91004
91005  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
91006 -echo "configure:108934: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
91007 +echo "configure:115521: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
91008  if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then
91009    echo $ac_n "(cached) $ac_c" 1>&6
91010  else
91011 @@ -108947,11 +115534,11 @@ else
91012     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
91013     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
91014     -e 's:$: $lt_compiler_flag:'`
91015 -   (eval echo "\"configure:108951: $lt_compile\"" >&5)
91016 +   (eval echo "\"configure:115538: $lt_compile\"" >&5)
91017     (eval "$lt_compile" 2>conftest.err)
91018     ac_status=$?
91019     cat conftest.err >&5
91020 -   echo "configure:108955: \$? = $ac_status" >&5
91021 +   echo "configure:115542: \$? = $ac_status" >&5
91022     if (exit $ac_status) && test -s "$ac_outfile"; then
91023       # The compiler can only warn and ignore the option if not recognized
91024       # So say no if there are warnings other than the usual output.
91025 @@ -108980,7 +115567,7 @@ lt_prog_compiler_pic=
91026  lt_prog_compiler_static=
91027
91028  echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
91029 -echo "configure:108984: checking for $compiler option to produce PIC" >&5
91030 +echo "configure:115571: checking for $compiler option to produce PIC" >&5
91031
91032    if test "$GCC" = yes; then
91033      lt_prog_compiler_wl='-Wl,'
91034 @@ -109227,7 +115814,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6
91035  if test -n "$lt_prog_compiler_pic"; then
91036
91037  echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6
91038 -echo "configure:109231: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
91039 +echo "configure:115818: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
91040  if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then
91041    echo $ac_n "(cached) $ac_c" 1>&6
91042  else
91043 @@ -109244,11 +115831,11 @@ else
91044     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
91045     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
91046     -e 's:$: $lt_compiler_flag:'`
91047 -   (eval echo "\"configure:109248: $lt_compile\"" >&5)
91048 +   (eval echo "\"configure:115835: $lt_compile\"" >&5)
91049     (eval "$lt_compile" 2>conftest.err)
91050     ac_status=$?
91051     cat conftest.err >&5
91052 -   echo "configure:109252: \$? = $ac_status" >&5
91053 +   echo "configure:115839: \$? = $ac_status" >&5
91054     if (exit $ac_status) && test -s "$ac_outfile"; then
91055       # The compiler can only warn and ignore the option if not recognized
91056       # So say no if there are warnings other than the usual output.
91057 @@ -109290,7 +115877,7 @@ esac
91058  #
91059  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
91060  echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
91061 -echo "configure:109294: checking if $compiler static flag $lt_tmp_static_flag works" >&5
91062 +echo "configure:115881: checking if $compiler static flag $lt_tmp_static_flag works" >&5
91063  if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then
91064    echo $ac_n "(cached) $ac_c" 1>&6
91065  else
91066 @@ -109328,7 +115915,7 @@ fi
91067
91068
91069  echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
91070 -echo "configure:109332: checking if $compiler supports -c -o file.$ac_objext" >&5
91071 +echo "configure:115919: checking if $compiler supports -c -o file.$ac_objext" >&5
91072  if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then
91073    echo $ac_n "(cached) $ac_c" 1>&6
91074  else
91075 @@ -109348,11 +115935,11 @@ else
91076     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
91077     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
91078     -e 's:$: $lt_compiler_flag:'`
91079 -   (eval echo "\"configure:109352: $lt_compile\"" >&5)
91080 +   (eval echo "\"configure:115939: $lt_compile\"" >&5)
91081     (eval "$lt_compile" 2>out/conftest.err)
91082     ac_status=$?
91083     cat out/conftest.err >&5
91084 -   echo "configure:109356: \$? = $ac_status" >&5
91085 +   echo "configure:115943: \$? = $ac_status" >&5
91086     if (exit $ac_status) && test -s out/conftest2.$ac_objext
91087     then
91088       # The compiler can only warn and ignore the option if not recognized
91089 @@ -109382,7 +115969,7 @@ hard_links="nottested"
91090  if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
91091    # do not overwrite the value of need_locks provided by the user
91092    echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
91093 -echo "configure:109386: checking if we can lock with hard links" >&5
91094 +echo "configure:115973: checking if we can lock with hard links" >&5
91095    hard_links=yes
91096    $rm conftest*
91097    ln conftest.a conftest.b 2>/dev/null && hard_links=no
91098 @@ -109399,7 +115986,7 @@ else
91099  fi
91100
91101  echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
91102 -echo "configure:109403: checking whether the $compiler linker ($LD) supports shared libraries" >&5
91103 +echo "configure:115990: checking whether the $compiler linker ($LD) supports shared libraries" >&5
91104
91105    runpath_var=
91106    allow_undefined_flag=
91107 @@ -109810,12 +116397,12 @@ _LT_EOF
91108         # Determine the default libpath from the value encoded in an empty executable.
91109
91110  cat > conftest.$ac_ext <<EOF
91111 -#line 109814 "configure"
91112 +#line 116401 "configure"
91113  #include "confdefs.h"
91114  int main() {
91115  ; return 0; }
91116  EOF
91117 -if { (eval echo configure:109819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91118 +if { (eval echo configure:116406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91119
91120  lt_aix_libpath_sed='
91121      /Import File Strings/,/^$/ {
91122 @@ -109848,12 +116435,12 @@ if test -z "$aix_libpath"; then aix_libp
91123          # Determine the default libpath from the value encoded in an empty executable.
91124
91125  cat > conftest.$ac_ext <<EOF
91126 -#line 109852 "configure"
91127 +#line 116439 "configure"
91128  #include "confdefs.h"
91129  int main() {
91130  ; return 0; }
91131  EOF
91132 -if { (eval echo configure:109857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91133 +if { (eval echo configure:116444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91134
91135  lt_aix_libpath_sed='
91136      /Import File Strings/,/^$/ {
91137 @@ -110343,11 +116930,11 @@ x|xyes)
91138        # systems, -lgcc has to come before -lc. If gcc already passes -lc
91139        # to ld, don't add -lc before -lgcc.
91140        echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
91141 -echo "configure:110347: checking whether -lc should be explicitly linked in" >&5
91142 +echo "configure:116934: checking whether -lc should be explicitly linked in" >&5
91143        $rm conftest*
91144        echo "$lt_simple_compile_test_code" > conftest.$ac_ext
91145
91146 -      if { (eval echo configure:110351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
91147 +      if { (eval echo configure:116938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
91148          soname=conftest
91149          lib=conftest
91150          libobjs=conftest.$ac_objext
91151 @@ -110361,7 +116948,7 @@ echo "configure:110347: checking whether
91152          libname=conftest
91153          lt_save_allow_undefined_flag=$allow_undefined_flag
91154          allow_undefined_flag=
91155 -        if { (eval echo configure:110365: \"$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; }
91156 +        if { (eval echo configure:116952: \"$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; }
91157          then
91158           archive_cmds_need_lc=no
91159          else
91160 @@ -110380,7 +116967,7 @@ echo "configure:110347: checking whether
91161  esac
91162
91163  echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
91164 -echo "configure:110384: checking dynamic linker characteristics" >&5
91165 +echo "configure:116971: checking dynamic linker characteristics" >&5
91166  library_names_spec=
91167  libname_spec='lib$name'
91168  soname_spec=
91169 @@ -111005,7 +117592,7 @@ if test "$GCC" = yes; then
91170  fi
91171
91172  echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
91173 -echo "configure:111009: checking how to hardcode library paths into programs" >&5
91174 +echo "configure:117596: checking how to hardcode library paths into programs" >&5
91175  hardcode_action=
91176  if test -n "$hardcode_libdir_flag_spec" || \
91177     test -n "$runpath_var" || \
91178 @@ -111043,7 +117630,7 @@ fi
91179  striplib=
91180  old_striplib=
91181  echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
91182 -echo "configure:111047: checking whether stripping libraries is possible" >&5
91183 +echo "configure:117634: checking whether stripping libraries is possible" >&5
91184  if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
91185    test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
91186    test -z "$striplib" && striplib="$STRIP --strip-unneeded"
91187 @@ -111094,7 +117681,7 @@ else
91188    darwin*)
91189    # if libdl is installed we need to link against it
91190      echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
91191 -echo "configure:111098: checking for dlopen in -ldl" >&5
91192 +echo "configure:117685: checking for dlopen in -ldl" >&5
91193  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
91194  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
91195    echo $ac_n "(cached) $ac_c" 1>&6
91196 @@ -111102,7 +117689,7 @@ else
91197    ac_save_LIBS="$LIBS"
91198  LIBS="-ldl  $LIBS"
91199  cat > conftest.$ac_ext <<EOF
91200 -#line 111106 "configure"
91201 +#line 117693 "configure"
91202  #include "confdefs.h"
91203  /* Override any gcc2 internal prototype to avoid an error.  */
91204  /* We use char because int might match the return type of a gcc2
91205 @@ -111113,7 +117700,7 @@ int main() {
91206  dlopen()
91207  ; return 0; }
91208  EOF
91209 -if { (eval echo configure:111117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91210 +if { (eval echo configure:117704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91211    rm -rf conftest*
91212    eval "ac_cv_lib_$ac_lib_var=yes"
91213  else
91214 @@ -111142,12 +117729,12 @@ fi
91215
91216    *)
91217      echo $ac_n "checking for shl_load""... $ac_c" 1>&6
91218 -echo "configure:111146: checking for shl_load" >&5
91219 +echo "configure:117733: checking for shl_load" >&5
91220  if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
91221    echo $ac_n "(cached) $ac_c" 1>&6
91222  else
91223    cat > conftest.$ac_ext <<EOF
91224 -#line 111151 "configure"
91225 +#line 117738 "configure"
91226  #include "confdefs.h"
91227  /* System header to define __stub macros and hopefully few prototypes,
91228      which can conflict with char shl_load(); below.  */
91229 @@ -111170,7 +117757,7 @@ shl_load();
91230
91231  ; return 0; }
91232  EOF
91233 -if { (eval echo configure:111174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91234 +if { (eval echo configure:117761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91235    rm -rf conftest*
91236    eval "ac_cv_func_shl_load=yes"
91237  else
91238 @@ -111188,7 +117775,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_
91239  else
91240    echo "$ac_t""no" 1>&6
91241  echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
91242 -echo "configure:111192: checking for shl_load in -ldld" >&5
91243 +echo "configure:117779: checking for shl_load in -ldld" >&5
91244  ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
91245  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
91246    echo $ac_n "(cached) $ac_c" 1>&6
91247 @@ -111196,7 +117783,7 @@ else
91248    ac_save_LIBS="$LIBS"
91249  LIBS="-ldld  $LIBS"
91250  cat > conftest.$ac_ext <<EOF
91251 -#line 111200 "configure"
91252 +#line 117787 "configure"
91253  #include "confdefs.h"
91254  /* Override any gcc2 internal prototype to avoid an error.  */
91255  /* We use char because int might match the return type of a gcc2
91256 @@ -111207,7 +117794,7 @@ int main() {
91257  shl_load()
91258  ; return 0; }
91259  EOF
91260 -if { (eval echo configure:111211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91261 +if { (eval echo configure:117798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91262    rm -rf conftest*
91263    eval "ac_cv_lib_$ac_lib_var=yes"
91264  else
91265 @@ -111226,12 +117813,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
91266  else
91267    echo "$ac_t""no" 1>&6
91268  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
91269 -echo "configure:111230: checking for dlopen" >&5
91270 +echo "configure:117817: checking for dlopen" >&5
91271  if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
91272    echo $ac_n "(cached) $ac_c" 1>&6
91273  else
91274    cat > conftest.$ac_ext <<EOF
91275 -#line 111235 "configure"
91276 +#line 117822 "configure"
91277  #include "confdefs.h"
91278  /* System header to define __stub macros and hopefully few prototypes,
91279      which can conflict with char dlopen(); below.  */
91280 @@ -111254,7 +117841,7 @@ dlopen();
91281
91282  ; return 0; }
91283  EOF
91284 -if { (eval echo configure:111258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91285 +if { (eval echo configure:117845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91286    rm -rf conftest*
91287    eval "ac_cv_func_dlopen=yes"
91288  else
91289 @@ -111272,7 +117859,7 @@ if eval "test \"`echo '$ac_cv_func_'dlop
91290  else
91291    echo "$ac_t""no" 1>&6
91292  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
91293 -echo "configure:111276: checking for dlopen in -ldl" >&5
91294 +echo "configure:117863: checking for dlopen in -ldl" >&5
91295  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
91296  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
91297    echo $ac_n "(cached) $ac_c" 1>&6
91298 @@ -111280,7 +117867,7 @@ else
91299    ac_save_LIBS="$LIBS"
91300  LIBS="-ldl  $LIBS"
91301  cat > conftest.$ac_ext <<EOF
91302 -#line 111284 "configure"
91303 +#line 117871 "configure"
91304  #include "confdefs.h"
91305  /* Override any gcc2 internal prototype to avoid an error.  */
91306  /* We use char because int might match the return type of a gcc2
91307 @@ -111291,7 +117878,7 @@ int main() {
91308  dlopen()
91309  ; return 0; }
91310  EOF
91311 -if { (eval echo configure:111295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91312 +if { (eval echo configure:117882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91313    rm -rf conftest*
91314    eval "ac_cv_lib_$ac_lib_var=yes"
91315  else
91316 @@ -111310,7 +117897,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
91317  else
91318    echo "$ac_t""no" 1>&6
91319  echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
91320 -echo "configure:111314: checking for dlopen in -lsvld" >&5
91321 +echo "configure:117901: checking for dlopen in -lsvld" >&5
91322  ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
91323  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
91324    echo $ac_n "(cached) $ac_c" 1>&6
91325 @@ -111318,7 +117905,7 @@ else
91326    ac_save_LIBS="$LIBS"
91327  LIBS="-lsvld  $LIBS"
91328  cat > conftest.$ac_ext <<EOF
91329 -#line 111322 "configure"
91330 +#line 117909 "configure"
91331  #include "confdefs.h"
91332  /* Override any gcc2 internal prototype to avoid an error.  */
91333  /* We use char because int might match the return type of a gcc2
91334 @@ -111329,7 +117916,7 @@ int main() {
91335  dlopen()
91336  ; return 0; }
91337  EOF
91338 -if { (eval echo configure:111333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91339 +if { (eval echo configure:117920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91340    rm -rf conftest*
91341    eval "ac_cv_lib_$ac_lib_var=yes"
91342  else
91343 @@ -111348,7 +117935,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
91344  else
91345    echo "$ac_t""no" 1>&6
91346  echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
91347 -echo "configure:111352: checking for dld_link in -ldld" >&5
91348 +echo "configure:117939: checking for dld_link in -ldld" >&5
91349  ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
91350  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
91351    echo $ac_n "(cached) $ac_c" 1>&6
91352 @@ -111356,7 +117943,7 @@ else
91353    ac_save_LIBS="$LIBS"
91354  LIBS="-ldld  $LIBS"
91355  cat > conftest.$ac_ext <<EOF
91356 -#line 111360 "configure"
91357 +#line 117947 "configure"
91358  #include "confdefs.h"
91359  /* Override any gcc2 internal prototype to avoid an error.  */
91360  /* We use char because int might match the return type of a gcc2
91361 @@ -111367,7 +117954,7 @@ int main() {
91362  dld_link()
91363  ; return 0; }
91364  EOF
91365 -if { (eval echo configure:111371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91366 +if { (eval echo configure:117958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91367    rm -rf conftest*
91368    eval "ac_cv_lib_$ac_lib_var=yes"
91369  else
91370 @@ -111423,7 +118010,7 @@ fi
91371      LIBS="$lt_cv_dlopen_libs $LIBS"
91372
91373      echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
91374 -echo "configure:111427: checking whether a program can dlopen itself" >&5
91375 +echo "configure:118014: checking whether a program can dlopen itself" >&5
91376  if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
91377    echo $ac_n "(cached) $ac_c" 1>&6
91378  else
91379 @@ -111433,7 +118020,7 @@ else
91380    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
91381    lt_status=$lt_dlunknown
91382    cat > conftest.$ac_ext <<EOF
91383 -#line 111437 "configure"
91384 +#line 118024 "configure"
91385  #include "confdefs.h"
91386
91387  #if HAVE_DLFCN_H
91388 @@ -111496,7 +118083,7 @@ int main ()
91389      exit (status);
91390  }
91391  EOF
91392 -  if { (eval echo configure:111500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
91393 +  if { (eval echo configure:118087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
91394      (./conftest; exit; ) >&5 2>/dev/null
91395      lt_status=$?
91396      case x$lt_status in
91397 @@ -111519,7 +118106,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
91398      if test "x$lt_cv_dlopen_self" = xyes; then
91399        wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
91400        echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
91401 -echo "configure:111523: checking whether a statically linked program can dlopen itself" >&5
91402 +echo "configure:118110: checking whether a statically linked program can dlopen itself" >&5
91403  if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
91404    echo $ac_n "(cached) $ac_c" 1>&6
91405  else
91406 @@ -111529,7 +118116,7 @@ else
91407    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
91408    lt_status=$lt_dlunknown
91409    cat > conftest.$ac_ext <<EOF
91410 -#line 111533 "configure"
91411 +#line 118120 "configure"
91412  #include "confdefs.h"
91413
91414  #if HAVE_DLFCN_H
91415 @@ -111592,7 +118179,7 @@ int main ()
91416      exit (status);
91417  }
91418  EOF
91419 -  if { (eval echo configure:111596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
91420 +  if { (eval echo configure:118183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
91421      (./conftest; exit; ) >&5 2>/dev/null
91422      lt_status=$?
91423      case x$lt_status in
91424 @@ -111633,11 +118220,11 @@ fi
91425
91426  # Report which library types will actually be built
91427  echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
91428 -echo "configure:111637: checking if libtool supports shared libraries" >&5
91429 +echo "configure:118224: checking if libtool supports shared libraries" >&5
91430  echo "$ac_t""$can_build_shared" 1>&6
91431
91432  echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
91433 -echo "configure:111641: checking whether to build shared libraries" >&5
91434 +echo "configure:118228: checking whether to build shared libraries" >&5
91435  test "$can_build_shared" = "no" && enable_shared=no
91436
91437  # On AIX, shared libraries and static libraries use the same namespace, and
91438 @@ -111660,7 +118247,7 @@ esac
91439  echo "$ac_t""$enable_shared" 1>&6
91440
91441  echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
91442 -echo "configure:111664: checking whether to build static libraries" >&5
91443 +echo "configure:118251: checking whether to build static libraries" >&5
91444  # Make sure either enable_shared or enable_static is yes.
91445  test "$enable_shared" = yes || enable_static=yes
91446  echo "$ac_t""$enable_static" 1>&6
91447 @@ -112346,7 +118933,7 @@ ac_prog=ld
91448  if test "$GCC" = yes; then
91449    # Check if gcc -print-prog-name=ld gives a path.
91450    echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
91451 -echo "configure:112350: checking for ld used by $CC" >&5
91452 +echo "configure:118937: checking for ld used by $CC" >&5
91453    case $host in
91454    *-*-mingw*)
91455      # gcc leaves a trailing carriage return which upsets mingw
91456 @@ -112376,10 +118963,10 @@ echo "configure:112350: checking for ld
91457    esac
91458  elif test "$with_gnu_ld" = yes; then
91459    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
91460 -echo "configure:112380: checking for GNU ld" >&5
91461 +echo "configure:118967: checking for GNU ld" >&5
91462  else
91463    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
91464 -echo "configure:112383: checking for non-GNU ld" >&5
91465 +echo "configure:118970: checking for non-GNU ld" >&5
91466  fi
91467  if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
91468    echo $ac_n "(cached) $ac_c" 1>&6
91469 @@ -112418,7 +119005,7 @@ else
91470  fi
91471  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
91472  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
91473 -echo "configure:112422: checking if the linker ($LD) is GNU ld" >&5
91474 +echo "configure:119009: checking if the linker ($LD) is GNU ld" >&5
91475  if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
91476    echo $ac_n "(cached) $ac_c" 1>&6
91477  else
91478 @@ -112484,7 +119071,7 @@ fi
91479
91480  # PORTME: fill in a description of your system's C++ link characteristics
91481  echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
91482 -echo "configure:112488: checking whether the $compiler linker ($LD) supports shared libraries" >&5
91483 +echo "configure:119075: checking whether the $compiler linker ($LD) supports shared libraries" >&5
91484  ld_shlibs_CXX=yes
91485  case $host_os in
91486    aix3*)
91487 @@ -112582,12 +119169,12 @@ case $host_os in
91488        # Determine the default libpath from the value encoded in an empty executable.
91489
91490  cat > conftest.$ac_ext <<EOF
91491 -#line 112586 "configure"
91492 +#line 119173 "configure"
91493  #include "confdefs.h"
91494  int main() {
91495  ; return 0; }
91496  EOF
91497 -if { (eval echo configure:112591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91498 +if { (eval echo configure:119178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91499
91500  lt_aix_libpath_sed='
91501      /Import File Strings/,/^$/ {
91502 @@ -112621,12 +119208,12 @@ if test -z "$aix_libpath"; then aix_libp
91503         # Determine the default libpath from the value encoded in an empty executable.
91504
91505  cat > conftest.$ac_ext <<EOF
91506 -#line 112625 "configure"
91507 +#line 119212 "configure"
91508  #include "confdefs.h"
91509  int main() {
91510  ; return 0; }
91511  EOF
91512 -if { (eval echo configure:112630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91513 +if { (eval echo configure:119217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
91514
91515  lt_aix_libpath_sed='
91516      /Import File Strings/,/^$/ {
91517 @@ -113393,7 +119980,7 @@ private:
91518  };
91519  EOF
91520
91521 -if { (eval echo configure:113397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
91522 +if { (eval echo configure:119984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
91523    # Parse the compiler output and extract the necessary
91524    # objects, libraries and library flags.
91525
91526 @@ -113549,7 +120136,7 @@ lt_prog_compiler_pic_CXX=
91527  lt_prog_compiler_static_CXX=
91528
91529  echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
91530 -echo "configure:113553: checking for $compiler option to produce PIC" >&5
91531 +echo "configure:120140: checking for $compiler option to produce PIC" >&5
91532
91533    # C++ specific cases for pic, static, wl, etc.
91534    if test "$GXX" = yes; then
91535 @@ -113846,7 +120433,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX"
91536  if test -n "$lt_prog_compiler_pic_CXX"; then
91537
91538  echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6
91539 -echo "configure:113850: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
91540 +echo "configure:120437: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
91541  if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then
91542    echo $ac_n "(cached) $ac_c" 1>&6
91543  else
91544 @@ -113863,11 +120450,11 @@ else
91545     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
91546     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
91547     -e 's:$: $lt_compiler_flag:'`
91548 -   (eval echo "\"configure:113867: $lt_compile\"" >&5)
91549 +   (eval echo "\"configure:120454: $lt_compile\"" >&5)
91550     (eval "$lt_compile" 2>conftest.err)
91551     ac_status=$?
91552     cat conftest.err >&5
91553 -   echo "configure:113871: \$? = $ac_status" >&5
91554 +   echo "configure:120458: \$? = $ac_status" >&5
91555     if (exit $ac_status) && test -s "$ac_outfile"; then
91556       # The compiler can only warn and ignore the option if not recognized
91557       # So say no if there are warnings other than the usual output.
91558 @@ -113909,7 +120496,7 @@ esac
91559  #
91560  wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
91561  echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
91562 -echo "configure:113913: checking if $compiler static flag $lt_tmp_static_flag works" >&5
91563 +echo "configure:120500: checking if $compiler static flag $lt_tmp_static_flag works" >&5
91564  if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then
91565    echo $ac_n "(cached) $ac_c" 1>&6
91566  else
91567 @@ -113947,7 +120534,7 @@ fi
91568
91569
91570  echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
91571 -echo "configure:113951: checking if $compiler supports -c -o file.$ac_objext" >&5
91572 +echo "configure:120538: checking if $compiler supports -c -o file.$ac_objext" >&5
91573  if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then
91574    echo $ac_n "(cached) $ac_c" 1>&6
91575  else
91576 @@ -113967,11 +120554,11 @@ else
91577     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
91578     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
91579     -e 's:$: $lt_compiler_flag:'`
91580 -   (eval echo "\"configure:113971: $lt_compile\"" >&5)
91581 +   (eval echo "\"configure:120558: $lt_compile\"" >&5)
91582     (eval "$lt_compile" 2>out/conftest.err)
91583     ac_status=$?
91584     cat out/conftest.err >&5
91585 -   echo "configure:113975: \$? = $ac_status" >&5
91586 +   echo "configure:120562: \$? = $ac_status" >&5
91587     if (exit $ac_status) && test -s out/conftest2.$ac_objext
91588     then
91589       # The compiler can only warn and ignore the option if not recognized
91590 @@ -114001,7 +120588,7 @@ hard_links="nottested"
91591  if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
91592    # do not overwrite the value of need_locks provided by the user
91593    echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
91594 -echo "configure:114005: checking if we can lock with hard links" >&5
91595 +echo "configure:120592: checking if we can lock with hard links" >&5
91596    hard_links=yes
91597    $rm conftest*
91598    ln conftest.a conftest.b 2>/dev/null && hard_links=no
91599 @@ -114018,7 +120605,7 @@ else
91600  fi
91601
91602  echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
91603 -echo "configure:114022: checking whether the $compiler linker ($LD) supports shared libraries" >&5
91604 +echo "configure:120609: checking whether the $compiler linker ($LD) supports shared libraries" >&5
91605
91606    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
91607    case $host_os in
91608 @@ -114064,11 +120651,11 @@ x|xyes)
91609        # systems, -lgcc has to come before -lc. If gcc already passes -lc
91610        # to ld, don't add -lc before -lgcc.
91611        echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
91612 -echo "configure:114068: checking whether -lc should be explicitly linked in" >&5
91613 +echo "configure:120655: checking whether -lc should be explicitly linked in" >&5
91614        $rm conftest*
91615        echo "$lt_simple_compile_test_code" > conftest.$ac_ext
91616
91617 -      if { (eval echo configure:114072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
91618 +      if { (eval echo configure:120659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
91619          soname=conftest
91620          lib=conftest
91621          libobjs=conftest.$ac_objext
91622 @@ -114082,7 +120669,7 @@ echo "configure:114068: checking whether
91623          libname=conftest
91624          lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
91625          allow_undefined_flag_CXX=
91626 -        if { (eval echo configure:114086: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
91627 +        if { (eval echo configure:120673: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
91628          then
91629           archive_cmds_need_lc_CXX=no
91630          else
91631 @@ -114101,7 +120688,7 @@ echo "configure:114068: checking whether
91632  esac
91633
91634  echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
91635 -echo "configure:114105: checking dynamic linker characteristics" >&5
91636 +echo "configure:120692: checking dynamic linker characteristics" >&5
91637  library_names_spec=
91638  libname_spec='lib$name'
91639  soname_spec=
91640 @@ -114674,7 +121261,7 @@ if test "$GCC" = yes; then
91641  fi
91642
91643  echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
91644 -echo "configure:114678: checking how to hardcode library paths into programs" >&5
91645 +echo "configure:121265: checking how to hardcode library paths into programs" >&5
91646  hardcode_action_CXX=
91647  if test -n "$hardcode_libdir_flag_spec_CXX" || \
91648     test -n "$runpath_var_CXX" || \
91649 --- a/generated_lists
91650 +++ b/generated_lists
91651 @@ -1,3 +1,3 @@
91652  makefile_am_files = Zend/Makefile.am TSRM/Makefile.am
91653  config_h_files = Zend/acconfig.h TSRM/acconfig.h
91654 -config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/recode/config9.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite/config.m4 ext/sqlite3/config0.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4
91655 +config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/apc/config.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dio/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/http/config9.m4 ext/http/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libevent/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config9.m4 ext/recode/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite3/config0.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4
91656 --- a/main/php_config.h.in
91657 +++ b/main/php_config.h.in
91658 @@ -1,4 +1,4 @@
91659 -/* main/php_config.h.in.  Generated automatically from configure.in by autoheader.  */
91660 +/* main/php_config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
91661  /* Leave this file alone */
91662  /*
91663     +----------------------------------------------------------------------+
91664 @@ -1325,6 +1325,51 @@
91665  /*   */
91666  #undef HAVE_ZLIB
91667
91668 +/*   */
91669 +#undef APC_MMAP
91670 +
91671 +/*   */
91672 +#undef APC_FILEHITS
91673 +
91674 +/*   */
91675 +#undef __DEBUG_APC__
91676 +
91677 +/*   */
91678 +#undef APC_SEM_LOCKS
91679 +
91680 +/*   */
91681 +#undef APC_SPIN_LOCKS
91682 +
91683 +/*   */
91684 +#undef APC_PTHREADMUTEX_LOCKS
91685 +
91686 +/*   */
91687 +#undef APC_FCNTL_LOCKS
91688 +
91689 +/*  shm/mmap memory protection  */
91690 +#undef APC_MEMPROTECT
91691 +
91692 +/*   */
91693 +#undef APC_HAVE_LOOKUP_HOOKS
91694 +
91695 +/*   */
91696 +#undef APC_HAVE_LOOKUP_HOOKS
91697 +
91698 +/*   */
91699 +#undef HAVE_SEMUN
91700 +
91701 +/*   */
91702 +#undef HAVE_SEMUN
91703 +
91704 +/* enable valgrind memchecks */
91705 +#undef HAVE_VALGRIND_MEMCHECK_H
91706 +
91707 +/* Whether to build apc as dynamic module */
91708 +#undef COMPILE_DL_APC
91709 +
91710 +/*   */
91711 +#undef HAVE_APC
91712 +
91713  /* Whether to build bcmath as dynamic module */
91714  #undef COMPILE_DL_BCMATH
91715
91716 @@ -1463,6 +1508,9 @@
91717  /* Whether to build dba as dynamic module */
91718  #undef COMPILE_DL_DBA
91719
91720 +/* Whether to build dio as dynamic module */
91721 +#undef COMPILE_DL_DIO
91722 +
91723  /*   */
91724  #undef HAVE_LIBXML
91725
91726 @@ -1886,6 +1934,9 @@
91727  /* LDAP SASL support */
91728  #undef HAVE_LDAP_SASL
91729
91730 +/* Whether to build libevent as dynamic module */
91731 +#undef COMPILE_DL_LIBEVENT
91732 +
91733  /* whether to have multibyte string support */
91734  #undef HAVE_MBSTRING
91735
91736 @@ -2804,6 +2855,120 @@
91737  /* Whether to build zip as dynamic module */
91738  #undef COMPILE_DL_ZIP
91739
91740 +/*   */
91741 +#undef HTTP_SHARED_DEPS
91742 +
91743 +/*   */
91744 +#undef HTTP_SHARED_DEPS
91745 +
91746 +/*   */
91747 +#undef HAVE_GETHOSTNAME
91748 +
91749 +/*   */
91750 +#undef HAVE_GETHOSTNAME
91751 +
91752 +/*   */
91753 +#undef HAVE_LIBNSL
91754 +
91755 +/*   */
91756 +#undef HAVE_GETDOMAINNAME
91757 +
91758 +/*   */
91759 +#undef HAVE_GETDOMAINNAME
91760 +
91761 +/*   */
91762 +#undef HAVE_LIBNSL
91763 +
91764 +/*   */
91765 +#undef HAVE_GETSERVBYPORT
91766 +
91767 +/*   */
91768 +#undef HAVE_GETSERVBYPORT
91769 +
91770 +/*   */
91771 +#undef HAVE_LIBNSL
91772 +
91773 +/*   */
91774 +#undef HAVE_GETSERVBYNAME
91775 +
91776 +/*   */
91777 +#undef HAVE_GETSERVBYNAME
91778 +
91779 +/*   */
91780 +#undef HAVE_LIBNSL
91781 +
91782 +/* Have zlib support */
91783 +#undef HTTP_HAVE_ZLIB
91784 +
91785 +/*   */
91786 +#undef HTTP_HAVE_SSL
91787 +
91788 +/*   */
91789 +#undef HTTP_HAVE_OPENSSL
91790 +
91791 +/*   */
91792 +#undef HTTP_HAVE_GNUTLS
91793 +
91794 +/* path to bundled SSL CA info */
91795 +#undef HTTP_CURL_CAINFO
91796 +
91797 +/* Have cURL support */
91798 +#undef HTTP_HAVE_CURL
91799 +
91800 +/*   */
91801 +#undef HAVE_CURL_SHARE_STRERROR
91802 +
91803 +/*   */
91804 +#undef HAVE_CURL_MULTI_STRERROR
91805 +
91806 +/*   */
91807 +#undef HAVE_CURL_EASY_STRERROR
91808 +
91809 +/*   */
91810 +#undef HAVE_CURL_EASY_RESET
91811 +
91812 +/*   */
91813 +#undef HAVE_CURL_FORMGET
91814 +
91815 +/*   */
91816 +#undef HAVE_CURL_MULTI_SETOPT
91817 +
91818 +/*   */
91819 +#undef HAVE_CURL_MULTI_TIMEOUT
91820 +
91821 +/*   */
91822 +#undef HTTP_EVENT_VERSION
91823 +
91824 +/* Have libevent support for cURL */
91825 +#undef HTTP_HAVE_EVENT
91826 +
91827 +/*   */
91828 +#undef HAVE_CURL_MULTI_SOCKET_ACTION
91829 +
91830 +/*   */
91831 +#undef HTTP_EVENT_VERSION
91832 +
91833 +/* Have libevent support for cURL */
91834 +#undef HTTP_HAVE_EVENT
91835 +
91836 +/*   */
91837 +#undef HAVE_CURL_MULTI_SOCKET_ACTION
91838 +
91839 +/* Have magic mime support */
91840 +#undef HTTP_HAVE_MAGIC
91841 +
91842 +/* Have ext/hash support */
91843 +#undef HTTP_HAVE_PHP_HASH_H
91844 +
91845 +/* Have ext/hash support */
91846 +#undef HTTP_HAVE_PHP_HASH_H
91847 +
91848 +/* Whether to build http as dynamic module */
91849 +#undef COMPILE_DL_HTTP
91850 +
91851 +/* Have extended HTTP support */
91852 +#undef HAVE_HTTP
91853 +
91854  /* Whether to build mysqlnd as dynamic module */
91855  #undef COMPILE_DL_MYSQLND
91856